Relax automake requirements and make 1.11 features optional -- kevin brintnall

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

diff --git a/program/MakeMakefile b/program/MakeMakefile
index 03a5f34ce139cc9a7e57bfb71586ad2ce3c51485..b6658d6ccaf8fb8bdaa378e1cf19a8fbf5eb8e37 100755 (executable)
--- a/program/MakeMakefile
+++ b/program/MakeMakefile
@@ -16,9 +16,9 @@ PERL
 }
 
 ERROR=0
-LIBTOOL_VER="2.2.6"
-AUTOMAKE_VER="1.11"
-AUTOCONF_VER="2.63"
+LIBTOOL_VER="1.5.6"
+AUTOMAKE_VER="1.9.2"
+AUTOCONF_VER="2.59"
 
 if vcheck $LIBTOOL_VER "libtool --version"
 then

diff --git a/program/configure.ac b/program/configure.ac
index 3e9c1f1b32d86dcb390d22a71b25f8a2450ba0e8..d9867f0a05c9b34bed1fd37cb28be850dd5c1514 100644 (file)
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -7,6 +7,9 @@ dnl Inspiration from http://autoconf-archive.cryp.to
  
 dnl tell automake the this script is for rrdtool
 
+dnl Minimum Autoconf version required.
+AC_PREREQ(2.59)
+
 dnl the official version number is
 dnl a.b.c
 AC_INIT([rrdtool],[1.3.8])
@@ -29,10 +32,11 @@ dnl see http://sourceware.org/autobook/autobook/autobook_91.html
 dnl 
 LIBVERS=4:7:0
 AC_SUBST(LIBVERS)
-AC_USE_SYSTEM_EXTENSIONS
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE
+m4_version_prereq(2.60, [AC_USE_SYSTEM_EXTENSIONS], [#])
+AM_INIT_AUTOMAKE(m4_version_prereq(2.63, [silent-rules], [[]]))
 AM_MAINTAINER_MODE
+m4_version_prereq(2.63, [AM_SILENT_RULES([yes])], [#])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([rrd_config.h])
@@ -47,9 +51,6 @@ AC_SUBST(VERSION)
 
 AC_PREFIX_DEFAULT( /usr/local/rrdtool-$PACKAGE_VERSION )
 
-dnl Minimum Autoconf version required.
-AC_PREREQ(2.59)
-
 dnl At the TOP of the HEADER
 
 AH_TOP([