diff -ru GConf-1.0.7/backends/bdb.c GConf-1.0.7-aix/backends/bdb.c
--- GConf-1.0.7/backends/bdb.c	Fri Oct 12 13:51:20 2001
+++ GConf-1.0.7-aix/backends/bdb.c	Thu Oct 25 12:50:11 2001
@@ -38,7 +38,7 @@
 
 enum eDirectoryId
 {
-  INVALID_DIR_ID = (guint32) - 1
+  INVALID_DIR_ID = (gint32)( -1)
 };
 
 /* #define GCONF_ENABLE_BDB_DEBUG 1 */
diff -ru GConf-1.0.7/configure.in GConf-1.0.7-aix/configure.in
--- GConf-1.0.7/configure.in	Tue Oct 16 13:50:41 2001
+++ GConf-1.0.7-aix/configure.in	Thu Oct 25 12:36:49 2001
@@ -178,7 +178,7 @@
 if test "x$BDB_LIBS" = x; then
   AC_MSG_WARN(No db3 library found. Not building bdb backend.)
 else
-  AC_CHECK_HEADERS(db3/db.h,  , AC_MSG_ERROR([db3 library found but db3/db.h not found]))
+  AC_CHECK_HEADERS(db.h,  , AC_MSG_ERROR([db3 library found but db.h not found]))
 fi
 
 AM_CONDITIONAL(BDB, test -n "$BDB_LIBS")
diff -ru GConf-1.0.7/gconf/Makefile.am GConf-1.0.7-aix/gconf/Makefile.am
--- GConf-1.0.7/gconf/Makefile.am	Thu Sep 27 13:09:49 2001
+++ GConf-1.0.7-aix/gconf/Makefile.am	Thu Oct 25 12:48:48 2001
@@ -56,7 +56,7 @@
 	gconfd.h		\
 	gconfd.c
 
-gconfd_1_LDADD = $(EFENCE) $(INTLLIBS) $(OAF_LIBS) $(GLIB_LIBS) libgconf-$(MAJOR_VERSION).la
+gconfd_1_LDADD =  libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(OAF_LIBS) $(GLIB_LIBS)
 
 # gconf_testclient_SOURCES = \
 # 	testclient.c
diff -ru GConf-1.0.7/gconf/gconf-internals.c GConf-1.0.7-aix/gconf/gconf-internals.c
--- GConf-1.0.7/gconf/gconf-internals.c	Fri Oct 12 18:27:14 2001
+++ GConf-1.0.7-aix/gconf/gconf-internals.c	Thu Oct 25 12:41:30 2001
@@ -38,6 +38,10 @@
 #include <time.h>
 #include <math.h>
 
+#ifdef _AIX
+#include <sys/socket.h>
+#endif
+
 #define g_utf8_skip gconf_g_utf8_skip

 typedef void (* GSpawnChildSetupFunc) (gpointer user_data);