Imported Upstream version 3.1.0

[debian/amanda] / common-src / genversion.c

diff --git a/common-src/genversion.c b/common-src/genversion.c
index e4ae2369d8513c6a1b1c801f65e18c9047307106..d3c28ffa20e0af6a2dcc156328da90a77a576bc9 100644 (file)
--- a/common-src/genversion.c
+++ b/common-src/genversion.c
@@ -24,12 +24,11 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: genversion.c 1168 2008-07-03 14:15:21Z djmitche $
+ * $Id: genversion.c 2031 2009-07-09 14:44:32Z djmitche $
  *
  * dump the current Amanda version info
  */
 #include "amanda.h"
-#include "version.h"
 
 /* distribution-time information */
 #include "svn-info.h"
@@ -178,7 +177,7 @@ main(
     g_printf("const char * const version_info[] = {\n");
 
     startline("build:");
-    v = version();
+    v = VERSION;
     v_len = SIZEOF("Amanda-") + strlen(v) + 1;
     verstr = malloc(v_len);
     if (!verstr) {
@@ -403,10 +402,6 @@ main(
     prstr("BSD_SECURITY");
 #endif
 
-#ifdef KRB4_SECURITY
-    prstr("KRB4_SECURITY");
-#endif
-
 #ifdef KRB5_SECURITY
     prstr("KRB5_SECURITY");
 #endif
@@ -429,10 +424,6 @@ main(
     prstr("CHECK_USERID");
 #endif
 
-#ifdef USE_VERSION_SUFFIXES
-    prstr("USE_VERSION_SUFFIXES");
-#endif
-
 #ifdef HAVE_GZIP
     prstr("HAVE_GZIP");
 #endif