diff -burN FlightGear-0.9.6.orig/src/Airports/Makefile.am FlightGear-0.9.6/src/Airports/Makefile.am
--- FlightGear-0.9.6.orig/src/Airports/Makefile.am	2004-11-01 17:13:02.183256960 +0100
+++ FlightGear-0.9.6/src/Airports/Makefile.am	2004-11-01 17:13:54.304333352 +0100
@@ -7,6 +7,7 @@
 	simple.cxx simple.hxx
 
 calc_loc_SOURCES = calc_loc.cxx
-calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS)
+calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS) \
+		 -lsgprops -lsgstructure -lsgxml
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
diff -burN FlightGear-0.9.6.orig/src/FDM/YASim/Makefile.am FlightGear-0.9.6/src/FDM/YASim/Makefile.am
--- FlightGear-0.9.6.orig/src/FDM/YASim/Makefile.am	2004-11-01 17:13:02.016282344 +0100
+++ FlightGear-0.9.6/src/FDM/YASim/Makefile.am	2004-11-01 17:14:28.542128416 +0100
@@ -43,9 +43,9 @@
 
 yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCE_FILES)
 
-yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS)
+yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) -lz
 
 proptest_SOURCES = proptest.cpp $(SHARED_SOURCE_FILES)
-proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS)
+proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) -lz
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
diff -burN FlightGear-0.9.6.orig/src/Main/Makefile.am FlightGear-0.9.6/src/Main/Makefile.am
--- FlightGear-0.9.6.orig/src/Main/Makefile.am	2004-11-01 17:13:02.143263040 +0100
+++ FlightGear-0.9.6/src/Main/Makefile.am	2004-11-01 17:15:10.865694256 +0100
@@ -104,6 +104,6 @@
 metar_LDADD = \
         -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
         -lplibnet -lplibul $(network_LIBS) \
-        -lz $(base_LIBS)
+        -lz $(base_LIBS) -lsgserial -lsgprops -lsgxml
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
diff -burN FlightGear-0.9.6.orig/src/Navaids/Makefile.am FlightGear-0.9.6/src/Navaids/Makefile.am
--- FlightGear-0.9.6.orig/src/Navaids/Makefile.am	2004-11-01 17:13:02.239248448 +0100
+++ FlightGear-0.9.6/src/Navaids/Makefile.am	2004-11-01 17:15:37.842593144 +0100
@@ -15,6 +15,6 @@
 # testnavs_LDADD = \
 # 	libNavaids.a \
 # 	-lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \
-# 	-lsgstructure $(base_LIBS) -lz
+# 	-lsgstructure $(base_LIBS) -lz -lsgprops
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
diff -burN FlightGear-0.9.6.orig/tests/Makefile.am FlightGear-0.9.6/tests/Makefile.am
--- FlightGear-0.9.6.orig/tests/Makefile.am	2004-11-01 17:13:02.274243128 +0100
+++ FlightGear-0.9.6/tests/Makefile.am	2004-11-01 17:15:59.265336392 +0100
@@ -17,4 +17,4 @@
 test_text_SOURCES = test-text.cxx
 
 test_up_SOURCES = test-up.cxx
-test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lplibsg -lplibul -lz $(base_LIBS)
+test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lplibsg -lplibul -lz $(base_LIBS) -lsgprops
--- FlightGear-0.9.9.org/src/GUI/Makefile.am	2005-07-30 16:20:24.000000000 +0200
+++ FlightGear-0.9.9/src/GUI/Makefile.am	2005-12-07 22:09:58.000000000 +0100
@@ -22,4 +22,6 @@
 
 layout_test_LDADD = libGUI.a \
                     -lsgprops -lsgdebug -lsgstructure -lsgmisc -lsgxml \
-                    -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS)
+                    -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS) \
+		    -lxml
+