diff options
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e305b6b0..9f6779a9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -292,9 +292,10 @@ AC_DEFUN([AC_PATH_USB], [ AC_DEFUN([AC_ARG_BLUEZ], [ debug_enable=no pie_enable=no + dbus_enable=${dbus_found} obex_enable=${openobex_found} + fuse_enable=no alsa_enable=no - dbus_enable=${dbus_found} test_enable=no cups_enable=no pcmcia_enable=no @@ -315,9 +316,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ ]) AC_ARG_ENABLE(all, AC_HELP_STRING([--enable-all], [enable all extra options below]), [ + dbus_enable=${enableval} obex_enable=${enableval} + fuse_enable=${enableval} alsa_enable=${enableval} - dbus_enable=${enableval} test_enable=${enableval} cups_enable=${enableval} pcmcia_enable=${enableval} @@ -330,16 +332,20 @@ AC_DEFUN([AC_ARG_BLUEZ], [ bluepin_enable=${enableval} ]) + AC_ARG_ENABLE(dbus, AC_HELP_STRING([--enable-dbus], [enable D-BUS support]), [ + dbus_enable=${enableval} + ]) + AC_ARG_ENABLE(obex, AC_HELP_STRING([--enable-obex], [enable OBEX support]), [ obex_enable=${enableval} ]) - AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa], [enable ALSA support]), [ - alsa_enable=${enableval} + AC_ARG_ENABLE(fuse, AC_HELP_STRING([--enable-fuse], [enable FUSE support]), [ + fuse_enable=${enableval} ]) - AC_ARG_ENABLE(dbus, AC_HELP_STRING([--enable-dbus], [enable D-BUS support]), [ - dbus_enable=${enableval} + AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa], [enable ALSA support]), [ + alsa_enable=${enableval} ]) AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [install test programs]), [ @@ -391,9 +397,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ LDFLAGS="$LDFLAGS -pie" fi + AM_CONDITIONAL(DBUS, test "${dbus_enable}" = "yes" && test "${dbus_found}" = "yes") AM_CONDITIONAL(OBEX, test "${obex_enable}" = "yes" && test "${openobex_found}" = "yes") + AM_CONDITIONAL(FUSE, test "${fuse_enable}" = "yes" && test "${openobex_found}" = "yes" && test "${fuse_found}" = "yes") AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes") - AM_CONDITIONAL(DBUS, test "${dbus_enable}" = "yes" && test "${dbus_found}" = "yes") AM_CONDITIONAL(TEST, test "${test_enable}" = "yes") AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes") AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes") |