diff -Naur GConf-2.6.1-old/doc/gconf/Makefile.in GConf-2.6.1/doc/gconf/Makefile.in
--- GConf-2.6.1-old/doc/gconf/Makefile.in	2004-04-19 08:12:05.000000000 -0400
+++ GConf-2.6.1/doc/gconf/Makefile.in	2004-06-17 15:22:08.000000000 -0400
@@ -180,7 +180,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
 
diff -Naur GConf-2.6.1-old/gconf/Makefile.in GConf-2.6.1/gconf/Makefile.in
--- GConf-2.6.1-old/gconf/Makefile.in	2004-04-19 08:11:03.000000000 -0400
+++ GConf-2.6.1/gconf/Makefile.in	2004-06-17 16:10:52.000000000 -0400
@@ -174,7 +174,7 @@
 gconfd_2_SOURCES =  	gconf-database.h		gconf-database.c		gconf-sources.h			gconfd.h			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 = \
 # 	testclient.c
@@ -184,12 +184,12 @@
 gconftool_2_SOURCES =  	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)
 
 libgconf_2_la_SOURCES =  	gconf-internals.c		gconf-internals.h		gconf-backend.h			gconf-backend.c			gconf-changeset.c		gconf-error.c			gconf-listeners.c		gconf-locale.h  		gconf-locale.c  		gconf-schema.c			gconf-sources.c			gconf-value.c			gconf.c				gconf-client.c			gconf-enum-types.c		$(CORBA_SOURCECODE)
 
diff -Naur GConf-2.6.1-old/gconf/gconf-internals.c GConf-2.6.1/gconf/gconf-internals.c
--- GConf-2.6.1-old/gconf/gconf-internals.c	2004-04-19 06:08:20.000000000 -0400
+++ GConf-2.6.1/gconf/gconf-internals.c	2004-06-17 15:22:08.000000000 -0400
@@ -2581,6 +2581,9 @@
         }
     }
 
+  /* needed on Darwin */
+  fsync (lock->lock_fd);
+
   return lock;
 }
 
diff -Naur GConf-2.6.1-old/ltmain.sh GConf-2.6.1/ltmain.sh
--- GConf-2.6.1-old/ltmain.sh	2004-04-19 08:03:11.000000000 -0400
+++ GConf-2.6.1/ltmain.sh	2004-06-17 15:22:08.000000000 -0400
@@ -3763,6 +3763,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