move curl back to packages
[openwrt/svn-archive/archive.git] / libs / curl / patches / 100-cross_compile.patch
1 Index: curl-7.17.1/configure
2 ===================================================================
3 --- curl-7.17.1.orig/configure 2008-04-02 11:38:36.800178755 +0200
4 +++ curl-7.17.1/configure 2008-04-02 11:39:49.124300271 +0200
5 @@ -26922,16 +26922,6 @@
6 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7 fi
8
9 - if test "$OPENSSL_ENABLED" = "1"; then
10 - if test -n "$LIB_OPENSSL"; then
11 -
12 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
13 - export LD_LIBRARY_PATH
14 - { echo "$as_me:$LINENO: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5
15 -echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;}
16 - fi
17 - fi
18 -
19 fi
20
21
22 @@ -27551,15 +27541,6 @@
23 { (exit 1); exit 1; }; }
24 fi
25
26 - if test "$LIBSSH2_ENABLED" = "1"; then
27 - if test -n "$LIB_LIBSSH2"; then
28 -
29 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_LIBSSH2"
30 - export LD_LIBRARY_PATH
31 - { echo "$as_me:$LINENO: Added $LIB_LIBSSH2 to LD_LIBRARY_PATH" >&5
32 -echo "$as_me: Added $LIB_LIBSSH2 to LD_LIBRARY_PATH" >&6;}
33 - fi
34 - fi
35 fi
36
37
38 @@ -27741,18 +27722,6 @@
39
40 fi
41
42 -
43 - if test "x$USE_GNUTLS" = "xyes"; then
44 - { echo "$as_me:$LINENO: detected GnuTLS version $version" >&5
45 -echo "$as_me: detected GnuTLS version $version" >&6;}
46 -
47 -
48 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlsprefix/lib$libsuff"
49 - export LD_LIBRARY_PATH
50 - { echo "$as_me:$LINENO: Added $gtlsprefix/lib$libsuff to LD_LIBRARY_PATH" >&5
51 -echo "$as_me: Added $gtlsprefix/lib$libsuff to LD_LIBRARY_PATH" >&6;}
52 - fi
53 -
54 fi
55
56 fi
57 @@ -27951,17 +27920,6 @@
58 fi
59
60
61 - if test "x$USE_NSS" = "xyes"; then
62 - { echo "$as_me:$LINENO: detected NSS version $version" >&5
63 -echo "$as_me: detected NSS version $version" >&6;}
64 -
65 -
66 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff"
67 - export LD_LIBRARY_PATH
68 - { echo "$as_me:$LINENO: Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH" >&5
69 -echo "$as_me: Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH" >&6;}
70 - fi
71 -
72 fi
73
74 fi
75 Index: curl-7.17.1/configure.ac
76 ===================================================================
77 --- curl-7.17.1.orig/configure.ac 2008-04-02 11:37:43.137120670 +0200
78 +++ curl-7.17.1/configure.ac 2008-04-02 11:38:33.383984077 +0200
79 @@ -1215,19 +1215,6 @@
80 AC_MSG_RESULT([no])
81 ])
82 fi
83 -
84 - if test "$OPENSSL_ENABLED" = "1"; then
85 - if test -n "$LIB_OPENSSL"; then
86 - dnl when the ssl shared libs were found in a path that the run-time
87 - dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH
88 - dnl to prevent further configure tests to fail due to this
89 -
90 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
91 - export LD_LIBRARY_PATH
92 - AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
93 - fi
94 - fi
95 -
96 fi
97
98 dnl **********************************************************************
99 @@ -1364,17 +1351,6 @@
100 AC_MSG_ERROR([libSSH2 libs and/or directories were not found where specified!])
101 fi
102
103 - if test "$LIBSSH2_ENABLED" = "1"; then
104 - if test -n "$LIB_LIBSSH2"; then
105 - dnl when the libssh2 shared libs were found in a path that the run-time
106 - dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH
107 - dnl to prevent further configure tests to fail due to this
108 -
109 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_LIBSSH2"
110 - export LD_LIBRARY_PATH
111 - AC_MSG_NOTICE([Added $LIB_LIBSSH2 to LD_LIBRARY_PATH])
112 - fi
113 - fi
114 fi
115
116 dnl **********************************************************************
117 @@ -1464,19 +1440,6 @@
118 CPPFLAGS="$CLEANCPPFLAGS"
119 ])
120
121 - if test "x$USE_GNUTLS" = "xyes"; then
122 - AC_MSG_NOTICE([detected GnuTLS version $version])
123 -
124 - dnl when shared libs were found in a path that the run-time
125 - dnl linker doesn't search through, we need to add it to
126 - dnl LD_LIBRARY_PATH to prevent further configure tests to fail
127 - dnl due to this
128 -
129 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlsprefix/lib$libsuff"
130 - export LD_LIBRARY_PATH
131 - AC_MSG_NOTICE([Added $gtlsprefix/lib$libsuff to LD_LIBRARY_PATH])
132 - fi
133 -
134 fi
135
136 fi dnl GNUTLS not disabled
137 @@ -1544,19 +1507,6 @@
138 CPPFLAGS="$CLEANCPPFLAGS"
139 ])
140
141 - if test "x$USE_NSS" = "xyes"; then
142 - AC_MSG_NOTICE([detected NSS version $version])
143 -
144 - dnl when shared libs were found in a path that the run-time
145 - dnl linker doesn't search through, we need to add it to
146 - dnl LD_LIBRARY_PATH to prevent further configure tests to fail
147 - dnl due to this
148 -
149 - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff"
150 - export LD_LIBRARY_PATH
151 - AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
152 - fi
153 -
154 fi
155
156 fi dnl NSS not disabled