summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2015-03-10 18:10:37 +0100
committerJakub Hrozek <jhrozek@redhat.com>2015-03-24 20:29:27 +0100
commit1acadc807209b24f681a4866812e11d04b5a129f (patch)
tree29f29d109d55c8c0a60a655ed3ee9b0a442801bd
parent2bbf29b268bd2e7f9399ad6d7f5be6ca73ef7223 (diff)
downloadsssd-1acadc807209b24f681a4866812e11d04b5a129f.tar.gz
sssd-1acadc807209b24f681a4866812e11d04b5a129f.tar.xz
sssd-1acadc807209b24f681a4866812e11d04b5a129f.zip
build: Only run cmocka tests if cmocka 1.0 or newer is available
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com> (cherry picked from commit cecee447d41c3ca22e94880a7d0cbd910f230fe5)
-rw-r--r--src/external/libcmocka.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/src/external/libcmocka.m4 b/src/external/libcmocka.m4
index 740d9ad25..230aa9269 100644
--- a/src/external/libcmocka.m4
+++ b/src/external/libcmocka.m4
@@ -1,7 +1,7 @@
dnl A macro to check presence of cmocka on the system
AC_DEFUN([AM_CHECK_CMOCKA],
[
- PKG_CHECK_EXISTS(cmocka,
+ PKG_CHECK_EXISTS(cmocka >= 1.0.0,
[AC_CHECK_HEADERS([stdarg.h stddef.h setjmp.h],
[], dnl We are only intrested in action-if-not-found
[AC_MSG_WARN([Header files stdarg.h stddef.h setjmp.h are required by cmocka])
@@ -12,7 +12,7 @@ AC_DEFUN([AM_CHECK_CMOCKA],
[PKG_CHECK_MODULES([CMOCKA], [cmocka], [have_cmocka="yes"])]
)],
dnl PKG_CHECK_EXISTS ACTION-IF-NOT-FOUND
- [AC_MSG_WARN([No libcmocka library found, cmocka tests will not be built])]
+ [AC_MSG_WARN([No libcmocka-1.0.0 or newer library found, cmocka tests will not be built])]
)
AM_CONDITIONAL([HAVE_CMOCKA], [test x$have_cmocka = xyes])
])