summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m420
-rw-r--r--configure.in2
2 files changed, 16 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 3e9add0c..029ef056 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -98,11 +98,6 @@ AC_DEFUN([AC_PATH_USB], [
])
AC_DEFUN([AC_PATH_DBUS], [
- AC_ARG_ENABLE(dbus, AC_HELP_STRING([--enable-dbus], [enable D-BUS support]), [
- dbus_enable=${enableval}
- dbus_prefix=${prefix}
- ])
-
AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus=DIR], [D-BUS library is installed in DIR]), [
if (test "${withval}" = "yes"); then
dbus_prefix=${prefix}
@@ -148,6 +143,21 @@ AC_DEFUN([AC_PATH_DBUS], [
])
AC_DEFUN([AC_PATH_EXTRA], [
+ AC_ARG_ENABLE(all, AC_HELP_STRING([--enable-all], [enable all extra options]), [
+ dbus_enable=${enableval}
+ dbus_prefix=${prefix}
+ test_enable=${enableval}
+ cups_enable=${enableval}
+ pcmcia_enable=${enableval}
+ hid2hci_enable=${enableval}
+ bcm203x_enable=${enableval}
+ ])
+
+ AC_ARG_ENABLE(dbus, AC_HELP_STRING([--enable-dbus], [enable D-BUS support]), [
+ dbus_enable=${enableval}
+ dbus_prefix=${prefix}
+ ])
+
AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [install test programs]), [
test_enable=${enableval}
])
diff --git a/configure.in b/configure.in
index 84db287c..dc549bb2 100644
--- a/configure.in
+++ b/configure.in
@@ -22,8 +22,8 @@ AC_PROG_YACC
AM_PROG_LEX
AC_PATH_BLUEZ
+AC_PATH_EXTRA
AC_PATH_USB
AC_PATH_DBUS
-AC_PATH_EXTRA
AC_OUTPUT(Makefile hcid/Makefile tools/Makefile rfcomm/Makefile sdpd/Makefile dund/Makefile pand/Makefile hidd/Makefile cups/Makefile test/Makefile scripts/Makefile pcmcia/Makefile extra/Makefile)