From 1dca2667b1e43540c377a45b0f653b0e9bc8840d Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Mon, 27 Mar 2017 12:18:53 +0200 Subject: [PATCH] configure: fix --disable-server with certauth plugin Resolves https://pagure.io/freeipa/issue/6816 Reviewed-By: Christian Heimes --- configure.ac | 12 ++++++++++++ server.m4 | 5 ----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 2d84426d1039e822fa3ee53410c819274e763e32..8d4b82e4590e9e122f7aa5684fd78834c4b6a204 100644 --- a/configure.ac +++ b/configure.ac @@ -225,6 +225,18 @@ AM_COND_IF([ENABLE_SERVER], [ ]) dnl --------------------------------------------------------------------------- +dnl - Check if IPA certauth plugin can be build +dnl --------------------------------------------------------------------------- + +AM_CONDITIONAL([BUILD_IPA_CERTAUTH_PLUGIN], + [test x$have_certauth_plugin = xyes -a x"$SSSCERTMAP_LIBS" != x]) +AM_COND_IF([BUILD_IPA_CERTAUTH_PLUGIN], [ + AM_COND_IF([ENABLE_SERVER], + [AC_MSG_NOTICE([Build IPA KDB certauth plugin])], + [AC_MSG_WARN([Cannot build IPA KDB certauth plugin])]) +]) + +dnl --------------------------------------------------------------------------- dnl - Check for program paths dnl --------------------------------------------------------------------------- AC_PATH_PROG(UNLINK, unlink, [AC_MSG_ERROR([unlink not found])]) diff --git a/server.m4 b/server.m4 index 7b2e94df91a4803849e496142788a4ed87ef487d..a4c99195ae535e586445cf5bbe9fef457d224531 100644 --- a/server.m4 +++ b/server.m4 @@ -37,11 +37,6 @@ PKG_CHECK_EXISTS([sss_certmap], AC_CHECK_HEADER([krb5/certauth_plugin.h], [have_certauth_plugin=yes], [have_certauth_plugin=no]) -AM_CONDITIONAL([BUILD_IPA_CERTAUTH_PLUGIN], - [test x$have_certauth_plugin = xyes -a x"$SSSCERTMAP_LIBS" != x]) -AM_COND_IF([BUILD_IPA_CERTAUTH_PLUGIN], - [AC_MSG_NOTICE([Build IPA KDB certauth plugin])], - [AC_MSG_WARN([Cannot build IPA KDB certauth plugin])]) dnl --------------------------------------------------------------------------- dnl - Check for KRB5 krad -- 2.12.1