diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-04-01 21:02:31 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-04-01 21:02:31 +0000 |
| commit | c0be1b30ea748331adfccadaadb49193f407bdd4 (patch) | |
| tree | 0502f9ee9dc14c8a1b844f2feb7394976bbcb42c | |
| parent | c40762547147401db6eed6d64db09744e5668dda (diff) | |
Make headset service installable
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | audio/Makefile.am | 23 | ||||
| -rwxr-xr-x | bootstrap-configure | 3 |
3 files changed, 25 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index dee55b24..c4e6103d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -157,6 +157,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ usb_enable=${usb_found} glib_enable=no obex_enable=${openobex_found} + headset_enable=no network_enable=no input_enable=no sync_enable=no @@ -233,6 +234,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ obex_enable=${enableval} ]) + AC_ARG_ENABLE(headset, AC_HELP_STRING([--enable-headset], [enable headset service]), [ + headset_enable=${enableval} + ]) + AC_ARG_ENABLE(network, AC_HELP_STRING([--enable-network], [enable network service]), [ network_enable=${enableval} ]) @@ -340,6 +345,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(HAL, test "${hal_enable}" = "yes" && test "${hal_found}" = "yes") AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes") AM_CONDITIONAL(OBEX, test "${obex_enable}" = "yes" && test "${openobex_found}" = "yes") + AM_CONDITIONAL(HEADSETSERVICE, test "${headset_enable}" = "yes") AM_CONDITIONAL(NETWORKSERVICE, test "${network_enable}" = "yes") AM_CONDITIONAL(INPUTSERVICE, test "${input_enable}" = "yes") AM_CONDITIONAL(SYNCSERVICE, test "${sync_enable}" = "yes" && test "${opensync_found}" = "yes") diff --git a/audio/Makefile.am b/audio/Makefile.am index 63f338b7..4de6d59f 100644 --- a/audio/Makefile.am +++ b/audio/Makefile.am @@ -1,18 +1,27 @@ -servicedir = $(libdir)/bluetooth +if HEADSETSERVICE +if CONFIGFILES +confdir = $(sysconfdir)/bluetooth -noinst_PROGRAMS = bluetoothd-service-audio \ - bluetoothd-service-headset +conf_DATA = headset.service +endif -bluetoothd_service_audio_SOURCES = main.c manager.h manager.c +servicedir = $(libdir)/bluetooth -bluetoothd_service_audio_LDADD = $(top_builddir)/common/libhelper.a \ - @SBC_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ +service_PROGRAMS = bluetoothd-service-headset bluetoothd_service_headset_SOURCES = headset.c bluetoothd_service_headset_LDADD = $(top_builddir)/common/libhelper.a \ - @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ + @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ +endif + +noinst_PROGRAMS = bluetoothd-service-audio + +bluetoothd_service_audio_SOURCES = main.c manager.h manager.c + +bluetoothd_service_audio_LDADD = $(top_builddir)/common/libhelper.a \ + @SBC_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @SBC_CFLAGS@ diff --git a/bootstrap-configure b/bootstrap-configure index 82c9cc03..2a23ad5e 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -13,7 +13,10 @@ fi --localstatedir=/var \ --libexecdir=/lib \ --enable-all \ + --enable-glib \ + --enable-headset \ --disable-configfiles \ --disable-initscripts \ --disable-pcmciarules \ + --disable-sdpd \ --disable-cups $* |