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