diff -Nurd -x'*~' GConf-2.14.0.orig/doc/gconf/Makefile.in GConf-2.14.0/doc/gconf/Makefile.in
--- GConf-2.14.0.orig/doc/gconf/Makefile.in	2006-03-18 10:09:20.000000000 -0500
+++ GConf-2.14.0/doc/gconf/Makefile.in	2006-07-10 22:25:28.000000000 -0400
@@ -240,7 +240,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.14.0.orig/gconf/gconf-internals.c GConf-2.14.0/gconf/gconf-internals.c
--- GConf-2.14.0.orig/gconf/gconf-internals.c	2006-01-03 11:36:30.000000000 -0500
+++ GConf-2.14.0/gconf/gconf-internals.c	2006-07-10 22:30:33.000000000 -0400
@@ -2685,6 +2685,9 @@
         }
     }
 
+  /* needed on Darwin */
+  fsync (lock->lock_fd);
+
   return lock;
 }
 
diff -Nurd -x'*~' GConf-2.14.0.orig/ltmain.sh GConf-2.14.0/ltmain.sh
--- GConf-2.14.0.orig/ltmain.sh	2006-03-11 13:49:04.000000000 -0500
+++ GConf-2.14.0/ltmain.sh	2006-07-10 22:29:55.000000000 -0400
@@ -4023,6 +4023,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