From: Tobias Oetiker <tobi@oetiker.ch>
Date: Thu, 7 Feb 2019 08:10:22 +0000 (+0100)
Subject: generate NUMVERS from VERSION file
X-Git-Tag: v1.7.2~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29ae1780743e0dd781d16145086d6f195c694e05;p=thirdparty%2Frrdtool-1.x.git

generate NUMVERS from VERSION file
---

diff --git a/configure b/configure
index 862d9c8e..18cf5702 100755
--- 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 456394ae..f9164803 100644
--- 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])