1 Index: curl-7.21.7/configure.ac
2 ===================================================================
3 --- curl-7.21.7.orig/configure.ac
4 +++ curl-7.21.7/configure.ac
5 @@ -1522,15 +1522,6 @@ if test X"$OPT_SSL" != Xno; then
8 if test "$OPENSSL_ENABLED" = "1"; then
9 - if test -n "$LIB_OPENSSL"; then
10 - dnl when the ssl shared libs were found in a path that the run-time
11 - dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH
12 - dnl to prevent further configure tests to fail due to this
14 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
15 - export LD_LIBRARY_PATH
16 - AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
18 CURL_CHECK_OPENSSL_API
21 @@ -1759,17 +1750,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
23 if test "x$USE_GNUTLS" = "xyes"; then
24 AC_MSG_NOTICE([detected GnuTLS version $version])
26 - if test -n "$gtlslib"; then
27 - dnl when shared libs were found in a path that the run-time
28 - dnl linker doesn't search through, we need to add it to
29 - dnl LD_LIBRARY_PATH to prevent further configure tests to fail
32 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib"
33 - export LD_LIBRARY_PATH
34 - AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
39 @@ -1869,18 +1849,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
41 CURL_LIBS="$CURL_LIBS -lpolarssl"
42 LIBS="$LIBS -lpolarssl"
44 - if test -n "$polarssllib"; then
45 - dnl when shared libs were found in a path that the run-time
46 - dnl linker doesn't search through, we need to add it to
47 - dnl LD_LIBRARY_PATH to prevent further configure tests to fail
50 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$polarssllib"
51 - export LD_LIBRARY_PATH
52 - AC_MSG_NOTICE([Added $polarssllib to LD_LIBRARY_PATH])
57 fi dnl PolarSSL not disabled
58 @@ -1958,18 +1926,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
60 CURL_LIBS="$CURL_LIBS -lcyassl -lm"
61 LIBS="$LIBS -lcyassl -lm"
63 - if test -n "$cyassllib"; then
64 - dnl when shared libs were found in a path that the run-time
65 - dnl linker doesn't search through, we need to add it to
66 - dnl LD_LIBRARY_PATH to prevent further configure tests to fail
69 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$cyassllib"
70 - export LD_LIBRARY_PATH
71 - AC_MSG_NOTICE([Added $cyassllib to LD_LIBRARY_PATH])
76 fi dnl CyaSSL not disabled
77 @@ -2053,19 +2009,6 @@ if test "$OPENSSL_ENABLED" != "1" -a "$G
78 CPPFLAGS="$CLEANCPPFLAGS"
81 - if test "x$USE_NSS" = "xyes"; then
82 - AC_MSG_NOTICE([detected NSS version $version])
84 - dnl when shared libs were found in a path that the run-time
85 - dnl linker doesn't search through, we need to add it to
86 - dnl LD_LIBRARY_PATH to prevent further configure tests to fail
89 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff"
90 - export LD_LIBRARY_PATH
91 - AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
96 fi dnl NSS not disabled
97 @@ -2114,11 +2057,6 @@ if test "$curl_ssl_msg" = "$init_ssl_msg
100 curl_ssl_msg="enabled (axTLS)"
103 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_AXTLS"
104 - export LD_LIBRARY_PATH
105 - AC_MSG_NOTICE([Added $LIB_AXTLS to LD_LIBRARY_PATH])
107 LDFLAGS="$CLEANLDFLAGS"
108 CPPFLAGS="$CLEANCPPFLAGS"
109 @@ -2220,10 +2158,6 @@ if test X"$OPT_LIBSSH2" != Xno; then
110 dnl libssh2_session_handshake was added in 1.2.8
111 AC_CHECK_FUNCS( libssh2_version libssh2_init libssh2_exit \
112 libssh2_scp_send64 libssh2_session_handshake)
114 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DIR_SSH2"
115 - export LD_LIBRARY_PATH
116 - AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])
119 dnl no libssh2, revert back to clean variables