Patches from Johan Walles:

Here are the two modifications I had to make to get flightgear (just
updated from CVS) to build.  The first one is for being able to specify
SimGear's location at the ./configure command line, and the second one
is to be able to link.

diff --git a/configure.ac b/configure.ac
index aa4c4c7a7ee2284f3347b330f90148afe083a39f..d1e2f452085a19825df667b333cb4428d178fcfc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -137,7 +137,7 @@ case "${host}" in
     if test -d /opt/X11R6 ; then
         EXTRA_DIR2="/opt/X11R6"
     fi
-    EXTRA_DIRS="$EXTRA_DIR1 $EXTRA_DIR2"
+    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2"
     ;;
 
 esac

diff --git a/src/Input/Makefile.am b/src/Input/Makefile.am
index 63566249d4a5f2ee383a1fbcb618c8f9e46a3ff5..65e578e84907616d775bd858b0f29e8b135d189e 100644 (file)
--- a/src/Input/Makefile.am
+++ b/src/Input/Makefile.am
@@ -6,10 +6,10 @@ bin_PROGRAMS = js_demo fgjs
 
 js_demo_SOURCES = js_demo.cxx
 
-js_demo_LDADD = -lplibjs -lplibul $(audio_LIBS)
+js_demo_LDADD = -lplibjs $(audio_LIBS) -lplibul
 
 fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h
 
-fgjs_LDADD = -lplibjs -lplibul $(audio_LIBS)
+fgjs_LDADD = -lplibjs $(audio_LIBS) -lplibul
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src