[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 20/205: configure: fix --with-zlib when a path is s
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 20/205: configure: fix --with-zlib when a path is specified |
Date: |
Thu, 20 Apr 2017 16:19:20 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.
commit 6fc91f6d3af1d9976cdba8e6d757d56b1c8d3b54
Author: Greg Rowe <address@hidden>
AuthorDate: Sun Feb 26 17:39:12 2017 -0500
configure: fix --with-zlib when a path is specified
Prior to this change if you attempted to configure curl using
--wtih-zlib and specified a path the path would be ignored if you also
had pkg-config installed on your system. This situation can easily
arise when you are cross compiling. This change moves the test for
detecting zlib settings via pkg-config only if OPT_ZLIB is not set.
Closes https://github.com/curl/curl/pull/1292
---
configure.ac | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5c77b0f4c..abd0def36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -893,17 +893,16 @@ else
OPT_ZLIB=""
fi
- CURL_CHECK_PKGCONFIG(zlib)
-
- if test "$PKGCONFIG" != "no" ; then
- LIBS="`$PKGCONFIG --libs-only-l zlib` $LIBS"
- LDFLAGS="`$PKGCONFIG --libs-only-L zlib` $LDFLAGS"
- CPPFLAGS="`$PKGCONFIG --cflags-only-I zlib` $CPPFLAGS"
- OPT_ZLIB=""
- HAVE_LIBZ="1"
- fi
-
if test -z "$OPT_ZLIB" ; then
+ CURL_CHECK_PKGCONFIG(zlib)
+
+ if test "$PKGCONFIG" != "no" ; then
+ LIBS="`$PKGCONFIG --libs-only-l zlib` $LIBS"
+ LDFLAGS="`$PKGCONFIG --libs-only-L zlib` $LDFLAGS"
+ CPPFLAGS="`$PKGCONFIG --cflags-only-I zlib` $CPPFLAGS"
+ OPT_ZLIB=""
+ HAVE_LIBZ="1"
+ fi
if test -z "$HAVE_LIBZ"; then
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 11/205: test1139: allow for the possibility that the man page is not rebuilt, (continued)
- [GNUnet-SVN] [gnurl] 11/205: test1139: allow for the possibility that the man page is not rebuilt, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 06/205: ftp: removed an erroneous free in an OOM path, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 01/205: bump: work on the next release, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 02/205: cmake: Replace invalid UTF-8 byte sequence, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 03/205: test557: explicitly use the C locale so the numeric output is as expected, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 04/205: tests: use consistent environment variables for setting charset, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 16/205: darwinssl: Warn that disabling host verify also disables SNI, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 08/205: ftp: fixed a NULL pointer dereference on OOM, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 14/205: tests: enable HTTP/2 tests to run with non-default port numbers, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 15/205: warnless: suppress compiler warning, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 20/205: configure: fix --with-zlib when a path is specified,
gnunet <=
- [GNUnet-SVN] [gnurl] 32/205: BINDINGS: add misssing C++ bindings, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 29/205: CMake: Add mbedTLS support, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 25/205: fix potential use of uninitialized variables, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 35/205: BINDINGS: update the Lua-cURL URL, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 17/205: configure: fix for --enable-pthreads, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 33/205: BINDINGS: add go-curl and perl6-net-curl, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 21/205: build: fix gcc7 implicit fallthrough warnings, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 26/205: CURLOPT_SSL_CTX_FUNCTION.3: Fix EXAMPLE formatting errors, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 30/205: CMake: Set at most one SSL library, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 27/205: CMake: Reorganize SSL support, separate WinSSL and SSPI, gnunet, 2017/04/20