Mail++, Vivian++, ... and mine, of course :-)

[flightgear.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 7417a30021027373e5e2112782d1e8395cc4d76c..c4a3061a132c575e2ad2f5098d409eee41026260 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,45 +2,40 @@
 
 OSTYPE=`uname -s`
 MACHINE=`uname -m`
-AUTO_MAKE_VERSION=`automake --version | head -1 | awk '{print $4}' | sed -e 's/\-p[0-9]$//' | sed -e 's/\.//'`
+AUTO_MAKE_VERSION=`automake --version | head -1 | awk '{print $4}' | sed -e 's/\.\([0-9]*\).*/\1/'`
+if test $AUTO_MAKE_VERSION -lt 15; then
+    echo ""
+    echo "You need to upgrade to automake version 1.5 or greater."
+    echo "Most distributions have packages available to install or you can"
+    echo "find the source for the most recent version at"
+    echo "ftp://ftp.gnu.org/gnu/automake"
+    exit 1
+fi
 
 echo "Host info: $OSTYPE $MACHINE"
 echo -n " automake: `automake --version | head -1 | awk '{print $4}'`"
 echo " ($AUTO_MAKE_VERSION)"
 echo ""
 
-echo -n "Running aclocal"
-if [ $AUTO_MAKE_VERSION -ge 15 ]; then
-    echo " -I ."
-    aclocal -I .
-else
-    echo ""
-    aclocal
-fi
+echo "Running aclocal"
+aclocal
 
 echo "Running autoheader"
 autoheader
+if [ ! -e src/Include/config.h.in ]; then
+    echo "ERROR: autoheader didn't create simgear/simgear_config.h.in!"
+    exit 1
+fi    
 
-echo -n "Running automake"
-if [ $OSTYPE = "IRIX" -o $OSTYPE = "IRIX64" ]; then
-    echo " --add-missing --include-deps"
-    automake --add-missing --include-deps
-else
-    echo " --add-missing"
-    automake --add-missing
-fi
+echo "Running automake --add-missing"
+automake --add-missing
 
 echo "Running autoconf"
 autoconf
 
-# fixup Makefiles for Irix
-if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then
-    echo "Fixing Makefiles for Irix"
-    for n in `find . -name Makefile.in`; do \
-        mv -f $n $n.ar-new; \
-        sed 's/$(AR) cru /$(AR) -o /g' $n.ar-new > $n; \
-        rm -f $n.ar-new; \
-    done;
+if [ ! -e configure ]; then
+    echo "ERROR: configure was not created!"
+    exit 1
 fi
 
 echo ""