URL: https://github.com/SSSD/sssd/pull/210
Author: lslebodn
 Title: #210: Kcm configure
Action: opened

PR body:
"""
I am not sure about 2nd patch "CONFIGURE: Update error messages for missing 
curl"
because IIRC secrets responder will require curl as well.
"""

To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/210/head:pr210
git checkout pr210
From 23fbd75966081def5322ef71154b419b45d908ff Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <[email protected]>
Date: Mon, 27 Mar 2017 11:59:01 +0200
Subject: [PATCH 1/2] CONFIGURE: Fix fallback if pkg-config for uuid is missing

---
 src/external/libuuid.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/external/libuuid.m4 b/src/external/libuuid.m4
index 55411a2..323521c 100644
--- a/src/external/libuuid.m4
+++ b/src/external/libuuid.m4
@@ -4,7 +4,7 @@ AC_SUBST(UUID_CFLAGS)
 PKG_CHECK_MODULES([UUID], [uuid], [found_uuid=yes], [found_uuid=no])
 
 SSS_AC_EXPAND_LIB_DIR()
-AS_IF([test x"$found_uuid" = xyes],
+AS_IF([test x"$found_uuid" != xyes],
     [AC_CHECK_HEADERS([uuid/uuid.h],
         [AC_CHECK_LIB([uuid],
                       [uuid_generate],

From 32b600df14090ef4af34995824578a8c3158fbdf Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <[email protected]>
Date: Mon, 27 Mar 2017 12:07:10 +0200
Subject: [PATCH 2/2] CONFIGURE: Update error messages for missing curl

Patch drops configure time parameter disable-curl-support
which is superseeded by --without-kcm
---
 contrib/ci/deps.sh      |  1 -
 src/external/libcurl.m4 | 21 +++++++--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/contrib/ci/deps.sh b/contrib/ci/deps.sh
index 4467e11..63ff72f 100644
--- a/contrib/ci/deps.sh
+++ b/contrib/ci/deps.sh
@@ -46,7 +46,6 @@ if [[ "$DISTRO_BRANCH" == -redhat-* ]]; then
         rpm-build
         uid_wrapper
         python-requests
-        curl-devel
         krb5-server
         krb5-workstation
     )
diff --git a/src/external/libcurl.m4 b/src/external/libcurl.m4
index b420b04..ab28a05 100644
--- a/src/external/libcurl.m4
+++ b/src/external/libcurl.m4
@@ -1,17 +1,10 @@
-AC_ARG_ENABLE([curl],
-              [AS_HELP_STRING([--disable-curl-support],
-                              [do not build with libcurl support])],
-              [enable_libcurl=$enableval],
-              [enable_libcurl=yes])
-
-found_libcurl="no"
-AS_IF([test x$enable_libcurl = xyes],
-      [PKG_CHECK_MODULES([CURL],
-                         [libcurl],
-                         [found_libcurl=yes],
-                         [AC_MSG_ERROR([
-The libcurl development library was not found.])
-      ])])
+PKG_CHECK_MODULES([CURL],
+                  [libcurl],
+                  [found_libcurl=yes],
+                  [AC_MSG_ERROR([
+You must have the libcurl devel packages installed to build sssd
+with KCM responder. If you want to build sssd without KCM responder
+then specify --without-kcm when running configure.])])
 
 AS_IF([test x"$found_libcurl" = xyes],
     CFLAGS="$CFLAGS $CURL_CFLAGS"
_______________________________________________
sssd-devel mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to