diff -Nurd -x'*~' GConf-2.12.0.orig/doc/gconf/Makefile.in GConf-2.12.0/doc/gconf/Makefile.in
--- GConf-2.12.0.orig/doc/gconf/Makefile.in	2005-09-06 05:05:54.000000000 -0400
+++ GConf-2.12.0/doc/gconf/Makefile.in	2005-09-06 12:35:43.000000000 -0400
@@ -242,7 +242,7 @@
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS = -I$(top_srcdir) $(CFLAGS) $(DEPENDENT_CFLAGS)
+GTKDOC_CFLAGS = -I$(top_srcdir) $(CFLAGS) $(CPPFLAGS) $(DEPENDENT_CFLAGS)
 
 GTKDOC_LIBS = $(LDFLAGS) $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
diff -Nurd -x'*~' GConf-2.12.0.orig/gconf/Makefile.in GConf-2.12.0/gconf/Makefile.in
--- GConf-2.12.0.orig/gconf/Makefile.in	2005-09-06 05:05:55.000000000 -0400
+++ GConf-2.12.0/gconf/Makefile.in	2005-09-06 12:35:43.000000000 -0400
@@ -263,7 +263,7 @@
 	gconfd.c
 
 
-gconfd_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS) libgconf-$(MAJOR_VERSION).la
+gconfd_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS)
 
 
 # gconf_testclient_SOURCES = \
@@ -274,13 +274,13 @@
 	gconftool.c
 
 
-gconftool_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS) $(POPT_LIBS) libgconf-$(MAJOR_VERSION).la
+gconftool_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS) $(POPT_LIBS)
 
 gconf_sanity_check_2_SOURCES = \
 	gconf-sanity-check.c
 
 
-gconf_sanity_check_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS) $(POPT_LIBS) libgconf-$(MAJOR_VERSION).la
+gconf_sanity_check_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS) $(POPT_LIBS)
 
 @OS_WIN32_TRUE@WIN32_SOURCECODE = dllmain.c
 
diff -Nurd -x'*~' GConf-2.12.0.orig/gconf/gconf-internals.c GConf-2.12.0/gconf/gconf-internals.c
--- GConf-2.12.0.orig/gconf/gconf-internals.c	2005-06-13 08:04:37.000000000 -0400
+++ GConf-2.12.0/gconf/gconf-internals.c	2005-09-06 12:35:43.000000000 -0400
@@ -2715,6 +2715,9 @@
         }
     }
 
+  /* needed on Darwin */
+  fsync (lock->lock_fd);
+
   return lock;
 }
 
diff -Nurd -x'*~' GConf-2.12.0.orig/ltmain.sh GConf-2.12.0/ltmain.sh
--- GConf-2.12.0.orig/ltmain.sh	2005-06-28 10:33:00.000000000 -0400
+++ GConf-2.12.0/ltmain.sh	2005-09-06 12:35:43.000000000 -0400
@@ -3883,6 +3883,11 @@
 	  eval test_cmds=\"$archive_expsym_cmds\"
 	  cmds=$archive_expsym_cmds
 	else
+	  if test "x$verstring" = "x0.0"; then
+            tmp_verstring=
+          else
+            tmp_verstring="$verstring"
+          fi
 	  eval test_cmds=\"$archive_cmds\"
 	  cmds=$archive_cmds
 	  fi