mirror of https://github.com/moparisthebest/curl
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.
This commit is contained in:
parent
d9569720dd
commit
68e7fb499d
|
@ -3350,6 +3350,11 @@ dnl yes or no
|
||||||
ENABLE_SHARED="$enable_shared"
|
ENABLE_SHARED="$enable_shared"
|
||||||
AC_SUBST(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
|
||||||
dnl For keeping supported features and protocols also in pkg-config file
|
dnl For keeping supported features and protocols also in pkg-config file
|
||||||
dnl since it is more cross-compile friendly than curl-config
|
dnl since it is more cross-compile friendly than curl-config
|
||||||
|
|
|
@ -155,7 +155,12 @@ while test $# -gt 0; do
|
||||||
;;
|
;;
|
||||||
|
|
||||||
--static-libs)
|
--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)
|
--configure)
|
||||||
|
|
Loading…
Reference in New Issue