summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m46
-rwxr-xr-xbootstrap-configure6
-rw-r--r--daemon/Makefile.am15
3 files changed, 2 insertions, 25 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 3135d94c..2e0c58c5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -184,7 +184,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
serial_enable=yes
network_enable=yes
sync_enable=no
- echo_enable=no
hcid_enable=yes
sdpd_enable=no
hidd_enable=no
@@ -286,10 +285,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
sync_enable=${enableval}
])
- AC_ARG_ENABLE(echo, AC_HELP_STRING([--enable-echo], [enable echo example service]), [
- echo_enable=${enableval}
- ])
-
AC_ARG_ENABLE(hcid, AC_HELP_STRING([--enable-hcid], [install HCI daemon]), [
hcid_enable=${enableval}
])
@@ -407,7 +402,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
AM_CONDITIONAL(SERIALSERVICE, test "${serial_enable}" = "yes")
AM_CONDITIONAL(NETWORKSERVICE, test "${network_enable}" = "yes")
AM_CONDITIONAL(SYNCSERVICE, test "${sync_enable}" = "yes" && test "${opensync_found}" = "yes")
- AM_CONDITIONAL(ECHOSERVICE, test "${echo_enable}" = "yes")
AM_CONDITIONAL(HCID, test "${hcid_enable}" = "yes")
AM_CONDITIONAL(SDPD, test "${sdpd_enable}" = "yes")
AM_CONDITIONAL(HIDD, test "${hidd_enable}" = "yes")
diff --git a/bootstrap-configure b/bootstrap-configure
index 60f61813..aee9a66f 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -14,14 +14,8 @@ fi
--libexecdir=/lib \
--enable-all \
--enable-glib \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
--disable-manpages \
--disable-configfiles \
--disable-initscripts \
--disable-pcmciarules \
- --disable-sdpd \
--disable-cups $*
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 39eabc7b..214b2449 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -1,21 +1,12 @@
-if ECHOSERVICE
-if CONFIGFILES
-confdir = $(sysconfdir)/bluetooth
-
-conf_DATA = echo.service
-endif
-
-servicedir = $(libdir)/bluetooth
-
-service_PROGRAMS = bluetoothd-service-echo
+noinst_PROGRAMS = bluetoothd passkey-agent auth-agent \
+ bluetoothd-service-echo
bluetoothd_service_echo_SOURCES = echo.c
bluetoothd_service_echo_LDADD = \
$(top_builddir)/common/libhelper.a \
@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
-endif
if CONFIGFILES
dbusdir = $(sysconfdir)/dbus-1/system.d
@@ -23,8 +14,6 @@ dbusdir = $(sysconfdir)/dbus-1/system.d
dbus_DATA = bluetooth.conf
endif
-noinst_PROGRAMS = bluetoothd passkey-agent auth-agent
-
bluetoothd_SOURCES = main.c system.h \
manager.h manager.c database.h database.c \
adapter.h adapter.c service.h service.c