diff options
author | Daniel Stenberg <daniel@haxx.se> | 2010-07-25 17:48:07 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2010-07-25 17:48:07 +0200 |
commit | a13128596c37603a1001e5f18b5706aa52600b3a (patch) | |
tree | 1af93a47d91018950ff6355e90b99ba6300bab7d | |
parent | 6d2ccfed48558f171c2840c3aa479261050d084a (diff) |
curl-config: --built-shared returns shared info
The curl-config now features a --built-shared command line option that
will output 'yes' or 'no' depending if the build process was asked to
build shared library/libraries or not.
It is primarily made to offer more details to the test suite to know
what kind of stunts it can expect to work.
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | curl-config.in | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b0530c496..633f9e49a 100644 --- a/configure.ac +++ b/configure.ac @@ -2653,6 +2653,10 @@ LIBS=$ALL_LIBS dnl LIBS is a magic variable that's used for every link AM_CONDITIONAL(CROSSCOMPILING, test x$cross_compiling = xyes) +dnl yes or no +ENABLE_SHARED="$enable_shared" +AC_SUBST(ENABLE_SHARED) + dnl dnl For keeping supported features and protocols also in pkg-config file dnl since it is more cross-compile frient than curl-config diff --git a/curl-config.in b/curl-config.in index ebda12998..27b9f7ffe 100644 --- a/curl-config.in +++ b/curl-config.in @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2001 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 2001 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -32,6 +32,7 @@ Usage: curl-config [OPTION] Available values for OPTION include: + --built-shared says 'yes' if libcurl was built shared --ca ca bundle install path --cc compiler --cflags pre-processor and compiler flags @@ -64,6 +65,10 @@ while test $# -gt 0; do esac case "$1" in + --built-shared) + echo @ENABLE_SHARED@ + ;; + --ca) echo "@CURL_CA_BUNDLE@" ;; @@ -87,6 +92,7 @@ while test $# -gt 0; do echo "$protocol" done ;; + --version) echo libcurl @VERSION@ exit 0 |