Fixes to better support the native irix compilers.

diff --git a/FlightGear.dsp b/FlightGear.dsp
index d99af381a15c5eb6fc2b9aa9d4d21b5fd1b96b99..4e9cfd223d8e0506cd67fe92a73ed0ea7f6e81d7 100644 (file)
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -4092,6 +4092,96 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_ice.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\FDM\UIUCModel\uiuc_iceboot.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_iceboot.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_ice_rates.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_ice_rates.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_iced_nonlin.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_iced_nonlin.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\FDM\UIUCModel\uiuc_initializemaps.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -4752,6 +4842,36 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_map_record5.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\FDM\UIUCModel\uiuc_map_record6.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_map_record6.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\FDM\UIUCModel\uiuc_menu.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r

diff --git a/autogen.sh b/autogen.sh
index e09c31b9115a75df3a5659c4bc37a439ddef7691..c4a3061a132c575e2ad2f5098d409eee41026260 100755 (executable)
--- 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 "======================================"
 

diff --git a/configure.ac b/configure.ac
index 66d0c94ba523e167f56abb89dd4678c0e88e574f..4b05998c8a47f8164895f5cfed6f6001561a0a15 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AC_CONFIG_SRCDIR([src/Aircraft/aircraft.cxx])
 AC_PREREQ(2.52)
 
 # Initialize the automake stuff
-AM_INIT_AUTOMAKE(FlightGear, 0.7.11pre1)
+AM_INIT_AUTOMAKE(FlightGear, 0.7.11pre2)
 
 # Checks for programs.
 AC_PROG_MAKE_SET
@@ -54,15 +54,19 @@ AM_CONDITIONAL(IS_CYGWIN, test "x$is_cygwin" = "xyes")
 # Used by JSBSim
 AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
 
+
 # Used on the Irix platform
 AR="ar"
+ARFLAGS="cru"
 OS=`uname -s`
 if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
     if test "$CXX" = "CC"; then
         AR="CC -ar"
-        AC_SUBST(AR)
+        ARFLAGS="-o"
     fi
 fi
+AC_SUBST(AR)
+AC_SUBST(ARFLAGS)
 
 
 # Specify if we want logging (testing build) or not (release build)