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