[grisbi-cvs] grisbi autogen.sh,1.14,1.15

Pierre Biava pbiava at users.sourceforge.net
Sun Aug 23 09:27:48 CEST 2009


Update of /cvsroot/grisbi/grisbi
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31260

Modified Files:
	autogen.sh 
Log Message:
modification for automake > 1.10

Index: autogen.sh
===================================================================
RCS file: /cvsroot/grisbi/grisbi/autogen.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- autogen.sh	27 Jun 2009 15:19:58 -0000	1.14
+++ autogen.sh	23 Aug 2009 07:27:46 -0000	1.15
@@ -20,33 +20,13 @@
 fi
 echo "automake and autoconf are installed"
 
-
-PATH_AUTOMAKE=/usr/share/automake
-
 # test for some distribution...
-# Y'a pas plus simple ?
 
-if test -x /usr/share/automake-1.10
-then
-	PATH_AUTOMAKE=/usr/share/automake-1.10
-elif test -x /usr/share/automake-1.9
-then
-	PATH_AUTOMAKE=/usr/share/automake-1.9
-elif test -x /usr/share/automake-1.8
-then
-	PATH_AUTOMAKE=/usr/share/automake-1.8
-elif test -x /usr/share/automake-1.7
-then
-	PATH_AUTOMAKE=/usr/share/automake-1.7
-elif test -x /usr/share/automake-1.6
-then
-	PATH_AUTOMAKE=/usr/share/automake-1.6
-elif test -x /usr/share/automake-1.5
-then
-	PATH_AUTOMAKE=/usr/share/automake-1.4
-elif test -x /usr/share/automake-1.4
+PATH_AUTOMAKE=$(ls -1d /usr/share/automake* 2>/dev/null | sort -gbu | tail -1)
+
+if ! test -x $PATH_AUTOMAKE
 then
-	PATH_AUTOMAKE=/usr/share/automake-1.4
+	echo "Error: directory $PATH_AUTOMAKE does not exist"
 fi
 
 # Refresh GNU autotools toolchain.
@@ -60,8 +40,6 @@
 	fi
 done
 
-
-
 #
 # Apple's Developer Tools have a "libtool" that has nothing to do with
 # the GNU libtool; they call the latter "glibtool".  They also call



More information about the cvs mailing list