From 50fe3d79ab12b795a687b676761bef265701626a Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 11 Mar 2013 12:28:23 -0400 Subject: BUILD: Fix cmocka detection We were not properly detecting that cmocka was unavailable. It was expecting an empty value and getting "no" instead. This patch corrects the expectation, so we will now skip building and running cmocka tests on platforms that do not have it available. Also, we were missing the cmocka header files in the distribution tarball, so 'make distcheck' was failing. --- Makefile.am | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 2401c912..67e2bd1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -461,6 +461,8 @@ dist_noinst_HEADERS = \ src/resolv/ares/ares_parse_txt_reply.h \ src/resolv/ares/ares_data.h \ src/tests/common.h \ + src/tests/cmocka/common_mock.h \ + src/tests/cmocka/common_mock_resp.h \ src/sss_client/ssh/sss_ssh_client.h \ src/lib/idmap/sss_idmap_private.h diff --git a/configure.ac b/configure.ac index 0e771238..4b1cfba2 100644 --- a/configure.ac +++ b/configure.ac @@ -270,7 +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]) +AM_CONDITIONAL([HAVE_CMOCKA], [test x$have_cmocka = xyes]) abs_build_dir=`pwd` AC_DEFINE_UNQUOTED([ABS_BUILD_DIR], ["$abs_build_dir"], [Absolute path to the build directory]) -- cgit