curl: update to version 7.21.3
[openwrt/svn-archive/archive.git] / libs / curl / patches / 100-cross_compile.patch
1 --- a/configure
2 +++ b/configure
3 @@ -19786,17 +19786,6 @@ $as_echo "no" >&6; }
4 fi
5 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6 fi
7 -
8 - if test "$OPENSSL_ENABLED" = "1"; then
9 - if test -n "$LIB_OPENSSL"; then
10 -
11 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
12 - export LD_LIBRARY_PATH
13 - { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5
14 -$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;}
15 - fi
16 - fi
17 -
18 fi
19
20
21 @@ -20252,21 +20241,6 @@ else
22 CPPFLAGS="$CLEANCPPFLAGS"
23
24 fi
25 -
26 -
27 - if test "x$USE_GNUTLS" = "xyes"; then
28 - { $as_echo "$as_me:${as_lineno-$LINENO}: detected GnuTLS version $version" >&5
29 -$as_echo "$as_me: detected GnuTLS version $version" >&6;}
30 -
31 - if test -n "$gtlslib"; then
32 -
33 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib"
34 - export LD_LIBRARY_PATH
35 - { $as_echo "$as_me:${as_lineno-$LINENO}: Added $gtlslib to LD_LIBRARY_PATH" >&5
36 -$as_echo "$as_me: Added $gtlslib to LD_LIBRARY_PATH" >&6;}
37 - fi
38 - fi
39 -
40 fi
41
42 fi
43 --- a/configure.ac
44 +++ b/configure.ac
45 @@ -1497,19 +1497,6 @@ if test X"$OPT_SSL" != Xno; then
46 AC_MSG_RESULT([no])
47 ])
48 fi
49 -
50 - if test "$OPENSSL_ENABLED" = "1"; then
51 - if test -n "$LIB_OPENSSL"; then
52 - dnl when the ssl shared libs were found in a path that the run-time
53 - dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH
54 - dnl to prevent further configure tests to fail due to this
55 -
56 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
57 - export LD_LIBRARY_PATH
58 - AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
59 - fi
60 - fi
61 -
62 fi
63
64 dnl **********************************************************************
65 @@ -1717,22 +1704,6 @@ if test "$OPENSSL_ENABLED" != "1"; then
66 LIBS="$CLEANLIBS"
67 CPPFLAGS="$CLEANCPPFLAGS"
68 ])
69 -
70 - if test "x$USE_GNUTLS" = "xyes"; then
71 - AC_MSG_NOTICE([detected GnuTLS version $version])
72 -
73 - if test -n "$gtlslib"; then
74 - dnl when shared libs were found in a path that the run-time
75 - dnl linker doesn't search through, we need to add it to
76 - dnl LD_LIBRARY_PATH to prevent further configure tests to fail
77 - dnl due to this
78 -
79 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib"
80 - export LD_LIBRARY_PATH
81 - AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
82 - fi
83 - fi
84 -
85 fi
86
87 fi dnl GNUTLS not disabled