generate NUMVERS from VERSION file

diff --git a/configure b/configure
index 862d9c8edec92ae805659561ba04fca897d20828..18cf5702d44d9e6c6c44af0197e7992fa887435d 100755 (executable)
--- a/configure
+++ b/configure
@@ -699,6 +699,7 @@ PERLLDFLAGS
 PERLLD
 PERLCCFLAGS
 PERLCC
+NUMVERS
 POD2HTML
 POD2MAN
 PERL
@@ -838,7 +839,6 @@ build_vendor
 build_cpu
 build
 LIBVERS
-NUMVERS
 target_alias
 host_alias
 build_alias
@@ -2848,8 +2848,6 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-NUMVERS=1.7001
-
 
 LIBVERS=10:0:2
 
@@ -21833,6 +21831,8 @@ fi
 
 
 
+NUMVERS=1.7002
+
 
 # Check whether --enable-perl was given.
 if test "${enable_perl+set}" = set; then :

diff --git a/configure.ac b/configure.ac
index 456394ae2ba45af3aaba40c4ce5e8634d66b9a3f..f9164803e7b1ffcc1f9ce22ec36467aa6132e4a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,13 +16,6 @@ dnl a.b.c
 AC_INIT([rrdtool],m4_esyscmd([tr -d '\n' < VERSION]))
 AC_CONFIG_AUX_DIR(conftools)
 
-dnl for testing a numerical version number comes handy
-dnl the released version are
-dnl a.bccc
-dnl the devel versions will be something like
-dnl a.b999yymmddhh
-NUMVERS=1.7002
-AC_SUBST(NUMVERS)
 
 dnl for the linker to understand which versions the library are compatible with
 dnl each other we must keep a separate library version cout of the format c:r:a.
@@ -650,6 +643,13 @@ AC_PATH_PROG(PERL, perl, no)
 AC_PATH_PROG(POD2MAN, pod2man, no)
 AC_PATH_PROG(POD2HTML, pod2html, no)
 
+dnl for testing a numerical version number comes handy
+dnl the released version are
+dnl a.bccc
+dnl the devel versions will be something like
+dnl a.b999yymmddhh
+NUMVERS=m4_esyscmd([perl -ne 'my @x=split /\./;printf "%d.%d%03d", @x' VERSION])
+AC_SUBST(NUMVERS)
 
 AC_ARG_ENABLE(perl,AS_HELP_STRING([--disable-perl],[do not build the perl modules]),
 [],[enable_perl=yes])