fix squashfs for ixp4xx
[openwrt/staging/florian.git] / package / keynote / patches / 02-cross_compile.patch
1 diff -urN keynote-2.3/configure keynote-2.3.new/configure
2 --- keynote-2.3/configure 2000-09-27 01:16:28.000000000 +0200
3 +++ keynote-2.3.new/configure 2006-09-01 19:16:35.000000000 +0200
4 @@ -889,52 +889,10 @@
5 done
6 test -n "$YACC" || YACC="yacc"
7
8 -for ac_prog in openssl ssleay
9 -do
10 -# Extract the first word of "$ac_prog", so it can be a program name with args.
11 -set dummy $ac_prog; ac_word=$2
12 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
13 -echo "configure:898: checking for $ac_word" >&5
14 -if eval "test \"`echo '$''{'ac_cv_path_SSLEAY'+set}'`\" = set"; then
15 - echo $ac_n "(cached) $ac_c" 1>&6
16 -else
17 - case "$SSLEAY" in
18 - /*)
19 - ac_cv_path_SSLEAY="$SSLEAY" # Let the user override the test with a path.
20 - ;;
21 - ?:/*)
22 - ac_cv_path_SSLEAY="$SSLEAY" # Let the user override the test with a dos path.
23 - ;;
24 - *)
25 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
26 - ac_dummy="\
27 - $PATH:/usr/local/bin:/usr/local/ssl/sbin:/usr/local/ssl/bin:/usr/ssl/bin:/usr/ssl/sbin:/usr/sbin:/usr/openssl/bin:/usr/openssl/bin:/usr/local/openssl/bin:/usr/local/openssl/sbin"
28 - for ac_dir in $ac_dummy; do
29 - test -z "$ac_dir" && ac_dir=.
30 - if test -f $ac_dir/$ac_word; then
31 - ac_cv_path_SSLEAY="$ac_dir/$ac_word"
32 - break
33 - fi
34 - done
35 - IFS="$ac_save_ifs"
36 - ;;
37 -esac
38 -fi
39 -SSLEAY="$ac_cv_path_SSLEAY"
40 -if test -n "$SSLEAY"; then
41 - echo "$ac_t""$SSLEAY" 1>&6
42 -else
43 - echo "$ac_t""no" 1>&6
44 -fi
45 -
46 -test -n "$SSLEAY" && break
47 -done
48 -test -n "$SSLEAY" || SSLEAY="/usr/local/bin/ssleay"
49 -
50 # Extract the first word of "rm", so it can be a program name with args.
51 set dummy rm; ac_word=$2
52 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
53 -echo "configure:938: checking for $ac_word" >&5
54 +echo "configure:896: checking for $ac_word" >&5
55 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
56 echo $ac_n "(cached) $ac_c" 1>&6
57 else
58 @@ -970,7 +928,7 @@
59 # Extract the first word of "ar", so it can be a program name with args.
60 set dummy ar; ac_word=$2
61 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
62 -echo "configure:974: checking for $ac_word" >&5
63 +echo "configure:932: checking for $ac_word" >&5
64 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then
65 echo $ac_n "(cached) $ac_c" 1>&6
66 else
67 @@ -1006,7 +964,7 @@
68 # Extract the first word of "nroff", so it can be a program name with args.
69 set dummy nroff; ac_word=$2
70 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
71 -echo "configure:1010: checking for $ac_word" >&5
72 +echo "configure:968: checking for $ac_word" >&5
73 if eval "test \"`echo '$''{'ac_cv_path_NROFF'+set}'`\" = set"; then
74 echo $ac_n "(cached) $ac_c" 1>&6
75 else
76 @@ -1042,7 +1000,7 @@
77 # Extract the first word of "tar", so it can be a program name with args.
78 set dummy tar; ac_word=$2
79 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
80 -echo "configure:1046: checking for $ac_word" >&5
81 +echo "configure:1004: checking for $ac_word" >&5
82 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
83 echo $ac_n "(cached) $ac_c" 1>&6
84 else
85 @@ -1078,7 +1036,7 @@
86 # Extract the first word of "true", so it can be a program name with args.
87 set dummy true; ac_word=$2
88 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
89 -echo "configure:1082: checking for $ac_word" >&5
90 +echo "configure:1040: checking for $ac_word" >&5
91 if eval "test \"`echo '$''{'ac_cv_path_TRUE'+set}'`\" = set"; then
92 echo $ac_n "(cached) $ac_c" 1>&6
93 else
94 @@ -1114,7 +1072,7 @@
95 # Extract the first word of "mkdir", so it can be a program name with args.
96 set dummy mkdir; ac_word=$2
97 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
98 -echo "configure:1118: checking for $ac_word" >&5
99 +echo "configure:1076: checking for $ac_word" >&5
100 if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then
101 echo $ac_n "(cached) $ac_c" 1>&6
102 else
103 @@ -1150,7 +1108,7 @@
104 # Extract the first word of "tr", so it can be a program name with args.
105 set dummy tr; ac_word=$2
106 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
107 -echo "configure:1154: checking for $ac_word" >&5
108 +echo "configure:1112: checking for $ac_word" >&5
109 if eval "test \"`echo '$''{'ac_cv_path_TR'+set}'`\" = set"; then
110 echo $ac_n "(cached) $ac_c" 1>&6
111 else
112 @@ -1186,7 +1144,7 @@
113 # Extract the first word of "echo", so it can be a program name with args.
114 set dummy echo; ac_word=$2
115 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
116 -echo "configure:1190: checking for $ac_word" >&5
117 +echo "configure:1148: checking for $ac_word" >&5
118 if eval "test \"`echo '$''{'ac_cv_path_ECHO'+set}'`\" = set"; then
119 echo $ac_n "(cached) $ac_c" 1>&6
120 else
121 @@ -1222,7 +1180,7 @@
122 # Extract the first word of "sed", so it can be a program name with args.
123 set dummy sed; ac_word=$2
124 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
125 -echo "configure:1226: checking for $ac_word" >&5
126 +echo "configure:1184: checking for $ac_word" >&5
127 if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
128 echo $ac_n "(cached) $ac_c" 1>&6
129 else
130 @@ -1256,11 +1214,8 @@
131 fi
132
133
134 -LIBS="-L/usr/lib -L/usr/local/lib -L/usr/ssl/lib -L/usr/openssl/lib\
135 - -L/usr/local/ssl/lib -L/usr/local/openssl/lib -L/usr/pkg/lib -L/pkg/lib"
136 -
137 echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6
138 -echo "configure:1264: checking for floor in -lm" >&5
139 +echo "configure:1219: checking for floor in -lm" >&5
140 ac_lib_var=`echo m'_'floor | sed 'y%./+-%__p_%'`
141 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
142 echo $ac_n "(cached) $ac_c" 1>&6
143 @@ -1268,7 +1223,7 @@
144 ac_save_LIBS="$LIBS"
145 LIBS="-lm $LIBS"
146 cat > conftest.$ac_ext <<EOF
147 -#line 1272 "configure"
148 +#line 1227 "configure"
149 #include "confdefs.h"
150 /* Override any gcc2 internal prototype to avoid an error. */
151 /* We use char because int might match the return type of a gcc2
152 @@ -1279,7 +1234,7 @@
153 floor()
154 ; return 0; }
155 EOF
156 -if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
157 +if { (eval echo configure:1238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
158 rm -rf conftest*
159 eval "ac_cv_lib_$ac_lib_var=yes"
160 else
161 @@ -1300,7 +1255,7 @@
162 fi
163
164 echo $ac_n "checking for RSAPrivateDecrypt in -lrsaref""... $ac_c" 1>&6
165 -echo "configure:1304: checking for RSAPrivateDecrypt in -lrsaref" >&5
166 +echo "configure:1259: checking for RSAPrivateDecrypt in -lrsaref" >&5
167 ac_lib_var=`echo rsaref'_'RSAPrivateDecrypt | sed 'y%./+-%__p_%'`
168 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
169 echo $ac_n "(cached) $ac_c" 1>&6
170 @@ -1308,7 +1263,7 @@
171 ac_save_LIBS="$LIBS"
172 LIBS="-lrsaref $LIBS"
173 cat > conftest.$ac_ext <<EOF
174 -#line 1312 "configure"
175 +#line 1267 "configure"
176 #include "confdefs.h"
177 /* Override any gcc2 internal prototype to avoid an error. */
178 /* We use char because int might match the return type of a gcc2
179 @@ -1319,7 +1274,7 @@
180 RSAPrivateDecrypt()
181 ; return 0; }
182 EOF
183 -if { (eval echo configure:1323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
184 +if { (eval echo configure:1278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
185 rm -rf conftest*
186 eval "ac_cv_lib_$ac_lib_var=yes"
187 else
188 @@ -1340,7 +1295,7 @@
189 fi
190
191 echo $ac_n "checking for i2a_ASN1_STRING in -lcrypto""... $ac_c" 1>&6
192 -echo "configure:1344: checking for i2a_ASN1_STRING in -lcrypto" >&5
193 +echo "configure:1299: checking for i2a_ASN1_STRING in -lcrypto" >&5
194 ac_lib_var=`echo crypto'_'i2a_ASN1_STRING | sed 'y%./+-%__p_%'`
195 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
196 echo $ac_n "(cached) $ac_c" 1>&6
197 @@ -1348,7 +1303,7 @@
198 ac_save_LIBS="$LIBS"
199 LIBS="-lcrypto $LIBS"
200 cat > conftest.$ac_ext <<EOF
201 -#line 1352 "configure"
202 +#line 1307 "configure"
203 #include "confdefs.h"
204 /* Override any gcc2 internal prototype to avoid an error. */
205 /* We use char because int might match the return type of a gcc2
206 @@ -1359,7 +1314,7 @@
207 i2a_ASN1_STRING()
208 ; return 0; }
209 EOF
210 -if { (eval echo configure:1363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
211 +if { (eval echo configure:1318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
212 rm -rf conftest*
213 eval "ac_cv_lib_$ac_lib_var=yes"
214 else
215 @@ -1380,7 +1335,7 @@
216 fi
217
218 echo $ac_n "checking for RSA_ref_private_encrypt in -lRSAglue""... $ac_c" 1>&6
219 -echo "configure:1384: checking for RSA_ref_private_encrypt in -lRSAglue" >&5
220 +echo "configure:1339: checking for RSA_ref_private_encrypt in -lRSAglue" >&5
221 ac_lib_var=`echo RSAglue'_'RSA_ref_private_encrypt | sed 'y%./+-%__p_%'`
222 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
223 echo $ac_n "(cached) $ac_c" 1>&6
224 @@ -1388,7 +1343,7 @@
225 ac_save_LIBS="$LIBS"
226 LIBS="-lRSAglue $LIBS"
227 cat > conftest.$ac_ext <<EOF
228 -#line 1392 "configure"
229 +#line 1347 "configure"
230 #include "confdefs.h"
231 /* Override any gcc2 internal prototype to avoid an error. */
232 /* We use char because int might match the return type of a gcc2
233 @@ -1399,7 +1354,7 @@
234 RSA_ref_private_encrypt()
235 ; return 0; }
236 EOF
237 -if { (eval echo configure:1403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
238 +if { (eval echo configure:1358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
239 rm -rf conftest*
240 eval "ac_cv_lib_$ac_lib_var=yes"
241 else
242 @@ -1420,12 +1375,9 @@
243 fi
244
245
246 -CPPFLAGS="-I/usr/include -I/usr/local/include -I/usr/ssl/include\
247 - -I/usr/local/ssl/include -I/usr/openssl/include -I/usr/pkg/include\
248 - -I/usr/local/openssl/include -I/pkg/include"
249
250 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
251 -echo "configure:1429: checking how to run the C preprocessor" >&5
252 +echo "configure:1381: checking how to run the C preprocessor" >&5
253 # On Suns, sometimes $CPP names a directory.
254 if test -n "$CPP" && test -d "$CPP"; then
255 CPP=
256 @@ -1440,13 +1392,13 @@
257 # On the NeXT, cc -E runs the code through the compiler's parser,
258 # not just through cpp.
259 cat > conftest.$ac_ext <<EOF
260 -#line 1444 "configure"
261 +#line 1396 "configure"
262 #include "confdefs.h"
263 #include <assert.h>
264 Syntax Error
265 EOF
266 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
267 -{ (eval echo configure:1450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
268 +{ (eval echo configure:1402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
269 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
270 if test -z "$ac_err"; then
271 :
272 @@ -1457,13 +1409,13 @@
273 rm -rf conftest*
274 CPP="${CC-cc} -E -traditional-cpp"
275 cat > conftest.$ac_ext <<EOF
276 -#line 1461 "configure"
277 +#line 1413 "configure"
278 #include "confdefs.h"
279 #include <assert.h>
280 Syntax Error
281 EOF
282 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
283 -{ (eval echo configure:1467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
284 +{ (eval echo configure:1419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
285 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
286 if test -z "$ac_err"; then
287 :
288 @@ -1474,13 +1426,13 @@
289 rm -rf conftest*
290 CPP="${CC-cc} -nologo -E"
291 cat > conftest.$ac_ext <<EOF
292 -#line 1478 "configure"
293 +#line 1430 "configure"
294 #include "confdefs.h"
295 #include <assert.h>
296 Syntax Error
297 EOF
298 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
299 -{ (eval echo configure:1484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
300 +{ (eval echo configure:1436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
301 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
302 if test -z "$ac_err"; then
303 :
304 @@ -1505,12 +1457,12 @@
305 echo "$ac_t""$CPP" 1>&6
306
307 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
308 -echo "configure:1509: checking for ANSI C header files" >&5
309 +echo "configure:1461: checking for ANSI C header files" >&5
310 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
311 echo $ac_n "(cached) $ac_c" 1>&6
312 else
313 cat > conftest.$ac_ext <<EOF
314 -#line 1514 "configure"
315 +#line 1466 "configure"
316 #include "confdefs.h"
317 #include <stdlib.h>
318 #include <stdarg.h>
319 @@ -1518,7 +1470,7 @@
320 #include <float.h>
321 EOF
322 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
323 -{ (eval echo configure:1522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
324 +{ (eval echo configure:1474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
325 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
326 if test -z "$ac_err"; then
327 rm -rf conftest*
328 @@ -1535,7 +1487,7 @@
329 if test $ac_cv_header_stdc = yes; then
330 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
331 cat > conftest.$ac_ext <<EOF
332 -#line 1539 "configure"
333 +#line 1491 "configure"
334 #include "confdefs.h"
335 #include <string.h>
336 EOF
337 @@ -1553,7 +1505,7 @@
338 if test $ac_cv_header_stdc = yes; then
339 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
340 cat > conftest.$ac_ext <<EOF
341 -#line 1557 "configure"
342 +#line 1509 "configure"
343 #include "confdefs.h"
344 #include <stdlib.h>
345 EOF
346 @@ -1574,7 +1526,7 @@
347 :
348 else
349 cat > conftest.$ac_ext <<EOF
350 -#line 1578 "configure"
351 +#line 1530 "configure"
352 #include "confdefs.h"
353 #include <ctype.h>
354 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
355 @@ -1585,7 +1537,7 @@
356 exit (0); }
357
358 EOF
359 -if { (eval echo configure:1589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
360 +if { (eval echo configure:1541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
361 then
362 :
363 else
364 @@ -1609,12 +1561,12 @@
365 fi
366
367 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
368 -echo "configure:1613: checking whether time.h and sys/time.h may both be included" >&5
369 +echo "configure:1565: checking whether time.h and sys/time.h may both be included" >&5
370 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
371 echo $ac_n "(cached) $ac_c" 1>&6
372 else
373 cat > conftest.$ac_ext <<EOF
374 -#line 1618 "configure"
375 +#line 1570 "configure"
376 #include "confdefs.h"
377 #include <sys/types.h>
378 #include <sys/time.h>
379 @@ -1623,7 +1575,7 @@
380 struct tm *tp;
381 ; return 0; }
382 EOF
383 -if { (eval echo configure:1627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
384 +if { (eval echo configure:1579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
385 rm -rf conftest*
386 ac_cv_header_time=yes
387 else
388 @@ -1647,17 +1599,17 @@
389 do
390 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
391 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
392 -echo "configure:1651: checking for $ac_hdr" >&5
393 +echo "configure:1603: checking for $ac_hdr" >&5
394 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
395 echo $ac_n "(cached) $ac_c" 1>&6
396 else
397 cat > conftest.$ac_ext <<EOF
398 -#line 1656 "configure"
399 +#line 1608 "configure"
400 #include "confdefs.h"
401 #include <$ac_hdr>
402 EOF
403 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
404 -{ (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
405 +{ (eval echo configure:1613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
406 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
407 if test -z "$ac_err"; then
408 rm -rf conftest*
409 @@ -1687,17 +1639,17 @@
410 do
411 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
412 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
413 -echo "configure:1691: checking for $ac_hdr" >&5
414 +echo "configure:1643: checking for $ac_hdr" >&5
415 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
416 echo $ac_n "(cached) $ac_c" 1>&6
417 else
418 cat > conftest.$ac_ext <<EOF
419 -#line 1696 "configure"
420 +#line 1648 "configure"
421 #include "confdefs.h"
422 #include <$ac_hdr>
423 EOF
424 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
425 -{ (eval echo configure:1701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
426 +{ (eval echo configure:1653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
427 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
428 if test -z "$ac_err"; then
429 rm -rf conftest*
430 @@ -1726,12 +1678,12 @@
431
432
433 echo $ac_n "checking for working const""... $ac_c" 1>&6
434 -echo "configure:1730: checking for working const" >&5
435 +echo "configure:1682: checking for working const" >&5
436 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
437 echo $ac_n "(cached) $ac_c" 1>&6
438 else
439 cat > conftest.$ac_ext <<EOF
440 -#line 1735 "configure"
441 +#line 1687 "configure"
442 #include "confdefs.h"
443
444 int main() {
445 @@ -1780,7 +1732,7 @@
446
447 ; return 0; }
448 EOF
449 -if { (eval echo configure:1784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
450 +if { (eval echo configure:1736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
451 rm -rf conftest*
452 ac_cv_c_const=yes
453 else
454 @@ -1801,12 +1753,12 @@
455 fi
456
457 echo $ac_n "checking for u_int""... $ac_c" 1>&6
458 -echo "configure:1805: checking for u_int" >&5
459 +echo "configure:1757: checking for u_int" >&5
460 if eval "test \"`echo '$''{'ac_cv_type_u_int'+set}'`\" = set"; then
461 echo $ac_n "(cached) $ac_c" 1>&6
462 else
463 cat > conftest.$ac_ext <<EOF
464 -#line 1810 "configure"
465 +#line 1762 "configure"
466 #include "confdefs.h"
467 #include <sys/types.h>
468 #if STDC_HEADERS
469 @@ -1834,12 +1786,12 @@
470 fi
471
472 echo $ac_n "checking for u_char""... $ac_c" 1>&6
473 -echo "configure:1838: checking for u_char" >&5
474 +echo "configure:1790: checking for u_char" >&5
475 if eval "test \"`echo '$''{'ac_cv_type_u_char'+set}'`\" = set"; then
476 echo $ac_n "(cached) $ac_c" 1>&6
477 else
478 cat > conftest.$ac_ext <<EOF
479 -#line 1843 "configure"
480 +#line 1795 "configure"
481 #include "confdefs.h"
482 #include <sys/types.h>
483 #if STDC_HEADERS
484 @@ -1870,12 +1822,12 @@
485 for ac_func in regcomp open close read _open _close _read strchr memcpy
486 do
487 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
488 -echo "configure:1874: checking for $ac_func" >&5
489 +echo "configure:1826: checking for $ac_func" >&5
490 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
491 echo $ac_n "(cached) $ac_c" 1>&6
492 else
493 cat > conftest.$ac_ext <<EOF
494 -#line 1879 "configure"
495 +#line 1831 "configure"
496 #include "confdefs.h"
497 /* System header to define __stub macros and hopefully few prototypes,
498 which can conflict with char $ac_func(); below. */
499 @@ -1898,7 +1850,7 @@
500
501 ; return 0; }
502 EOF
503 -if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
504 +if { (eval echo configure:1854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
505 rm -rf conftest*
506 eval "ac_cv_func_$ac_func=yes"
507 else
508 @@ -1925,12 +1877,12 @@
509 for ac_func in strcasecmp strncasecmp stricmp strnicmp snprintf __b64_ntop
510 do
511 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
512 -echo "configure:1929: checking for $ac_func" >&5
513 +echo "configure:1881: checking for $ac_func" >&5
514 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
515 echo $ac_n "(cached) $ac_c" 1>&6
516 else
517 cat > conftest.$ac_ext <<EOF
518 -#line 1934 "configure"
519 +#line 1886 "configure"
520 #include "confdefs.h"
521 /* System header to define __stub macros and hopefully few prototypes,
522 which can conflict with char $ac_func(); below. */
523 @@ -1953,7 +1905,7 @@
524
525 ; return 0; }
526 EOF
527 -if { (eval echo configure:1957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
528 +if { (eval echo configure:1909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
529 rm -rf conftest*
530 eval "ac_cv_func_$ac_func=yes"
531 else
532 @@ -1980,12 +1932,12 @@
533 for ac_func in getopt
534 do
535 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
536 -echo "configure:1984: checking for $ac_func" >&5
537 +echo "configure:1936: checking for $ac_func" >&5
538 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
539 echo $ac_n "(cached) $ac_c" 1>&6
540 else
541 cat > conftest.$ac_ext <<EOF
542 -#line 1989 "configure"
543 +#line 1941 "configure"
544 #include "confdefs.h"
545 /* System header to define __stub macros and hopefully few prototypes,
546 which can conflict with char $ac_func(); below. */
547 @@ -2008,7 +1960,7 @@
548
549 ; return 0; }
550 EOF
551 -if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
552 +if { (eval echo configure:1964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
553 rm -rf conftest*
554 eval "ac_cv_func_$ac_func=yes"
555 else
556 @@ -2172,7 +2124,6 @@
557 s%@CC@%$CC%g
558 s%@RANLIB@%$RANLIB%g
559 s%@YACC@%$YACC%g
560 -s%@SSLEAY@%$SSLEAY%g
561 s%@RM@%$RM%g
562 s%@AR@%$AR%g
563 s%@NROFF@%$NROFF%g
564 diff -urN keynote-2.3/configure.in keynote-2.3.new/configure.in
565 --- keynote-2.3/configure.in 2006-09-01 19:08:13.000000000 +0200
566 +++ keynote-2.3.new/configure.in 2006-09-01 19:16:05.000000000 +0200
567 @@ -9,8 +9,8 @@
568 AC_PROG_CC
569 AC_PROG_RANLIB
570 AC_PROG_YACC
571 -AC_PATH_PROGS(SSLEAY, openssl ssleay, /usr/local/bin/ssleay, \
572 - $PATH:/usr/local/bin:/usr/local/ssl/sbin:/usr/local/ssl/bin:/usr/ssl/bin:/usr/ssl/sbin:/usr/sbin:/usr/openssl/bin:/usr/openssl/bin:/usr/local/openssl/bin:/usr/local/openssl/sbin)
573 +dnl AC_PATH_PROGS(SSLEAY, openssl ssleay, /usr/local/bin/ssleay, \
574 +dnl $PATH:/usr/local/bin:/usr/local/ssl/sbin:/usr/local/ssl/bin:/usr/ssl/bin:/usr/ssl/sbin:/usr/sbin:/usr/openssl/bin:/usr/openssl/bin:/usr/local/openssl/bin:/usr/local/openssl/sbin)
575 AC_PATH_PROG(RM, rm, /bin/rm)
576 AC_PATH_PROG(AR, ar, /usr/bin/ar)
577 AC_PATH_PROG(NROFF, nroff, /usr/bin/nroff)
578 @@ -27,7 +27,7 @@
579 AC_CHECK_LIB(RSAglue, RSA_ref_private_encrypt, LIBS="$LIBS -lRSAglue")
580
581 dnl Checks for header files.
582 -CPPFLAGS="-I/usr/include/openssl"
583 +dnl CPPFLAGS="-I/usr/include/openssl"
584
585 AC_HEADER_STDC
586 AC_HEADER_TIME