mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk) #4977 "Rev 13388: gtk required" -- fix r13388 regression in configure.ac that required GTK+ even if only building transmission-daemon.

This commit is contained in:
Jordan Lee 2012-07-22 16:55:50 +00:00
parent 4195e3671c
commit 4123630768
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -352,10 +352,16 @@ dnl detection for the GTK+ client
AC_ARG_ENABLE([nls], AC_ARG_ENABLE([nls],
[AS_HELP_STRING([--enable-nls],[enable native language support])],, [AS_HELP_STRING([--enable-nls],[enable native language support])],,
[enable_nls=yes]) [enable_nls=yes])
AC_ARG_WITH([gtk], PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK_MINIMUM
AC_HELP_STRING([--with-gtk],[with Gtk]), glib-2.0 >= $GLIB_MINIMUM
gio-2.0 >= $GIO_MINIMUM,
gmodule-2.0 >= $GLIB_MINIMUM
gthread-2.0 >= $GLIB_MINIMUM],
[have_gtk=yes],
[have_gtk=no])
AC_ARG_WITH([gtk], AC_HELP_STRING([--with-gtk],[with Gtk]),
[with_gtk=$withval], [with_gtk=$withval],
[with_gtk=yes]) [with_gtk=$have_gtk])
AM_CONDITIONAL([BUILD_GTK],[test "x$with_gtk" = "xyes"]) AM_CONDITIONAL([BUILD_GTK],[test "x$with_gtk" = "xyes"])
use_libappindicator=no use_libappindicator=no
if test "x$with_gtk" = "xyes" ; then if test "x$with_gtk" = "xyes" ; then
@ -373,8 +379,6 @@ if test "x$with_gtk" = "xyes" ; then
[appindicator3-0.1 >= $LIBAPPINDICATOR_MINIMUM], [appindicator3-0.1 >= $LIBAPPINDICATOR_MINIMUM],
[have_libappindicator=yes], [have_libappindicator=yes],
[have_libappindicator=no]) [have_libappindicator=no])
AC_MSG_NOTICE([using GTK+ 3])
if test "x$have_libappindicator" = "xyes"; then if test "x$have_libappindicator" = "xyes"; then
use_libappindicator=yes use_libappindicator=yes
AC_DEFINE([HAVE_LIBAPPINDICATOR], 1) AC_DEFINE([HAVE_LIBAPPINDICATOR], 1)