Removed some more portability hacks that were made for systems that are now completel...

[citadel.git] / citadel / server / citadel.h

diff --git a/citadel/server/citadel.h b/citadel/server/citadel.h
index 62dbf52f545ec0afbc9a6eff25287871b8f39c1c..40b308f6829a22ccd52e324ee626176d8545c789 100644 (file)
--- a/citadel/server/citadel.h
+++ b/citadel/server/citadel.h
@@ -24,9 +24,6 @@
 extern "C" {
 #endif
 
-// Text description of this software
-// (We used to define this ourselves, but why bother when the build tools do it for us?)
-#define CITADEL        "Citadel" PACKAGE_VERSION
 
 #define REV_LEVEL 956          // This version
 #define REV_MIN                591             // Oldest compatible database
@@ -34,6 +31,11 @@ extern "C" {
 #define LIBCITADEL_MIN 951             // Minimum required version of libcitadel
 #define SERVER_TYPE    0               // zero for stock Citadel; other developers please obtain SERVER_TYPE codes for your implementations
 
+// hats off to https://stackoverflow.com/questions/5459868/concatenate-int-to-string-using-c-preprocessor
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
+#define CITADEL        "Citadel Server " STR(REV_LEVEL)
+
 #ifdef LIBCITADEL_VERSION_NUMBER
 #if LIBCITADEL_VERSION_NUMBER < LIBCITADEL_MIN
 #error libcitadel is too old.  Please upgrade it before continuing.