summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <withnall@endlessm.com>2017-02-09 11:00:19 +0000
committerBastien Nocera <hadess@hadess.net>2017-02-14 19:03:41 +0100
commit73c718b9ba6287de483312ad85f4dad0e4f97101 (patch)
tree1d19df05c26a4178f488ffcea62d02d13b94d3e1
parenteea8d7e861162f4e7e0de409372a1a3e5cb8f40e (diff)
downloadgnome-settings-daemon-73c718b9ba6287de483312ad85f4dad0e4f97101.tar.gz
build: Fix --enable-rfkill configure switch
There was an additional comma in the AC_ARG_ENABLE call, which meant that no action-if-given was provided, meaning that enable_rfkill would be enabled by default if the rfkill switch was not passed — but if it was passed, enable_rfkill would not be set at all and the plugin would always be disabled. https://bugzilla.gnome.org/show_bug.cgi?id=778383
-rw-r--r--configure.ac8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index a2fa53fc..257bbb6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,9 +391,11 @@ AM_CONDITIONAL(BUILD_PRINT_NOTIFICATIONS, [test x"$enable_cups" = x"yes"])
# Rfkill
# ---------------------------------------------------------------------------
-AC_ARG_ENABLE(rfkill,
- AS_HELP_STRING([--disable-rfkill], [disable rfkill support (default: enabled)]),,
- enable_rfkill=yes, enabled_rfkill=no)
+AC_ARG_ENABLE([rfkill],
+ [AS_HELP_STRING([--disable-rfkill],
+ [Disable rfkill support (default: enabled)])],
+ [enable_rfkill=$enableval],
+ [enable_rfkill=yes])
if test x"$enable_rfkill" != x"no" ; then
AC_CHECK_HEADERS([linux/rfkill.h],,