From 6c8049742f47c52b47db7f12ca62fa4fdd9fb2b8 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Thu, 1 Apr 2010 22:12:32 +0000
Subject: [PATCH] (trunk) #3109 "configure: option name doesn't match
 description" -- fixed in trunk for 2.00

---
 configure.ac    | 22 +++++++++++-----------
 gtk/Makefile.am |  4 ++--
 gtk/main.c      |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index df5de4d23..1ac0c73a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,7 +265,7 @@ use_libappindicator=no
 use_libnotify=no
 use_dbus_glib=no
 use_canberra=no
-use_libgconf=no
+use_gconf2=no
 if test "x$want_gtk" = "xyes" ; then
     if test "x$have_gtk" = "xyes"; then
       build_gtk=yes
@@ -332,17 +332,17 @@ if test "x$build_gtk" = "xyes"; then
         fi
     fi
 
-    PKG_CHECK_MODULES([LIBGCONF],
+    PKG_CHECK_MODULES([GCONF2],
                       [gconf-2.0 >= $GCONF2_MINIMUM],
-                      [have_libgconf=yes],
-                      [have_libgconf=no])
+                      [have_gconf2=yes],
+                      [have_gconf2=no])
     AC_ARG_ENABLE([gconf2], 
-                  AS_HELP_STRING([--enable-libgconf],[enable GConf support]),, 
-                  [enable_libgconf=yes]) 
-    if test "x$enable_libgconf" = "xyes" ; then
-        if test "x$have_libgconf" = "xyes"; then
-            use_libgconf=yes
-            AC_DEFINE([HAVE_LIBGCONF], 1) 
+                  AS_HELP_STRING([--enable-gconf2],[enable GConf support]),, 
+                  [enable_gconf2=yes]) 
+    if test "x$enable_gconf2" = "xyes" ; then
+        if test "x$have_gconf2" = "xyes"; then
+            use_gconf2=yes
+            AC_DEFINE([HAVE_GCONF2], 1) 
         fi
     fi
 
@@ -513,7 +513,7 @@ Configuration:
       gio for watchdir support:                       ${use_gio}
       libnotify for 'download completed' popups:      ${use_libnotify}
       libcanberra for 'download completed' sounds:    ${use_canberra}
-      libgconf to tell GNOME we handle magnet links:  ${use_libgconf}
+      gconf2 to tell GNOME we handle magnet links:    ${use_gconf2}
       libappindicator for Ubuntu-style system tray:   ${use_libappindicator}
 
       THESE ARE ALL OPTIONAL. If you're a packager
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c93b9f4c3..8fdbc32b7 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -23,7 +23,7 @@ AM_CFLAGS = \
     @LIBAPPINDICATOR_CFLAGS@ \
     @LIBEVENT_CFLAGS@ \
     @LIBCANBERRA_CFLAGS@ \
-    @LIBGCONF_CFLAGS@ \
+    @GCONF2_CFLAGS@ \
     @GTK_CFLAGS@ \
     @LIBCURL_CFLAGS@ \
     @GIO_CFLAGS@ \
@@ -110,7 +110,7 @@ transmission_LDADD = \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     @LIBCANBERRA_LIBS@ \
-    @LIBGCONF_LIBS@ \
+    @GCONF2_LIBS@ \
     @DHT_LIBS@ \
     @GTK_LIBS@ \
     @GIO_LIBS@ \
diff --git a/gtk/main.c b/gtk/main.c
index 69241377f..33d2a719c 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -227,7 +227,7 @@ static gboolean       updatemodel( gpointer gdata );
 ****
 ***/
 
-#ifdef HAVE_LIBGCONF
+#ifdef HAVE_GCONF2
  #include <gconf/gconf.h>
  #include <gconf/gconf-client.h>
 #endif
@@ -235,7 +235,7 @@ static gboolean       updatemodel( gpointer gdata );
 static void
 registerMagnetLinkHandler( void )
 {
-#ifdef HAVE_LIBGCONF
+#ifdef HAVE_GCONF2
     GError * err;
     GConfValue * value;
     GConfClient * client = gconf_client_get_default( );