41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
|
From 1acadc807209b24f681a4866812e11d04b5a129f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jakub Hrozek <jhrozek@redhat.com>
|
||
|
|
Date: Tue, 10 Mar 2015 18:10:37 +0100
|
||
|
|
Subject: [PATCH 42/99] build: Only run cmocka tests if cmocka 1.0 or newer is
|
||
|
|
available
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
||
|
|
(cherry picked from commit cecee447d41c3ca22e94880a7d0cbd910f230fe5)
|
||
|
|
---
|
||
|
|
src/external/libcmocka.m4 | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/external/libcmocka.m4 b/src/external/libcmocka.m4
|
||
|
|
index 740d9ad254b50563d4d1cbcab3d10f5920ffd79f..230aa92697d8ea4ca12fce21dbaa417bbe3c9b96 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])
|
||
|
|
])
|
||
|
|
--
|
||
|
|
2.4.0
|
||
|
|
|