[geos-commits] r2241 - trunk

[svn_geos at osgeo.org]

Author: pramsey
Date: 2009-01-18 16:30:30 -0500 (Sun, 18 Jan 2009)
New Revision: 2241

Modified:
   trunk/autogen.sh
Log:
Add version test for aclocal and automake to allow OpenSolaris to work.


Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2009-01-18 20:34:09 UTC (rev 2240)
+++ trunk/autogen.sh	2009-01-18 21:30:30 UTC (rev 2241)
@@ -14,6 +14,21 @@
 
 OSTYPE=`uname -s`
 
+for aclocal in aclocal aclocal-1.10 aclocal-1.9; do
+    ACLOCAL=`which $aclocal 2>/dev/null`
+    if test -x "${ACLOCAL}"; then
+        break;
+    fi
+done
+
+for automake in automake automake-1.10 automake-1.9; do
+    AUTOMAKE=`which $automake 2>/dev/null`
+    if test -x "${AUTOMAKE}"; then
+        break;
+    fi
+done
+
+
 for libtoolize in glibtoolize libtoolize; do
     LIBTOOLIZE=`which $libtoolize 2>/dev/null`
     if test -x "${LIBTOOLIZE}"; then
@@ -28,13 +43,13 @@
 fi
 
 echo "Running aclocal -I macros"
-aclocal -I macros || giveup
+$ACLOCAL -I macros || giveup
 echo "Running autoheader"
 autoheader || giveup
 echo "Running libtoolize"
 $LIBTOOLIZE --force --copy || giveup
 echo "Running automake"
-automake $AMFLAGS # || giveup
+$AUTOMAKE $AMFLAGS # || giveup
 echo "Running autoconf"
 autoconf || giveup