mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-25 09:13:06 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Charles Kerr 2010-04-01 22:12:32 +00:00
parent b075381f64
commit 6c8049742f
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
configure.ac
View file

@ -265,7 +265,7 @@ use_libappindicator=no
use_libnotify=no use_libnotify=no
use_dbus_glib=no use_dbus_glib=no
use_canberra=no use_canberra=no
use_libgconf=no use_gconf2=no
if test "x$want_gtk" = "xyes" ; then if test "x$want_gtk" = "xyes" ; then
if test "x$have_gtk" = "xyes"; then if test "x$have_gtk" = "xyes"; then
build_gtk=yes build_gtk=yes
@ -332,17 +332,17 @@ if test "x$build_gtk" = "xyes"; then
fi fi
fi fi
PKG_CHECK_MODULES([LIBGCONF], PKG_CHECK_MODULES([GCONF2],
[gconf-2.0 >= $GCONF2_MINIMUM], [gconf-2.0 >= $GCONF2_MINIMUM],
[have_libgconf=yes], [have_gconf2=yes],
[have_libgconf=no]) [have_gconf2=no])
AC_ARG_ENABLE([gconf2], AC_ARG_ENABLE([gconf2],
AS_HELP_STRING([--enable-libgconf],[enable GConf support]),, AS_HELP_STRING([--enable-gconf2],[enable GConf support]),,
[enable_libgconf=yes]) [enable_gconf2=yes])
if test "x$enable_libgconf" = "xyes" ; then if test "x$enable_gconf2" = "xyes" ; then
if test "x$have_libgconf" = "xyes"; then if test "x$have_gconf2" = "xyes"; then
use_libgconf=yes use_gconf2=yes
AC_DEFINE([HAVE_LIBGCONF], 1) AC_DEFINE([HAVE_GCONF2], 1)
fi fi
fi fi
@ -513,7 +513,7 @@ Configuration:
gio for watchdir support: ${use_gio} gio for watchdir support: ${use_gio}
libnotify for 'download completed' popups: ${use_libnotify} libnotify for 'download completed' popups: ${use_libnotify}
libcanberra for 'download completed' sounds: ${use_canberra} 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} libappindicator for Ubuntu-style system tray: ${use_libappindicator}
THESE ARE ALL OPTIONAL. If you're a packager THESE ARE ALL OPTIONAL. If you're a packager

4
gtk/Makefile.am
View file

@ -23,7 +23,7 @@ AM_CFLAGS = \
@LIBAPPINDICATOR_CFLAGS@ \ @LIBAPPINDICATOR_CFLAGS@ \
@LIBEVENT_CFLAGS@ \ @LIBEVENT_CFLAGS@ \
@LIBCANBERRA_CFLAGS@ \ @LIBCANBERRA_CFLAGS@ \
@LIBGCONF_CFLAGS@ \ @GCONF2_CFLAGS@ \
@GTK_CFLAGS@ \ @GTK_CFLAGS@ \
@LIBCURL_CFLAGS@ \ @LIBCURL_CFLAGS@ \
@GIO_CFLAGS@ \ @GIO_CFLAGS@ \
@ -110,7 +110,7 @@ transmission_LDADD = \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
@LIBCANBERRA_LIBS@ \ @LIBCANBERRA_LIBS@ \
@LIBGCONF_LIBS@ \ @GCONF2_LIBS@ \
@DHT_LIBS@ \ @DHT_LIBS@ \
@GTK_LIBS@ \ @GTK_LIBS@ \
@GIO_LIBS@ \ @GIO_LIBS@ \

4
gtk/main.c
View file

@ -227,7 +227,7 @@ static gboolean updatemodel( gpointer gdata );
**** ****
***/ ***/
#ifdef HAVE_LIBGCONF #ifdef HAVE_GCONF2
#include <gconf/gconf.h> #include <gconf/gconf.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
#endif #endif
@ -235,7 +235,7 @@ static gboolean updatemodel( gpointer gdata );
static void static void
registerMagnetLinkHandler( void ) registerMagnetLinkHandler( void )
{ {
#ifdef HAVE_LIBGCONF #ifdef HAVE_GCONF2
GError * err; GError * err;
GConfValue * value; GConfValue * value;
GConfClient * client = gconf_client_get_default( ); GConfClient * client = gconf_client_get_default( );