diff options
| -rw-r--r-- | Makefile.am | 29 | ||||
| -rw-r--r-- | acinclude.m4 | 9 | ||||
| -rw-r--r-- | configure.ac | 1 |
3 files changed, 0 insertions, 39 deletions
diff --git a/Makefile.am b/Makefile.am index 4defec5f7..aed610b08 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,35 +82,6 @@ noinst_LTLIBRARIES += lib/libbluetooth-private.la lib_libbluetooth_private_la_SOURCES = $(lib_libbluetooth_la_SOURCES) -if SBC -noinst_LTLIBRARIES += sbc/libsbc.la - -sbc_libsbc_la_SOURCES = sbc/sbc.h sbc/sbc.c sbc/sbc_math.h sbc/sbc_tables.h \ - sbc/sbc_primitives.h sbc/sbc_primitives.c \ - sbc/sbc_primitives_mmx.h sbc/sbc_primitives_mmx.c \ - sbc/sbc_primitives_iwmmxt.h sbc/sbc_primitives_iwmmxt.c \ - sbc/sbc_primitives_neon.h sbc/sbc_primitives_neon.c \ - sbc/sbc_primitives_armv6.h sbc/sbc_primitives_armv6.c - -sbc_libsbc_la_CFLAGS = $(AM_CFLAGS) -finline-functions -fgcse-after-reload \ - -funswitch-loops -funroll-loops - -noinst_PROGRAMS += sbc/sbcinfo sbc/sbcdec sbc/sbcenc - -sbc_sbcdec_SOURCES = sbc/sbcdec.c sbc/formats.h -sbc_sbcdec_LDADD = sbc/libsbc.la - -sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h -sbc_sbcenc_LDADD = sbc/libsbc.la - -if SNDFILE -noinst_PROGRAMS += sbc/sbctester - -sbc_sbctester_LDADD = @SNDFILE_LIBS@ -lm -sbc_sbctest_CFLAGS = $(AM_CFLAGS) @SNDFILE_CFLAGS@ -endif -endif - attrib_sources = attrib/att.h attrib/att-database.h attrib/att.c \ attrib/gatt.h attrib/gatt.c \ attrib/gattrib.h attrib/gattrib.c attrib/client.h \ diff --git a/acinclude.m4 b/acinclude.m4 index 636916de4..0694429e2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -123,12 +123,6 @@ AC_DEFUN([AC_PATH_UDEV], [ AC_SUBST(UDEV_LIBS) ]) -AC_DEFUN([AC_PATH_SNDFILE], [ - PKG_CHECK_MODULES(SNDFILE, sndfile, sndfile_found=yes, sndfile_found=no) - AC_SUBST(SNDFILE_CFLAGS) - AC_SUBST(SNDFILE_LIBS) -]) - AC_DEFUN([AC_PATH_READLINE], [ AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, main, @@ -157,7 +151,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ optimization_enable=yes fortify_enable=yes pie_enable=yes - sndfile_enable=${sndfile_found} usb_enable=${usb_found} audio_enable=yes input_enable=yes @@ -317,9 +310,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.]) fi - AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes") AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes") - AM_CONDITIONAL(SBC, test "${test_enable}" = "yes") AM_CONDITIONAL(AUDIOPLUGIN, test "${audio_enable}" = "yes") AM_CONDITIONAL(INPUTPLUGIN, test "${input_enable}" = "yes") diff --git a/configure.ac b/configure.ac index 150eeebf9..c97d403b6 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,6 @@ AC_PATH_DBUS AC_PATH_GLIB AC_PATH_USB AC_PATH_UDEV -AC_PATH_SNDFILE AC_PATH_OUI AC_PATH_READLINE AC_PATH_CHECK |