|
1 --- configure 2010-10-01 13:49:17.000000000 -0700 |
|
2 +++ configure 2010-10-18 08:18:56.838791104 -0700 |
|
3 @@ -1,4 +1,4 @@ |
|
4 -#! /bin/sh |
|
5 +#! /bin/ksh93 |
|
6 # Guess values for system-dependent variables and create Makefiles. |
|
7 # Generated by GNU Autoconf 2.67 for curl -. |
|
8 # |
|
9 @@ -274,7 +274,7 @@ |
|
10 fi |
|
11 fi |
|
12 fi |
|
13 -SHELL=${CONFIG_SHELL-/bin/sh} |
|
14 +SHELL=${CONFIG_SHELL-/bin/ksh93} |
|
15 export SHELL |
|
16 # Unset more variables known to interfere with behavior of common tools. |
|
17 CLICOLOR_FORCE= GREP_OPTIONS= |
|
18 @@ -565,7 +565,7 @@ |
|
19 |
|
20 |
|
21 # Check that we are running under the correct shell. |
|
22 -SHELL=${CONFIG_SHELL-/bin/sh} |
|
23 +SHELL=${CONFIG_SHELL-/bin/ksh93} |
|
24 |
|
25 case X$lt_ECHO in |
|
26 X*--fallback-echo) |
|
27 @@ -649,7 +649,7 @@ |
|
28 elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
|
29 test "X$CONFIG_SHELL" != X/bin/ksh; then |
|
30 # If we have ksh, try running configure again with it. |
|
31 - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
|
32 + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/ksh93} |
|
33 export ORIGINAL_CONFIG_SHELL |
|
34 CONFIG_SHELL=/bin/ksh |
|
35 export CONFIG_SHELL |
|
36 @@ -691,7 +691,7 @@ |
|
37 if test "$prev" != 'sed 50q "$0"'; then |
|
38 echo_test_string=`eval $prev` |
|
39 export echo_test_string |
|
40 - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} |
|
41 + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/ksh93}} "$0" ${1+"$@"} |
|
42 else |
|
43 # Oops. We lost completely, so just stick with echo. |
|
44 ECHO=echo |
|
45 @@ -2001,6 +2001,13 @@ |
|
46 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
47 /* end confdefs.h. */ |
|
48 $4 |
|
49 +#include <stdio.h> |
|
50 +#include <stdlib.h> |
|
51 +#include <limits.h> |
|
52 +#include <sys/types.h> |
|
53 +#include <stdint.h> |
|
54 +#include <inttypes.h> |
|
55 +#include <sys/socket.h> |
|
56 int main (void) |
|
57 { |
|
58 static int test_array [1 - 2 * !(($2) >= 0)]; |
|
59 @@ -2041,6 +2048,13 @@ |
|
60 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
61 /* end confdefs.h. */ |
|
62 $4 |
|
63 +#include <stdio.h> |
|
64 +#include <stdlib.h> |
|
65 +#include <limits.h> |
|
66 +#include <sys/types.h> |
|
67 +#include <stdint.h> |
|
68 +#include <inttypes.h> |
|
69 +#include <sys/socket.h> |
|
70 int main (void) |
|
71 { |
|
72 static int test_array [1 - 2 * !(($2) < 0)]; |
|
73 @@ -2056,6 +2070,13 @@ |
|
74 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
75 /* end confdefs.h. */ |
|
76 $4 |
|
77 +#include <stdio.h> |
|
78 +#include <stdlib.h> |
|
79 +#include <limits.h> |
|
80 +#include <sys/types.h> |
|
81 +#include <stdint.h> |
|
82 +#include <inttypes.h> |
|
83 +#include <sys/socket.h> |
|
84 int main (void) |
|
85 { |
|
86 static int test_array [1 - 2 * !(($2) >= $ac_mid)]; |
|
87 @@ -2089,6 +2110,13 @@ |
|
88 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
89 /* end confdefs.h. */ |
|
90 $4 |
|
91 +#include <stdio.h> |
|
92 +#include <stdlib.h> |
|
93 +#include <limits.h> |
|
94 +#include <sys/types.h> |
|
95 +#include <stdint.h> |
|
96 +#include <inttypes.h> |
|
97 +#include <sys/socket.h> |
|
98 int main (void) |
|
99 { |
|
100 static int test_array [1 - 2 * !(($2) <= $ac_mid)]; |
|
101 @@ -2113,10 +2141,15 @@ |
|
102 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
103 /* end confdefs.h. */ |
|
104 $4 |
|
105 -static long int longval () { return $2; } |
|
106 -static unsigned long int ulongval () { return $2; } |
|
107 #include <stdio.h> |
|
108 #include <stdlib.h> |
|
109 +#include <limits.h> |
|
110 +#include <sys/types.h> |
|
111 +#include <stdint.h> |
|
112 +#include <inttypes.h> |
|
113 +#include <sys/socket.h> |
|
114 +static long int longval () { return $2; } |
|
115 +static unsigned long int ulongval () { return $2; } |
|
116 int main (void) |
|
117 { |
|
118 |
|
119 @@ -2797,7 +2830,7 @@ |
|
120 |
|
121 |
|
122 |
|
123 -ac_config_headers="$ac_config_headers lib/curl_config.h src/curl_config.h include/curl/curlbuild.h" |
|
124 +ac_config_headers="$ac_config_headers lib/curl_config.h src/curl_config.h" |
|
125 |
|
126 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
|
127 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
|
128 @@ -3263,12 +3296,6 @@ |
|
129 fi |
|
130 |
|
131 |
|
132 - |
|
133 - |
|
134 -if test -f ${srcdir}/include/curl/curlbuild.h; then |
|
135 - rm -f ${srcdir}/include/curl/curlbuild.h |
|
136 -fi |
|
137 - |
|
138 VERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curlver.h` |
|
139 am__api_version="1.9" |
|
140 ac_aux_dir= |
|
141 @@ -3538,7 +3565,7 @@ |
|
142 $as_echo_n "(cached) " >&6 |
|
143 else |
|
144 cat >conftest.make <<\_ACEOF |
|
145 -SHELL = /bin/sh |
|
146 +SHELL = /bin/ksh93 |
|
147 all: |
|
148 @echo '@@@%%%=$(MAKE)=@@@%%%' |
|
149 _ACEOF |
|
150 @@ -4734,7 +4761,7 @@ |
|
151 for i in 1 2 3 4 5 6; do |
|
152 echo '#include "conftst'$i'.h"' >> sub/conftest.c |
|
153 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
|
154 - # Solaris 8's {/usr,}/bin/sh. |
|
155 + # Solaris 8's {/usr,}/bin/ksh93. |
|
156 touch sub/conftst$i.h |
|
157 done |
|
158 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
|
159 @@ -8029,7 +8056,7 @@ |
|
160 for i in 1 2 3 4 5 6 7 8 ; do |
|
161 teststring=$teststring$teststring |
|
162 done |
|
163 - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} |
|
164 + SHELL=${SHELL-${CONFIG_SHELL-/bin/ksh93}} |
|
165 # If test is not a shell built-in, we'll probably end up computing a |
|
166 # maximum length that is only half of the actual maximum length, but |
|
167 # we can't tell. |
|
168 @@ -9261,8 +9288,8 @@ |
|
169 case $lt_cv_prog_gnu_ld in |
|
170 yes*) LD="${LD-ld} -m elf64_sparc" ;; |
|
171 *) |
|
172 - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
|
173 - LD="${LD-ld} -64" |
|
174 + if ${LD-ld} -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
|
175 + LD="${LD-ld}" |
|
176 fi |
|
177 ;; |
|
178 esac |
|
179 @@ -13653,7 +13680,7 @@ |
|
180 $as_echo_n "(cached) " >&6 |
|
181 else |
|
182 cat >conftest.make <<\_ACEOF |
|
183 -SHELL = /bin/sh |
|
184 +SHELL = /bin/ksh93 |
|
185 all: |
|
186 @echo '@@@%%%=$(MAKE)=@@@%%%' |
|
187 _ACEOF |
|
188 @@ -19176,15 +19203,15 @@ |
|
189 LIBS="$LIBS $gss_libs" |
|
190 elif test "$GSSAPI_ROOT" != "yes"; then |
|
191 LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff" |
|
192 - LIBS="$LIBS -lgssapi" |
|
193 + LIBS="$LIBS -lgss" |
|
194 else |
|
195 - LIBS="$LIBS -lgssapi" |
|
196 + LIBS="$LIBS -lgss" |
|
197 fi |
|
198 ;; |
|
199 esac |
|
200 else |
|
201 LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR" |
|
202 - LIBS="$LIBS -lgssapi" |
|
203 + LIBS="$LIBS -lgss" |
|
204 fi |
|
205 else |
|
206 CPPFLAGS="$save_CPPFLAGS" |
|
207 @@ -19210,7 +19237,7 @@ |
|
208 if test x$cross_compiling != xyes; then |
|
209 PKGTEST="yes" |
|
210 fi |
|
211 - PREFIX_OPENSSL=/usr/local/ssl |
|
212 + PREFIX_OPENSSL="/usr" |
|
213 LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff" |
|
214 ;; |
|
215 off) |
|
216 @@ -22731,20 +22758,13 @@ |
|
217 |
|
218 |
|
219 |
|
220 -curl_preprocess_callconv="\ |
|
221 -/* preprocess start */ |
|
222 -#ifdef HAVE_WINDOWS_H |
|
223 -# define FUNCALLCONV __stdcall |
|
224 -#else |
|
225 -# define FUNCALLCONV |
|
226 -#endif |
|
227 -/* preprocess end */" |
|
228 +curl_preprocess_callconv="" |
|
229 |
|
230 |
|
231 # |
|
232 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_socklen_t data type" >&5 |
|
233 $as_echo_n "checking for curl_socklen_t data type... " >&6; } |
|
234 - curl_typeof_curl_socklen_t="unknown" |
|
235 + curl_typeof_curl_socklen_t="socklen_t" |
|
236 for arg1 in int SOCKET; do |
|
237 for arg2 in 'struct sockaddr' void; do |
|
238 for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do |
|
239 @@ -35751,7 +35771,6 @@ |
|
240 case $ac_config_target in |
|
241 "lib/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/curl_config.h" ;; |
|
242 "src/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/curl_config.h" ;; |
|
243 - "include/curl/curlbuild.h") CONFIG_HEADERS="$CONFIG_HEADERS include/curl/curlbuild.h" ;; |
|
244 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; |
|
245 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; |
|
246 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |