From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Mon, 8 Jun 2009 04:56:56 +0000 (+0000)
Subject: Relax automake requirements and make 1.11 features optional -- kevin brintnall
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f9d99d5d00152608c0412ab37814544ba9334c16;p=rrdtool-all.git

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




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

diff --git a/program/MakeMakefile b/program/MakeMakefile
index ab2a275f..90e4700f 100755
--- a/program/MakeMakefile
+++ b/program/MakeMakefile
@@ -17,9 +17,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 dc816467..2f4be2cd 100644
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -8,6 +8,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.999])
@@ -32,10 +35,10 @@ LIBVERS=5:0:1
 AC_SUBST(LIBVERS)
 
 AC_CANONICAL_TARGET
-AC_USE_SYSTEM_EXTENSIONS
-AM_INIT_AUTOMAKE([silent-rules])
+m4_version_prereq(2.60, [AC_USE_SYSTEM_EXTENSIONS], [#])
+AM_INIT_AUTOMAKE(m4_version_prereq(2.63, [silent-rules], [[]]))
 AM_MAINTAINER_MODE
-AM_SILENT_RULES([yes])
+m4_version_prereq(2.63, [AM_SILENT_RULES([yes])], [#])
 AC_CONFIG_HEADERS([rrd_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -49,9 +52,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([