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 d90e76f01050f13a657a81be955ff8be0677df09..0fd21ccc04bb4784e7b35ee606eafcae49bb10a3 100644 (file)
--- 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 7417a30021027373e5e2112782d1e8395cc4d76c..ed58ef48864c31a8592f335e1c7a49bb3916f6f1 100755 (executable)
--- 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