Commit 68e7fb49 authored by Wouter Van Rooy's avatar Wouter Van Rooy Committed by Daniel Stenberg
Browse files

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.
parent d9569720

configure.ac

+5 −0
Original line number Diff line number Diff line
@@ -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

curl-config.in

+6 −1
Original line number Diff line number Diff line
@@ -155,7 +155,12 @@ while test $# -gt 0; do 
        ;;



    --static-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)