summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m418
-rwxr-xr-xbootstrap-configure12
2 files changed, 9 insertions, 21 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index f09fe48e..53ff899f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -271,24 +271,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
debug_enable=${enableval}
])
- AC_ARG_ENABLE(all, AC_HELP_STRING([--enable-all], [enable all extra options below]), [
- dbus_enable=${enableval}
- alsa_enable=${enableval}
- hidd_enable=${enableval}
- pand_enable=${enableval}
- dund_enable=${enableval}
- cups_enable=${enableval}
- test_enable=${enableval}
- manpages_enable=${enableval}
- configfiles_enable=${enableval}
- initscripts_enable=${enableval}
- pcmciarules_enable=${enableval}
- tools_enable=${enableval}
- bccmd_enable=${enableval}
- hid2hci_enable=${enableval}
- dfutool_enable=${enableval}
- ])
-
if (test "${fortify_enable}" = "yes"); then
CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
fi
diff --git a/bootstrap-configure b/bootstrap-configure
index 5e455968..f0751398 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -12,9 +12,15 @@ fi
--sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/lib \
- --enable-all \
+ --enable-bccmd \
+ --enable-dfutool \
+ --enalbe-hid2hci \
+ --enable-hidd \
+ --enable-pand \
+ --enable-dund \
+ --enable-test \
+ --disable-cups \
--disable-manpages \
--disable-configfiles \
--disable-initscripts \
- --disable-pcmciarules \
- --disable-cups $*
+ --disable-pcmciarules $*