diff --git a/acinclude.m4 b/acinclude.m4 index b26027502..e885992db 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -167,7 +167,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ obex_enable=${openobex_found} glib_enable=no gstreamer_enable=${gstreamer_found} - pulse_enable=${pulse_found} audio_enable=no input_enable=no serial_enable=no @@ -253,10 +252,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ gstreamer_enable=${enableval} ]) - AC_ARG_ENABLE(pulse, AC_HELP_STRING([--enable-pulse], [enable PulseAudio support]), [ - pulse_enable=${enableval} - ]) - AC_ARG_ENABLE(audio, AC_HELP_STRING([--enable-audio], [enable audio service]), [ audio_enable=${enableval} ]) @@ -379,7 +374,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes") AM_CONDITIONAL(OBEX, test "${obex_enable}" = "yes" && test "${openobex_found}" = "yes") AM_CONDITIONAL(GSTREAMER, test "${gstreamer_enable}" = "yes" && test "${gstreamer_found}" = "yes") - AM_CONDITIONAL(PULSE, test "${pulse_enable}" = "yes" && test "${pulse_found}" = "yes") AM_CONDITIONAL(AUDIOSERVICE, test "${audio_enable}" = "yes") AM_CONDITIONAL(INPUTSERVICE, test "${input_enable}" = "yes") AM_CONDITIONAL(SERIALSERVICE, test "${serial_enable}" = "yes") diff --git a/audio/Makefile.am b/audio/Makefile.am index 7d23d83a6..b5e3c466b 100644 --- a/audio/Makefile.am +++ b/audio/Makefile.am @@ -34,17 +34,6 @@ libasound_module_ctl_bluetooth_la_LIBADD = @ALSA_LIBS@ libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@ endif -if PULSE -pulsedir = $(libdir)/pulse-0.9/modules - -noinst_LTLIBRARIES = module-bluetooth-sink.la - -module_bluetooth_sink_la_SOURCES = module-bluetooth-sink.c ipc.h -module_bluetooth_sink_la_LDFLAGS = -module -avoid-version -module_bluetooth_sink_la_LIBADD = @SBC_LIBS@ @PULSE_LIBS@ -module_bluetooth_sink_la_CFLAGS = @PULSE_CFLAGS@ @SBC_CFLAGS@ -endif - if GSTREAMER gstreamerdir = $(libdir)/gstreamer-0.10 diff --git a/configure.in b/configure.in index 2e9162beb..51c1e0f8d 100644 --- a/configure.in +++ b/configure.in @@ -28,7 +28,6 @@ AC_PATH_BLUEZ AC_PATH_GLIB AC_PATH_DBUS AC_PATH_ALSA -AC_PATH_PULSE AC_PATH_GSTREAMER AC_PATH_OPENOBEX AC_PATH_OPENSYNC