From: curt <curt>
Date: Sat, 19 Jan 2002 14:58:49 +0000 (+0000)
Subject: Same autogen.sh tweak as for simgear to better handle irix vs.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6e11f22bc9db9c82652d16cb6b2755837d6db847;p=flightgear.git

Same autogen.sh tweak as for simgear to better handle irix vs.
linux.  This will likely require more tweaking as other platforms report
in.
Fixed a warning that Makefile.am was generating.
---

diff --git a/Makefile.am b/Makefile.am
index d90e76f01..0fd21ccc0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,6 @@ dist-hook:
 	(cd $(top_srcdir); $(HOME)/projects/FlightGear-0.7/admin/am2dsp.pl)
 	(cd $(top_srcdir); tar --exclude docs-mini/CVS --exclude hints/CVS \
 		-cf - docs-mini ) | (cd $(distdir); tar xvf -)
-	# tar cf - Simulator/FDM/JSBsim/aircraft Simulator/FDM/JSBsim/engine | (cd $(distdir); tar xvf -)
 
 
 ##########################################################################
diff --git a/autogen.sh b/autogen.sh
index 7417a3002..ed58ef488 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,14 +9,14 @@ 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