diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2008-09-02 12:07:08 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2008-09-02 12:07:08 +0000 |
| commit | bbc002a50575f7690fe67e23850e63bc8eb792f1 (patch) | |
| tree | e5cfedcf6f0f5ed012ecd14c901d9e4caaad859d /curl-config.in | |
| parent | c8d4e8b5d0c83d959256a54dabccc8176db10d78 (diff) | |
| download | curl-bbc002a50575f7690fe67e23850e63bc8eb792f1.tar.gz | |
- Keith Mok added supported_protocols and supported_features to the pkg-config
file for libcurl, and while doing that fix he unified with curl-config.in
how the supported protocols and features are extracted and used, so both those
tools should now always be synced.
Diffstat (limited to 'curl-config.in')
| -rw-r--r-- | curl-config.in | 68 |
1 files changed, 6 insertions, 62 deletions
diff --git a/curl-config.in b/curl-config.in index 107fa2c59..375318037 100644 --- a/curl-config.in +++ b/curl-config.in @@ -80,71 +80,15 @@ while test $# -gt 0; do ;; --feature|--features) - if test "@USE_SSLEAY@" = "1"; then - echo "SSL" - NTLM=1 # OpenSSL implies NTLM - elif test -n "@SSL_ENABLED@"; then - echo "SSL" - fi - if test "@KRB4_ENABLED@" = "1"; then - echo "KRB4" - fi - if test "@IPV6_ENABLED@" = "1"; then - echo "IPv6" - fi - if test "@HAVE_LIBZ@" = "1"; then - echo "libz" - fi - if test "@HAVE_ARES@" = "1"; then - echo "AsynchDNS" - fi - if test "@IDN_ENABLED@" = "1"; then - echo "IDN" - fi - if test "@USE_WINDOWS_SSPI@" = "1"; then - echo "SSPI" - NTLM=1 - fi - if test "$NTLM" = "1"; then - echo "NTLM" - fi + for feature in @SUPPORT_FEATURES@; do + echo $feature; + done ;; --protocols) - if test "@CURL_DISABLE_HTTP@" != "1"; then - echo "HTTP" - if test "@SSL_ENABLED@" = "1"; then - echo "HTTPS" - fi - fi - if test "@CURL_DISABLE_FTP@" != "1"; then - echo "FTP" - if test "@SSL_ENABLED@" = "1"; then - echo "FTPS" - fi - fi - if test "@CURL_DISABLE_FILE@" != "1"; then - echo "FILE" - fi - if test "@CURL_DISABLE_TELNET@" != "1"; then - echo "TELNET" - fi - if test "@CURL_DISABLE_LDAP@" != "1"; then - echo "LDAP" - fi - if test "@CURL_DISABLE_LDAPS@" != "1"; then - echo "LDAPS" - fi - if test "@CURL_DISABLE_DICT@" != "1"; then - echo "DICT" - fi - if test "@CURL_DISABLE_TFTP@" != "1"; then - echo "TFTP" - fi - if test "@USE_LIBSSH2@" = "1"; then - echo "SCP" - echo "SFTP" - fi + for protocol in @SUPPORT_PROTOCOLS@; do + echo $protocol; + done ;; --version) echo libcurl @VERSION@ |