From 2470aaf9e2b484941fff5124addf5acddbbe85fb Mon Sep 17 00:00:00 2001 From: oetiker Date: Sun, 28 Sep 2008 19:23:23 +0000 Subject: [PATCH] Attached is a patch to lower the version requirements of libtool and automake. I have tested this on CentOS 4.x with the specified versions of libtool and automake and was able to build RRDTool fine. I did *not* test building with PHP, tcl, ruby or Python though. I also abstracted the version numbers of all the dependencies such that editing them in the future will be easier. -- Bernard Li git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1537 a5681a0c-68f1-0310-ab6d-d61299d08faa --- MakeMakefile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/MakeMakefile b/MakeMakefile index f945d3b..2765238 100755 --- a/MakeMakefile +++ b/MakeMakefile @@ -17,18 +17,22 @@ PERL } ERROR=0 +LIBTOOL_VER="1.5.6" +AUTOMAKE_VER="1.9.2" +AUTOCONF_VER="2.59" +INTLTOOL_VER="0.35.0" -if vcheck 1.5.14 "libtool --version" +if vcheck $LIBTOOL_VER "libtool --version" then - echo "get a copy of GNU libtool >= 1.5.14" + echo "get a copy of GNU libtool >= $LIBTOOL_VER" ERROR=1 fi -if vcheck 1.9.5 "automake --version" +if vcheck $AUTOMAKE_VER "automake --version" then - if vcheck 1.9.5 "automake-1.9 --version" + if vcheck $AUTOMAKE_VER "automake-1.9 --version" then - echo "get a copy of GNU automake >= 1.9.5" + echo "get a copy of GNU automake >= $AUTOMAKE_VER" ERROR=1 else automake=automake-1.9 @@ -43,15 +47,15 @@ else # aclocal="aclocal -I /usr/pack/libtool-1.5.14-to/share/aclocal" fi -if vcheck 2.59 "autoconf --version" +if vcheck $AUTOCONF_VER "autoconf --version" then - echo "get a copy of GNU autoconf >= 2.59" + echo "get a copy of GNU autoconf >= $autoconf_ver" ERROR=1 fi -if vcheck 0.35.0 "intltoolize --version" +if vcheck $INTLTOOL_VER "intltoolize --version" then - echo "get a copy of GNU intltoolize >= 0.35.0" + echo "get a copy of GNU intltoolize >= $INTLTOOL_VER" ERROR=1 fi -- 2.30.2