Changeset 10598
- Timestamp:
- May 1, 2010, 2:06:53 PM (12 years ago)
- Location:
- branches/1.9x
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.9x/configure.ac
r10596 r10598 266 266 use_dbus_glib=no 267 267 use_canberra=no 268 use_ libgconf=no268 use_gconf2=no 269 269 if test "x$want_gtk" = "xyes" ; then 270 270 if test "x$have_gtk" = "xyes"; then … … 340 340 fi 341 341 342 PKG_CHECK_MODULES([ LIBGCONF],342 PKG_CHECK_MODULES([GCONF2], 343 343 [gconf-2.0 >= $GCONF2_MINIMUM], 344 [have_ libgconf=yes],345 [have_ libgconf=no])344 [have_gconf2=yes], 345 [have_gconf2=no]) 346 346 AC_ARG_ENABLE([gconf2], 347 AS_HELP_STRING([--enable- libgconf],[enable GConf support]),,348 [enable_ libgconf=yes])349 if test "x$have libgconf" = "xyes" ; then350 if test "x$enable_ libgconf" = "xyes"; then351 use_ libgconf=yes352 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) 353 353 else 354 LIBGCONF_CFLAGS=355 LIBGCONF_LIBS=354 GCONF2_CFLAGS= 355 GCONF2_LIBS= 356 356 fi 357 357 fi … … 523 523 optional libnotify for 'download completed' popups: ${use_libnotify} 524 524 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} 526 526 optional libappindicator for Ubuntu-style system tray: ${use_libappindicator} 527 527 -
branches/1.9x/gtk/Makefile.am
r10563 r10598 24 24 @LIBEVENT_CFLAGS@ \ 25 25 @LIBCANBERRA_CFLAGS@ \ 26 @ LIBGCONF_CFLAGS@ \26 @GCONF2_CFLAGS@ \ 27 27 @GTK_CFLAGS@ \ 28 28 @LIBCURL_CFLAGS@ \ … … 108 108 $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ 109 109 @LIBCANBERRA_LIBS@ \ 110 @ LIBGCONF_LIBS@ \110 @GCONF2_LIBS@ \ 111 111 @DHT_LIBS@ \ 112 112 @GTK_LIBS@ \ -
branches/1.9x/gtk/main.c
r10292 r10598 228 228 ***/ 229 229 230 #ifdef HAVE_ LIBGCONF230 #ifdef HAVE_GCONF2 231 231 #include <gconf/gconf.h> 232 232 #include <gconf/gconf-client.h> … … 236 236 registerMagnetLinkHandler( void ) 237 237 { 238 #ifdef HAVE_ LIBGCONF238 #ifdef HAVE_GCONF2 239 239 GError * err; 240 240 GConfValue * value;
Note: See TracChangeset
for help on using the changeset viewer.