Index: backends/Makefile.in
--- backends/Makefile.in.orig	2010-08-04 18:55:43.000000000 +0200
+++ backends/Makefile.in	2010-08-05 09:28:38.000000000 +0200
@@ -357,25 +357,25 @@
 	xml-entry.c		\
 	xml-backend.c
 
-libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined
-libgconfbackend_oldxml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(INTLLIBS)
+libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module
+libgconfbackend_oldxml_la_LIBADD = $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(DEPENDENT_WITH_XML_LIBS) $(INTLLIBS)
 libgconfbackend_xml_la_SOURCES = \
 	markup-backend.c		\
 	markup-tree.h			\
 	markup-tree.c
 
-libgconfbackend_xml_la_LDFLAGS = -avoid-version -module -no-undefined
-libgconfbackend_xml_la_LIBADD = $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(INTLLIBS)
+libgconfbackend_xml_la_LDFLAGS = -avoid-version -module
+libgconfbackend_xml_la_LIBADD = $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(DEPENDENT_LIBS) $(INTLLIBS)
 xml_test_SOURCES = xml-test.c
 xml_test_LDADD = \
-	$(DEPENDENT_WITH_XML_LIBS) \
 	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
-	libgconfbackend-oldxml.la
+	libgconfbackend-oldxml.la \
+	$(DEPENDENT_WITH_XML_LIBS)
 
 gconf_merge_tree_SOURCES = gconf-merge-tree.c
-gconf_merge_tree_LDADD = $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
+gconf_merge_tree_LDADD = $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(DEPENDENT_LIBS)
 @LDAP_SUPPORT_TRUE@libgconfbackend_evoldap_la_SOURCES = evoldap-backend.c
-@LDAP_SUPPORT_TRUE@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module -no-undefined
+@LDAP_SUPPORT_TRUE@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module
 @LDAP_SUPPORT_TRUE@libgconfbackend_evoldap_la_LIBADD = \
 @LDAP_SUPPORT_TRUE@	$(DEPENDENT_WITH_XML_LIBS) \
 @LDAP_SUPPORT_TRUE@	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
@@ -516,10 +516,10 @@
 	rm -f $$list
 gconf-merge-tree$(EXEEXT): $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_DEPENDENCIES) 
 	@rm -f gconf-merge-tree$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) -static $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_LDADD) $(LIBS)
 xml-test$(EXEEXT): $(xml_test_OBJECTS) $(xml_test_DEPENDENCIES) 
 	@rm -f xml-test$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) -static $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
Index: gconf/Makefile.in
--- gconf/Makefile.in.orig	2010-08-04 18:55:44.000000000 +0200
+++ gconf/Makefile.in	2010-08-05 09:29:02.000000000 +0200
@@ -393,15 +393,15 @@
 	gconfd.c
 
 @OS_WIN32_TRUE@gconfd_2_LDFLAGS = -mwindows
-gconfd_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS) libgconf-$(MAJOR_VERSION).la
+gconfd_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS)
 gconftool_2_SOURCES = \
 	gconftool.c
 
-gconftool_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS) libgconf-$(MAJOR_VERSION).la
+gconftool_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS)
 gconf_sanity_check_2_SOURCES = \
 	gconf-sanity-check.c
 
-gconf_sanity_check_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS) libgconf-$(MAJOR_VERSION).la
+gconf_sanity_check_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS)
 @OS_WIN32_TRUE@WIN32_SOURCECODE = dllmain.c
 libgconf_2_la_SOURCES = \
 	gconf-internals.c	\
@@ -422,7 +422,7 @@
 	$(CORBA_SOURCECODE)	\
 	$(WIN32_SOURCECODE)
 
-libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined
+libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE)
 libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS)
 INTROSPECTION_GIRS = $(am__append_1)
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
@@ -600,13 +600,13 @@
 	rm -f $$list
 gconf-sanity-check-2$(EXEEXT): $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_DEPENDENCIES) 
 	@rm -f gconf-sanity-check-2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) -static $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD) $(LIBS)
 gconfd-2$(EXEEXT): $(gconfd_2_OBJECTS) $(gconfd_2_DEPENDENCIES) 
 	@rm -f gconfd-2$(EXEEXT)
-	$(AM_V_CCLD)$(gconfd_2_LINK) $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(gconfd_2_LINK) -static $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS)
 gconftool-2$(EXEEXT): $(gconftool_2_OBJECTS) $(gconftool_2_DEPENDENCIES) 
 	@rm -f gconftool-2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) -static $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
