Mercurial > pidgin
changeset 14797:aae32cf1caac
[gaim-migrate @ 17562]
SF Patch #1581054 from Jason Lynch
Fixes SF Bug #1581014
'Several switches in the configure script
(startup-notification and gtkspell, among others)
explicitly set the relevant enable_x variable to "no"
in the AC_ARG_ENABLE macro in the "action-if-given"
area, with the side effect that if someone explicitly
passes --enable-feature, the feature will be disabled.
replacing the "no" with "$enableval" as in other
AC_ARG_ENABLE calls fixes the problem.'
The signature is:
AC_ARG_ENABLE (FEATURE, HELP-STRING, [ACTION-IF-GIVEN], [ACTION-IF-NOT-GIVEN])
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 22 Oct 2006 05:12:28 +0000 |
| parents | f06721350f8f |
| children | a413bcb6f19a |
| files | COPYRIGHT configure.ac |
| diffstat | 2 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Sun Oct 22 05:05:16 2006 +0000 +++ b/COPYRIGHT Sun Oct 22 05:12:28 2006 +0000 @@ -178,6 +178,7 @@ Uli Luckas Matthew Luckie Mike Lundy +Jason Lynch Lucio Maciel Brian Macke Paolo Maggi
--- a/configure.ac Sun Oct 22 05:05:16 2006 +0000 +++ b/configure.ac Sun Oct 22 05:12:28 2006 +0000 @@ -186,27 +186,27 @@ AC_ARG_ENABLE(screensaver, [AC_HELP_STRING([--disable-screensaver], [compile without X screensaver extension (used to detect idleness)])], - enable_screensaver="no", enable_screensaver="yes") + enable_screensaver="$enableval", enable_screensaver="yes") AC_ARG_ENABLE(sm, [AC_HELP_STRING([--disable-sm], [compile without X session management support])], - enable_sm="no", enable_sm="yes") + enable_sm="$enableval", enable_sm="yes") AC_ARG_ENABLE(startup-notification, [AC_HELP_STRING([--disable-startup-notification], [compile without startup notification support])], - enable_startup_notification="no", enable_startup_notification="yes") + enable_startup_notification="$enableval", enable_startup_notification="yes") AC_ARG_ENABLE(gtkspell, [AC_HELP_STRING([--disable-gtkspell], [compile without GtkSpell automatic spell checking])], - enable_gtkspell="no", enable_gtkspell="yes") + enable_gtkspell="$enableval", enable_gtkspell="yes") AC_ARG_ENABLE(gevolution, [AC_HELP_STRING([--disable-gevolution], [compile without the Gaim Evolution plugin])], - enable_gevolution="no", enable_gevolution="yes") + enable_gevolution="$enableval", enable_gevolution="yes") AC_ARG_ENABLE(cap, [AC_HELP_STRING([--disable-cap], [compile without Contact Availability Prediction plugin])], - enable_cap="no", enable_cap="yes") + enable_cap="$enableval", enable_cap="yes") AC_PATH_XTRA @@ -455,7 +455,7 @@ dnl ####################################################################### AC_ARG_ENABLE(gstreamer, [AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])], - enable_gst="no", enable_gst="yes") + enable_gst="$enableval", enable_gst="yes") PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], , [ AC_MSG_RESULT(no) enable_gst="no" @@ -1564,7 +1564,7 @@ dnl # Check for Tcl dnl ####################################################################### AC_ARG_ENABLE(tcl, [AC_HELP_STRING([--disable-tcl], - [compile without Tcl scripting])], enable_tcl="no", enable_tcl="yes") + [compile without Tcl scripting])], enable_tcl="$enableval", enable_tcl="yes") AC_ARG_WITH(tclconfig, [AC_HELP_STRING([--with-tclconfig=DIR], [directory containing tclConfig.sh])]) @@ -1633,7 +1633,7 @@ dnl # Check for Tk dnl ####################################################################### AC_ARG_ENABLE(tk, [AC_HELP_STRING([--disable-tk], - [compile without Tcl support for Tk])], enable_tk="no", enable_tk="yes") + [compile without Tcl support for Tk])], enable_tk="$enableval", enable_tk="yes") AC_ARG_WITH(tkconfig, [AC_HELP_STRING([--with-tkconfig=DIR], [directory containing tkConfig.sh])]) @@ -1812,11 +1812,11 @@ AC_ARG_ENABLE(doxygen, [AC_HELP_STRING([--disable-doxygen], [enable documentation with doxygen])], - enable_doxygen="no", enable_doxygen="yes") + enable_doxygen="$enableval", enable_doxygen="yes") AC_ARG_ENABLE(dot, [AC_HELP_STRING([--enable-dot], [enable graphs in doxygen via 'dot'])], - enable_dot="no", enable_dot="yes") + enable_dot="$enableval", enable_dot="yes") if test "x$enable_doxygen" = xyes; then AC_CHECK_PROG(DOXYGEN, doxygen, true, false)