From: Iker Pedrosa Date: Mon, 27 May 2024 13:33:45 +0000 (+0200) Subject: configure: move cmocka library detection X-Git-Tag: 4.15.2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e2453fa9f0c1e0c18d1f118140af69d5fb82b8e;p=thirdparty%2Fshadow.git configure: move cmocka library detection `PKG_CONFIG` variable needs to be set for `PKG_CHECK_MODULES` to succeed, but this wasn't happening in Fedora because the first appearance of `PKG_CHECK_MODULES` was conditionally skipped because this distribution is compiled without `libbsd` support. Thus, moving the cmocka library detection before libbsd fixes the problem. Suggested-by: Lukas Slebodnik Signed-off-by: Iker Pedrosa --- diff --git a/configure.ac b/configure.ac index 9a6103d4c..9e4e353a8 100644 --- a/configure.ac +++ b/configure.ac @@ -274,6 +274,7 @@ AC_DEFINE_UNQUOTED(GROUP_NAME_MAX_LENGTH, $with_group_name_max_length, [max grou AC_SUBST(GROUP_NAME_MAX_LENGTH) GROUP_NAME_MAX_LENGTH="$with_group_name_max_length" + AM_CONDITIONAL(USE_SHA_CRYPT, test "x$with_sha_crypt" = "xyes") if test "$with_sha_crypt" = "yes"; then AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms]) @@ -310,6 +311,10 @@ dnl needed (Linux glibc, Irix), but still link it if needed (Solaris). AC_SEARCH_LIBS(gethostbyname, nsl) +PKG_CHECK_MODULES([CMOCKA], [cmocka], [have_cmocka="yes"], + [AC_MSG_WARN([libcmocka not found, cmocka tests will not be built])]) +AM_CONDITIONAL([HAVE_CMOCKA], [test x$have_cmocka = xyes]) + AC_CHECK_LIB([econf],[econf_readDirs],[LIBECONF="-leconf"],[LIBECONF=""]) if test -n "$LIBECONF"; then AC_DEFINE_UNQUOTED([VENDORDIR], ["$enable_vendordir"], @@ -701,10 +706,6 @@ if test "$with_skey" = "yes"; then ]])],[AC_DEFINE(SKEY_BSD_STYLE, 1, [Define to support newer BSD S/Key API])],[]) fi -PKG_CHECK_MODULES([CMOCKA], [cmocka], [have_cmocka="yes"], - [AC_MSG_WARN([libcmocka not found, cmocka tests will not be built])]) -AM_CONDITIONAL([HAVE_CMOCKA], [test x$have_cmocka = xyes]) - AC_CHECK_FUNC(fgetpwent_r, [AC_DEFINE(HAVE_FGETPWENT_R, 1, [Defined to 1 if you have the declaration of 'fgetpwent_r'])]) AC_DEFINE_UNQUOTED(SHELL, ["$SHELL"], [The default shell.])