X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=autogen.sh;h=c4a3061a132c575e2ad2f5098d409eee41026260;hb=3d66aa6175cfe66030a6c82b10fb78ffc12db469;hp=e09c31b9115a75df3a5659c4bc37a439ddef7691;hpb=64312039da71e931281364b2bbc7c1a408423ad1;p=flightgear.git

diff --git a/autogen.sh b/autogen.sh
index e09c31b91..c4a3061a1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,14 +17,8 @@ echo -n " automake: `automake --version | head -1 | awk '{print $4}'`"
 echo " ($AUTO_MAKE_VERSION)"
 echo ""
 
-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 aclocal"
+aclocal
 
 echo "Running autoheader"
 autoheader
@@ -33,14 +27,8 @@ if [ ! -e src/Include/config.h.in ]; then
     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
@@ -50,16 +38,6 @@ if [ ! -e configure ]; then
     exit 1
 fi
 
-# 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;
-fi
-
 echo ""
 echo "======================================"