Changeset 10598


Ignore:
Timestamp:
May 1, 2010, 2:06:53 PM (11 years ago)
Author:
charles
Message:

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

Location:
branches/1.9x
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.9x/configure.ac

    r10596 r10598  
    266266use_dbus_glib=no
    267267use_canberra=no
    268 use_libgconf=no
     268use_gconf2=no
    269269if test "x$want_gtk" = "xyes" ; then
    270270    if test "x$have_gtk" = "xyes"; then
     
    340340    fi
    341341
    342     PKG_CHECK_MODULES([LIBGCONF],
     342    PKG_CHECK_MODULES([GCONF2],
    343343                      [gconf-2.0 >= $GCONF2_MINIMUM],
    344                       [have_libgconf=yes],
    345                       [have_libgconf=no])
     344                      [have_gconf2=yes],
     345                      [have_gconf2=no])
    346346    AC_ARG_ENABLE([gconf2],
    347                   AS_HELP_STRING([--enable-libgconf],[enable GConf support]),,
    348                   [enable_libgconf=yes])
    349     if test "x$havelibgconf" = "xyes" ; then
    350         if test "x$enable_libgconf" = "xyes"; then
    351             use_libgconf=yes
    352             AC_DEFINE([HAVE_LIBGCONF], 1)
     347                  AS_HELP_STRING([--enable-gconf2],[enable GConf support]),,
     348                  [enable_gconf2=yes])
     349    if test "x$have_gconf2" = "xyes" ; then
     350        if test "x$enable_gconf2" = "xyes"; then
     351            use_gconf2=yes
     352            AC_DEFINE([HAVE_GCONF2], 1)
    353353        else
    354             LIBGCONF_CFLAGS=
    355             LIBGCONF_LIBS=
     354            GCONF2_CFLAGS=
     355            GCONF2_LIBS=
    356356        fi
    357357    fi
     
    523523      optional libnotify for 'download completed' popups:      ${use_libnotify}
    524524      optional libcanberra for 'download completed' sounds:    ${use_canberra}
    525       optional libgconf to tell GNOME we handle magnet links:  ${use_libgconf}
     525      optional gconf2 to tell GNOME we handle magnet links:    ${use_gconf2}
    526526      optional libappindicator for Ubuntu-style system tray:   ${use_libappindicator}
    527527
  • branches/1.9x/gtk/Makefile.am

    r10563 r10598  
    2424    @LIBEVENT_CFLAGS@ \
    2525    @LIBCANBERRA_CFLAGS@ \
    26     @LIBGCONF_CFLAGS@ \
     26    @GCONF2_CFLAGS@ \
    2727    @GTK_CFLAGS@ \
    2828    @LIBCURL_CFLAGS@ \
     
    108108    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
    109109    @LIBCANBERRA_LIBS@ \
    110     @LIBGCONF_LIBS@ \
     110    @GCONF2_LIBS@ \
    111111    @DHT_LIBS@ \
    112112    @GTK_LIBS@ \
  • branches/1.9x/gtk/main.c

    r10292 r10598  
    228228***/
    229229
    230 #ifdef HAVE_LIBGCONF
     230#ifdef HAVE_GCONF2
    231231 #include <gconf/gconf.h>
    232232 #include <gconf/gconf-client.h>
     
    236236registerMagnetLinkHandler( void )
    237237{
    238 #ifdef HAVE_LIBGCONF
     238#ifdef HAVE_GCONF2
    239239    GError * err;
    240240    GConfValue * value;
Note: See TracChangeset for help on using the changeset viewer.