diff options
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | configure.ac | 1 |
3 files changed, 2 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index ee2045381..a6afcac4f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -219,20 +219,10 @@ AM_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \ -I$(srcdir)/gdbus -I$(srcdir)/btio -unit_objects = - -if TEST unit_tests = unit/test-eir -noinst_PROGRAMS += $(unit_tests) - unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c -unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@ -unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@ -unit_objects += $(unit_test_eir_OBJECTS) -else -unit_tests = -endif +unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \ unit/test-gobex-transfer unit/test-gobex-apparam diff --git a/acinclude.m4 b/acinclude.m4 index b61cd172f..b3e41810c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -130,12 +130,6 @@ AC_DEFUN([AC_PATH_READLINE], [ []) ]) -AC_DEFUN([AC_PATH_CHECK], [ - PKG_CHECK_MODULES(CHECK, check >= 0.9.6, check_found=yes, check_found=no) - AC_SUBST(CHECK_CFLAGS) - AC_SUBST(CHECK_LIBS) -]) - AC_DEFUN([AC_PATH_OUI], [ AC_ARG_WITH(ouifile, AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]), @@ -291,7 +285,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(HEALTHPLUGIN, test "${health_enable}" = "yes") AM_CONDITIONAL(READLINE, test "${readline_found}" = "yes") AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes") - AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes") + AM_CONDITIONAL(TEST, test "${test_enable}" = "yes") AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes") AM_CONDITIONAL(HID2HCI, test "${hid2hci_enable}" = "yes" && test "${usb_found}" = "yes" && test "${udev_found}" = "yes") AM_CONDITIONAL(DATAFILES, test "${datafiles_enable}" = "yes") diff --git a/configure.ac b/configure.ac index 6359f3ce8..429297843 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,6 @@ AC_PATH_USB AC_PATH_UDEV AC_PATH_OUI AC_PATH_READLINE -AC_PATH_CHECK AC_ARG_BLUEZ |