>From 1bb20056e23730d751a61d7e51786c78820f44a6 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Tue, 12 Feb 2013 14:47:35 +0100 Subject: [PATCH 1/4] Detect the presence of libcmocka during configure --- configure.ac | 2 ++ src/external/libcmocka.m4 | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 src/external/libcmocka.m4 diff --git a/configure.ac b/configure.ac index af976151ad3c90bfcb056dd7d8d24bbc8b884ca5..0e7712389d99cf1b903ae1dbf063d889be62d7b0 100644 --- a/configure.ac +++ b/configure.ac @@ -137,6 +137,7 @@ m4_include([src/external/ldap.m4]) m4_include([src/external/libpcre.m4]) m4_include([src/external/krb5.m4]) m4_include([src/external/libcares.m4]) +m4_include([src/external/libcmocka.m4]) m4_include([src/external/docbook.m4]) m4_include([src/external/sizes.m4]) m4_include([src/external/python.m4]) @@ -269,6 +270,7 @@ AC_PATH_PROG([DOXYGEN], [doxygen], [false]) AM_CONDITIONAL([HAVE_DOXYGEN], [test x$DOXYGEN != xfalse ]) AM_CONDITIONAL([HAVE_CHECK], [test x$have_check != x]) +AM_CONDITIONAL([HAVE_CMOCKA], [test x$have_cmocka != x]) abs_build_dir=`pwd` AC_DEFINE_UNQUOTED([ABS_BUILD_DIR], ["$abs_build_dir"], [Absolute path to the build directory]) diff --git a/src/external/libcmocka.m4 b/src/external/libcmocka.m4 new file mode 100644 index 0000000000000000000000000000000000000000..c57327612e2eec2411f18b640c4e2eaed2b31bc1 --- /dev/null +++ b/src/external/libcmocka.m4 @@ -0,0 +1,19 @@ +dnl this file will be simplified when cmocka carries a .pc file +AC_SUBST(CMOCKA_LIBS) +AC_SUBST(CMOCKA_CFLAGS) + +AC_CHECK_HEADERS( + [setjmp.h cmocka.h], + [AC_CHECK_LIB([cmocka], [_will_return], + [ CMOCKA_LIBS="-lcmocka" + have_cmocka="yes" ], + [AC_MSG_WARN([No libcmocka library found]) + have_cmocka="no" ])], + [AC_MSG_WARN([libcmocka header files not installed])], + [[ #include + # include + #ifdef HAVE_SETJMP_H + # include + #endif + ]] +) -- 1.8.1.4