|
 |
bb7cd1 |
From 1ea81a335baa08746df7daf2707c070271990937 Mon Sep 17 00:00:00 2001
|
|
|
bb7cd1 |
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
|
|
|
bb7cd1 |
Date: Wed, 22 Mar 2017 12:32:31 +0100
|
|
|
bb7cd1 |
Subject: [PATCH 82/90] build: make curl required by secrets
|
|
|
bb7cd1 |
MIME-Version: 1.0
|
|
|
bb7cd1 |
Content-Type: text/plain; charset=UTF-8
|
|
|
bb7cd1 |
Content-Transfer-Encoding: 8bit
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
Also remove --disable-libcurl since it doesn't make sense.
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
|
|
bb7cd1 |
Reviewed-by: Simo Sorce <simo@redhat.com>
|
|
|
bb7cd1 |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
bb7cd1 |
(cherry picked from commit 793f2573b2beaf8b48eab850429482acf68ec2b1)
|
|
|
bb7cd1 |
---
|
|
|
bb7cd1 |
configure.ac | 6 +++++-
|
|
|
bb7cd1 |
src/external/libcurl.m4 | 16 ++--------------
|
|
|
bb7cd1 |
2 files changed, 7 insertions(+), 15 deletions(-)
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
diff --git a/configure.ac b/configure.ac
|
|
|
bb7cd1 |
index cf5e2557ef0a1bd6374200aa33abea6c509d03aa..80d8ea9ff5785b0d76edbb04f454d0dd8c8a1e6d 100644
|
|
|
bb7cd1 |
--- a/configure.ac
|
|
|
bb7cd1 |
+++ b/configure.ac
|
|
|
bb7cd1 |
@@ -201,9 +201,13 @@ if test x$with_secrets = xyes; then
|
|
|
bb7cd1 |
fi
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
if test x$with_kcm = xyes; then
|
|
|
bb7cd1 |
- m4_include([src/external/libcurl.m4])
|
|
|
bb7cd1 |
m4_include([src/external/libuuid.m4])
|
|
|
bb7cd1 |
fi
|
|
|
bb7cd1 |
+
|
|
|
bb7cd1 |
+if test x$with_kcm = xyes -o x$with_secrets = xyes; then
|
|
|
bb7cd1 |
+ m4_include([src/external/libcurl.m4])
|
|
|
bb7cd1 |
+fi
|
|
|
bb7cd1 |
+
|
|
|
bb7cd1 |
# This variable is defined by external/libcurl.m4, but conditionals
|
|
|
bb7cd1 |
# must be always evaluated
|
|
|
bb7cd1 |
AM_CONDITIONAL([BUILD_WITH_LIBCURL],
|
|
|
bb7cd1 |
diff --git a/src/external/libcurl.m4 b/src/external/libcurl.m4
|
|
|
bb7cd1 |
index b420b04ad806bd1251f086b773ffe480d39f8bd3..42be308cd1e4b04e736daf887be9b75ea92db80e 100644
|
|
|
bb7cd1 |
--- a/src/external/libcurl.m4
|
|
|
bb7cd1 |
+++ b/src/external/libcurl.m4
|
|
|
bb7cd1 |
@@ -1,17 +1,5 @@
|
|
|
bb7cd1 |
-AC_ARG_ENABLE([curl],
|
|
|
bb7cd1 |
- [AS_HELP_STRING([--disable-curl-support],
|
|
|
bb7cd1 |
- [do not build with libcurl support])],
|
|
|
bb7cd1 |
- [enable_libcurl=$enableval],
|
|
|
bb7cd1 |
- [enable_libcurl=yes])
|
|
|
bb7cd1 |
-
|
|
|
bb7cd1 |
-found_libcurl="no"
|
|
|
bb7cd1 |
-AS_IF([test x$enable_libcurl = xyes],
|
|
|
bb7cd1 |
- [PKG_CHECK_MODULES([CURL],
|
|
|
bb7cd1 |
- [libcurl],
|
|
|
bb7cd1 |
- [found_libcurl=yes],
|
|
|
bb7cd1 |
- [AC_MSG_ERROR([
|
|
|
bb7cd1 |
-The libcurl development library was not found.])
|
|
|
bb7cd1 |
- ])])
|
|
|
bb7cd1 |
+PKG_CHECK_MODULES([CURL], [libcurl], [found_libcurl=yes],
|
|
|
bb7cd1 |
+ [AC_MSG_ERROR([The libcurl development library was not found.])])
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
AS_IF([test x"$found_libcurl" = xyes],
|
|
|
bb7cd1 |
CFLAGS="$CFLAGS $CURL_CFLAGS"
|
|
|
bb7cd1 |
--
|
|
|
bb7cd1 |
2.9.3
|
|
|
bb7cd1 |
|