X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=autogen.sh;h=ed58ef48864c31a8592f335e1c7a49bb3916f6f1;hb=dc132d80b19614f729f6e35bbf4423db90728c4c;hp=c045940447981d5c8bf2ec946706f95d43b75e73;hpb=ac75d9d46b05289790f3c5ff2e806c6980686fc4;p=flightgear.git

diff --git a/autogen.sh b/autogen.sh
index c04594044..ed58ef488 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,22 +3,20 @@
 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/\.//'`
-# AM_CONDITIONAL(ANCIENT_AUTOMAKE, test $AUTO_MAKE_VERSION -lt 14)
-# AM_CONDITIONAL(OLD_AUTOMAKE, test $AUTO_MAKE_VERSION -lt 15)
 
 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
+ACLOCAL_OPTS=""
+if [ $AUTO_MAKE_VERSION -ge 14 ]; then
+    if [ $OSTYPE = "IRIX" -o $OSTYPE = "IRIX64" ]; then    echo " -I ."
+        ACLOCAL_OPTS="-I ."
+    fi
 fi
+echo "Running aclocal $ACLOCAL_OPTS"
+aclocal $ACLOCAL_OPTS
 
 echo "Running autoheader"
 autoheader
@@ -36,7 +34,7 @@ echo "Running autoconf"
 autoconf
 
 # fixup Makefiles for Irix
-if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
+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; \