diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-02-10 05:12:11 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-02-10 05:12:11 +0000 |
| commit | 9341b13b646e5c4621a0c76a1852a8cc415d92c3 (patch) | |
| tree | d2a685f12947b80a37ba7225e8e749904d15a2b5 | |
| parent | 84070adc0a6a50037789b0fc3b4f4c87efd63867 (diff) | |
Enable services by default and keep old daemons disabled
| -rw-r--r-- | acinclude.m4 | 21 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | dund/Makefile.am | 5 |
3 files changed, 19 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d42ff89d..c154d9b8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -184,16 +184,17 @@ AC_DEFUN([AC_ARG_BLUEZ], [ obex_enable=${openobex_found} glib_enable=no gstreamer_enable=${gstreamer_found} - audio_enable=no - input_enable=no - serial_enable=no - network_enable=no + audio_enable=yes + input_enable=yes + serial_enable=yes + network_enable=yes sync_enable=no echo_enable=no hcid_enable=yes - sdpd_enable=yes - hidd_enable=yes - pand_enable=yes + sdpd_enable=no + hidd_enable=no + pand_enable=no + dund_enable=no test_enable=no cups_enable=no manpages_enable=yes @@ -226,6 +227,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ sdpd_enable=${enableval} hidd_enable=${enableval} pand_enable=${enableval} + dund_enable=${enableval} test_enable=${enableval} cups_enable=${enableval} manpages_enable=${enableval} @@ -311,6 +313,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ pand_enable=${enableval} ]) + AC_ARG_ENABLE(dund, AC_HELP_STRING([--enable-dund], [install DUN daemon]), [ + dund_enable=${enableval} + ]) + AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [install test programs]), [ test_enable=${enableval} ]) @@ -410,6 +416,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(SDPD, test "${sdpd_enable}" = "yes") AM_CONDITIONAL(HIDD, test "${hidd_enable}" = "yes") AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes") + AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes") AM_CONDITIONAL(TEST, test "${test_enable}" = "yes") AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes") AM_CONDITIONAL(MANPAGES, test "${manpages_enable}" = "yes") diff --git a/configure.in b/configure.in index eba74ceb..ff0060e4 100644 --- a/configure.in +++ b/configure.in @@ -30,8 +30,6 @@ AC_PATH_GMODULE AC_PATH_DBUS AC_PATH_ALSA AC_PATH_GSTREAMER -AC_PATH_OPENOBEX -AC_PATH_OPENSYNC AC_PATH_HAL AC_PATH_USB AC_PATH_EXPAT diff --git a/dund/Makefile.am b/dund/Makefile.am index 91fb1d2e..260698ab 100644 --- a/dund/Makefile.am +++ b/dund/Makefile.am @@ -1,14 +1,19 @@ +if DUND bin_PROGRAMS = dund dund_SOURCES = main.c dun.c dund.h sdp.c lib.h msdun.c + dund_LDADD = @BLUEZ_LIBS@ +endif AM_CFLAGS = @BLUEZ_CFLAGS@ +if DUND if MANPAGES man_MANS = dund.1 endif +endif EXTRA_DIST = dund.1 |