On Tue, Nov 27, 2012 at 05:33:37PM +0100, Wouter Van Rooy wrote:
> --- curl/curl-config.in.orig 2012-11-20 10:09:59.899288883 +0000
> +++ curl/curl-config.in 2012-11-20 10:16:20.463354946 +0000
> @@ -156,7 +155,12 @@
> ;;
>
> --static-libs)
> - echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
> + if [ "@ENABLE_STATIC@" != no ]; then

To be consistent with the rest of the file, I'd use "test" here instead
of [ ]. And, I'm not sure if it's still an issue in the 21st century, but
some non-bash shells have/had trouble with empty strings in quotes,
which is why configure and the rest of this file use apparently
supurious X characters to avoid the possibility.

> + echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
> + else
> + echo "curl was build with static libraries disabled" >&2

s/build/built/

> + exit 1
> + fi
> ;;
>
> --configure)
> --- curl/configure.ac 2012-11-20 10:45:34.679698084 +0000
> +++ curl/configure.ac 2012-11-20 10:42:05.967659506 +0000
> @@ -3348,6 +3348,10 @@
> 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

>>> Dan
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
Received on 2012-11-27