Changeset 10435


Ignore:
Timestamp:
Apr 1, 2010, 10:12:32 PM (11 years ago)
Author:
charles
Message:

(trunk) #3109 "configure: option name doesn't match description" -- fixed in trunk for 2.00

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r10391 r10435  
    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
     
    333333    fi
    334334
    335     PKG_CHECK_MODULES([LIBGCONF],
     335    PKG_CHECK_MODULES([GCONF2],
    336336                      [gconf-2.0 >= $GCONF2_MINIMUM],
    337                       [have_libgconf=yes],
    338                       [have_libgconf=no])
     337                      [have_gconf2=yes],
     338                      [have_gconf2=no])
    339339    AC_ARG_ENABLE([gconf2],
    340                   AS_HELP_STRING([--enable-libgconf],[enable GConf support]),,
    341                   [enable_libgconf=yes])
    342     if test "x$enable_libgconf" = "xyes" ; then
    343         if test "x$have_libgconf" = "xyes"; then
    344             use_libgconf=yes
    345             AC_DEFINE([HAVE_LIBGCONF], 1)
     340                  AS_HELP_STRING([--enable-gconf2],[enable GConf support]),,
     341                  [enable_gconf2=yes])
     342    if test "x$enable_gconf2" = "xyes" ; then
     343        if test "x$have_gconf2" = "xyes"; then
     344            use_gconf2=yes
     345            AC_DEFINE([HAVE_GCONF2], 1)
    346346        fi
    347347    fi
     
    514514      libnotify for 'download completed' popups:      ${use_libnotify}
    515515      libcanberra for 'download completed' sounds:    ${use_canberra}
    516       libgconf to tell GNOME we handle magnet links:  ${use_libgconf}
     516      gconf2 to tell GNOME we handle magnet links:    ${use_gconf2}
    517517      libappindicator for Ubuntu-style system tray:   ${use_libappindicator}
    518518
  • trunk/gtk/Makefile.am

    r10380 r10435  
    2424    @LIBEVENT_CFLAGS@ \
    2525    @LIBCANBERRA_CFLAGS@ \
    26     @LIBGCONF_CFLAGS@ \
     26    @GCONF2_CFLAGS@ \
    2727    @GTK_CFLAGS@ \
    2828    @LIBCURL_CFLAGS@ \
     
    111111    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
    112112    @LIBCANBERRA_LIBS@ \
    113     @LIBGCONF_LIBS@ \
     113    @GCONF2_LIBS@ \
    114114    @DHT_LIBS@ \
    115115    @GTK_LIBS@ \
  • trunk/gtk/main.c

    r10391 r10435  
    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.