diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-05-08 12:52:54 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-05-08 12:52:54 +0000 |
| commit | 331abb4c83b5c6690093ec0807d01823e4548865 (patch) | |
| tree | 0f8dac2febcd38b747f9aa27a4a9739e248db4c5 | |
| parent | 5d9f545ef534d3d2f4861c336de8d4f6321dd011 (diff) | |
Allow configuration of serial service
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rwxr-xr-x | bootstrap-configure | 1 | ||||
| -rw-r--r-- | serial/Makefile.am | 14 | ||||
| -rw-r--r-- | serial/serial.service | 5 |
4 files changed, 24 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 88696bc8..2d8c75b1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -159,6 +159,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ obex_enable=${openobex_found} alsa_enable=${alsa_found} network_enable=no + serial_enable=no input_enable=no audio_enable=no sync_enable=no @@ -240,6 +241,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ network_enable=${enableval} ]) + AC_ARG_ENABLE(serial, AC_HELP_STRING([--enable-serial], [enable serial service]), [ + serial_enable=${enableval} + ]) + AC_ARG_ENABLE(input, AC_HELP_STRING([--enable-input], [enable input service]), [ input_enable=${enableval} ]) @@ -349,6 +354,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(OBEX, test "${obex_enable}" = "yes" && test "${openobex_found}" = "yes") AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes") AM_CONDITIONAL(NETWORKSERVICE, test "${network_enable}" = "yes") + AM_CONDITIONAL(SERIALSERVICE, test "${serial_enable}" = "yes") AM_CONDITIONAL(INPUTSERVICE, test "${input_enable}" = "yes") AM_CONDITIONAL(AUDIOSERVICE, test "${audio_enable}" = "yes") AM_CONDITIONAL(SYNCSERVICE, test "${sync_enable}" = "yes" && test "${opensync_found}" = "yes") diff --git a/bootstrap-configure b/bootstrap-configure index c2188408..0b608ce6 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -15,6 +15,7 @@ fi --enable-all \ --enable-glib \ --enable-network \ + --enable-serial \ --enable-input \ --enable-audio \ --enable-echo \ diff --git a/serial/Makefile.am b/serial/Makefile.am index 24506088..240429a6 100644 --- a/serial/Makefile.am +++ b/serial/Makefile.am @@ -1,15 +1,25 @@ -noinst_PROGRAMS = bluetoothd-service-serial +if SERIALSERVICE +if CONFIGFILES +confdir = $(sysconfdir)/bluetooth + +conf_DATA = serial.service +endif + +servicedir = $(libdir)/bluetooth + +service_PROGRAMS = bluetoothd-service-serial bluetoothd_service_serial_SOURCES = main.c manager.h manager.c LDADD = $(top_builddir)/common/libhelper.a \ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ +endif AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -EXTRA_DIST = serial-api.txt +EXTRA_DIST = serial.service serial-api.txt MAINTAINERCLEANFILES = Makefile.in diff --git a/serial/serial.service b/serial/serial.service new file mode 100644 index 00000000..926e5064 --- /dev/null +++ b/serial/serial.service @@ -0,0 +1,5 @@ +[Bluetooth Service] +Identifier=serial +Name=Serial service +Description=Bluetooth Serial Port service +Autostart=false |