[geos-commits] r2289 - trunk

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-03-23 10:01:54 -0400 (Mon, 23 Mar 2009)
New Revision: 2289

Modified:
   trunk/autogen.sh
Log:
autogen.sh: verbose check if autotools versions.

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2009-03-22 20:29:49 UTC (rev 2288)
+++ trunk/autogen.sh	2009-03-23 14:01:54 UTC (rev 2289)
@@ -14,16 +14,24 @@
 
 OSTYPE=`uname -s`
 
+AUTOHEADER=`which autoheader 2>/dev/null`
+if [ ! ${AUTOHEADER} ]; then
+    echo "Missing autoconf!"
+    exit
+fi
+AUTOHEADER_VER=`${AUTOHEADER} --version | grep -E "^.*[0-9]$" | sed '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
-if [ ! $ACLOCAL ]; then
+if [ ! ${ACLOCAL} ]; then
     echo "Missing aclocal!"
     exit
 fi
+ACLOCAL_VER=`${ACLOCAL} --version | grep -E "^.*[0-9]$" | sed 's/^.* //'`
 
 for automake in automake automake-1.10 automake-1.9; do
     AUTOMAKE=`which $automake 2>/dev/null`
@@ -31,10 +39,11 @@
         break;
     fi
 done
-if [ ! $AUTOMAKE ]; then
+if [ ! ${AUTOMAKE} ]; then
     echo "Missing automake!"
     exit
 fi
+AUTOMAKE_VER=`${AUTOMAKE} --version | grep -E "^.*[0-9]$" | sed 's/^.* //'`
 
 
 for libtoolize in glibtoolize libtoolize; do
@@ -43,10 +52,11 @@
         break;
     fi
 done
-if [ ! $LIBTOOLIZE ]; then
+if [ ! ${LIBTOOLIZE} ]; then
     echo "Missing libtoolize!"
     exit
 fi
+LIBTOOLIZE_VER=`${LIBTOOLIZE} --version | grep -E "^.*[0-9]\.[0-9]$" | sed 's/^.* //'`
 
 #AMFLAGS="--add-missing --copy --force-missing"
 AMFLAGS="--add-missing --copy"
@@ -54,15 +64,16 @@
    AMFLAGS=$AMFLAGS" --include-deps";
 fi
 
-echo "Running $ACLOCAL -I macros"
-$ACLOCAL -I macros || giveup
-echo "Running autoheader"
-autoheader || giveup
-echo "Running $LIBTOOLIZE --force --copy"
-$LIBTOOLIZE --force --copy || giveup
-echo "Running $AUTOMAKE $AMFLAGS"
-$AUTOMAKE $AMFLAGS # || giveup
-echo "Running autoconf"
+echo "* Running $ACLOCAL (${ACLOCAL_VER})"
+${ACLOCAL} -I macros || giveup
+echo "* Running ${AUTOHEADER} (${AUTOHEADER_VER})"
+${AUTOHEADER} || giveup
+echo "* Running ${LIBTOOLIZE} (${LIBTOOLIZE_VER})"
+${LIBTOOLIZE} --force --copy || giveup
+echo "* Running ${AUTOMAKE} (${AUTOMAKE_VER})"
+echo "\tAMFLAGS=${AMFLAGS}"
+${AUTOMAKE} ${AMFLAGS} # || giveup
+echo "* Running autoconf"
 autoconf || giveup
 
 echo "======================================"