Fix link error on Fedora 14: newer GConf don't use g_type_*.

* configure.in (HAVE_GCONF): Check for g_type_init if GConf is found.

* src/config.in (HAVE_G_TYPE_INIT): New symbol.

* src/xsettings.c (init_gconf): Check HAVE_G_TYPE_INIT.

2 files changed, 5 insertions, 3 deletions

diff --git a/src/config.in b/src/config.in
index 90098719511..f7c5bbc7daf 100644
--- a/src/config.in
+++ b/src/config.in
@@ -292,6 +292,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if GTK can handle more than one display. */
 #undef HAVE_GTK_MULTIDISPLAY
 
+/* Define to 1 if you have the `g_type_init' function. */
+#undef HAVE_G_TYPE_INIT
+
 /* Define to 1 if netdb.h declares h_errno. */
 #undef HAVE_H_ERRNO
 
@@ -334,9 +337,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 #undef HAVE_LANGINFO_CODESET
 
-/* Define to 1 if the directory /usr/lib64 exists. */
-#undef HAVE_LIB64_DIR
-
 /* Define to 1 if you have the `com_err' library (-lcom_err). */
 #undef HAVE_LIBCOM_ERR
 
diff --git a/src/xsettings.c b/src/xsettings.c
index 945007db2f0..de37063c741 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -563,7 +563,9 @@ init_gconf ()
   int i;
   char *s;
 
+#ifdef HAVE_G_TYPE_INIT
   g_type_init ();
+#endif
   gconf_client = gconf_client_get_default ();
   s = gconf_client_get_string (gconf_client, SYSTEM_MONO_FONT, NULL);
   if (s)