Changeset 10598

Timestamp:

May 1, 2010, 2:06:53 PM (12 years ago)

Author:

charles

Message:

(1.9x gtk) backport r10435 for #3109 "configure: option name doesn't match description"

Location:

branches/1.9x

Files:

• configure.ac (modified) (3 diffs)
• gtk/Makefile.am (modified) (2 diffs)
• gtk/main.c (modified) (2 diffs)

branches/1.9x/configure.ac

@@ -266 +266 @@
 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
@@ -340 +340 @@
     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$havelibgconf" = "xyes" ; then
-        if test "x$enable_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$have_gconf2" = "xyes" ; then
+        if test "x$enable_gconf2" = "xyes"; then
+            use_gconf2=yes
+            AC_DEFINE([HAVE_GCONF2], 1) 
         else
-            LIBGCONF_CFLAGS=
-            LIBGCONF_LIBS=
+            GCONF2_CFLAGS=
+            GCONF2_LIBS=
         fi
     fi
@@ -523 +523 @@
       optional libnotify for 'download completed' popups:      ${use_libnotify}
       optional libcanberra for 'download completed' sounds:    ${use_canberra}
-      optional libgconf to tell GNOME we handle magnet links:  ${use_libgconf}
+      optional gconf2 to tell GNOME we handle magnet links:    ${use_gconf2}
       optional libappindicator for Ubuntu-style system tray:   ${use_libappindicator}
 

branches/1.9x/gtk/Makefile.am

@@ -24 +24 @@
     @LIBEVENT_CFLAGS@ \
     @LIBCANBERRA_CFLAGS@ \
-    @LIBGCONF_CFLAGS@ \
+    @GCONF2_CFLAGS@ \
     @GTK_CFLAGS@ \
     @LIBCURL_CFLAGS@ \
@@ -108 +108 @@
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     @LIBCANBERRA_LIBS@ \
-    @LIBGCONF_LIBS@ \
+    @GCONF2_LIBS@ \
     @DHT_LIBS@ \
     @GTK_LIBS@ \

branches/1.9x/gtk/main.c

@@ -228 +228 @@
 ***/
 
-#ifdef HAVE_LIBGCONF
+#ifdef HAVE_GCONF2
  #include <gconf/gconf.h>
  #include <gconf/gconf-client.h>
@@ -236 +236 @@
 registerMagnetLinkHandler( void )
 {
-#ifdef HAVE_LIBGCONF
+#ifdef HAVE_GCONF2
     GError * err;
     GConfValue * value;