[geos-commits] r2293 - trunk

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-03-23 13:08:14 -0400 (Mon, 23 Mar 2009)
New Revision: 2293

Modified:
   trunk/autogen.sh
Log:
autogen.sh: be more verbose about versions, check for autoconf, check if ./configure is really generated.

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2009-03-23 16:28:47 UTC (rev 2292)
+++ trunk/autogen.sh	2009-03-23 17:08:14 UTC (rev 2293)
@@ -14,12 +14,18 @@
 
 OSTYPE=`uname -s`
 
+AUTOCONF=`which autoconf 2>/dev/null`
+if [ ! ${AUTOCONF} ]; then
+    echo "Missing autoconf!"
+    exit
+fi
+AUTOCONF_VER=`${AUTOCONF} --version | grep -E "^.*[0-9]$" | sed 's/^.* //'`
+
 AUTOHEADER=`which autoheader 2>/dev/null`
 if [ ! ${AUTOHEADER} ]; then
-    echo "Missing autoconf!"
+    echo "Missing autoheader!"
     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`
@@ -58,24 +64,34 @@
 fi
 LIBTOOLIZE_VER=`${LIBTOOLIZE} --version | grep -E "^.*[0-9]\.[0-9]$" | sed 's/^.* //'`
 
-#AMFLAGS="--add-missing --copy --force-missing"
-AMFLAGS="--add-missing --copy"
+AMOPTS="--add-missing --copy"
 if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then
-   AMFLAGS=$AMFLAGS" --include-deps";
+   AMOPTS=$AMOPTS" --include-deps";
 fi
 
+LTOPTS="--force --copy"
 echo "* Running ${LIBTOOLIZE} (${LIBTOOLIZE_VER})"
-${LIBTOOLIZE} --force --copy || giveup
+echo "\tOPTIONS = ${LTOPTS}"
+${LIBTOOLIZE} ${LTOPTS} || giveup
+
 echo "* Running $ACLOCAL (${ACLOCAL_VER})"
 ${ACLOCAL} -I macros || giveup
-echo "* Running ${AUTOHEADER} (${AUTOHEADER_VER})"
+
+echo "* Running ${AUTOHEADER} (${AUTOCONF_VER})"
 ${AUTOHEADER} || giveup
+
 echo "* Running ${AUTOMAKE} (${AUTOMAKE_VER})"
-echo "\tAMFLAGS=${AMFLAGS}"
-${AUTOMAKE} ${AMFLAGS} # || giveup
-echo "* Running autoconf"
-autoconf || giveup
+echo "\OPTIONS = ${AMOPTS}"
+${AUTOMAKE} ${AMOPTS} || giveup
 
-echo "======================================"
-echo "Now you are ready to run './configure'"
-echo "======================================"
+echo "* Running ${AUTOCONF} (${AUTOCONF_VER})"
+${AUTOCONF} || giveup
+
+if test -f "${PWD}/configure"; then
+    echo "======================================"
+    echo "Now you are ready to run './configure'"
+    echo "======================================"
+else
+    echo "  Failed to generate ./configure script!"
+    giveup
+fi