summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2017-03-27 12:18:53 +0200
committerPavel Vomacka <pvomacka@redhat.com>2017-03-27 17:57:28 +0200
commit054f1bd78b04a79f765f524f829b34c0ee252a1b (patch)
treeb408b9762acf2e86d17c0a7ad383d2027bd9297d
parentc4156041feb9c48598427ad59e43313b9c7327bb (diff)
downloadfreeipa-054f1bd78b04a79f765f524f829b34c0ee252a1b.tar.gz
freeipa-054f1bd78b04a79f765f524f829b34c0ee252a1b.tar.xz
freeipa-054f1bd78b04a79f765f524f829b34c0ee252a1b.zip
configure: fix --disable-server with certauth plugin
Resolves https://pagure.io/freeipa/issue/6816 Reviewed-By: Christian Heimes <cheimes@redhat.com>
-rw-r--r--configure.ac12
-rw-r--r--server.m45
2 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 7a67ec0ef..68340c8ac 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 7b2e94df9..a4c99195a 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