Make sure the path to simgear and plib get added to the include path before anything...

diff --git a/Thanks b/Thanks
index d39bc3def4c3a3682b6f038c4f41b7f07dc85956..da0e6bc6e3170565eceff6d0a201a284e8b6dcd3 100644 (file)
--- a/Thanks
+++ b/Thanks
@@ -621,6 +621,16 @@ Roy Vegard Ovesen <rvovesen@tiscali.no>
   autopilot designers.
 
 
+Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
+  Enhancements to the Cessna-310 3d model.
+  Added a generic yoke model, a generic throttle quadrant model and a 
+  generic pedal set model.
+
+
+Stefan Seifert <nine@detonation.org>
+  Added the save-on-exit option to save the user preferences at program exit.
+
+
 Space Imaging, Inc  http://www.spaceimaging.com/
   Space Imaging has allowed us to use the images in their archive for
   commercial and non-commercial use, provided the original image can't be

diff --git a/configure.ac b/configure.ac
index 3362342873f9f64ac8607c4a54729eac65ac15f4..6492439210aa77b4d49dac60574eb100edbf19f3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,8 +27,43 @@ AC_ARG_WITH(simgear, [  --with-simgear=PREFIX   Specify the prefix path to simge
 if test "x$with_simgear" != "x" ; then
     echo "SimGear prefix path is $with_simgear"
     EXTRA_DIRS="${EXTRA_DIRS} $with_simgear"
+    CXXFLAGS="$CXXFLAGS -I$with_simgear"
 fi
 
+# specify the plib location
+AC_ARG_WITH(plib, [  --with-plib=PREFIX      Specify the prefix path to plib])
+
+if test "x$with_plib" != "x" ; then
+    echo "plib prefix is $with_plib"
+    EXTRA_DIRS="${EXTRA_DIRS} $with_plib"
+fi
+
+dnl Determine an extra directories to add to include/lib search paths
+case "${host}" in
+*-apple-darwin* | *-*-mingw32*)
+    echo no EXTRA_DIRS for $host
+    ;;
+
+*-*-cygwin*)
+    if test -d /usr/local ; then
+        EXTRA_DIRS="${EXTRA_DIRS} /usr/local"
+    fi
+    ;;
+
+*)
+    if test -d /usr/X11R6 ; then
+        EXTRA_DIR1="/usr/X11R6"
+    fi
+    if test -d /opt/X11R6 ; then
+        EXTRA_DIR2="/opt/X11R6"
+    fi
+    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local"
+    ;;
+
+esac
+wi_EXTRA_DIRS(no, ${EXTRA_DIRS})
+
+
 case "${host}" in
 *-*-irix*)
     if test "$CXX" = "CC"; then
@@ -83,46 +118,12 @@ fi
 AC_CHECK_HEADER(pthread.h)
 AM_CONDITIONAL(WITH_THREADS, test "x$with_threads" = "xyes")
 
-# specify the plib location
-AC_ARG_WITH(plib, [  --with-plib=PREFIX      Specify the prefix path to plib])
-
-if test "x$with_plib" != "x" ; then
-    echo "plib prefix is $with_plib"
-    EXTRA_DIRS="${EXTRA_DIRS} $with_plib"
-fi
-
 dnl Used by JSBSim to conditionally compile in fgfs interface code
 AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
 
 # Check for MS Windows environment
 AC_CHECK_HEADER(windows.h)
 
-dnl Determine an extra directories to add to include/lib search paths
-case "${host}" in
-*-apple-darwin* | *-*-mingw32*)
-    echo no EXTRA_DIRS for $host
-    ;;
-
-*-*-cygwin*)
-    if test -d /usr/local ; then
-        EXTRA_DIRS="${EXTRA_DIRS} /usr/local"
-    fi
-    ;;
-
-*)
-    if test -d /usr/X11R6 ; then
-        EXTRA_DIR1="/usr/X11R6"
-    fi
-    if test -d /opt/X11R6 ; then
-        EXTRA_DIR2="/opt/X11R6"
-    fi
-    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local"
-    ;;
-
-esac
-wi_EXTRA_DIRS(no, ${EXTRA_DIRS})
-
-
 dnl Using AM_CONDITIONAL is a step out of the protected little 
 dnl automake fold so it is potentially dangerous.  But, we are
 dnl beginning to run into cases where the standard checks are not
@@ -569,7 +570,7 @@ else
 fi
 
 echo -n "Automake version: "
-automake --version | head -1
+automake --version | head -n 1
 
 if test "x$with_multiplayer" != "xno"; then
     echo "Building with multiplayer support"