aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2007-09-14 01:24:59 +0000
committerDan Fandrich <dan@coneharvesters.com>2007-09-14 01:24:59 +0000
commit9b23b310712fbd2e3162e88b299780734965c5d4 (patch)
treec1f91c710d8f2861b14c700a1742bbf7bb670896
parent8412d1e4937899aedc69852cc5de63c4273e14d6 (diff)
Added LDAPS, SCP and SFTP to curl-config --protocols.
Removed and fixed some AC_SUBST configure entries.
-rw-r--r--configure.ac10
-rw-r--r--curl-config.in7
2 files changed, 9 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 1f887ece9..c793c28b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1314,6 +1314,7 @@ if test X"$OPT_LIBSSH2" != Xno; then
curl_ssh_msg="enabled (libSSH2)"
LIBSSH2_ENABLED=1
AC_DEFINE(USE_LIBSSH2, 1, [if libSSH2 is in use]))
+ AC_SUBST(USE_LIBSSH2, [1])
if test X"$OPT_LIBSSH2" != Xoff &&
test "$LIBSSH2_ENABLED" != "1"; then
@@ -2189,7 +2190,6 @@ AC_HELP_STRING([--disable-verbose],[Disable verbose strings]),
no)
AC_MSG_RESULT(no)
AC_DEFINE(CURL_DISABLE_VERBOSE_STRINGS, 1, [to disable verbose strings])
- AC_SUBST(CURL_DISABLE_VERBOSE_STRINGS)
curl_verbose_msg="no"
;;
*) AC_MSG_RESULT(yes)
@@ -2212,7 +2212,7 @@ AC_HELP_STRING([--disable-sspi],[Disable SSPI]),
if test "$ac_cv_native_windows" = "yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE(USE_WINDOWS_SSPI, 1, [to enable SSPI support])
- AC_SUBST(USE_WINDOWS_SSPI)
+ AC_SUBST(USE_WINDOWS_SSPI, [1])
curl_sspi_msg="yes"
else
AC_MSG_RESULT(no)
@@ -2262,7 +2262,6 @@ AC_HELP_STRING([--disable-crypto-auth],[Disable cryptographic authentication]),
no)
AC_MSG_RESULT(no)
AC_DEFINE(CURL_DISABLE_CRYPTO_AUTH, 1, [to disable cryptographic authentication])
- AC_SUBST(CURL_DISABLE_CRYPTO_AUTH)
;;
*) AC_MSG_RESULT(yes)
;;
@@ -2281,7 +2280,6 @@ AC_HELP_STRING([--disable-cookies],[Disable cookies support]),
no)
AC_MSG_RESULT(no)
AC_DEFINE(CURL_DISABLE_COOKIES, 1, [to disable cookies support])
- AC_SUBST(CURL_DISABLE_COOKIES)
;;
*) AC_MSG_RESULT(yes)
;;
@@ -2308,9 +2306,7 @@ AC_HELP_STRING([--disable-hidden-symbols],[Leave all symbols with default visibi
if $CC --help --verbose 2>&1 | grep fvisibility= > /dev/null ; then
AC_MSG_RESULT(yes)
AC_DEFINE(CURL_HIDDEN_SYMBOLS, 1, [to enable hidden symbols])
- AC_SUBST(CURL_HIDDEN_SYMBOLS)
AC_DEFINE(CURL_EXTERN_SYMBOL, [__attribute__ ((visibility ("default")))], [to make a symbol visible])
- AC_SUBST(CURL_EXTERN_SYMBOL)
CFLAGS="$CFLAGS -fvisibility=hidden"
else
AC_MSG_RESULT(no)
@@ -2321,9 +2317,7 @@ AC_HELP_STRING([--disable-hidden-symbols],[Leave all symbols with default visibi
if $CC 2>&1 | grep flags >/dev/null && $CC -flags | grep xldscope= >/dev/null ; then
AC_MSG_RESULT(yes)
AC_DEFINE(CURL_HIDDEN_SYMBOLS, 1, [to enable hidden symbols])
- AC_SUBST(CURL_HIDDEN_SYMBOLS)
AC_DEFINE(CURL_EXTERN_SYMBOL, [__global], [to make a symbol visible])
- AC_SUBST(CURL_EXTERN_SYMBOL)
CFLAGS="$CFLAGS -xldscope=hidden"
else
AC_MSG_RESULT(no)
diff --git a/curl-config.in b/curl-config.in
index 96a1a0267..92d1bb02e 100644
--- a/curl-config.in
+++ b/curl-config.in
@@ -131,12 +131,19 @@ while test $# -gt 0; do
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
;;
--version)
echo libcurl @VERSION@