added propper numeric version number to version

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@585 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/src/Makefile.am b/program/src/Makefile.am
index 9ac851f74320aa2e8ef8ca9d561d5e3c4fe6eb8d..0bbac1a074add18ca61a31e59bab27ede14121ec 100644 (file)
--- a/program/src/Makefile.am
+++ b/program/src/Makefile.am
@@ -11,7 +11,7 @@ fonts_DATA = DejaVuSansMono-Roman.ttf
 #INCLUDES = $(CGI_INCLUDES) $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
 #           $(PNG_INCLUDES) $(ZLIB_INCLUDES)
 RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
-AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\"
+AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@
 
 RRD_C_FILES =          \
        getopt.c        \

diff --git a/program/src/rrd_tool.c b/program/src/rrd_tool.c
index 810e4b706f106250e99a174d1b2817224a633d7b..a5a4e008c447317b6b1e2fbf71c481e17bc9756f 100644 (file)
--- a/program/src/rrd_tool.c
+++ b/program/src/rrd_tool.c
@@ -552,8 +552,8 @@ int HandleInputLine(int argc, char **argv, FILE* out)
             strcmp("v", argv[1]) == 0 ||
             strcmp("-v", argv[1]) == 0  ||
             strcmp("-version", argv[1]) == 0  )
-        printf("RRDtool " PACKAGE_VERSION "  Copyright by Tobi Oetiker, 1997-2005 (v.%lu)\n",
-               rrd_version(0, NULL));
+        printf("RRDtool " PACKAGE_VERSION "  Copyright by Tobi Oetiker, 1997-2005 (%f)\n",
+               rrd_version());
     else if (strcmp("restore", argv[1]) == 0)
        rrd_restore(argc-1, &argv[1]);
     else if (strcmp("resize", argv[1]) == 0)