1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-26 16:02:51 +00:00

(trunk) #3111 "configure --disable-FOO doesn't quite work" -- fixed in trunk for 2.00. patch by naddy

This commit is contained in:
Charles Kerr 2010-04-01 22:17:52 +00:00
parent 6c8049742f
commit 01ae1dbe37

View file

@ -293,10 +293,13 @@ if test "x$build_gtk" = "xyes"; then
AS_HELP_STRING([--enable-libnotify],[enable notifications]),, AS_HELP_STRING([--enable-libnotify],[enable notifications]),,
[enable_libnotify=yes]) [enable_libnotify=yes])
use_libnotify=no use_libnotify=no
if test "x$enable_libnotify" = "xyes" ; then if test "x$have_libnotify" = "xyes"; then
if test "x$have_libnotify" = "xyes"; then if test "x$enable_libnotify" = "xyes" ; then
use_libnotify=yes use_libnotify=yes
AC_DEFINE([HAVE_LIBNOTIFY], 1) AC_DEFINE([HAVE_LIBNOTIFY], 1)
else
LIBNOTIFY_CFLAGS=
LIBNOTIFY_LIBS=
fi fi
fi fi
@ -309,12 +312,13 @@ if test "x$build_gtk" = "xyes"; then
AS_HELP_STRING([--enable-libappindicator],[enable AppIndicator support]),, AS_HELP_STRING([--enable-libappindicator],[enable AppIndicator support]),,
[enable_libappindicator=yes]) [enable_libappindicator=yes])
use_libappindicator=no use_libappindicator=no
if test "x$enable_libappindicator" = "xyes" ; then if test "x$have_libappindicator" = "xyes"; then
if test "x$have_libappindicator" = "xyes"; then if test "x$enable_libappindicator" = "xyes" ; then
use_libappindicator=yes use_libappindicator=yes
AC_SUBST(LIBAPPINDICATOR_LIBS)
AC_SUBST(LIBAPPINDICATOR_CFLAGS)
AC_DEFINE([HAVE_LIBAPPINDICATOR], 1) AC_DEFINE([HAVE_LIBAPPINDICATOR], 1)
else
LIBAPPINDICATOR_CFLAGS=
LIBAPPINDICATOR_LIBS=
fi fi
fi fi
@ -325,10 +329,13 @@ if test "x$build_gtk" = "xyes"; then
AC_ARG_ENABLE([libcanberra], AC_ARG_ENABLE([libcanberra],
AS_HELP_STRING([--enable-libcanberra],[enable sounds]),, AS_HELP_STRING([--enable-libcanberra],[enable sounds]),,
[enable_libcanberra=yes]) [enable_libcanberra=yes])
if test "x$enable_libcanberra" = "xyes" ; then if test "x$have_libcanberra" = "xyes"; then
if test "x$have_libcanberra" = "xyes"; then if test "x$enable_libcanberra" = "xyes" ; then
use_canberra=yes use_canberra=yes
AC_DEFINE([HAVE_LIBCANBERRA], 1) AC_DEFINE([HAVE_LIBCANBERRA], 1)
else
LIBCANBERRA_CFLAGS=
LIBCANBERRA_LIBS=
fi fi
fi fi
@ -339,10 +346,13 @@ if test "x$build_gtk" = "xyes"; then
AC_ARG_ENABLE([gconf2], AC_ARG_ENABLE([gconf2],
AS_HELP_STRING([--enable-gconf2],[enable GConf support]),, AS_HELP_STRING([--enable-gconf2],[enable GConf support]),,
[enable_gconf2=yes]) [enable_gconf2=yes])
if test "x$enable_gconf2" = "xyes" ; then if test "x$have_gconf2" = "xyes"; then
if test "x$have_gconf2" = "xyes"; then if test "x$enable_gconf2" = "xyes" ; then
use_gconf2=yes use_gconf2=yes
AC_DEFINE([HAVE_GCONF2], 1) AC_DEFINE([HAVE_GCONF2], 1)
else
GCONF2_CFLAGS=
GCONF2_LIBS=
fi fi
fi fi