svn_revision() now declared in svn_revision.h

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 9e78857188c305105722dabc0a0537edf77a9f83..b959d04f9db533f999e15236befff29849446728 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -58,6 +58,7 @@
 #include "policy.h"
 #include "control.h"
 #include "euidindex.h"
+#include "svn_revision.h"
 
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 7c453cc1b505deeebd43e037ba40413fff5e39b5..4bf86ee85868610646b1871687344da29dd8b67c 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -54,6 +54,7 @@
 #include "database.h"
 #include "user_ops.h"
 #include "housekeeping.h"
+#include "svn_revision.h"
 #include "citadel_dirs.c"
 
 #include "modules_init.h"
@@ -72,11 +73,6 @@ const char *CitadelServiceTCP="citadel-TCP";
 
 void go_threading(void);
 
-/*
- * For the subversion revision number
- */
-const char *svn_revision(void);
-
 /*
  * Here's where it all begins.
  */
@@ -202,15 +198,11 @@ int main(int argc, char **argv)
        CtdlLogPrintf(CTDL_NOTICE, "\n");
        CtdlLogPrintf(CTDL_NOTICE, "\n");
        CtdlLogPrintf(CTDL_NOTICE,
-               "*** Citadel server engine v%d.%02d ***\n",
-               (REV_LEVEL/100), (REV_LEVEL%100));
-       CtdlLogPrintf(CTDL_NOTICE,
-               "*** Build number %s ***\n", svn_revision());
-       CtdlLogPrintf(CTDL_NOTICE,
-               "Copyright (C) 1987-2008 by the Citadel development team.\n");
-       CtdlLogPrintf(CTDL_NOTICE,
-               "This program is distributed under the terms of the GNU "
-               "General Public License.\n");
+               "*** Citadel server engine v%d.%02d (build %s) ***\n",
+               (REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
+       CtdlLogPrintf(CTDL_NOTICE, "Copyright (C) 1987-2008 by the Citadel development team.\n");
+       CtdlLogPrintf(CTDL_NOTICE, "This program is distributed under the terms of the GNU "
+                                       "General Public License.\n");
        CtdlLogPrintf(CTDL_NOTICE, "\n");
        CtdlLogPrintf(CTDL_DEBUG, "Called as: %s\n", argv[0]);
        CtdlLogPrintf(CTDL_INFO, "%s\n", libcitadel_version_string());

diff --git a/citadel/svn_revision.h b/citadel/svn_revision.h
new file mode 100644 (file)
index 0000000..8c3428e
--- /dev/null
+++ b/citadel/svn_revision.h
@@ -0,0 +1,5 @@
+
+
+const char *svn_revision(void);
+
+