From: Wouter Van Rooy <wouter.van.rooy@vasco.com>
Date: Tue, 16 Apr 2013 13:40:00 +0000 (+0200)
Subject: curl-config: don't output static libs when they are disabled
X-Git-Tag: curl-7_31_0~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68e7fb499d93ffcad8b7407c07689c8a5b1628b2;p=thirdparty%2Fcurl.git

curl-config: don't output static libs when they are disabled

Curl-config outputs static libraries even when they are disabled in
configure.

This causes problems with the build of pycurl.
---

diff --git a/configure.ac b/configure.ac
index 1a46fd9c25..49309e6f41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3350,6 +3350,11 @@ dnl yes or no
 ENABLE_SHARED="$enable_shared"
 AC_SUBST(ENABLE_SHARED)
 
+dnl to let curl-config output the static libraries correctly
+ENABLE_STATIC="$enable_static"
+AC_SUBST(ENABLE_STATIC)
+
+
 dnl
 dnl For keeping supported features and protocols also in pkg-config file
 dnl since it is more cross-compile friendly than curl-config
diff --git a/curl-config.in b/curl-config.in
index c95518d569..e0fa03c2d4 100644
--- a/curl-config.in
+++ b/curl-config.in
@@ -155,7 +155,12 @@ while test $# -gt 0; do
         ;;
 
     --static-libs)
-        echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@
+	if test "X@ENABLE_STATIC@" != "Xno" ; then
+		echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@
+	else
+		echo "curl was built with static libraries disabled" >&2
+		exit 1
+	fi
         ;;
 
     --configure)