diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2011-12-27 20:09:56 -0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2011-12-27 20:09:56 -0800 |
| commit | bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7 (patch) | |
| tree | fa845fa5afd9978f9680943b9e9ba65022386833 /acinclude.m4 | |
| parent | ec632165d6707bece074dbba43d704e26346ab0a (diff) | |
| download | bluez-bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7.tar.gz | |
build: Move libcheck under TEST conditional
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2097d7707..753b9942a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -170,6 +170,12 @@ AC_DEFUN([AC_PATH_READLINE], [ []) ]) +AC_DEFUN([AC_PATH_CHECK], [ + PKG_CHECK_MODULES(CHECK, check >= 0.9.4, 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@:>@]), @@ -422,7 +428,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes") AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes") AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes") - AM_CONDITIONAL(TEST, test "${test_enable}" = "yes") + AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes") AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes") AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes") AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes") |