projects / openwrt / svn-archive / archive.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
update freeradius to 1.0.6 (closes: #1331), rename patches to match our naming conven...
[openwrt/svn-archive/archive.git] / net / freeradius / patches / 004-ldap_configure.patch
1 diff -ruN freeradius-1.1.6-old/src/modules/rlm_ldap/configure freeradius-1.1.6-new/src/modules/rlm_ldap/configure
2 --- freeradius-1.1.6-old/src/modules/rlm_ldap/configure 2006-06-27 00:57:36.000000000 +0200
3 +++ freeradius-1.1.6-new/src/modules/rlm_ldap/configure 2007-04-13 02:09:28.000000000 +0200
4 @@ -1,9 +1,10 @@
5 #! /bin/sh
6 # From configure.in Revision: 1.10.2.4 .
7 # Guess values for system-dependent variables and create Makefiles.
8 -# Generated by GNU Autoconf 2.59.
9 +# Generated by GNU Autoconf 2.60.
10 #
11 -# Copyright (C) 2003 Free Software Foundation, Inc.
12 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
13 +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
14 # This configure script is free software; the Free Software Foundation
15 # gives unlimited permission to copy, distribute and modify it.
16 ## --------------------- ##
17 @@ -17,11 +18,35 @@
18 # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
19 # is contrary to our usage. Disable this feature.
20 alias -g '${1+"$@"}'='"$@"'
21 -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
22 - set -o posix
23 + setopt NO_GLOB_SUBST
24 +else
25 + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
26 fi
27 +BIN_SH=xpg4; export BIN_SH # for Tru64
28 DUALCASE=1; export DUALCASE # for MKS sh
29
30 +
31 +# PATH needs CR
32 +# Avoid depending upon Character Ranges.
33 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
34 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
35 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
36 +as_cr_digits='0123456789'
37 +as_cr_alnum=$as_cr_Letters$as_cr_digits
38 +
39 +# The user is always right.
40 +if test "${PATH_SEPARATOR+set}" != set; then
41 + echo "#! /bin/sh" >conf$$.sh
42 + echo "exit 0" >>conf$$.sh
43 + chmod +x conf$$.sh
44 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
45 + PATH_SEPARATOR=';'
46 + else
47 + PATH_SEPARATOR=:
48 + fi
49 + rm -f conf$$.sh
50 +fi
51 +
52 # Support unset when possible.
53 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
54 as_unset=unset
55 @@ -30,8 +55,43 @@
56 fi
57
58
59 +# IFS
60 +# We need space, tab and new line, in precisely that order. Quoting is
61 +# there to prevent editors from complaining about space-tab.
62 +# (If _AS_PATH_WALK were called with IFS unset, it would disable word
63 +# splitting by setting IFS to empty value.)
64 +as_nl='
65 +'
66 +IFS=" "" $as_nl"
67 +
68 +# Find who we are. Look in the path if we contain no directory separator.
69 +case $0 in
70 + *[\\/]* ) as_myself=$0 ;;
71 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
72 +for as_dir in $PATH
73 +do
74 + IFS=$as_save_IFS
75 + test -z "$as_dir" && as_dir=.
76 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
77 +done
78 +IFS=$as_save_IFS
79 +
80 + ;;
81 +esac
82 +# We did not find ourselves, most probably we were run as `sh COMMAND'
83 +# in which case we are not to be found in the path.
84 +if test "x$as_myself" = x; then
85 + as_myself=$0
86 +fi
87 +if test ! -f "$as_myself"; then
88 + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
89 + { (exit 1); exit 1; }
90 +fi
91 +
92 # Work around bugs in pre-3.0 UWIN ksh.
93 -$as_unset ENV MAIL MAILPATH
94 +for as_var in ENV MAIL MAILPATH
95 +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
96 +done
97 PS1='$ '
98 PS2='> '
99 PS4='+ '
100 @@ -45,18 +105,19 @@
101 if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
102 eval $as_var=C; export $as_var
103 else
104 - $as_unset $as_var
105 + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
106 fi
107 done
108
109 # Required to use basename.
110 -if expr a : '\(a\)' >/dev/null 2>&1; then
111 +if expr a : '\(a\)' >/dev/null 2>&1 &&
112 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
113 as_expr=expr
114 else
115 as_expr=false
116 fi
117
118 -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
119 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
120 as_basename=basename
121 else
122 as_basename=false
123 @@ -64,157 +125,386 @@
124
125
126 # Name of the executable.
127 -as_me=`$as_basename "$0" ||
128 +as_me=`$as_basename -- "$0" ||
129 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
130 X"$0" : 'X\(//\)$' \| \
131 - X"$0" : 'X\(/\)$' \| \
132 - . : '\(.\)' 2>/dev/null ||
133 + X"$0" : 'X\(/\)' \| . 2>/dev/null ||
134 echo X/"$0" |
135 - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
136 - /^X\/\(\/\/\)$/{ s//\1/; q; }
137 - /^X\/\(\/\).*/{ s//\1/; q; }
138 - s/.*/./; q'`
139 + sed '/^.*\/\([^/][^/]*\)\/*$/{
140 + s//\1/
141 + q
142 + }
143 + /^X\/\(\/\/\)$/{
144 + s//\1/
145 + q
146 + }
147 + /^X\/\(\/\).*/{
148 + s//\1/
149 + q
150 + }
151 + s/.*/./; q'`
152
153 +# CDPATH.
154 +$as_unset CDPATH
155
156 -# PATH needs CR, and LINENO needs CR and PATH.
157 -# Avoid depending upon Character Ranges.
158 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
159 -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
160 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
161 -as_cr_digits='0123456789'
162 -as_cr_alnum=$as_cr_Letters$as_cr_digits
163
164 -# The user is always right.
165 -if test "${PATH_SEPARATOR+set}" != set; then
166 - echo "#! /bin/sh" >conf$$.sh
167 - echo "exit 0" >>conf$$.sh
168 - chmod +x conf$$.sh
169 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
170 - PATH_SEPARATOR=';'
171 - else
172 - PATH_SEPARATOR=:
173 - fi
174 - rm -f conf$$.sh
175 +if test "x$CONFIG_SHELL" = x; then
176 + if (eval ":") 2>/dev/null; then
177 + as_have_required=yes
178 +else
179 + as_have_required=no
180 fi
181
182 + if test $as_have_required = yes && (eval ":
183 +(as_func_return () {
184 + (exit \$1)
185 +}
186 +as_func_success () {
187 + as_func_return 0
188 +}
189 +as_func_failure () {
190 + as_func_return 1
191 +}
192 +as_func_ret_success () {
193 + return 0
194 +}
195 +as_func_ret_failure () {
196 + return 1
197 +}
198
199 - as_lineno_1=$LINENO
200 - as_lineno_2=$LINENO
201 - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
202 - test "x$as_lineno_1" != "x$as_lineno_2" &&
203 - test "x$as_lineno_3" = "x$as_lineno_2" || {
204 - # Find who we are. Look in the path if we contain no path at all
205 - # relative or not.
206 - case $0 in
207 - *[\\/]* ) as_myself=$0 ;;
208 - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
209 -for as_dir in $PATH
210 -do
211 - IFS=$as_save_IFS
212 - test -z "$as_dir" && as_dir=.
213 - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
214 -done
215 +exitcode=0
216 +if as_func_success; then
217 + :
218 +else
219 + exitcode=1
220 + echo as_func_success failed.
221 +fi
222
223 - ;;
224 - esac
225 - # We did not find ourselves, most probably we were run as `sh COMMAND'
226 - # in which case we are not to be found in the path.
227 - if test "x$as_myself" = x; then
228 - as_myself=$0
229 - fi
230 - if test ! -f "$as_myself"; then
231 - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
232 - { (exit 1); exit 1; }; }
233 - fi
234 - case $CONFIG_SHELL in
235 - '')
236 +if as_func_failure; then
237 + exitcode=1
238 + echo as_func_failure succeeded.
239 +fi
240 +
241 +if as_func_ret_success; then
242 + :
243 +else
244 + exitcode=1
245 + echo as_func_ret_success failed.
246 +fi
247 +
248 +if as_func_ret_failure; then
249 + exitcode=1
250 + echo as_func_ret_failure succeeded.
251 +fi
252 +
253 +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
254 + :
255 +else
256 + exitcode=1
257 + echo positional parameters were not saved.
258 +fi
259 +
260 +test \$exitcode = 0) || { (exit 1); exit 1; }
261 +
262 +(
263 + as_lineno_1=\$LINENO
264 + as_lineno_2=\$LINENO
265 + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
266 + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
267 +") 2> /dev/null; then
268 + :
269 +else
270 + as_candidate_shells=
271 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
272 -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
273 +for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
274 do
275 IFS=$as_save_IFS
276 test -z "$as_dir" && as_dir=.
277 - for as_base in sh bash ksh sh5; do
278 - case $as_dir in
279 + case $as_dir in
280 /*)
281 - if ("$as_dir/$as_base" -c '
282 + for as_base in sh bash ksh sh5; do
283 + as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
284 + done;;
285 + esac
286 +done
287 +IFS=$as_save_IFS
288 +
289 +
290 + for as_shell in $as_candidate_shells $SHELL; do
291 + # Try only shells that exist, to save several forks.
292 + if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
293 + { ("$as_shell") 2> /dev/null <<\_ASEOF
294 +# Be Bourne compatible
295 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
296 + emulate sh
297 + NULLCMD=:
298 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
299 + # is contrary to our usage. Disable this feature.
300 + alias -g '${1+"$@"}'='"$@"'
301 + setopt NO_GLOB_SUBST
302 +else
303 + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
304 +fi
305 +BIN_SH=xpg4; export BIN_SH # for Tru64
306 +DUALCASE=1; export DUALCASE # for MKS sh
307 +
308 +:
309 +_ASEOF
310 +}; then
311 + CONFIG_SHELL=$as_shell
312 + as_have_required=yes
313 + if { "$as_shell" 2> /dev/null <<\_ASEOF
314 +# Be Bourne compatible
315 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
316 + emulate sh
317 + NULLCMD=:
318 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
319 + # is contrary to our usage. Disable this feature.
320 + alias -g '${1+"$@"}'='"$@"'
321 + setopt NO_GLOB_SUBST
322 +else
323 + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
324 +fi
325 +BIN_SH=xpg4; export BIN_SH # for Tru64
326 +DUALCASE=1; export DUALCASE # for MKS sh
327 +
328 +:
329 +(as_func_return () {
330 + (exit $1)
331 +}
332 +as_func_success () {
333 + as_func_return 0
334 +}
335 +as_func_failure () {
336 + as_func_return 1
337 +}
338 +as_func_ret_success () {
339 + return 0
340 +}
341 +as_func_ret_failure () {
342 + return 1
343 +}
344 +
345 +exitcode=0
346 +if as_func_success; then
347 + :
348 +else
349 + exitcode=1
350 + echo as_func_success failed.
351 +fi
352 +
353 +if as_func_failure; then
354 + exitcode=1
355 + echo as_func_failure succeeded.
356 +fi
357 +
358 +if as_func_ret_success; then
359 + :
360 +else
361 + exitcode=1
362 + echo as_func_ret_success failed.
363 +fi
364 +
365 +if as_func_ret_failure; then
366 + exitcode=1
367 + echo as_func_ret_failure succeeded.
368 +fi
369 +
370 +if ( set x; as_func_ret_success y && test x = "$1" ); then
371 + :
372 +else
373 + exitcode=1
374 + echo positional parameters were not saved.
375 +fi
376 +
377 +test $exitcode = 0) || { (exit 1); exit 1; }
378 +
379 +(
380 as_lineno_1=$LINENO
381 as_lineno_2=$LINENO
382 - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
383 test "x$as_lineno_1" != "x$as_lineno_2" &&
384 - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
385 - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
386 - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
387 - CONFIG_SHELL=$as_dir/$as_base
388 - export CONFIG_SHELL
389 - exec "$CONFIG_SHELL" "$0" ${1+"$@"}
390 - fi;;
391 - esac
392 - done
393 -done
394 -;;
395 - esac
396 + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
397 +
398 +_ASEOF
399 +}; then
400 + break
401 +fi
402 +
403 +fi
404 +
405 + done
406 +
407 + if test "x$CONFIG_SHELL" != x; then
408 + for as_var in BASH_ENV ENV
409 + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
410 + done
411 + export CONFIG_SHELL
412 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
413 +fi
414 +
415 +
416 + if test $as_have_required = no; then
417 + echo This script requires a shell more modern than all the
418 + echo shells that I found on your system. Please install a
419 + echo modern shell, or manually run the script under such a
420 + echo shell if you do have one.
421 + { (exit 1); exit 1; }
422 +fi
423 +
424 +
425 +fi
426 +
427 +fi
428 +
429 +
430 +
431 +(eval "as_func_return () {
432 + (exit \$1)
433 +}
434 +as_func_success () {
435 + as_func_return 0
436 +}
437 +as_func_failure () {
438 + as_func_return 1
439 +}
440 +as_func_ret_success () {
441 + return 0
442 +}
443 +as_func_ret_failure () {
444 + return 1
445 +}
446 +
447 +exitcode=0
448 +if as_func_success; then
449 + :
450 +else
451 + exitcode=1
452 + echo as_func_success failed.
453 +fi
454 +
455 +if as_func_failure; then
456 + exitcode=1
457 + echo as_func_failure succeeded.
458 +fi
459 +
460 +if as_func_ret_success; then
461 + :
462 +else
463 + exitcode=1
464 + echo as_func_ret_success failed.
465 +fi
466 +
467 +if as_func_ret_failure; then
468 + exitcode=1
469 + echo as_func_ret_failure succeeded.
470 +fi
471 +
472 +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
473 + :
474 +else
475 + exitcode=1
476 + echo positional parameters were not saved.
477 +fi
478 +
479 +test \$exitcode = 0") || {
480 + echo No shell found that supports shell functions.
481 + echo Please tell autoconf@gnu.org about your system,
482 + echo including any error possibly output before this
483 + echo message
484 +}
485 +
486 +
487 +
488 + as_lineno_1=$LINENO
489 + as_lineno_2=$LINENO
490 + test "x$as_lineno_1" != "x$as_lineno_2" &&
491 + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
492
493 # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
494 # uniformly replaced by the line number. The first 'sed' inserts a
495 - # line-number line before each line; the second 'sed' does the real
496 - # work. The second script uses 'N' to pair each line-number line
497 - # with the numbered line, and appends trailing '-' during
498 - # substitution so that $LINENO is not a special case at line end.
499 + # line-number line after each line using $LINENO; the second 'sed'
500 + # does the real work. The second script uses 'N' to pair each
501 + # line-number line with the line containing $LINENO, and appends
502 + # trailing '-' during substitution so that $LINENO is not a special
503 + # case at line end.
504 # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
505 - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
506 - sed '=' <$as_myself |
507 + # scripts with optimization help from Paolo Bonzini. Blame Lee
508 + # E. McMahon (1931-1989) for sed's syntax. :-)
509 + sed -n '
510 + p
511 + /[$]LINENO/=
512 + ' <$as_myself |
513 sed '
514 + s/[$]LINENO.*/&-/
515 + t lineno
516 + b
517 + :lineno
518 N
519 - s,$,-,
520 - : loop
521 - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
522 + :loop
523 + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
524 t loop
525 - s,-$,,
526 - s,^['$as_cr_digits']*\n,,
527 + s/-\n.*//
528 ' >$as_me.lineno &&
529 - chmod +x $as_me.lineno ||
530 + chmod +x "$as_me.lineno" ||
531 { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
532 { (exit 1); exit 1; }; }
533
534 # Don't try to exec as it changes $[0], causing all sort of problems
535 # (the dirname of $[0] is not the place where we might find the
536 - # original and so on. Autoconf is especially sensible to this).
537 - . ./$as_me.lineno
538 + # original and so on. Autoconf is especially sensitive to this).
539 + . "./$as_me.lineno"
540 # Exit status is that of the last command.
541 exit
542 }
543
544
545 -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
546 - *c*,-n*) ECHO_N= ECHO_C='
547 -' ECHO_T=' ' ;;
548 - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
549 - *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
550 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
551 + as_dirname=dirname
552 +else
553 + as_dirname=false
554 +fi
555 +
556 +ECHO_C= ECHO_N= ECHO_T=
557 +case `echo -n x` in
558 +-n*)
559 + case `echo 'x\c'` in
560 + *c*) ECHO_T=' ';; # ECHO_T is single tab character.
561 + *) ECHO_C='\c';;
562 + esac;;
563 +*)
564 + ECHO_N='-n';;
565 esac
566
567 -if expr a : '\(a\)' >/dev/null 2>&1; then
568 +if expr a : '\(a\)' >/dev/null 2>&1 &&
569 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
570 as_expr=expr
571 else
572 as_expr=false
573 fi
574
575 rm -f conf$$ conf$$.exe conf$$.file
576 +if test -d conf$$.dir; then
577 + rm -f conf$$.dir/conf$$.file
578 +else
579 + rm -f conf$$.dir
580 + mkdir conf$$.dir
581 +fi
582 echo >conf$$.file
583 if ln -s conf$$.file conf$$ 2>/dev/null; then
584 - # We could just check for DJGPP; but this test a) works b) is more generic
585 - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
586 - if test -f conf$$.exe; then
587 - # Don't use ln at all; we don't have any links
588 + as_ln_s='ln -s'
589 + # ... but there are two gotchas:
590 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
591 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
592 + # In both cases, we have to default to `cp -p'.
593 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
594 as_ln_s='cp -p'
595 - else
596 - as_ln_s='ln -s'
597 - fi
598 elif ln conf$$.file conf$$ 2>/dev/null; then
599 as_ln_s=ln
600 else
601 as_ln_s='cp -p'
602 fi
603 -rm -f conf$$ conf$$.exe conf$$.file
604 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
605 +rmdir conf$$.dir 2>/dev/null
606
607 if mkdir -p . 2>/dev/null; then
608 as_mkdir_p=:
609 @@ -223,7 +513,19 @@
610 as_mkdir_p=false
611 fi
612
613 -as_executable_p="test -f"
614 +# Find out whether ``test -x'' works. Don't use a zero-byte file, as
615 +# systems may use methods other than mode bits to determine executability.
616 +cat >conf$$.file <<_ASEOF
617 +#! /bin/sh
618 +exit 0
619 +_ASEOF
620 +chmod +x conf$$.file
621 +if test -x conf$$.file >/dev/null 2>&1; then
622 + as_executable_p="test -x"
623 +else
624 + as_executable_p=:
625 +fi
626 +rm -f conf$$.file
627
628 # Sed expression to map a string onto a valid CPP name.
629 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
630 @@ -232,39 +534,27 @@
631 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
632
633
634 -# IFS
635 -# We need space, tab and new line, in precisely that order.
636 -as_nl='
637 -'
638 -IFS=" $as_nl"
639 -
640 -# CDPATH.
641 -$as_unset CDPATH
642
643 +exec 7<&0 </dev/null 6>&1
644
645 # Name of the host.
646 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
647 # so uname gets run too.
648 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
649
650 -exec 6>&1
651 -
652 #
653 # Initializations.
654 #
655 ac_default_prefix=/usr/local
656 +ac_clean_files=
657 ac_config_libobj_dir=.
658 +LIBOBJS=
659 cross_compiling=no
660 subdirs=
661 MFLAGS=
662 MAKEFLAGS=
663 SHELL=${CONFIG_SHELL-/bin/sh}
664
665 -# Maximum number of lines to put in a shell here document.
666 -# This variable seems obsolete. It should probably be removed, and
667 -# only ac_max_sed_lines should be used.
668 -: ${ac_max_here_lines=38}
669 -
670 # Identity of this package.
671 PACKAGE_NAME=
672 PACKAGE_TARNAME=
673 @@ -273,8 +563,65 @@
674 PACKAGE_BUGREPORT=
675
676 ac_unique_file="rlm_ldap.c"
677 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT edir ldap_ldflags ldap_cflags targetname LIBOBJS LTLIBOBJS'
678 +ac_subst_vars='SHELL
679 +PATH_SEPARATOR
680 +PACKAGE_NAME
681 +PACKAGE_TARNAME
682 +PACKAGE_VERSION
683 +PACKAGE_STRING
684 +PACKAGE_BUGREPORT
685 +exec_prefix
686 +prefix
687 +program_transform_name
688 +bindir
689 +sbindir
690 +libexecdir
691 +datarootdir
692 +datadir
693 +sysconfdir
694 +sharedstatedir
695 +localstatedir
696 +includedir
697 +oldincludedir
698 +docdir
699 +infodir
700 +htmldir
701 +dvidir
702 +pdfdir
703 +psdir
704 +libdir
705 +localedir
706 +mandir
707 +DEFS
708 +ECHO_C
709 +ECHO_N
710 +ECHO_T
711 +LIBS
712 +build_alias
713 +host_alias
714 +target_alias
715 +CC
716 +CFLAGS
717 +LDFLAGS
718 +CPPFLAGS
719 +ac_ct_CC
720 +EXEEXT
721 +OBJEXT
722 +edir
723 +ldap_ldflags
724 +ldap_cflags
725 +targetname
726 +LIBOBJS
727 +LTLIBOBJS'
728 ac_subst_files=''
729 + ac_precious_vars='build_alias
730 +host_alias
731 +target_alias
732 +CC
733 +CFLAGS
734 +LDFLAGS
735 +CPPFLAGS'
736 +
737
738 # Initialize some variables set by options.
739 ac_init_help=
740 @@ -301,34 +648,48 @@
741 # and all the variables that are supposed to be based on exec_prefix
742 # by default will actually change.
743 # Use braces instead of parens because sh, perl, etc. also accept them.
744 +# (The list follows the same order as the GNU Coding Standards.)
745 bindir='${exec_prefix}/bin'
746 sbindir='${exec_prefix}/sbin'
747 libexecdir='${exec_prefix}/libexec'
748 -datadir='${prefix}/share'
749 +datarootdir='${prefix}/share'
750 +datadir='${datarootdir}'
751 sysconfdir='${prefix}/etc'
752 sharedstatedir='${prefix}/com'
753 localstatedir='${prefix}/var'
754 -libdir='${exec_prefix}/lib'
755 includedir='${prefix}/include'
756 oldincludedir='/usr/include'
757 -infodir='${prefix}/info'
758 -mandir='${prefix}/man'
759 +docdir='${datarootdir}/doc/${PACKAGE}'
760 +infodir='${datarootdir}/info'
761 +htmldir='${docdir}'
762 +dvidir='${docdir}'
763 +pdfdir='${docdir}'
764 +psdir='${docdir}'
765 +libdir='${exec_prefix}/lib'
766 +localedir='${datarootdir}/locale'
767 +mandir='${datarootdir}/man'
768
769 ac_prev=
770 +ac_dashdash=
771 for ac_option
772 do
773 # If the previous option needs an argument, assign it.
774 if test -n "$ac_prev"; then
775 - eval "$ac_prev=\$ac_option"
776 + eval $ac_prev=\$ac_option
777 ac_prev=
778 continue
779 fi
780
781 - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
782 + case $ac_option in
783 + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
784 + *) ac_optarg=yes ;;
785 + esac
786
787 # Accept the important Cygnus configure options, so we can diagnose typos.
788
789 - case $ac_option in
790 + case $ac_dashdash$ac_option in
791 + --)
792 + ac_dashdash=yes ;;
793
794 -bindir | --bindir | --bindi | --bind | --bin | --bi)
795 ac_prev=bindir ;;
796 @@ -350,12 +711,18 @@
797 --config-cache | -C)
798 cache_file=config.cache ;;
799
800 - -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
801 + -datadir | --datadir | --datadi | --datad)
802 ac_prev=datadir ;;
803 - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
804 - | --da=*)
805 + -datadir=* | --datadir=* | --datadi=* | --datad=*)
806 datadir=$ac_optarg ;;
807
808 + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
809 + | --dataroo | --dataro | --datar)
810 + ac_prev=datarootdir ;;
811 + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
812 + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
813 + datarootdir=$ac_optarg ;;
814 +
815 -disable-* | --disable-*)
816 ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
817 # Reject names that are not valid shell variable names.
818 @@ -363,7 +730,17 @@
819 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
820 { (exit 1); exit 1; }; }
821 ac_feature=`echo $ac_feature | sed 's/-/_/g'`
822 - eval "enable_$ac_feature=no" ;;
823 + eval enable_$ac_feature=no ;;
824 +
825 + -docdir | --docdir | --docdi | --doc | --do)
826 + ac_prev=docdir ;;
827 + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
828 + docdir=$ac_optarg ;;
829 +
830 + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
831 + ac_prev=dvidir ;;
832 + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
833 + dvidir=$ac_optarg ;;
834
835 -enable-* | --enable-*)
836 ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
837 @@ -372,11 +749,7 @@
838 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
839 { (exit 1); exit 1; }; }
840 ac_feature=`echo $ac_feature | sed 's/-/_/g'`
841 - case $ac_option in
842 - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
843 - *) ac_optarg=yes ;;
844 - esac
845 - eval "enable_$ac_feature='$ac_optarg'" ;;
846 + eval enable_$ac_feature=\$ac_optarg ;;
847
848 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
849 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
850 @@ -403,6 +776,12 @@
851 -host=* | --host=* | --hos=* | --ho=*)
852 host_alias=$ac_optarg ;;
853
854 + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
855 + ac_prev=htmldir ;;
856 + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
857 + | --ht=*)
858 + htmldir=$ac_optarg ;;
859 +
860 -includedir | --includedir | --includedi | --included | --include \
861 | --includ | --inclu | --incl | --inc)
862 ac_prev=includedir ;;
863 @@ -427,13 +806,16 @@
864 | --libexe=* | --libex=* | --libe=*)
865 libexecdir=$ac_optarg ;;
866
867 + -localedir | --localedir | --localedi | --localed | --locale)
868 + ac_prev=localedir ;;
869 + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
870 + localedir=$ac_optarg ;;
871 +
872 -localstatedir | --localstatedir | --localstatedi | --localstated \
873 - | --localstate | --localstat | --localsta | --localst \
874 - | --locals | --local | --loca | --loc | --lo)
875 + | --localstate | --localstat | --localsta | --localst | --locals)
876 ac_prev=localstatedir ;;
877 -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
878 - | --localstate=* | --localstat=* | --localsta=* | --localst=* \
879 - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
880 + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
881 localstatedir=$ac_optarg ;;
882
883 -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
884 @@ -498,6 +880,16 @@
885 | --progr-tra=* | --program-tr=* | --program-t=*)
886 program_transform_name=$ac_optarg ;;
887
888 + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
889 + ac_prev=pdfdir ;;
890 + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
891 + pdfdir=$ac_optarg ;;
892 +
893 + -psdir | --psdir | --psdi | --psd | --ps)
894 + ac_prev=psdir ;;
895 + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
896 + psdir=$ac_optarg ;;
897 +
898 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
899 | -silent | --silent | --silen | --sile | --sil)
900 silent=yes ;;
901 @@ -554,11 +946,7 @@
902 { echo "$as_me: error: invalid package name: $ac_package" >&2
903 { (exit 1); exit 1; }; }
904 ac_package=`echo $ac_package| sed 's/-/_/g'`
905 - case $ac_option in
906 - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
907 - *) ac_optarg=yes ;;
908 - esac
909 - eval "with_$ac_package='$ac_optarg'" ;;
910 + eval with_$ac_package=\$ac_optarg ;;
911
912 -without-* | --without-*)
913 ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
914 @@ -567,7 +955,7 @@
915 { echo "$as_me: error: invalid package name: $ac_package" >&2
916 { (exit 1); exit 1; }; }
917 ac_package=`echo $ac_package | sed 's/-/_/g'`
918 - eval "with_$ac_package=no" ;;
919 + eval with_$ac_package=no ;;
920
921 --x)
922 # Obsolete; use --with-x.
923 @@ -598,8 +986,7 @@
924 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
925 { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
926 { (exit 1); exit 1; }; }
927 - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
928 - eval "$ac_envvar='$ac_optarg'"
929 + eval $ac_envvar=\$ac_optarg
930 export $ac_envvar ;;
931
932 *)
933 @@ -619,27 +1006,19 @@
934 { (exit 1); exit 1; }; }
935 fi
936
937 -# Be sure to have absolute paths.
938 -for ac_var in exec_prefix prefix
939 -do
940 - eval ac_val=$`echo $ac_var`
941 - case $ac_val in
942 - [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
943 - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
944 - { (exit 1); exit 1; }; };;
945 - esac
946 -done
947 -
948 -# Be sure to have absolute paths.
949 -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
950 - localstatedir libdir includedir oldincludedir infodir mandir
951 +# Be sure to have absolute directory names.
952 +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
953 + datadir sysconfdir sharedstatedir localstatedir includedir \
954 + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
955 + libdir localedir mandir
956 do
957 - eval ac_val=$`echo $ac_var`
958 + eval ac_val=\$$ac_var
959 case $ac_val in
960 - [\\/$]* | ?:[\\/]* ) ;;
961 - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
962 - { (exit 1); exit 1; }; };;
963 + [\\/$]* | ?:[\\/]* ) continue;;
964 + NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
965 esac
966 + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
967 + { (exit 1); exit 1; }; }
968 done
969
970 # There might be people who depend on the old broken behavior: `$host'
971 @@ -666,70 +1045,76 @@
972 test "$silent" = yes && exec 6>/dev/null
973
974
975 +ac_pwd=`pwd` && test -n "$ac_pwd" &&
976 +ac_ls_di=`ls -di .` &&
977 +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
978 + { echo "$as_me: error: Working directory cannot be determined" >&2
979 + { (exit 1); exit 1; }; }
980 +test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
981 + { echo "$as_me: error: pwd does not report name of working directory" >&2
982 + { (exit 1); exit 1; }; }
983 +
984 +
985 # Find the source files, if location was not specified.
986 if test -z "$srcdir"; then
987 ac_srcdir_defaulted=yes
988 - # Try the directory containing this script, then its parent.
989 - ac_confdir=`(dirname "$0") 2>/dev/null ||
990 + # Try the directory containing this script, then the parent directory.
991 + ac_confdir=`$as_dirname -- "$0" ||
992 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
993 X"$0" : 'X\(//\)[^/]' \| \
994 X"$0" : 'X\(//\)$' \| \
995 - X"$0" : 'X\(/\)' \| \
996 - . : '\(.\)' 2>/dev/null ||
997 + X"$0" : 'X\(/\)' \| . 2>/dev/null ||
998 echo X"$0" |
999 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
1000 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
1001 - /^X\(\/\/\)$/{ s//\1/; q; }
1002 - /^X\(\/\).*/{ s//\1/; q; }
1003 - s/.*/./; q'`
1004 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1005 + s//\1/
1006 + q
1007 + }
1008 + /^X\(\/\/\)[^/].*/{
1009 + s//\1/
1010 + q
1011 + }
1012 + /^X\(\/\/\)$/{
1013 + s//\1/
1014 + q
1015 + }
1016 + /^X\(\/\).*/{
1017 + s//\1/
1018 + q
1019 + }
1020 + s/.*/./; q'`
1021 srcdir=$ac_confdir
1022 - if test ! -r $srcdir/$ac_unique_file; then
1023 + if test ! -r "$srcdir/$ac_unique_file"; then
1024 srcdir=..
1025 fi
1026 else
1027 ac_srcdir_defaulted=no
1028 fi
1029 -if test ! -r $srcdir/$ac_unique_file; then
1030 - if test "$ac_srcdir_defaulted" = yes; then
1031 - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
1032 - { (exit 1); exit 1; }; }
1033 - else
1034 - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1035 +if test ! -r "$srcdir/$ac_unique_file"; then
1036 + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1037 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1038 { (exit 1); exit 1; }; }
1039 - fi
1040 fi
1041 -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
1042 - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
1043 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1044 +ac_abs_confdir=`(
1045 + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
1046 { (exit 1); exit 1; }; }
1047 -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
1048 -ac_env_build_alias_set=${build_alias+set}
1049 -ac_env_build_alias_value=$build_alias
1050 -ac_cv_env_build_alias_set=${build_alias+set}
1051 -ac_cv_env_build_alias_value=$build_alias
1052 -ac_env_host_alias_set=${host_alias+set}
1053 -ac_env_host_alias_value=$host_alias
1054 -ac_cv_env_host_alias_set=${host_alias+set}
1055 -ac_cv_env_host_alias_value=$host_alias
1056 -ac_env_target_alias_set=${target_alias+set}
1057 -ac_env_target_alias_value=$target_alias
1058 -ac_cv_env_target_alias_set=${target_alias+set}
1059 -ac_cv_env_target_alias_value=$target_alias
1060 -ac_env_CC_set=${CC+set}
1061 -ac_env_CC_value=$CC
1062 -ac_cv_env_CC_set=${CC+set}
1063 -ac_cv_env_CC_value=$CC
1064 -ac_env_CFLAGS_set=${CFLAGS+set}
1065 -ac_env_CFLAGS_value=$CFLAGS
1066 -ac_cv_env_CFLAGS_set=${CFLAGS+set}
1067 -ac_cv_env_CFLAGS_value=$CFLAGS
1068 -ac_env_LDFLAGS_set=${LDFLAGS+set}
1069 -ac_env_LDFLAGS_value=$LDFLAGS
1070 -ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
1071 -ac_cv_env_LDFLAGS_value=$LDFLAGS
1072 -ac_env_CPPFLAGS_set=${CPPFLAGS+set}
1073 -ac_env_CPPFLAGS_value=$CPPFLAGS
1074 -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
1075 -ac_cv_env_CPPFLAGS_value=$CPPFLAGS
1076 + pwd)`
1077 +# When building in place, set srcdir=.
1078 +if test "$ac_abs_confdir" = "$ac_pwd"; then
1079 + srcdir=.
1080 +fi
1081 +# Remove unnecessary trailing slashes from srcdir.
1082 +# Double slashes in file names in object file debugging info
1083 +# mess up M-x gdb in Emacs.
1084 +case $srcdir in
1085 +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
1086 +esac
1087 +for ac_var in $ac_precious_vars; do
1088 + eval ac_env_${ac_var}_set=\${${ac_var}+set}
1089 + eval ac_env_${ac_var}_value=\$${ac_var}
1090 + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
1091 + eval ac_cv_env_${ac_var}_value=\$${ac_var}
1092 +done
1093
1094 #
1095 # Report the --help message.
1096 @@ -758,9 +1143,6 @@
1097 -n, --no-create do not create output files
1098 --srcdir=DIR find the sources in DIR [configure dir or \`..']
1099
1100 -_ACEOF
1101 -
1102 - cat <<_ACEOF
1103 Installation directories:
1104 --prefix=PREFIX install architecture-independent files in PREFIX
1105 [$ac_default_prefix]
1106 @@ -778,15 +1160,22 @@
1107 --bindir=DIR user executables [EPREFIX/bin]
1108 --sbindir=DIR system admin executables [EPREFIX/sbin]
1109 --libexecdir=DIR program executables [EPREFIX/libexec]
1110 - --datadir=DIR read-only architecture-independent data [PREFIX/share]
1111 --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1112 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1113 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1114 --libdir=DIR object code libraries [EPREFIX/lib]
1115 --includedir=DIR C header files [PREFIX/include]
1116 --oldincludedir=DIR C header files for non-gcc [/usr/include]
1117 - --infodir=DIR info documentation [PREFIX/info]
1118 - --mandir=DIR man documentation [PREFIX/man]
1119 + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
1120 + --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
1121 + --infodir=DIR info documentation [DATAROOTDIR/info]
1122 + --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
1123 + --mandir=DIR man documentation [DATAROOTDIR/man]
1124 + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
1125 + --htmldir=DIR html documentation [DOCDIR]
1126 + --dvidir=DIR dvi documentation [DOCDIR]
1127 + --pdfdir=DIR pdf documentation [DOCDIR]
1128 + --psdir=DIR ps documentation [DOCDIR]
1129 _ACEOF
1130
1131 cat <<\_ACEOF
1132 @@ -800,8 +1189,7 @@
1133 Optional Features:
1134 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1135 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1136 - --enable-shared[=PKGS]
1137 - build shared libraries [default=yes]
1138 + --enable-shared[=PKGS] build shared libraries [default=yes]
1139
1140 Optional Packages:
1141 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
1142 @@ -816,125 +1204,93 @@
1143 CFLAGS C compiler flags
1144 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
1145 nonstandard directory <lib dir>
1146 - CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
1147 - headers in a nonstandard directory <include dir>
1148 + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
1149 + you have headers in a nonstandard directory <include dir>
1150
1151 Use these variables to override the choices made by `configure' or to help
1152 it to find libraries and programs with nonstandard names/locations.
1153
1154 _ACEOF
1155 +ac_status=$?
1156 fi
1157
1158 if test "$ac_init_help" = "recursive"; then
1159 # If there are subdirs, report their specific --help.
1160 - ac_popdir=`pwd`
1161 for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
1162 - test -d $ac_dir || continue
1163 + test -d "$ac_dir" || continue
1164 ac_builddir=.
1165
1166 -if test "$ac_dir" != .; then
1167 +case "$ac_dir" in
1168 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
1169 +*)
1170 ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
1171 - # A "../" for each directory in $ac_dir_suffix.
1172 - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
1173 -else
1174 - ac_dir_suffix= ac_top_builddir=
1175 -fi
1176 + # A ".." for each directory in $ac_dir_suffix.
1177 + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
1178 + case $ac_top_builddir_sub in
1179 + "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
1180 + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
1181 + esac ;;
1182 +esac
1183 +ac_abs_top_builddir=$ac_pwd
1184 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
1185 +# for backward compatibility:
1186 +ac_top_builddir=$ac_top_build_prefix
1187
1188 case $srcdir in
1189 - .) # No --srcdir option. We are building in place.
1190 + .) # We are building in place.
1191 ac_srcdir=.
1192 - if test -z "$ac_top_builddir"; then
1193 - ac_top_srcdir=.
1194 - else
1195 - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
1196 - fi ;;
1197 - [\\/]* | ?:[\\/]* ) # Absolute path.
1198 + ac_top_srcdir=$ac_top_builddir_sub
1199 + ac_abs_top_srcdir=$ac_pwd ;;
1200 + [\\/]* | ?:[\\/]* ) # Absolute name.
1201 ac_srcdir=$srcdir$ac_dir_suffix;
1202 - ac_top_srcdir=$srcdir ;;
1203 - *) # Relative path.
1204 - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
1205 - ac_top_srcdir=$ac_top_builddir$srcdir ;;
1206 + ac_top_srcdir=$srcdir
1207 + ac_abs_top_srcdir=$srcdir ;;
1208 + *) # Relative name.
1209 + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
1210 + ac_top_srcdir=$ac_top_build_prefix$srcdir
1211 + ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
1212 esac
1213 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
1214
1215 -# Do not use `cd foo && pwd` to compute absolute paths, because
1216 -# the directories may not exist.
1217 -case `pwd` in
1218 -.) ac_abs_builddir="$ac_dir";;
1219 -*)
1220 - case "$ac_dir" in
1221 - .) ac_abs_builddir=`pwd`;;
1222 - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
1223 - *) ac_abs_builddir=`pwd`/"$ac_dir";;
1224 - esac;;
1225 -esac
1226 -case $ac_abs_builddir in
1227 -.) ac_abs_top_builddir=${ac_top_builddir}.;;
1228 -*)
1229 - case ${ac_top_builddir}. in
1230 - .) ac_abs_top_builddir=$ac_abs_builddir;;
1231 - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
1232 - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
1233 - esac;;
1234 -esac
1235 -case $ac_abs_builddir in
1236 -.) ac_abs_srcdir=$ac_srcdir;;
1237 -*)
1238 - case $ac_srcdir in
1239 - .) ac_abs_srcdir=$ac_abs_builddir;;
1240 - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
1241 - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
1242 - esac;;
1243 -esac
1244 -case $ac_abs_builddir in
1245 -.) ac_abs_top_srcdir=$ac_top_srcdir;;
1246 -*)
1247 - case $ac_top_srcdir in
1248 - .) ac_abs_top_srcdir=$ac_abs_builddir;;
1249 - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
1250 - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
1251 - esac;;
1252 -esac
1253 -
1254 - cd $ac_dir
1255 - # Check for guested configure; otherwise get Cygnus style configure.
1256 - if test -f $ac_srcdir/configure.gnu; then
1257 - echo
1258 - $SHELL $ac_srcdir/configure.gnu --help=recursive
1259 - elif test -f $ac_srcdir/configure; then
1260 - echo
1261 - $SHELL $ac_srcdir/configure --help=recursive
1262 - elif test -f $ac_srcdir/configure.ac ||
1263 - test -f $ac_srcdir/configure.in; then
1264 - echo
1265 - $ac_configure --help
1266 + cd "$ac_dir" || { ac_status=$?; continue; }
1267 + # Check for guested configure.
1268 + if test -f "$ac_srcdir/configure.gnu"; then
1269 + echo &&
1270 + $SHELL "$ac_srcdir/configure.gnu" --help=recursive
1271 + elif test -f "$ac_srcdir/configure"; then
1272 + echo &&
1273 + $SHELL "$ac_srcdir/configure" --help=recursive
1274 else
1275 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
1276 - fi
1277 - cd $ac_popdir
1278 + fi || ac_status=$?
1279 + cd "$ac_pwd" || { ac_status=$?; break; }
1280 done
1281 fi
1282
1283 -test -n "$ac_init_help" && exit 0
1284 +test -n "$ac_init_help" && exit $ac_status
1285 if $ac_init_version; then
1286 cat <<\_ACEOF
1287 +configure
1288 +generated by GNU Autoconf 2.60
1289
1290 -Copyright (C) 2003 Free Software Foundation, Inc.
1291 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1292 +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
1293 This configure script is free software; the Free Software Foundation
1294 gives unlimited permission to copy, distribute and modify it.
1295 _ACEOF
1296 - exit 0
1297 + exit
1298 fi
1299 -exec 5>config.log
1300 -cat >&5 <<_ACEOF
1301 +cat >config.log <<_ACEOF
1302 This file contains any messages produced by compilers while
1303 running configure, to aid debugging if configure makes a mistake.
1304
1305 It was created by $as_me, which was
1306 -generated by GNU Autoconf 2.59. Invocation command line was
1307 +generated by GNU Autoconf 2.60. Invocation command line was
1308
1309 $ $0 $@
1310
1311 _ACEOF
1312 +exec 5>>config.log
1313 {
1314 cat <<_ASUNAME
1315 ## --------- ##
1316 @@ -953,7 +1309,7 @@
1317 /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
1318 /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
1319 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
1320 -hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
1321 +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
1322 /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
1323 /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
1324 /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
1325 @@ -967,6 +1323,7 @@
1326 test -z "$as_dir" && as_dir=.
1327 echo "PATH: $as_dir"
1328 done
1329 +IFS=$as_save_IFS
1330
1331 } >&5
1332
1333 @@ -988,7 +1345,6 @@
1334 ac_configure_args=
1335 ac_configure_args0=
1336 ac_configure_args1=
1337 -ac_sep=
1338 ac_must_keep_next=false
1339 for ac_pass in 1 2
1340 do
1341 @@ -999,7 +1355,7 @@
1342 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
1343 | -silent | --silent | --silen | --sile | --sil)
1344 continue ;;
1345 - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
1346 + *\'*)
1347 ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
1348 esac
1349 case $ac_pass in
1350 @@ -1021,9 +1377,7 @@
1351 -* ) ac_must_keep_next=true ;;
1352 esac
1353 fi
1354 - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
1355 - # Get rid of the leading space.
1356 - ac_sep=" "
1357 + ac_configure_args="$ac_configure_args '$ac_arg'"
1358 ;;
1359 esac
1360 done
1361 @@ -1034,8 +1388,8 @@
1362 # When interrupted or exit'd, cleanup temporary files, and complete
1363 # config.log. We remove comments because anyway the quotes in there
1364 # would cause problems or look ugly.
1365 -# WARNING: Be sure not to use single quotes in there, as some shells,
1366 -# such as our DU 5.0 friend, will then `close' the trap.
1367 +# WARNING: Use '\'' to represent an apostrophe within the trap.
1368 +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
1369 trap 'exit_status=$?
1370 # Save into config.log some information that might help in debugging.
1371 {
1372 @@ -1048,20 +1402,34 @@
1373 _ASBOX
1374 echo
1375 # The following way of writing the cache mishandles newlines in values,
1376 -{
1377 +(
1378 + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
1379 + eval ac_val=\$$ac_var
1380 + case $ac_val in #(
1381 + *${as_nl}*)
1382 + case $ac_var in #(
1383 + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
1384 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
1385 + esac
1386 + case $ac_var in #(
1387 + _ | IFS | as_nl) ;; #(
1388 + *) $as_unset $ac_var ;;
1389 + esac ;;
1390 + esac
1391 + done
1392 (set) 2>&1 |
1393 - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
1394 - *ac_space=\ *)
1395 + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
1396 + *${as_nl}ac_space=\ *)
1397 sed -n \
1398 - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
1399 - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
1400 - ;;
1401 + "s/'\''/'\''\\\\'\'''\''/g;
1402 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
1403 + ;; #(
1404 *)
1405 - sed -n \
1406 - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
1407 + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
1408 ;;
1409 - esac;
1410 -}
1411 + esac |
1412 + sort
1413 +)
1414 echo
1415
1416 cat <<\_ASBOX
1417 @@ -1072,22 +1440,28 @@
1418 echo
1419 for ac_var in $ac_subst_vars
1420 do
1421 - eval ac_val=$`echo $ac_var`
1422 - echo "$ac_var='"'"'$ac_val'"'"'"
1423 + eval ac_val=\$$ac_var
1424 + case $ac_val in
1425 + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1426 + esac
1427 + echo "$ac_var='\''$ac_val'\''"
1428 done | sort
1429 echo
1430
1431 if test -n "$ac_subst_files"; then
1432 cat <<\_ASBOX
1433 -## ------------- ##
1434 -## Output files. ##
1435 -## ------------- ##
1436 +## ------------------- ##
1437 +## File substitutions. ##
1438 +## ------------------- ##
1439 _ASBOX
1440 echo
1441 for ac_var in $ac_subst_files
1442 do
1443 - eval ac_val=$`echo $ac_var`
1444 - echo "$ac_var='"'"'$ac_val'"'"'"
1445 + eval ac_val=\$$ac_var
1446 + case $ac_val in
1447 + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1448 + esac
1449 + echo "$ac_var='\''$ac_val'\''"
1450 done | sort
1451 echo
1452 fi
1453 @@ -1099,26 +1473,24 @@
1454 ## ----------- ##
1455 _ASBOX
1456 echo
1457 - sed "/^$/d" confdefs.h | sort
1458 + cat confdefs.h
1459 echo
1460 fi
1461 test "$ac_signal" != 0 &&
1462 echo "$as_me: caught signal $ac_signal"
1463 echo "$as_me: exit $exit_status"
1464 } >&5
1465 - rm -f core *.core &&
1466 - rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
1467 + rm -f core *.core core.conftest.* &&
1468 + rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
1469 exit $exit_status
1470 - ' 0
1471 +' 0
1472 for ac_signal in 1 2 13 15; do
1473 trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
1474 done
1475 ac_signal=0
1476
1477 # confdefs.h avoids OS command line length limits that DEFS can exceed.
1478 -rm -rf conftest* confdefs.h
1479 -# AIX cpp loses on an empty file, so make sure it contains at least a newline.
1480 -echo >confdefs.h
1481 +rm -f -r conftest* confdefs.h
1482
1483 # Predefined preprocessor variables.
1484
1485 @@ -1149,14 +1521,17 @@
1486
1487 # Let the site file select an alternate cache file if it wants to.
1488 # Prefer explicitly selected file to automatically selected ones.
1489 -if test -z "$CONFIG_SITE"; then
1490 - if test "x$prefix" != xNONE; then
1491 - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
1492 - else
1493 - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
1494 - fi
1495 +if test -n "$CONFIG_SITE"; then
1496 + set x "$CONFIG_SITE"
1497 +elif test "x$prefix" != xNONE; then
1498 + set x "$prefix/share/config.site" "$prefix/etc/config.site"
1499 +else
1500 + set x "$ac_default_prefix/share/config.site" \
1501 + "$ac_default_prefix/etc/config.site"
1502 fi
1503 -for ac_site_file in $CONFIG_SITE; do
1504 +shift
1505 +for ac_site_file
1506 +do
1507 if test -r "$ac_site_file"; then
1508 { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
1509 echo "$as_me: loading site script $ac_site_file" >&6;}
1510 @@ -1172,8 +1547,8 @@
1511 { echo "$as_me:$LINENO: loading cache $cache_file" >&5
1512 echo "$as_me: loading cache $cache_file" >&6;}
1513 case $cache_file in
1514 - [\\/]* | ?:[\\/]* ) . $cache_file;;
1515 - *) . ./$cache_file;;
1516 + [\\/]* | ?:[\\/]* ) . "$cache_file";;
1517 + *) . "./$cache_file";;
1518 esac
1519 fi
1520 else
1521 @@ -1185,12 +1560,11 @@
1522 # Check that the precious variables saved in the cache have kept the same
1523 # value.
1524 ac_cache_corrupted=false
1525 -for ac_var in `(set) 2>&1 |
1526 - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
1527 +for ac_var in $ac_precious_vars; do
1528 eval ac_old_set=\$ac_cv_env_${ac_var}_set
1529 eval ac_new_set=\$ac_env_${ac_var}_set
1530 - eval ac_old_val="\$ac_cv_env_${ac_var}_value"
1531 - eval ac_new_val="\$ac_env_${ac_var}_value"
1532 + eval ac_old_val=\$ac_cv_env_${ac_var}_value
1533 + eval ac_new_val=\$ac_env_${ac_var}_value
1534 case $ac_old_set,$ac_new_set in
1535 set,)
1536 { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1537 @@ -1215,8 +1589,7 @@
1538 # Pass precious variables to config.status.
1539 if test "$ac_new_set" = set; then
1540 case $ac_new_val in
1541 - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
1542 - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
1543 + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
1544 *) ac_arg=$ac_var=$ac_new_val ;;
1545 esac
1546 case " $ac_configure_args " in
1547 @@ -1233,12 +1606,6 @@
1548 { (exit 1); exit 1; }; }
1549 fi
1550
1551 -ac_ext=c
1552 -ac_cpp='$CPP $CPPFLAGS'
1553 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1554 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1555 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
1556 -
1557
1558
1559
1560 @@ -1255,6 +1622,11 @@
1561
1562
1563
1564 +ac_ext=c
1565 +ac_cpp='$CPP $CPPFLAGS'
1566 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1567 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1568 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
1569
1570
1571
1572 @@ -1273,8 +1645,8 @@
1573 if test -n "$ac_tool_prefix"; then
1574 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
1575 set dummy ${ac_tool_prefix}gcc; ac_word=$2
1576 -echo "$as_me:$LINENO: checking for $ac_word" >&5
1577 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1578 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1579 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1580 if test "${ac_cv_prog_CC+set}" = set; then
1581 echo $ECHO_N "(cached) $ECHO_C" >&6
1582 else
1583 @@ -1287,32 +1659,34 @@
1584 IFS=$as_save_IFS
1585 test -z "$as_dir" && as_dir=.
1586 for ac_exec_ext in '' $ac_executable_extensions; do
1587 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1588 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
1589 ac_cv_prog_CC="${ac_tool_prefix}gcc"
1590 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1591 break 2
1592 fi
1593 done
1594 done
1595 +IFS=$as_save_IFS
1596
1597 fi
1598 fi
1599 CC=$ac_cv_prog_CC
1600 if test -n "$CC"; then
1601 - echo "$as_me:$LINENO: result: $CC" >&5
1602 -echo "${ECHO_T}$CC" >&6
1603 + { echo "$as_me:$LINENO: result: $CC" >&5
1604 +echo "${ECHO_T}$CC" >&6; }
1605 else
1606 - echo "$as_me:$LINENO: result: no" >&5
1607 -echo "${ECHO_T}no" >&6
1608 + { echo "$as_me:$LINENO: result: no" >&5
1609 +echo "${ECHO_T}no" >&6; }
1610 fi
1611
1612 +
1613 fi
1614 if test -z "$ac_cv_prog_CC"; then
1615 ac_ct_CC=$CC
1616 # Extract the first word of "gcc", so it can be a program name with args.
1617 set dummy gcc; ac_word=$2
1618 -echo "$as_me:$LINENO: checking for $ac_word" >&5
1619 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1620 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1621 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1622 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1623 echo $ECHO_N "(cached) $ECHO_C" >&6
1624 else
1625 @@ -1325,36 +1699,51 @@
1626 IFS=$as_save_IFS
1627 test -z "$as_dir" && as_dir=.
1628 for ac_exec_ext in '' $ac_executable_extensions; do
1629 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1630 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
1631 ac_cv_prog_ac_ct_CC="gcc"
1632 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1633 break 2
1634 fi
1635 done
1636 done
1637 +IFS=$as_save_IFS
1638
1639 fi
1640 fi
1641 ac_ct_CC=$ac_cv_prog_ac_ct_CC
1642 if test -n "$ac_ct_CC"; then
1643 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1644 -echo "${ECHO_T}$ac_ct_CC" >&6
1645 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1646 +echo "${ECHO_T}$ac_ct_CC" >&6; }
1647 else
1648 - echo "$as_me:$LINENO: result: no" >&5
1649 -echo "${ECHO_T}no" >&6
1650 + { echo "$as_me:$LINENO: result: no" >&5
1651 +echo "${ECHO_T}no" >&6; }
1652 fi
1653
1654 - CC=$ac_ct_CC
1655 + if test "x$ac_ct_CC" = x; then
1656 + CC=""
1657 + else
1658 + case $cross_compiling:$ac_tool_warned in
1659 +yes:)
1660 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1661 +whose name does not start with the host triplet. If you think this
1662 +configuration is useful to you, please write to autoconf@gnu.org." >&5
1663 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1664 +whose name does not start with the host triplet. If you think this
1665 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1666 +ac_tool_warned=yes ;;
1667 +esac
1668 + CC=$ac_ct_CC
1669 + fi
1670 else
1671 CC="$ac_cv_prog_CC"
1672 fi
1673
1674 if test -z "$CC"; then
1675 - if test -n "$ac_tool_prefix"; then
1676 - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
1677 + if test -n "$ac_tool_prefix"; then
1678 + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
1679 set dummy ${ac_tool_prefix}cc; ac_word=$2
1680 -echo "$as_me:$LINENO: checking for $ac_word" >&5
1681 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1682 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1683 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1684 if test "${ac_cv_prog_CC+set}" = set; then
1685 echo $ECHO_N "(cached) $ECHO_C" >&6
1686 else
1687 @@ -1367,74 +1756,34 @@
1688 IFS=$as_save_IFS
1689 test -z "$as_dir" && as_dir=.
1690 for ac_exec_ext in '' $ac_executable_extensions; do
1691 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1692 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
1693 ac_cv_prog_CC="${ac_tool_prefix}cc"
1694 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1695 break 2
1696 fi
1697 done
1698 done
1699 +IFS=$as_save_IFS
1700
1701 fi
1702 fi
1703 CC=$ac_cv_prog_CC
1704 if test -n "$CC"; then
1705 - echo "$as_me:$LINENO: result: $CC" >&5
1706 -echo "${ECHO_T}$CC" >&6
1707 -else
1708 - echo "$as_me:$LINENO: result: no" >&5
1709 -echo "${ECHO_T}no" >&6
1710 -fi
1711 -
1712 -fi
1713 -if test -z "$ac_cv_prog_CC"; then
1714 - ac_ct_CC=$CC
1715 - # Extract the first word of "cc", so it can be a program name with args.
1716 -set dummy cc; ac_word=$2
1717 -echo "$as_me:$LINENO: checking for $ac_word" >&5
1718 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1719 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1720 - echo $ECHO_N "(cached) $ECHO_C" >&6
1721 -else
1722 - if test -n "$ac_ct_CC"; then
1723 - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1724 -else
1725 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1726 -for as_dir in $PATH
1727 -do
1728 - IFS=$as_save_IFS
1729 - test -z "$as_dir" && as_dir=.
1730 - for ac_exec_ext in '' $ac_executable_extensions; do
1731 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1732 - ac_cv_prog_ac_ct_CC="cc"
1733 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1734 - break 2
1735 - fi
1736 -done
1737 -done
1738 -
1739 -fi
1740 -fi
1741 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
1742 -if test -n "$ac_ct_CC"; then
1743 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1744 -echo "${ECHO_T}$ac_ct_CC" >&6
1745 + { echo "$as_me:$LINENO: result: $CC" >&5
1746 +echo "${ECHO_T}$CC" >&6; }
1747 else
1748 - echo "$as_me:$LINENO: result: no" >&5
1749 -echo "${ECHO_T}no" >&6
1750 + { echo "$as_me:$LINENO: result: no" >&5
1751 +echo "${ECHO_T}no" >&6; }
1752 fi
1753
1754 - CC=$ac_ct_CC
1755 -else
1756 - CC="$ac_cv_prog_CC"
1757 -fi
1758
1759 + fi
1760 fi
1761 if test -z "$CC"; then
1762 # Extract the first word of "cc", so it can be a program name with args.
1763 set dummy cc; ac_word=$2
1764 -echo "$as_me:$LINENO: checking for $ac_word" >&5
1765 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1766 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1767 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1768 if test "${ac_cv_prog_CC+set}" = set; then
1769 echo $ECHO_N "(cached) $ECHO_C" >&6
1770 else
1771 @@ -1448,7 +1797,7 @@
1772 IFS=$as_save_IFS
1773 test -z "$as_dir" && as_dir=.
1774 for ac_exec_ext in '' $ac_executable_extensions; do
1775 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1776 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
1777 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
1778 ac_prog_rejected=yes
1779 continue
1780 @@ -1459,6 +1808,7 @@
1781 fi
1782 done
1783 done
1784 +IFS=$as_save_IFS
1785
1786 if test $ac_prog_rejected = yes; then
1787 # We found a bogon in the path, so make sure we never use it.
1788 @@ -1476,22 +1826,23 @@
1789 fi
1790 CC=$ac_cv_prog_CC
1791 if test -n "$CC"; then
1792 - echo "$as_me:$LINENO: result: $CC" >&5
1793 -echo "${ECHO_T}$CC" >&6
1794 + { echo "$as_me:$LINENO: result: $CC" >&5
1795 +echo "${ECHO_T}$CC" >&6; }
1796 else
1797 - echo "$as_me:$LINENO: result: no" >&5
1798 -echo "${ECHO_T}no" >&6
1799 + { echo "$as_me:$LINENO: result: no" >&5
1800 +echo "${ECHO_T}no" >&6; }
1801 fi
1802
1803 +
1804 fi
1805 if test -z "$CC"; then
1806 if test -n "$ac_tool_prefix"; then
1807 - for ac_prog in cl
1808 + for ac_prog in cl.exe
1809 do
1810 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1811 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1812 -echo "$as_me:$LINENO: checking for $ac_word" >&5
1813 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1814 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1815 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1816 if test "${ac_cv_prog_CC+set}" = set; then
1817 echo $ECHO_N "(cached) $ECHO_C" >&6
1818 else
1819 @@ -1504,36 +1855,38 @@
1820 IFS=$as_save_IFS
1821 test -z "$as_dir" && as_dir=.
1822 for ac_exec_ext in '' $ac_executable_extensions; do
1823 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1824 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
1825 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
1826 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1827 break 2
1828 fi
1829 done
1830 done
1831 +IFS=$as_save_IFS
1832
1833 fi
1834 fi
1835 CC=$ac_cv_prog_CC
1836 if test -n "$CC"; then
1837 - echo "$as_me:$LINENO: result: $CC" >&5
1838 -echo "${ECHO_T}$CC" >&6
1839 + { echo "$as_me:$LINENO: result: $CC" >&5
1840 +echo "${ECHO_T}$CC" >&6; }
1841 else
1842 - echo "$as_me:$LINENO: result: no" >&5
1843 -echo "${ECHO_T}no" >&6
1844 + { echo "$as_me:$LINENO: result: no" >&5
1845 +echo "${ECHO_T}no" >&6; }
1846 fi
1847
1848 +
1849 test -n "$CC" && break
1850 done
1851 fi
1852 if test -z "$CC"; then
1853 ac_ct_CC=$CC
1854 - for ac_prog in cl
1855 + for ac_prog in cl.exe
1856 do
1857 # Extract the first word of "$ac_prog", so it can be a program name with args.
1858 set dummy $ac_prog; ac_word=$2
1859 -echo "$as_me:$LINENO: checking for $ac_word" >&5
1860 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1861 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1862 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1863 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1864 echo $ECHO_N "(cached) $ECHO_C" >&6
1865 else
1866 @@ -1546,29 +1899,45 @@
1867 IFS=$as_save_IFS
1868 test -z "$as_dir" && as_dir=.
1869 for ac_exec_ext in '' $ac_executable_extensions; do
1870 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1871 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
1872 ac_cv_prog_ac_ct_CC="$ac_prog"
1873 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1874 break 2
1875 fi
1876 done
1877 done
1878 +IFS=$as_save_IFS
1879
1880 fi
1881 fi
1882 ac_ct_CC=$ac_cv_prog_ac_ct_CC
1883 if test -n "$ac_ct_CC"; then
1884 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1885 -echo "${ECHO_T}$ac_ct_CC" >&6
1886 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1887 +echo "${ECHO_T}$ac_ct_CC" >&6; }
1888 else
1889 - echo "$as_me:$LINENO: result: no" >&5
1890 -echo "${ECHO_T}no" >&6
1891 + { echo "$as_me:$LINENO: result: no" >&5
1892 +echo "${ECHO_T}no" >&6; }
1893 fi
1894
1895 +
1896 test -n "$ac_ct_CC" && break
1897 done
1898
1899 - CC=$ac_ct_CC
1900 + if test "x$ac_ct_CC" = x; then
1901 + CC=""
1902 + else
1903 + case $cross_compiling:$ac_tool_warned in
1904 +yes:)
1905 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1906 +whose name does not start with the host triplet. If you think this
1907 +configuration is useful to you, please write to autoconf@gnu.org." >&5
1908 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1909 +whose name does not start with the host triplet. If you think this
1910 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1911 +ac_tool_warned=yes ;;
1912 +esac
1913 + CC=$ac_ct_CC
1914 + fi
1915 fi
1916
1917 fi
1918 @@ -1581,21 +1950,35 @@
1919 { (exit 1); exit 1; }; }
1920
1921 # Provide some information about the compiler.
1922 -echo "$as_me:$LINENO:" \
1923 - "checking for C compiler version" >&5
1924 +echo "$as_me:$LINENO: checking for C compiler version" >&5
1925 ac_compiler=`set X $ac_compile; echo $2`
1926 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
1927 - (eval $ac_compiler --version </dev/null >&5) 2>&5
1928 +{ (ac_try="$ac_compiler --version >&5"
1929 +case "(($ac_try" in
1930 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1931 + *) ac_try_echo=$ac_try;;
1932 +esac
1933 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1934 + (eval "$ac_compiler --version >&5") 2>&5
1935 ac_status=$?
1936 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1937 (exit $ac_status); }
1938 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
1939 - (eval $ac_compiler -v </dev/null >&5) 2>&5
1940 +{ (ac_try="$ac_compiler -v >&5"
1941 +case "(($ac_try" in
1942 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1943 + *) ac_try_echo=$ac_try;;
1944 +esac
1945 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1946 + (eval "$ac_compiler -v >&5") 2>&5
1947 ac_status=$?
1948 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1949 (exit $ac_status); }
1950 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
1951 - (eval $ac_compiler -V </dev/null >&5) 2>&5
1952 +{ (ac_try="$ac_compiler -V >&5"
1953 +case "(($ac_try" in
1954 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1955 + *) ac_try_echo=$ac_try;;
1956 +esac
1957 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1958 + (eval "$ac_compiler -V >&5") 2>&5
1959 ac_status=$?
1960 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1961 (exit $ac_status); }
1962 @@ -1620,46 +2003,70 @@
1963 # Try to create an executable without -o first, disregard a.out.
1964 # It will help us diagnose broken compilers, and finding out an intuition
1965 # of exeext.
1966 -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
1967 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
1968 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
1969 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
1970 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
1971 -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
1972 - (eval $ac_link_default) 2>&5
1973 +#
1974 +# List of possible output files, starting from the most likely.
1975 +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
1976 +# only as a last resort. b.out is created by i960 compilers.
1977 +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
1978 +#
1979 +# The IRIX 6 linker writes into existing files which may not be
1980 +# executable, retaining their permissions. Remove them first so a
1981 +# subsequent execution test works.
1982 +ac_rmfiles=
1983 +for ac_file in $ac_files
1984 +do
1985 + case $ac_file in
1986 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
1987 + * ) ac_rmfiles="$ac_rmfiles $ac_file";;
1988 + esac
1989 +done
1990 +rm -f $ac_rmfiles
1991 +
1992 +if { (ac_try="$ac_link_default"
1993 +case "(($ac_try" in
1994 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1995 + *) ac_try_echo=$ac_try;;
1996 +esac
1997 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1998 + (eval "$ac_link_default") 2>&5
1999 ac_status=$?
2000 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2001 (exit $ac_status); }; then
2002 - # Find the output, starting from the most likely. This scheme is
2003 -# not robust to junk in `.', hence go to wildcards (a.*) only as a last
2004 -# resort.
2005 -
2006 -# Be careful to initialize this variable, since it used to be cached.
2007 -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
2008 -ac_cv_exeext=
2009 -# b.out is created by i960 compilers.
2010 -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
2011 + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
2012 +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
2013 +# in a Makefile. We should not override ac_cv_exeext if it was cached,
2014 +# so that the user can short-circuit this test for compilers unknown to
2015 +# Autoconf.
2016 +for ac_file in $ac_files
2017 do
2018 test -f "$ac_file" || continue
2019 case $ac_file in
2020 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
2021 - ;;
2022 - conftest.$ac_ext )
2023 - # This is the source file.
2024 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
2025 ;;
2026 [ab].out )
2027 # We found the default executable, but exeext='' is most
2028 # certainly right.
2029 break;;
2030 *.* )
2031 - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2032 - # FIXME: I believe we export ac_cv_exeext for Libtool,
2033 - # but it would be cool to find out if it's true. Does anybody
2034 - # maintain Libtool? --akim.
2035 - export ac_cv_exeext
2036 + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
2037 + then :; else
2038 + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2039 + fi
2040 + # We set ac_cv_exeext here because the later test for it is not
2041 + # safe: cross compilers may not add the suffix if given an `-o'
2042 + # argument, so we may need to know it at that point already.
2043 + # Even if this section looks crufty: it has the advantage of
2044 + # actually working.
2045 break;;
2046 * )
2047 break;;
2048 esac
2049 done
2050 +test "$ac_cv_exeext" = no && ac_cv_exeext=
2051 +
2052 else
2053 echo "$as_me: failed program was:" >&5
2054 sed 's/^/| /' conftest.$ac_ext >&5
2055 @@ -1672,19 +2079,23 @@
2056 fi
2057
2058 ac_exeext=$ac_cv_exeext
2059 -echo "$as_me:$LINENO: result: $ac_file" >&5
2060 -echo "${ECHO_T}$ac_file" >&6
2061 +{ echo "$as_me:$LINENO: result: $ac_file" >&5
2062 +echo "${ECHO_T}$ac_file" >&6; }
2063
2064 -# Check the compiler produces executables we can run. If not, either
2065 +# Check that the compiler produces executables we can run. If not, either
2066 # the compiler is broken, or we cross compile.
2067 -echo "$as_me:$LINENO: checking whether the C compiler works" >&5
2068 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
2069 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
2070 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
2071 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
2072 # If not cross compiling, check that we can run a simple program.
2073 if test "$cross_compiling" != yes; then
2074 if { ac_try='./$ac_file'
2075 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2076 - (eval $ac_try) 2>&5
2077 + { (case "(($ac_try" in
2078 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2079 + *) ac_try_echo=$ac_try;;
2080 +esac
2081 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2082 + (eval "$ac_try") 2>&5
2083 ac_status=$?
2084 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2085 (exit $ac_status); }; }; then
2086 @@ -1703,22 +2114,27 @@
2087 fi
2088 fi
2089 fi
2090 -echo "$as_me:$LINENO: result: yes" >&5
2091 -echo "${ECHO_T}yes" >&6
2092 +{ echo "$as_me:$LINENO: result: yes" >&5
2093 +echo "${ECHO_T}yes" >&6; }
2094
2095 rm -f a.out a.exe conftest$ac_cv_exeext b.out
2096 ac_clean_files=$ac_clean_files_save
2097 -# Check the compiler produces executables we can run. If not, either
2098 +# Check that the compiler produces executables we can run. If not, either
2099 # the compiler is broken, or we cross compile.
2100 -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
2101 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
2102 -echo "$as_me:$LINENO: result: $cross_compiling" >&5
2103 -echo "${ECHO_T}$cross_compiling" >&6
2104 -
2105 -echo "$as_me:$LINENO: checking for suffix of executables" >&5
2106 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
2107 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
2108 - (eval $ac_link) 2>&5
2109 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
2110 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
2111 +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
2112 +echo "${ECHO_T}$cross_compiling" >&6; }
2113 +
2114 +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
2115 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
2116 +if { (ac_try="$ac_link"
2117 +case "(($ac_try" in
2118 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2119 + *) ac_try_echo=$ac_try;;
2120 +esac
2121 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2122 + (eval "$ac_link") 2>&5
2123 ac_status=$?
2124 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2125 (exit $ac_status); }; then
2126 @@ -1729,9 +2145,8 @@
2127 for ac_file in conftest.exe conftest conftest.*; do
2128 test -f "$ac_file" || continue
2129 case $ac_file in
2130 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
2131 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
2132 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2133 - export ac_cv_exeext
2134 break;;
2135 * ) break;;
2136 esac
2137 @@ -1745,14 +2160,14 @@
2138 fi
2139
2140 rm -f conftest$ac_cv_exeext
2141 -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
2142 -echo "${ECHO_T}$ac_cv_exeext" >&6
2143 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
2144 +echo "${ECHO_T}$ac_cv_exeext" >&6; }
2145
2146 rm -f conftest.$ac_ext
2147 EXEEXT=$ac_cv_exeext
2148 ac_exeext=$EXEEXT
2149 -echo "$as_me:$LINENO: checking for suffix of object files" >&5
2150 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
2151 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
2152 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
2153 if test "${ac_cv_objext+set}" = set; then
2154 echo $ECHO_N "(cached) $ECHO_C" >&6
2155 else
2156 @@ -1772,14 +2187,20 @@
2157 }
2158 _ACEOF
2159 rm -f conftest.o conftest.obj
2160 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2161 - (eval $ac_compile) 2>&5
2162 +if { (ac_try="$ac_compile"
2163 +case "(($ac_try" in
2164 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2165 + *) ac_try_echo=$ac_try;;
2166 +esac
2167 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2168 + (eval "$ac_compile") 2>&5
2169 ac_status=$?
2170 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2171 (exit $ac_status); }; then
2172 - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
2173 + for ac_file in conftest.o conftest.obj conftest.*; do
2174 + test -f "$ac_file" || continue;
2175 case $ac_file in
2176 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
2177 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
2178 *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
2179 break;;
2180 esac
2181 @@ -1797,12 +2218,12 @@
2182
2183 rm -f conftest.$ac_cv_objext conftest.$ac_ext
2184 fi
2185 -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
2186 -echo "${ECHO_T}$ac_cv_objext" >&6
2187 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
2188 +echo "${ECHO_T}$ac_cv_objext" >&6; }
2189 OBJEXT=$ac_cv_objext
2190 ac_objext=$OBJEXT
2191 -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
2192 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
2193 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
2194 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
2195 if test "${ac_cv_c_compiler_gnu+set}" = set; then
2196 echo $ECHO_N "(cached) $ECHO_C" >&6
2197 else
2198 @@ -1825,24 +2246,36 @@
2199 }
2200 _ACEOF
2201 rm -f conftest.$ac_objext
2202 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2203 - (eval $ac_compile) 2>conftest.er1
2204 +if { (ac_try="$ac_compile"
2205 +case "(($ac_try" in
2206 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2207 + *) ac_try_echo=$ac_try;;
2208 +esac
2209 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2210 + (eval "$ac_compile") 2>conftest.er1
2211 ac_status=$?
2212 grep -v '^ *+' conftest.er1 >conftest.err
2213 rm -f conftest.er1
2214 cat conftest.err >&5
2215 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2216 (exit $ac_status); } &&
2217 - { ac_try='test -z "$ac_c_werror_flag"
2218 - || test ! -s conftest.err'
2219 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2220 - (eval $ac_try) 2>&5
2221 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
2222 + { (case "(($ac_try" in
2223 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2224 + *) ac_try_echo=$ac_try;;
2225 +esac
2226 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2227 + (eval "$ac_try") 2>&5
2228 ac_status=$?
2229 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2230 (exit $ac_status); }; } &&
2231 { ac_try='test -s conftest.$ac_objext'
2232 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2233 - (eval $ac_try) 2>&5
2234 + { (case "(($ac_try" in
2235 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2236 + *) ac_try_echo=$ac_try;;
2237 +esac
2238 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2239 + (eval "$ac_try") 2>&5
2240 ac_status=$?
2241 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2242 (exit $ac_status); }; }; then
2243 @@ -1851,24 +2284,139 @@
2244 echo "$as_me: failed program was:" >&5
2245 sed 's/^/| /' conftest.$ac_ext >&5
2246
2247 -ac_compiler_gnu=no
2248 + ac_compiler_gnu=no
2249 fi
2250 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2251 +
2252 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2253 ac_cv_c_compiler_gnu=$ac_compiler_gnu
2254
2255 fi
2256 -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
2257 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
2258 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
2259 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
2260 GCC=`test $ac_compiler_gnu = yes && echo yes`
2261 ac_test_CFLAGS=${CFLAGS+set}
2262 ac_save_CFLAGS=$CFLAGS
2263 -CFLAGS="-g"
2264 -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
2265 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
2266 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
2267 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
2268 if test "${ac_cv_prog_cc_g+set}" = set; then
2269 echo $ECHO_N "(cached) $ECHO_C" >&6
2270 else
2271 - cat >conftest.$ac_ext <<_ACEOF
2272 + ac_save_c_werror_flag=$ac_c_werror_flag
2273 + ac_c_werror_flag=yes
2274 + ac_cv_prog_cc_g=no
2275 + CFLAGS="-g"
2276 + cat >conftest.$ac_ext <<_ACEOF
2277 +/* confdefs.h. */
2278 +_ACEOF
2279 +cat confdefs.h >>conftest.$ac_ext
2280 +cat >>conftest.$ac_ext <<_ACEOF
2281 +/* end confdefs.h. */
2282 +
2283 +int
2284 +main ()
2285 +{
2286 +
2287 + ;
2288 + return 0;
2289 +}
2290 +_ACEOF
2291 +rm -f conftest.$ac_objext
2292 +if { (ac_try="$ac_compile"
2293 +case "(($ac_try" in
2294 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2295 + *) ac_try_echo=$ac_try;;
2296 +esac
2297 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2298 + (eval "$ac_compile") 2>conftest.er1
2299 + ac_status=$?
2300 + grep -v '^ *+' conftest.er1 >conftest.err
2301 + rm -f conftest.er1
2302 + cat conftest.err >&5
2303 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2304 + (exit $ac_status); } &&
2305 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
2306 + { (case "(($ac_try" in
2307 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2308 + *) ac_try_echo=$ac_try;;
2309 +esac
2310 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2311 + (eval "$ac_try") 2>&5
2312 + ac_status=$?
2313 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2314 + (exit $ac_status); }; } &&
2315 + { ac_try='test -s conftest.$ac_objext'
2316 + { (case "(($ac_try" in
2317 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2318 + *) ac_try_echo=$ac_try;;
2319 +esac
2320 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2321 + (eval "$ac_try") 2>&5
2322 + ac_status=$?
2323 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2324 + (exit $ac_status); }; }; then
2325 + ac_cv_prog_cc_g=yes
2326 +else
2327 + echo "$as_me: failed program was:" >&5
2328 +sed 's/^/| /' conftest.$ac_ext >&5
2329 +
2330 + CFLAGS=""
2331 + cat >conftest.$ac_ext <<_ACEOF
2332 +/* confdefs.h. */
2333 +_ACEOF
2334 +cat confdefs.h >>conftest.$ac_ext
2335 +cat >>conftest.$ac_ext <<_ACEOF
2336 +/* end confdefs.h. */
2337 +
2338 +int
2339 +main ()
2340 +{
2341 +
2342 + ;
2343 + return 0;
2344 +}
2345 +_ACEOF
2346 +rm -f conftest.$ac_objext
2347 +if { (ac_try="$ac_compile"
2348 +case "(($ac_try" in
2349 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2350 + *) ac_try_echo=$ac_try;;
2351 +esac
2352 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2353 + (eval "$ac_compile") 2>conftest.er1
2354 + ac_status=$?
2355 + grep -v '^ *+' conftest.er1 >conftest.err
2356 + rm -f conftest.er1
2357 + cat conftest.err >&5
2358 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2359 + (exit $ac_status); } &&
2360 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
2361 + { (case "(($ac_try" in
2362 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2363 + *) ac_try_echo=$ac_try;;
2364 +esac
2365 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2366 + (eval "$ac_try") 2>&5
2367 + ac_status=$?
2368 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2369 + (exit $ac_status); }; } &&
2370 + { ac_try='test -s conftest.$ac_objext'
2371 + { (case "(($ac_try" in
2372 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2373 + *) ac_try_echo=$ac_try;;
2374 +esac
2375 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2376 + (eval "$ac_try") 2>&5
2377 + ac_status=$?
2378 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2379 + (exit $ac_status); }; }; then
2380 + :
2381 +else
2382 + echo "$as_me: failed program was:" >&5
2383 +sed 's/^/| /' conftest.$ac_ext >&5
2384 +
2385 + ac_c_werror_flag=$ac_save_c_werror_flag
2386 + CFLAGS="-g"
2387 + cat >conftest.$ac_ext <<_ACEOF
2388 /* confdefs.h. */
2389 _ACEOF
2390 cat confdefs.h >>conftest.$ac_ext
2391 @@ -1884,24 +2432,36 @@
2392 }
2393 _ACEOF
2394 rm -f conftest.$ac_objext
2395 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2396 - (eval $ac_compile) 2>conftest.er1
2397 +if { (ac_try="$ac_compile"
2398 +case "(($ac_try" in
2399 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2400 + *) ac_try_echo=$ac_try;;
2401 +esac
2402 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2403 + (eval "$ac_compile") 2>conftest.er1
2404 ac_status=$?
2405 grep -v '^ *+' conftest.er1 >conftest.err
2406 rm -f conftest.er1
2407 cat conftest.err >&5
2408 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2409 (exit $ac_status); } &&
2410 - { ac_try='test -z "$ac_c_werror_flag"
2411 - || test ! -s conftest.err'
2412 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2413 - (eval $ac_try) 2>&5
2414 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
2415 + { (case "(($ac_try" in
2416 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2417 + *) ac_try_echo=$ac_try;;
2418 +esac
2419 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2420 + (eval "$ac_try") 2>&5
2421 ac_status=$?
2422 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2423 (exit $ac_status); }; } &&
2424 { ac_try='test -s conftest.$ac_objext'
2425 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2426 - (eval $ac_try) 2>&5
2427 + { (case "(($ac_try" in
2428 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2429 + *) ac_try_echo=$ac_try;;
2430 +esac
2431 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2432 + (eval "$ac_try") 2>&5
2433 ac_status=$?
2434 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2435 (exit $ac_status); }; }; then
2436 @@ -1910,12 +2470,20 @@
2437 echo "$as_me: failed program was:" >&5
2438 sed 's/^/| /' conftest.$ac_ext >&5
2439
2440 -ac_cv_prog_cc_g=no
2441 +
2442 fi
2443 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2444 +
2445 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2446 +fi
2447 +
2448 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2449 +fi
2450 +
2451 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2452 + ac_c_werror_flag=$ac_save_c_werror_flag
2453 fi
2454 -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
2455 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
2456 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
2457 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
2458 if test "$ac_test_CFLAGS" = set; then
2459 CFLAGS=$ac_save_CFLAGS
2460 elif test $ac_cv_prog_cc_g = yes; then
2461 @@ -1931,12 +2499,12 @@
2462 CFLAGS=
2463 fi
2464 fi
2465 -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
2466 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
2467 -if test "${ac_cv_prog_cc_stdc+set}" = set; then
2468 +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
2469 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
2470 +if test "${ac_cv_prog_cc_c89+set}" = set; then
2471 echo $ECHO_N "(cached) $ECHO_C" >&6
2472 else
2473 - ac_cv_prog_cc_stdc=no
2474 + ac_cv_prog_cc_c89=no
2475 ac_save_CC=$CC
2476 cat >conftest.$ac_ext <<_ACEOF
2477 /* confdefs.h. */
2478 @@ -1970,12 +2538,17 @@
2479 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
2480 function prototypes and stuff, but not '\xHH' hex character constants.
2481 These don't provoke an error unfortunately, instead are silently treated
2482 - as 'x'. The following induces an error, until -std1 is added to get
2483 + as 'x'. The following induces an error, until -std is added to get
2484 proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
2485 array size at least. It's necessary to write '\x00'==0 to get something
2486 - that's true only with -std1. */
2487 + that's true only with -std. */
2488 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
2489
2490 +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
2491 + inside strings and character constants. */
2492 +#define FOO(x) 'x'
2493 +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
2494 +
2495 int test (int i, double x);
2496 struct s1 {int (*f) (int a);};
2497 struct s2 {int (*f) (double a);};
2498 @@ -1990,205 +2563,74 @@
2499 return 0;
2500 }
2501 _ACEOF
2502 -# Don't try gcc -ansi; that turns off useful extensions and
2503 -# breaks some systems' header files.
2504 -# AIX -qlanglvl=ansi
2505 -# Ultrix and OSF/1 -std1
2506 -# HP-UX 10.20 and later -Ae
2507 -# HP-UX older versions -Aa -D_HPUX_SOURCE
2508 -# SVR4 -Xc -D__EXTENSIONS__
2509 -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
2510 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
2511 + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
2512 do
2513 CC="$ac_save_CC $ac_arg"
2514 rm -f conftest.$ac_objext
2515 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2516 - (eval $ac_compile) 2>conftest.er1
2517 +if { (ac_try="$ac_compile"
2518 +case "(($ac_try" in
2519 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2520 + *) ac_try_echo=$ac_try;;
2521 +esac
2522 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2523 + (eval "$ac_compile") 2>conftest.er1
2524 ac_status=$?
2525 grep -v '^ *+' conftest.er1 >conftest.err
2526 rm -f conftest.er1
2527 cat conftest.err >&5
2528 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2529 (exit $ac_status); } &&
2530 - { ac_try='test -z "$ac_c_werror_flag"
2531 - || test ! -s conftest.err'
2532 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2533 - (eval $ac_try) 2>&5
2534 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
2535 + { (case "(($ac_try" in
2536 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2537 + *) ac_try_echo=$ac_try;;
2538 +esac
2539 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2540 + (eval "$ac_try") 2>&5
2541 ac_status=$?
2542 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2543 (exit $ac_status); }; } &&
2544 { ac_try='test -s conftest.$ac_objext'
2545 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2546 - (eval $ac_try) 2>&5
2547 + { (case "(($ac_try" in
2548 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2549 + *) ac_try_echo=$ac_try;;
2550 +esac
2551 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2552 + (eval "$ac_try") 2>&5
2553 ac_status=$?
2554 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2555 (exit $ac_status); }; }; then
2556 - ac_cv_prog_cc_stdc=$ac_arg
2557 -break
2558 + ac_cv_prog_cc_c89=$ac_arg
2559 else
2560 echo "$as_me: failed program was:" >&5
2561 sed 's/^/| /' conftest.$ac_ext >&5
2562
2563 +
2564 fi
2565 -rm -f conftest.err conftest.$ac_objext
2566 +
2567 +rm -f core conftest.err conftest.$ac_objext
2568 + test "x$ac_cv_prog_cc_c89" != "xno" && break
2569 done
2570 -rm -f conftest.$ac_ext conftest.$ac_objext
2571 +rm -f conftest.$ac_ext
2572 CC=$ac_save_CC
2573
2574 fi
2575 -
2576 -case "x$ac_cv_prog_cc_stdc" in
2577 - x|xno)
2578 - echo "$as_me:$LINENO: result: none needed" >&5
2579 -echo "${ECHO_T}none needed" >&6 ;;
2580 +# AC_CACHE_VAL
2581 +case "x$ac_cv_prog_cc_c89" in
2582 + x)
2583 + { echo "$as_me:$LINENO: result: none needed" >&5
2584 +echo "${ECHO_T}none needed" >&6; } ;;
2585 + xno)
2586 + { echo "$as_me:$LINENO: result: unsupported" >&5
2587 +echo "${ECHO_T}unsupported" >&6; } ;;
2588 *)
2589 - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
2590 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
2591 - CC="$CC $ac_cv_prog_cc_stdc" ;;
2592 + CC="$CC $ac_cv_prog_cc_c89"
2593 + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
2594 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
2595 esac
2596
2597 -# Some people use a C++ compiler to compile C. Since we use `exit',
2598 -# in C++ we need to declare it. In case someone uses the same compiler
2599 -# for both compiling C and C++ we need to have the C++ compiler decide
2600 -# the declaration of exit, since it's the most demanding environment.
2601 -cat >conftest.$ac_ext <<_ACEOF
2602 -#ifndef __cplusplus
2603 - choke me
2604 -#endif
2605 -_ACEOF
2606 -rm -f conftest.$ac_objext
2607 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2608 - (eval $ac_compile) 2>conftest.er1
2609 - ac_status=$?
2610 - grep -v '^ *+' conftest.er1 >conftest.err
2611 - rm -f conftest.er1
2612 - cat conftest.err >&5
2613 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2614 - (exit $ac_status); } &&
2615 - { ac_try='test -z "$ac_c_werror_flag"
2616 - || test ! -s conftest.err'
2617 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2618 - (eval $ac_try) 2>&5
2619 - ac_status=$?
2620 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2621 - (exit $ac_status); }; } &&
2622 - { ac_try='test -s conftest.$ac_objext'
2623 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2624 - (eval $ac_try) 2>&5
2625 - ac_status=$?
2626 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2627 - (exit $ac_status); }; }; then
2628 - for ac_declaration in \
2629 - '' \
2630 - 'extern "C" void std::exit (int) throw (); using std::exit;' \
2631 - 'extern "C" void std::exit (int); using std::exit;' \
2632 - 'extern "C" void exit (int) throw ();' \
2633 - 'extern "C" void exit (int);' \
2634 - 'void exit (int);'
2635 -do
2636 - cat >conftest.$ac_ext <<_ACEOF
2637 -/* confdefs.h. */
2638 -_ACEOF
2639 -cat confdefs.h >>conftest.$ac_ext
2640 -cat >>conftest.$ac_ext <<_ACEOF
2641 -/* end confdefs.h. */
2642 -$ac_declaration
2643 -#include <stdlib.h>
2644 -int
2645 -main ()
2646 -{
2647 -exit (42);
2648 - ;
2649 - return 0;
2650 -}
2651 -_ACEOF
2652 -rm -f conftest.$ac_objext
2653 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2654 - (eval $ac_compile) 2>conftest.er1
2655 - ac_status=$?
2656 - grep -v '^ *+' conftest.er1 >conftest.err
2657 - rm -f conftest.er1
2658 - cat conftest.err >&5
2659 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2660 - (exit $ac_status); } &&
2661 - { ac_try='test -z "$ac_c_werror_flag"
2662 - || test ! -s conftest.err'
2663 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2664 - (eval $ac_try) 2>&5
2665 - ac_status=$?
2666 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2667 - (exit $ac_status); }; } &&
2668 - { ac_try='test -s conftest.$ac_objext'
2669 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2670 - (eval $ac_try) 2>&5
2671 - ac_status=$?
2672 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2673 - (exit $ac_status); }; }; then
2674 - :
2675 -else
2676 - echo "$as_me: failed program was:" >&5
2677 -sed 's/^/| /' conftest.$ac_ext >&5
2678
2679 -continue
2680 -fi
2681 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2682 - cat >conftest.$ac_ext <<_ACEOF
2683 -/* confdefs.h. */
2684 -_ACEOF
2685 -cat confdefs.h >>conftest.$ac_ext
2686 -cat >>conftest.$ac_ext <<_ACEOF
2687 -/* end confdefs.h. */
2688 -$ac_declaration
2689 -int
2690 -main ()
2691 -{
2692 -exit (42);
2693 - ;
2694 - return 0;
2695 -}
2696 -_ACEOF
2697 -rm -f conftest.$ac_objext
2698 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2699 - (eval $ac_compile) 2>conftest.er1
2700 - ac_status=$?
2701 - grep -v '^ *+' conftest.er1 >conftest.err
2702 - rm -f conftest.er1
2703 - cat conftest.err >&5
2704 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2705 - (exit $ac_status); } &&
2706 - { ac_try='test -z "$ac_c_werror_flag"
2707 - || test ! -s conftest.err'
2708 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2709 - (eval $ac_try) 2>&5
2710 - ac_status=$?
2711 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2712 - (exit $ac_status); }; } &&
2713 - { ac_try='test -s conftest.$ac_objext'
2714 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2715 - (eval $ac_try) 2>&5
2716 - ac_status=$?
2717 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2718 - (exit $ac_status); }; }; then
2719 - break
2720 -else
2721 - echo "$as_me: failed program was:" >&5
2722 -sed 's/^/| /' conftest.$ac_ext >&5
2723 -
2724 -fi
2725 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2726 -done
2727 -rm -f conftest*
2728 -if test -n "$ac_declaration"; then
2729 - echo '#ifdef __cplusplus' >>confdefs.h
2730 - echo $ac_declaration >>confdefs.h
2731 - echo '#endif' >>confdefs.h
2732 -fi
2733 -
2734 -else
2735 - echo "$as_me: failed program was:" >&5
2736 -sed 's/^/| /' conftest.$ac_ext >&5
2737 -
2738 -fi
2739 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2740 ac_ext=c
2741 ac_cpp='$CPP $CPPFLAGS'
2742 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2743 @@ -2199,10 +2641,9 @@
2744
2745 rlm_ldap_lib_dir=
2746
2747 -# Check whether --with-rlm-ldap-lib-dir or --without-rlm-ldap-lib-dir was given.
2748 +# Check whether --with-rlm-ldap-lib-dir was given.
2749 if test "${with_rlm_ldap_lib_dir+set}" = set; then
2750 - withval="$with_rlm_ldap_lib_dir"
2751 - case "$withval" in
2752 + withval=$with_rlm_ldap_lib_dir; case "$withval" in
2753 no)
2754 { { echo "$as_me:$LINENO: error: Need rlm-ldap-lib-dir" >&5
2755 echo "$as_me: error: Need rlm-ldap-lib-dir" >&2;}
2756 @@ -2215,14 +2656,14 @@
2757 ;;
2758 esac
2759
2760 -fi;
2761 +fi
2762 +
2763
2764 rlm_ldap_include_dir=
2765
2766 -# Check whether --with-rlm-ldap-include-dir or --without-rlm-ldap-include-dir was given.
2767 +# Check whether --with-rlm-ldap-include-dir was given.
2768 if test "${with_rlm_ldap_include_dir+set}" = set; then
2769 - withval="$with_rlm_ldap_include_dir"
2770 - case "$withval" in
2771 + withval=$with_rlm_ldap_include_dir; case "$withval" in
2772 no)
2773 { { echo "$as_me:$LINENO: error: Need rlm-ldap-include-dir" >&5
2774 echo "$as_me: error: Need rlm-ldap-include-dir" >&2;}
2775 @@ -2235,12 +2676,12 @@
2776 ;;
2777 esac
2778
2779 -fi;
2780 +fi
2781 +
2782
2783 - # Check whether --enable-shared or --disable-shared was given.
2784 + # Check whether --enable-shared was given.
2785 if test "${enable_shared+set}" = set; then
2786 - enableval="$enable_shared"
2787 - p=${PACKAGE-default}
2788 + enableval=$enable_shared; p=${PACKAGE-default}
2789 case $enableval in
2790 yes) enable_shared=yes ;;
2791 no) enable_shared=no ;;
2792 @@ -2259,7 +2700,8 @@
2793 esac
2794 else
2795 enable_shared=yes
2796 -fi;
2797 +fi
2798 +
2799
2800
2801 if test "x$enable_shared" = "xno"; then
2802 @@ -2269,22 +2711,22 @@
2803
2804 rlm_ldap_with_threads=yes
2805
2806 -# Check whether --with-threads or --without-threads was given.
2807 +# Check whether --with-threads was given.
2808 if test "${with_threads+set}" = set; then
2809 - withval="$with_threads"
2810 - case "$withval" in
2811 + withval=$with_threads; case "$withval" in
2812 no)
2813 rlm_ldap_with_threads=no
2814 ;;
2815 *)
2816 ;;
2817 esac
2818 -fi;
2819 +fi
2820 +
2821
2822
2823 if test "x$rlm_ldap_with_threads" = "xyes"; then
2824 - echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
2825 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
2826 + { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
2827 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
2828 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
2829 echo $ECHO_N "(cached) $ECHO_C" >&6
2830 else
2831 @@ -2297,40 +2739,52 @@
2832 cat >>conftest.$ac_ext <<_ACEOF
2833 /* end confdefs.h. */
2834
2835 -/* Override any gcc2 internal prototype to avoid an error. */
2836 +/* Override any GCC internal prototype to avoid an error.
2837 + Use char because int might match the return type of a GCC
2838 + builtin and then its argument prototype would still apply. */
2839 #ifdef __cplusplus
2840 extern "C"
2841 #endif
2842 -/* We use char because int might match the return type of a gcc2
2843 - builtin and then its argument prototype would still apply. */
2844 char pthread_create ();
2845 int
2846 main ()
2847 {
2848 -pthread_create ();
2849 +return pthread_create ();
2850 ;
2851 return 0;
2852 }
2853 _ACEOF
2854 rm -f conftest.$ac_objext conftest$ac_exeext
2855 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
2856 - (eval $ac_link) 2>conftest.er1
2857 +if { (ac_try="$ac_link"
2858 +case "(($ac_try" in
2859 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2860 + *) ac_try_echo=$ac_try;;
2861 +esac
2862 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2863 + (eval "$ac_link") 2>conftest.er1
2864 ac_status=$?
2865 grep -v '^ *+' conftest.er1 >conftest.err
2866 rm -f conftest.er1
2867 cat conftest.err >&5
2868 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2869 (exit $ac_status); } &&
2870 - { ac_try='test -z "$ac_c_werror_flag"
2871 - || test ! -s conftest.err'
2872 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2873 - (eval $ac_try) 2>&5
2874 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
2875 + { (case "(($ac_try" in
2876 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2877 + *) ac_try_echo=$ac_try;;
2878 +esac
2879 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2880 + (eval "$ac_try") 2>&5
2881 ac_status=$?
2882 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2883 (exit $ac_status); }; } &&
2884 { ac_try='test -s conftest$ac_exeext'
2885 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2886 - (eval $ac_try) 2>&5
2887 + { (case "(($ac_try" in
2888 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2889 + *) ac_try_echo=$ac_try;;
2890 +esac
2891 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2892 + (eval "$ac_try") 2>&5
2893 ac_status=$?
2894 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2895 (exit $ac_status); }; }; then
2896 @@ -2339,19 +2793,20 @@
2897 echo "$as_me: failed program was:" >&5
2898 sed 's/^/| /' conftest.$ac_ext >&5
2899
2900 -ac_cv_lib_pthread_pthread_create=no
2901 + ac_cv_lib_pthread_pthread_create=no
2902 fi
2903 -rm -f conftest.err conftest.$ac_objext \
2904 +
2905 +rm -f core conftest.err conftest.$ac_objext \
2906 conftest$ac_exeext conftest.$ac_ext
2907 LIBS=$ac_check_lib_save_LIBS
2908 fi
2909 -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
2910 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
2911 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
2912 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
2913 if test $ac_cv_lib_pthread_pthread_create = yes; then
2914 LIBS="-lpthread $LIBS"
2915 else
2916 - echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
2917 -echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6
2918 + { echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
2919 +echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6; }
2920 if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then
2921 echo $ECHO_N "(cached) $ECHO_C" >&6
2922 else
2923 @@ -2365,40 +2820,52 @@
2924 cat >>conftest.$ac_ext <<_ACEOF
2925 /* end confdefs.h. */
2926
2927 -/* Override any gcc2 internal prototype to avoid an error. */
2928 +/* Override any GCC internal prototype to avoid an error.
2929 + Use char because int might match the return type of a GCC
2930 + builtin and then its argument prototype would still apply. */
2931 #ifdef __cplusplus
2932 extern "C"
2933 #endif
2934 -/* We use char because int might match the return type of a gcc2
2935 - builtin and then its argument prototype would still apply. */
2936 char pthread_create ();
2937 int
2938 main ()
2939 {
2940 -pthread_create ();
2941 +return pthread_create ();
2942 ;
2943 return 0;
2944 }
2945 _ACEOF
2946 rm -f conftest.$ac_objext conftest$ac_exeext
2947 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
2948 - (eval $ac_link) 2>conftest.er1
2949 +if { (ac_try="$ac_link"
2950 +case "(($ac_try" in
2951 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2952 + *) ac_try_echo=$ac_try;;
2953 +esac
2954 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2955 + (eval "$ac_link") 2>conftest.er1
2956 ac_status=$?
2957 grep -v '^ *+' conftest.er1 >conftest.err
2958 rm -f conftest.er1
2959 cat conftest.err >&5
2960 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2961 (exit $ac_status); } &&
2962 - { ac_try='test -z "$ac_c_werror_flag"
2963 - || test ! -s conftest.err'
2964 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2965 - (eval $ac_try) 2>&5
2966 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
2967 + { (case "(($ac_try" in
2968 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2969 + *) ac_try_echo=$ac_try;;
2970 +esac
2971 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2972 + (eval "$ac_try") 2>&5
2973 ac_status=$?
2974 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2975 (exit $ac_status); }; } &&
2976 { ac_try='test -s conftest$ac_exeext'
2977 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2978 - (eval $ac_try) 2>&5
2979 + { (case "(($ac_try" in
2980 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2981 + *) ac_try_echo=$ac_try;;
2982 +esac
2983 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2984 + (eval "$ac_try") 2>&5
2985 ac_status=$?
2986 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2987 (exit $ac_status); }; }; then
2988 @@ -2407,14 +2874,15 @@
2989 echo "$as_me: failed program was:" >&5
2990 sed 's/^/| /' conftest.$ac_ext >&5
2991
2992 -ac_cv_lib_c_r_pthread_create=no
2993 + ac_cv_lib_c_r_pthread_create=no
2994 fi
2995 -rm -f conftest.err conftest.$ac_objext \
2996 +
2997 +rm -f core conftest.err conftest.$ac_objext \
2998 conftest$ac_exeext conftest.$ac_ext
2999 LIBS=$ac_check_lib_save_LIBS
3000 fi
3001 -echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5
3002 -echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6
3003 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5
3004 +echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6; }
3005 if test $ac_cv_lib_c_r_pthread_create = yes; then
3006 LIBS="-lc_r $LIBS"
3007 else
3008 @@ -2428,13 +2896,13 @@
3009 fi
3010
3011 smart_try_dir=$rlm_ldap_lib_dir
3012 - if test "x$rlm_ldap_with_threads" = "xyes"; then
3013
3014
3015 -sm_lib_safe=`echo "ldap_r" | sed 'y%./+-%__p_%'`
3016 -sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
3017 -echo "$as_me:$LINENO: checking for ldap_init in -lldap_r" >&5
3018 -echo $ECHO_N "checking for ldap_init in -lldap_r... $ECHO_C" >&6
3019 +
3020 +sm_lib_safe=`echo "sasl" | sed 'y%./+-%__p_%'`
3021 +sm_func_safe=`echo "sasl_encode" | sed 'y%./+-%__p_%'`
3022 +{ echo "$as_me:$LINENO: checking for sasl_encode in -lsasl" >&5
3023 +echo $ECHO_N "checking for sasl_encode in -lsasl... $ECHO_C" >&6; }
3024
3025 old_LIBS="$LIBS"
3026 smart_lib=
3027 @@ -2442,51 +2910,65 @@
3028
3029 if test "x$smart_try_dir" != "x"; then
3030 for try in $smart_try_dir; do
3031 - LIBS="-L$try -lldap_r $old_LIBS"
3032 + LIBS="-L$try -lsasl $old_LIBS"
3033 cat >conftest.$ac_ext <<_ACEOF
3034 /* confdefs.h. */
3035 _ACEOF
3036 cat confdefs.h >>conftest.$ac_ext
3037 cat >>conftest.$ac_ext <<_ACEOF
3038 /* end confdefs.h. */
3039 -extern char ldap_init();
3040 +extern char sasl_encode();
3041 int
3042 main ()
3043 {
3044 - ldap_init()
3045 + sasl_encode()
3046 ;
3047 return 0;
3048 }
3049 _ACEOF
3050 rm -f conftest.$ac_objext conftest$ac_exeext
3051 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3052 - (eval $ac_link) 2>conftest.er1
3053 +if { (ac_try="$ac_link"
3054 +case "(($ac_try" in
3055 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3056 + *) ac_try_echo=$ac_try;;
3057 +esac
3058 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3059 + (eval "$ac_link") 2>conftest.er1
3060 ac_status=$?
3061 grep -v '^ *+' conftest.er1 >conftest.err
3062 rm -f conftest.er1
3063 cat conftest.err >&5
3064 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3065 (exit $ac_status); } &&
3066 - { ac_try='test -z "$ac_c_werror_flag"
3067 - || test ! -s conftest.err'
3068 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3069 - (eval $ac_try) 2>&5
3070 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3071 + { (case "(($ac_try" in
3072 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3073 + *) ac_try_echo=$ac_try;;
3074 +esac
3075 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3076 + (eval "$ac_try") 2>&5
3077 ac_status=$?
3078 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3079 (exit $ac_status); }; } &&
3080 { ac_try='test -s conftest$ac_exeext'
3081 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3082 - (eval $ac_try) 2>&5
3083 + { (case "(($ac_try" in
3084 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3085 + *) ac_try_echo=$ac_try;;
3086 +esac
3087 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3088 + (eval "$ac_try") 2>&5
3089 ac_status=$?
3090 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3091 (exit $ac_status); }; }; then
3092 - smart_lib="-L$try -lldap_r"
3093 + smart_lib="-L$try -lsasl"
3094 else
3095 echo "$as_me: failed program was:" >&5
3096 sed 's/^/| /' conftest.$ac_ext >&5
3097
3098 +
3099 fi
3100 -rm -f conftest.err conftest.$ac_objext \
3101 +
3102 +rm -f core conftest.err conftest.$ac_objext \
3103 conftest$ac_exeext conftest.$ac_ext
3104 if test "x$smart_lib" != "x"; then
3105 break;
3106 @@ -2496,51 +2978,65 @@
3107 fi
3108
3109 if test "x$smart_lib" = "x"; then
3110 - LIBS="-lldap_r $old_LIBS"
3111 + LIBS="-lsasl $old_LIBS"
3112 cat >conftest.$ac_ext <<_ACEOF
3113 /* confdefs.h. */
3114 _ACEOF
3115 cat confdefs.h >>conftest.$ac_ext
3116 cat >>conftest.$ac_ext <<_ACEOF
3117 /* end confdefs.h. */
3118 -extern char ldap_init();
3119 +extern char sasl_encode();
3120 int
3121 main ()
3122 {
3123 - ldap_init()
3124 + sasl_encode()
3125 ;
3126 return 0;
3127 }
3128 _ACEOF
3129 rm -f conftest.$ac_objext conftest$ac_exeext
3130 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3131 - (eval $ac_link) 2>conftest.er1
3132 +if { (ac_try="$ac_link"
3133 +case "(($ac_try" in
3134 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3135 + *) ac_try_echo=$ac_try;;
3136 +esac
3137 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3138 + (eval "$ac_link") 2>conftest.er1
3139 ac_status=$?
3140 grep -v '^ *+' conftest.er1 >conftest.err
3141 rm -f conftest.er1
3142 cat conftest.err >&5
3143 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3144 (exit $ac_status); } &&
3145 - { ac_try='test -z "$ac_c_werror_flag"
3146 - || test ! -s conftest.err'
3147 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3148 - (eval $ac_try) 2>&5
3149 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3150 + { (case "(($ac_try" in
3151 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3152 + *) ac_try_echo=$ac_try;;
3153 +esac
3154 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3155 + (eval "$ac_try") 2>&5
3156 ac_status=$?
3157 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3158 (exit $ac_status); }; } &&
3159 { ac_try='test -s conftest$ac_exeext'
3160 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3161 - (eval $ac_try) 2>&5
3162 + { (case "(($ac_try" in
3163 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3164 + *) ac_try_echo=$ac_try;;
3165 +esac
3166 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3167 + (eval "$ac_try") 2>&5
3168 ac_status=$?
3169 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3170 (exit $ac_status); }; }; then
3171 - smart_lib="-lldap_r"
3172 + smart_lib="-lsasl"
3173 else
3174 echo "$as_me: failed program was:" >&5
3175 sed 's/^/| /' conftest.$ac_ext >&5
3176
3177 +
3178 fi
3179 -rm -f conftest.err conftest.$ac_objext \
3180 +
3181 +rm -f core conftest.err conftest.$ac_objext \
3182 conftest$ac_exeext conftest.$ac_ext
3183 LIBS="$old_LIBS"
3184 fi
3185 @@ -2550,7 +3046,7 @@
3186
3187 if test "x$LOCATE" != "x"; then
3188 DIRS=
3189 - file=libldap_r${libltdl_cv_shlibext}
3190 + file=libsasl${libltdl_cv_shlibext}
3191
3192 for x in `${LOCATE} $file 2>/dev/null`; do
3193 base=`echo $x | sed "s%/${file}%%"`
3194 @@ -2577,7 +3073,7 @@
3195
3196 if test "x$LOCATE" != "x"; then
3197 DIRS=
3198 - file=libldap_r.a
3199 + file=libsasl.a
3200
3201 for x in `${LOCATE} $file 2>/dev/null`; do
3202 base=`echo $x | sed "s%/${file}%%"`
3203 @@ -2602,51 +3098,65 @@
3204
3205
3206 for try in $smart_lib_dir /usr/local/lib /opt/lib; do
3207 - LIBS="-L$try -lldap_r $old_LIBS"
3208 + LIBS="-L$try -lsasl $old_LIBS"
3209 cat >conftest.$ac_ext <<_ACEOF
3210 /* confdefs.h. */
3211 _ACEOF
3212 cat confdefs.h >>conftest.$ac_ext
3213 cat >>conftest.$ac_ext <<_ACEOF
3214 /* end confdefs.h. */
3215 -extern char ldap_init();
3216 +extern char sasl_encode();
3217 int
3218 main ()
3219 {
3220 - ldap_init()
3221 + sasl_encode()
3222 ;
3223 return 0;
3224 }
3225 _ACEOF
3226 rm -f conftest.$ac_objext conftest$ac_exeext
3227 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3228 - (eval $ac_link) 2>conftest.er1
3229 +if { (ac_try="$ac_link"
3230 +case "(($ac_try" in
3231 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3232 + *) ac_try_echo=$ac_try;;
3233 +esac
3234 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3235 + (eval "$ac_link") 2>conftest.er1
3236 ac_status=$?
3237 grep -v '^ *+' conftest.er1 >conftest.err
3238 rm -f conftest.er1
3239 cat conftest.err >&5
3240 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3241 (exit $ac_status); } &&
3242 - { ac_try='test -z "$ac_c_werror_flag"
3243 - || test ! -s conftest.err'
3244 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3245 - (eval $ac_try) 2>&5
3246 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3247 + { (case "(($ac_try" in
3248 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3249 + *) ac_try_echo=$ac_try;;
3250 +esac
3251 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3252 + (eval "$ac_try") 2>&5
3253 ac_status=$?
3254 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3255 (exit $ac_status); }; } &&
3256 { ac_try='test -s conftest$ac_exeext'
3257 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3258 - (eval $ac_try) 2>&5
3259 + { (case "(($ac_try" in
3260 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3261 + *) ac_try_echo=$ac_try;;
3262 +esac
3263 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3264 + (eval "$ac_try") 2>&5
3265 ac_status=$?
3266 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3267 (exit $ac_status); }; }; then
3268 - smart_lib="-L$try -lldap_r"
3269 + smart_lib="-L$try -lsasl"
3270 else
3271 echo "$as_me: failed program was:" >&5
3272 sed 's/^/| /' conftest.$ac_ext >&5
3273
3274 +
3275 fi
3276 -rm -f conftest.err conftest.$ac_objext \
3277 +
3278 +rm -f core conftest.err conftest.$ac_objext \
3279 conftest$ac_exeext conftest.$ac_ext
3280 if test "x$smart_lib" != "x"; then
3281 break;
3282 @@ -2656,26 +3166,22 @@
3283 fi
3284
3285 if test "x$smart_lib" != "x"; then
3286 - echo "$as_me:$LINENO: result: yes" >&5
3287 -echo "${ECHO_T}yes" >&6
3288 + { echo "$as_me:$LINENO: result: yes" >&5
3289 +echo "${ECHO_T}yes" >&6; }
3290 eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
3291 LIBS="$smart_lib $old_LIBS"
3292 SMART_LIBS="$smart_lib $SMART_LIBS"
3293 else
3294 - echo "$as_me:$LINENO: result: no" >&5
3295 -echo "${ECHO_T}no" >&6
3296 + { echo "$as_me:$LINENO: result: no" >&5
3297 +echo "${ECHO_T}no" >&6; }
3298 fi
3299
3300 - if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then
3301 - fail="$fail libldap_r"
3302 - fi
3303 - else
3304
3305
3306 -sm_lib_safe=`echo "ldap" | sed 'y%./+-%__p_%'`
3307 -sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
3308 -echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
3309 -echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6
3310 +sm_lib_safe=`echo "lber" | sed 'y%./+-%__p_%'`
3311 +sm_func_safe=`echo "ber_init" | sed 'y%./+-%__p_%'`
3312 +{ echo "$as_me:$LINENO: checking for ber_init in -llber" >&5
3313 +echo $ECHO_N "checking for ber_init in -llber... $ECHO_C" >&6; }
3314
3315 old_LIBS="$LIBS"
3316 smart_lib=
3317 @@ -2683,51 +3189,65 @@
3318
3319 if test "x$smart_try_dir" != "x"; then
3320 for try in $smart_try_dir; do
3321 - LIBS="-L$try -lldap $old_LIBS"
3322 + LIBS="-L$try -llber $old_LIBS"
3323 cat >conftest.$ac_ext <<_ACEOF
3324 /* confdefs.h. */
3325 _ACEOF
3326 cat confdefs.h >>conftest.$ac_ext
3327 cat >>conftest.$ac_ext <<_ACEOF
3328 /* end confdefs.h. */
3329 -extern char ldap_init();
3330 +extern char ber_init();
3331 int
3332 main ()
3333 {
3334 - ldap_init()
3335 + ber_init()
3336 ;
3337 return 0;
3338 }
3339 _ACEOF
3340 rm -f conftest.$ac_objext conftest$ac_exeext
3341 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3342 - (eval $ac_link) 2>conftest.er1
3343 +if { (ac_try="$ac_link"
3344 +case "(($ac_try" in
3345 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3346 + *) ac_try_echo=$ac_try;;
3347 +esac
3348 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3349 + (eval "$ac_link") 2>conftest.er1
3350 ac_status=$?
3351 grep -v '^ *+' conftest.er1 >conftest.err
3352 rm -f conftest.er1
3353 cat conftest.err >&5
3354 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3355 (exit $ac_status); } &&
3356 - { ac_try='test -z "$ac_c_werror_flag"
3357 - || test ! -s conftest.err'
3358 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3359 - (eval $ac_try) 2>&5
3360 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3361 + { (case "(($ac_try" in
3362 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3363 + *) ac_try_echo=$ac_try;;
3364 +esac
3365 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3366 + (eval "$ac_try") 2>&5
3367 ac_status=$?
3368 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3369 (exit $ac_status); }; } &&
3370 { ac_try='test -s conftest$ac_exeext'
3371 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3372 - (eval $ac_try) 2>&5
3373 + { (case "(($ac_try" in
3374 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3375 + *) ac_try_echo=$ac_try;;
3376 +esac
3377 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3378 + (eval "$ac_try") 2>&5
3379 ac_status=$?
3380 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3381 (exit $ac_status); }; }; then
3382 - smart_lib="-L$try -lldap"
3383 + smart_lib="-L$try -llber"
3384 else
3385 echo "$as_me: failed program was:" >&5
3386 sed 's/^/| /' conftest.$ac_ext >&5
3387
3388 +
3389 fi
3390 -rm -f conftest.err conftest.$ac_objext \
3391 +
3392 +rm -f core conftest.err conftest.$ac_objext \
3393 conftest$ac_exeext conftest.$ac_ext
3394 if test "x$smart_lib" != "x"; then
3395 break;
3396 @@ -2737,51 +3257,65 @@
3397 fi
3398
3399 if test "x$smart_lib" = "x"; then
3400 - LIBS="-lldap $old_LIBS"
3401 + LIBS="-llber $old_LIBS"
3402 cat >conftest.$ac_ext <<_ACEOF
3403 /* confdefs.h. */
3404 _ACEOF
3405 cat confdefs.h >>conftest.$ac_ext
3406 cat >>conftest.$ac_ext <<_ACEOF
3407 /* end confdefs.h. */
3408 -extern char ldap_init();
3409 +extern char ber_init();
3410 int
3411 main ()
3412 {
3413 - ldap_init()
3414 + ber_init()
3415 ;
3416 return 0;
3417 }
3418 _ACEOF
3419 rm -f conftest.$ac_objext conftest$ac_exeext
3420 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3421 - (eval $ac_link) 2>conftest.er1
3422 +if { (ac_try="$ac_link"
3423 +case "(($ac_try" in
3424 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3425 + *) ac_try_echo=$ac_try;;
3426 +esac
3427 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3428 + (eval "$ac_link") 2>conftest.er1
3429 ac_status=$?
3430 grep -v '^ *+' conftest.er1 >conftest.err
3431 rm -f conftest.er1
3432 cat conftest.err >&5
3433 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3434 (exit $ac_status); } &&
3435 - { ac_try='test -z "$ac_c_werror_flag"
3436 - || test ! -s conftest.err'
3437 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3438 - (eval $ac_try) 2>&5
3439 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3440 + { (case "(($ac_try" in
3441 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3442 + *) ac_try_echo=$ac_try;;
3443 +esac
3444 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3445 + (eval "$ac_try") 2>&5
3446 ac_status=$?
3447 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3448 (exit $ac_status); }; } &&
3449 { ac_try='test -s conftest$ac_exeext'
3450 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3451 - (eval $ac_try) 2>&5
3452 + { (case "(($ac_try" in
3453 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3454 + *) ac_try_echo=$ac_try;;
3455 +esac
3456 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3457 + (eval "$ac_try") 2>&5
3458 ac_status=$?
3459 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3460 (exit $ac_status); }; }; then
3461 - smart_lib="-lldap"
3462 + smart_lib="-llber"
3463 else
3464 echo "$as_me: failed program was:" >&5
3465 sed 's/^/| /' conftest.$ac_ext >&5
3466
3467 +
3468 fi
3469 -rm -f conftest.err conftest.$ac_objext \
3470 +
3471 +rm -f core conftest.err conftest.$ac_objext \
3472 conftest$ac_exeext conftest.$ac_ext
3473 LIBS="$old_LIBS"
3474 fi
3475 @@ -2791,7 +3325,7 @@
3476
3477 if test "x$LOCATE" != "x"; then
3478 DIRS=
3479 - file=libldap${libltdl_cv_shlibext}
3480 + file=liblber${libltdl_cv_shlibext}
3481
3482 for x in `${LOCATE} $file 2>/dev/null`; do
3483 base=`echo $x | sed "s%/${file}%%"`
3484 @@ -2818,7 +3352,7 @@
3485
3486 if test "x$LOCATE" != "x"; then
3487 DIRS=
3488 - file=libldap.a
3489 + file=liblber.a
3490
3491 for x in `${LOCATE} $file 2>/dev/null`; do
3492 base=`echo $x | sed "s%/${file}%%"`
3493 @@ -2843,51 +3377,65 @@
3494
3495
3496 for try in $smart_lib_dir /usr/local/lib /opt/lib; do
3497 - LIBS="-L$try -lldap $old_LIBS"
3498 + LIBS="-L$try -llber $old_LIBS"
3499 cat >conftest.$ac_ext <<_ACEOF
3500 /* confdefs.h. */
3501 _ACEOF
3502 cat confdefs.h >>conftest.$ac_ext
3503 cat >>conftest.$ac_ext <<_ACEOF
3504 /* end confdefs.h. */
3505 -extern char ldap_init();
3506 +extern char ber_init();
3507 int
3508 main ()
3509 {
3510 - ldap_init()
3511 + ber_init()
3512 ;
3513 return 0;
3514 }
3515 _ACEOF
3516 rm -f conftest.$ac_objext conftest$ac_exeext
3517 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3518 - (eval $ac_link) 2>conftest.er1
3519 +if { (ac_try="$ac_link"
3520 +case "(($ac_try" in
3521 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3522 + *) ac_try_echo=$ac_try;;
3523 +esac
3524 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3525 + (eval "$ac_link") 2>conftest.er1
3526 ac_status=$?
3527 grep -v '^ *+' conftest.er1 >conftest.err
3528 rm -f conftest.er1
3529 cat conftest.err >&5
3530 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3531 (exit $ac_status); } &&
3532 - { ac_try='test -z "$ac_c_werror_flag"
3533 - || test ! -s conftest.err'
3534 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3535 - (eval $ac_try) 2>&5
3536 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3537 + { (case "(($ac_try" in
3538 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3539 + *) ac_try_echo=$ac_try;;
3540 +esac
3541 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3542 + (eval "$ac_try") 2>&5
3543 ac_status=$?
3544 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3545 (exit $ac_status); }; } &&
3546 { ac_try='test -s conftest$ac_exeext'
3547 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3548 - (eval $ac_try) 2>&5
3549 + { (case "(($ac_try" in
3550 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3551 + *) ac_try_echo=$ac_try;;
3552 +esac
3553 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3554 + (eval "$ac_try") 2>&5
3555 ac_status=$?
3556 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3557 (exit $ac_status); }; }; then
3558 - smart_lib="-L$try -lldap"
3559 + smart_lib="-L$try -llber"
3560 else
3561 echo "$as_me: failed program was:" >&5
3562 sed 's/^/| /' conftest.$ac_ext >&5
3563
3564 +
3565 fi
3566 -rm -f conftest.err conftest.$ac_objext \
3567 +
3568 +rm -f core conftest.err conftest.$ac_objext \
3569 conftest$ac_exeext conftest.$ac_ext
3570 if test "x$smart_lib" != "x"; then
3571 break;
3572 @@ -2897,144 +3445,168 @@
3573 fi
3574
3575 if test "x$smart_lib" != "x"; then
3576 - echo "$as_me:$LINENO: result: yes" >&5
3577 -echo "${ECHO_T}yes" >&6
3578 + { echo "$as_me:$LINENO: result: yes" >&5
3579 +echo "${ECHO_T}yes" >&6; }
3580 eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
3581 LIBS="$smart_lib $old_LIBS"
3582 SMART_LIBS="$smart_lib $SMART_LIBS"
3583 else
3584 - echo "$as_me:$LINENO: result: no" >&5
3585 -echo "${ECHO_T}no" >&6
3586 + { echo "$as_me:$LINENO: result: no" >&5
3587 +echo "${ECHO_T}no" >&6; }
3588 fi
3589
3590 - if test "x$ac_cv_lib_ldap_ldap_init" != "xyes"; then
3591 - fail="$fail libldap"
3592 - fi
3593 - fi
3594
3595 -
3596 - smart_try_dir=$rlm_ldap_include_dir
3597 + if test "x$rlm_ldap_with_threads" = "xyes"; then
3598
3599
3600 -ac_safe=`echo "ldap.h" | sed 'y%./+-%__pm%'`
3601 -echo "$as_me:$LINENO: checking for ldap.h" >&5
3602 -echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6
3603 +sm_lib_safe=`echo "ldap_r" | sed 'y%./+-%__p_%'`
3604 +sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
3605 +{ echo "$as_me:$LINENO: checking for ldap_init in -lldap_r" >&5
3606 +echo $ECHO_N "checking for ldap_init in -lldap_r... $ECHO_C" >&6; }
3607
3608 -old_CFLAGS="$CFLAGS"
3609 -smart_include=
3610 -smart_include_dir=
3611 +old_LIBS="$LIBS"
3612 +smart_lib=
3613 +smart_lib_dir=
3614
3615 if test "x$smart_try_dir" != "x"; then
3616 for try in $smart_try_dir; do
3617 - CFLAGS="$old_CFLAGS -I$try"
3618 + LIBS="-L$try -lldap_r $old_LIBS"
3619 cat >conftest.$ac_ext <<_ACEOF
3620 /* confdefs.h. */
3621 _ACEOF
3622 cat confdefs.h >>conftest.$ac_ext
3623 cat >>conftest.$ac_ext <<_ACEOF
3624 /* end confdefs.h. */
3625 -
3626 - #include <ldap.h>
3627 +extern char ldap_init();
3628 int
3629 main ()
3630 {
3631 - int a = 1;
3632 + ldap_init()
3633 ;
3634 return 0;
3635 }
3636 _ACEOF
3637 -rm -f conftest.$ac_objext
3638 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3639 - (eval $ac_compile) 2>conftest.er1
3640 +rm -f conftest.$ac_objext conftest$ac_exeext
3641 +if { (ac_try="$ac_link"
3642 +case "(($ac_try" in
3643 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3644 + *) ac_try_echo=$ac_try;;
3645 +esac
3646 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3647 + (eval "$ac_link") 2>conftest.er1
3648 ac_status=$?
3649 grep -v '^ *+' conftest.er1 >conftest.err
3650 rm -f conftest.er1
3651 cat conftest.err >&5
3652 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3653 (exit $ac_status); } &&
3654 - { ac_try='test -z "$ac_c_werror_flag"
3655 - || test ! -s conftest.err'
3656 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3657 - (eval $ac_try) 2>&5
3658 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3659 + { (case "(($ac_try" in
3660 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3661 + *) ac_try_echo=$ac_try;;
3662 +esac
3663 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3664 + (eval "$ac_try") 2>&5
3665 ac_status=$?
3666 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3667 (exit $ac_status); }; } &&
3668 - { ac_try='test -s conftest.$ac_objext'
3669 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3670 - (eval $ac_try) 2>&5
3671 + { ac_try='test -s conftest$ac_exeext'
3672 + { (case "(($ac_try" in
3673 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3674 + *) ac_try_echo=$ac_try;;
3675 +esac
3676 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3677 + (eval "$ac_try") 2>&5
3678 ac_status=$?
3679 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3680 (exit $ac_status); }; }; then
3681 - smart_include="-I$try"
3682 + smart_lib="-L$try -lldap_r"
3683 else
3684 echo "$as_me: failed program was:" >&5
3685 sed 's/^/| /' conftest.$ac_ext >&5
3686
3687 -smart_include=
3688 +
3689 fi
3690 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3691 - if test "x$smart_include" != "x"; then
3692 +
3693 +rm -f core conftest.err conftest.$ac_objext \
3694 + conftest$ac_exeext conftest.$ac_ext
3695 + if test "x$smart_lib" != "x"; then
3696 break;
3697 fi
3698 done
3699 - CFLAGS="$old_CFLAGS"
3700 + LIBS="$old_LIBS"
3701 fi
3702
3703 -if test "x$smart_include" = "x"; then
3704 +if test "x$smart_lib" = "x"; then
3705 + LIBS="-lldap_r $old_LIBS"
3706 cat >conftest.$ac_ext <<_ACEOF
3707 /* confdefs.h. */
3708 _ACEOF
3709 cat confdefs.h >>conftest.$ac_ext
3710 cat >>conftest.$ac_ext <<_ACEOF
3711 /* end confdefs.h. */
3712 -
3713 - #include <ldap.h>
3714 +extern char ldap_init();
3715 int
3716 main ()
3717 {
3718 - int a = 1;
3719 + ldap_init()
3720 ;
3721 return 0;
3722 }
3723 _ACEOF
3724 -rm -f conftest.$ac_objext
3725 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3726 - (eval $ac_compile) 2>conftest.er1
3727 +rm -f conftest.$ac_objext conftest$ac_exeext
3728 +if { (ac_try="$ac_link"
3729 +case "(($ac_try" in
3730 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3731 + *) ac_try_echo=$ac_try;;
3732 +esac
3733 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3734 + (eval "$ac_link") 2>conftest.er1
3735 ac_status=$?
3736 grep -v '^ *+' conftest.er1 >conftest.err
3737 rm -f conftest.er1
3738 cat conftest.err >&5
3739 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3740 (exit $ac_status); } &&
3741 - { ac_try='test -z "$ac_c_werror_flag"
3742 - || test ! -s conftest.err'
3743 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3744 - (eval $ac_try) 2>&5
3745 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3746 + { (case "(($ac_try" in
3747 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3748 + *) ac_try_echo=$ac_try;;
3749 +esac
3750 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3751 + (eval "$ac_try") 2>&5
3752 ac_status=$?
3753 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3754 (exit $ac_status); }; } &&
3755 - { ac_try='test -s conftest.$ac_objext'
3756 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3757 - (eval $ac_try) 2>&5
3758 + { ac_try='test -s conftest$ac_exeext'
3759 + { (case "(($ac_try" in
3760 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3761 + *) ac_try_echo=$ac_try;;
3762 +esac
3763 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3764 + (eval "$ac_try") 2>&5
3765 ac_status=$?
3766 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3767 (exit $ac_status); }; }; then
3768 - smart_include=" "
3769 + smart_lib="-lldap_r"
3770 else
3771 echo "$as_me: failed program was:" >&5
3772 sed 's/^/| /' conftest.$ac_ext >&5
3773
3774 -smart_include=
3775 +
3776 fi
3777 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3778 +
3779 +rm -f core conftest.err conftest.$ac_objext \
3780 + conftest$ac_exeext conftest.$ac_ext
3781 + LIBS="$old_LIBS"
3782 fi
3783
3784 -if test "x$smart_include" = "x"; then
3785 +if test "x$smart_lib" = "x"; then
3786
3787
3788 if test "x$LOCATE" != "x"; then
3789 DIRS=
3790 - file=ldap.h
3791 + file=libldap_r${libltdl_cv_shlibext}
3792
3793 for x in `${LOCATE} $file 2>/dev/null`; do
3794 base=`echo $x | sed "s%/${file}%%"`
3795 @@ -3048,90 +3620,669 @@
3796 continue
3797 fi
3798
3799 - already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}`
3800 + already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
3801 if test "x$already" = "x"; then
3802 DIRS="$DIRS $dir"
3803 fi
3804 done
3805 fi
3806
3807 -eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
3808 +eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
3809
3810
3811 - for try in $smart_include_dir /usr/local/include /opt/include; do
3812 - CFLAGS="$old_CFLAGS -I$try"
3813 +
3814 +if test "x$LOCATE" != "x"; then
3815 + DIRS=
3816 + file=libldap_r.a
3817 +
3818 + for x in `${LOCATE} $file 2>/dev/null`; do
3819 + base=`echo $x | sed "s%/${file}%%"`
3820 + if test "x$x" = "x$base"; then
3821 + continue;
3822 + fi
3823 +
3824 + dir=`${DIRNAME} $x 2>/dev/null`
3825 + exclude=`echo ${dir} | ${GREP} /home`
3826 + if test "x$exclude" != "x"; then
3827 + continue
3828 + fi
3829 +
3830 + already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
3831 + if test "x$already" = "x"; then
3832 + DIRS="$DIRS $dir"
3833 + fi
3834 + done
3835 +fi
3836 +
3837 +eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
3838 +
3839 +
3840 + for try in $smart_lib_dir /usr/local/lib /opt/lib; do
3841 + LIBS="-L$try -lldap_r $old_LIBS"
3842 cat >conftest.$ac_ext <<_ACEOF
3843 /* confdefs.h. */
3844 _ACEOF
3845 cat confdefs.h >>conftest.$ac_ext
3846 cat >>conftest.$ac_ext <<_ACEOF
3847 /* end confdefs.h. */
3848 -
3849 - #include <ldap.h>
3850 +extern char ldap_init();
3851 int
3852 main ()
3853 {
3854 - int a = 1;
3855 + ldap_init()
3856 ;
3857 return 0;
3858 }
3859 _ACEOF
3860 -rm -f conftest.$ac_objext
3861 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3862 - (eval $ac_compile) 2>conftest.er1
3863 +rm -f conftest.$ac_objext conftest$ac_exeext
3864 +if { (ac_try="$ac_link"
3865 +case "(($ac_try" in
3866 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3867 + *) ac_try_echo=$ac_try;;
3868 +esac
3869 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3870 + (eval "$ac_link") 2>conftest.er1
3871 ac_status=$?
3872 grep -v '^ *+' conftest.er1 >conftest.err
3873 rm -f conftest.er1
3874 cat conftest.err >&5
3875 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3876 (exit $ac_status); } &&
3877 - { ac_try='test -z "$ac_c_werror_flag"
3878 - || test ! -s conftest.err'
3879 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3880 - (eval $ac_try) 2>&5
3881 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3882 + { (case "(($ac_try" in
3883 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3884 + *) ac_try_echo=$ac_try;;
3885 +esac
3886 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3887 + (eval "$ac_try") 2>&5
3888 ac_status=$?
3889 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3890 (exit $ac_status); }; } &&
3891 - { ac_try='test -s conftest.$ac_objext'
3892 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3893 - (eval $ac_try) 2>&5
3894 + { ac_try='test -s conftest$ac_exeext'
3895 + { (case "(($ac_try" in
3896 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3897 + *) ac_try_echo=$ac_try;;
3898 +esac
3899 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3900 + (eval "$ac_try") 2>&5
3901 ac_status=$?
3902 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3903 (exit $ac_status); }; }; then
3904 - smart_include="-I$try"
3905 + smart_lib="-L$try -lldap_r"
3906 else
3907 echo "$as_me: failed program was:" >&5
3908 sed 's/^/| /' conftest.$ac_ext >&5
3909
3910 -smart_include=
3911 +
3912 fi
3913 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3914 - if test "x$smart_include" != "x"; then
3915 +
3916 +rm -f core conftest.err conftest.$ac_objext \
3917 + conftest$ac_exeext conftest.$ac_ext
3918 + if test "x$smart_lib" != "x"; then
3919 break;
3920 fi
3921 done
3922 - CFLAGS="$old_CFLAGS"
3923 + LIBS="$old_LIBS"
3924 fi
3925
3926 -if test "x$smart_include" != "x"; then
3927 - echo "$as_me:$LINENO: result: yes" >&5
3928 -echo "${ECHO_T}yes" >&6
3929 - eval "ac_cv_header_$ac_safe=yes"
3930 - CFLAGS="$old_CFLAGS $smart_include"
3931 - SMART_CFLAGS="$SMART_CFLAGS $smart_include"
3932 +if test "x$smart_lib" != "x"; then
3933 + { echo "$as_me:$LINENO: result: yes" >&5
3934 +echo "${ECHO_T}yes" >&6; }
3935 + eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
3936 + LIBS="$smart_lib $old_LIBS"
3937 + SMART_LIBS="$smart_lib $SMART_LIBS"
3938 else
3939 - echo "$as_me:$LINENO: result: no" >&5
3940 -echo "${ECHO_T}no" >&6
3941 + { echo "$as_me:$LINENO: result: no" >&5
3942 +echo "${ECHO_T}no" >&6; }
3943 fi
3944
3945 - if test "$ac_cv_header_ldap_h" != "yes"; then
3946 - fail="$fail ldap.h"
3947 - fi
3948 -
3949 -
3950 + if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then
3951 + fail="$fail libldap_r"
3952 + fi
3953 + else
3954 +
3955 +
3956 +sm_lib_safe=`echo "ldap" | sed 'y%./+-%__p_%'`
3957 +sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
3958 +{ echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
3959 +echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6; }
3960 +
3961 +old_LIBS="$LIBS"
3962 +smart_lib=
3963 +smart_lib_dir=
3964 +
3965 +if test "x$smart_try_dir" != "x"; then
3966 + for try in $smart_try_dir; do
3967 + LIBS="-L$try -lldap $old_LIBS"
3968 + cat >conftest.$ac_ext <<_ACEOF
3969 +/* confdefs.h. */
3970 +_ACEOF
3971 +cat confdefs.h >>conftest.$ac_ext
3972 +cat >>conftest.$ac_ext <<_ACEOF
3973 +/* end confdefs.h. */
3974 +extern char ldap_init();
3975 +int
3976 +main ()
3977 +{
3978 + ldap_init()
3979 + ;
3980 + return 0;
3981 +}
3982 +_ACEOF
3983 +rm -f conftest.$ac_objext conftest$ac_exeext
3984 +if { (ac_try="$ac_link"
3985 +case "(($ac_try" in
3986 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3987 + *) ac_try_echo=$ac_try;;
3988 +esac
3989 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3990 + (eval "$ac_link") 2>conftest.er1
3991 + ac_status=$?
3992 + grep -v '^ *+' conftest.er1 >conftest.err
3993 + rm -f conftest.er1
3994 + cat conftest.err >&5
3995 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3996 + (exit $ac_status); } &&
3997 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3998 + { (case "(($ac_try" in
3999 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4000 + *) ac_try_echo=$ac_try;;
4001 +esac
4002 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4003 + (eval "$ac_try") 2>&5
4004 + ac_status=$?
4005 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4006 + (exit $ac_status); }; } &&
4007 + { ac_try='test -s conftest$ac_exeext'
4008 + { (case "(($ac_try" in
4009 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4010 + *) ac_try_echo=$ac_try;;
4011 +esac
4012 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4013 + (eval "$ac_try") 2>&5
4014 + ac_status=$?
4015 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4016 + (exit $ac_status); }; }; then
4017 + smart_lib="-L$try -lldap"
4018 +else
4019 + echo "$as_me: failed program was:" >&5
4020 +sed 's/^/| /' conftest.$ac_ext >&5
4021 +
4022 +
4023 +fi
4024 +
4025 +rm -f core conftest.err conftest.$ac_objext \
4026 + conftest$ac_exeext conftest.$ac_ext
4027 + if test "x$smart_lib" != "x"; then
4028 + break;
4029 + fi
4030 + done
4031 + LIBS="$old_LIBS"
4032 +fi
4033 +
4034 +if test "x$smart_lib" = "x"; then
4035 + LIBS="-lldap $old_LIBS"
4036 + cat >conftest.$ac_ext <<_ACEOF
4037 +/* confdefs.h. */
4038 +_ACEOF
4039 +cat confdefs.h >>conftest.$ac_ext
4040 +cat >>conftest.$ac_ext <<_ACEOF
4041 +/* end confdefs.h. */
4042 +extern char ldap_init();
4043 +int
4044 +main ()
4045 +{
4046 + ldap_init()
4047 + ;
4048 + return 0;
4049 +}
4050 +_ACEOF
4051 +rm -f conftest.$ac_objext conftest$ac_exeext
4052 +if { (ac_try="$ac_link"
4053 +case "(($ac_try" in
4054 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4055 + *) ac_try_echo=$ac_try;;
4056 +esac
4057 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4058 + (eval "$ac_link") 2>conftest.er1
4059 + ac_status=$?
4060 + grep -v '^ *+' conftest.er1 >conftest.err
4061 + rm -f conftest.er1
4062 + cat conftest.err >&5
4063 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4064 + (exit $ac_status); } &&
4065 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4066 + { (case "(($ac_try" in
4067 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4068 + *) ac_try_echo=$ac_try;;
4069 +esac
4070 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4071 + (eval "$ac_try") 2>&5
4072 + ac_status=$?
4073 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4074 + (exit $ac_status); }; } &&
4075 + { ac_try='test -s conftest$ac_exeext'
4076 + { (case "(($ac_try" in
4077 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4078 + *) ac_try_echo=$ac_try;;
4079 +esac
4080 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4081 + (eval "$ac_try") 2>&5
4082 + ac_status=$?
4083 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4084 + (exit $ac_status); }; }; then
4085 + smart_lib="-lldap"
4086 +else
4087 + echo "$as_me: failed program was:" >&5
4088 +sed 's/^/| /' conftest.$ac_ext >&5
4089 +
4090 +
4091 +fi
4092 +
4093 +rm -f core conftest.err conftest.$ac_objext \
4094 + conftest$ac_exeext conftest.$ac_ext
4095 + LIBS="$old_LIBS"
4096 +fi
4097 +
4098 +if test "x$smart_lib" = "x"; then
4099 +
4100 +
4101 +if test "x$LOCATE" != "x"; then
4102 + DIRS=
4103 + file=libldap${libltdl_cv_shlibext}
4104 +
4105 + for x in `${LOCATE} $file 2>/dev/null`; do
4106 + base=`echo $x | sed "s%/${file}%%"`
4107 + if test "x$x" = "x$base"; then
4108 + continue;
4109 + fi
4110 +
4111 + dir=`${DIRNAME} $x 2>/dev/null`
4112 + exclude=`echo ${dir} | ${GREP} /home`
4113 + if test "x$exclude" != "x"; then
4114 + continue
4115 + fi
4116 +
4117 + already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
4118 + if test "x$already" = "x"; then
4119 + DIRS="$DIRS $dir"
4120 + fi
4121 + done
4122 +fi
4123 +
4124 +eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
4125 +
4126 +
4127 +
4128 +if test "x$LOCATE" != "x"; then
4129 + DIRS=
4130 + file=libldap.a
4131 +
4132 + for x in `${LOCATE} $file 2>/dev/null`; do
4133 + base=`echo $x | sed "s%/${file}%%"`
4134 + if test "x$x" = "x$base"; then
4135 + continue;
4136 + fi
4137 +
4138 + dir=`${DIRNAME} $x 2>/dev/null`
4139 + exclude=`echo ${dir} | ${GREP} /home`
4140 + if test "x$exclude" != "x"; then
4141 + continue
4142 + fi
4143 +
4144 + already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
4145 + if test "x$already" = "x"; then
4146 + DIRS="$DIRS $dir"
4147 + fi
4148 + done
4149 +fi
4150 +
4151 +eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
4152 +
4153 +
4154 + for try in $smart_lib_dir /usr/local/lib /opt/lib; do
4155 + LIBS="-L$try -lldap $old_LIBS"
4156 + cat >conftest.$ac_ext <<_ACEOF
4157 +/* confdefs.h. */
4158 +_ACEOF
4159 +cat confdefs.h >>conftest.$ac_ext
4160 +cat >>conftest.$ac_ext <<_ACEOF
4161 +/* end confdefs.h. */
4162 +extern char ldap_init();
4163 +int
4164 +main ()
4165 +{
4166 + ldap_init()
4167 + ;
4168 + return 0;
4169 +}
4170 +_ACEOF
4171 +rm -f conftest.$ac_objext conftest$ac_exeext
4172 +if { (ac_try="$ac_link"
4173 +case "(($ac_try" in
4174 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4175 + *) ac_try_echo=$ac_try;;
4176 +esac
4177 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4178 + (eval "$ac_link") 2>conftest.er1
4179 + ac_status=$?
4180 + grep -v '^ *+' conftest.er1 >conftest.err
4181 + rm -f conftest.er1
4182 + cat conftest.err >&5
4183 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4184 + (exit $ac_status); } &&
4185 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4186 + { (case "(($ac_try" in
4187 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4188 + *) ac_try_echo=$ac_try;;
4189 +esac
4190 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4191 + (eval "$ac_try") 2>&5
4192 + ac_status=$?
4193 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4194 + (exit $ac_status); }; } &&
4195 + { ac_try='test -s conftest$ac_exeext'
4196 + { (case "(($ac_try" in
4197 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4198 + *) ac_try_echo=$ac_try;;
4199 +esac
4200 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4201 + (eval "$ac_try") 2>&5
4202 + ac_status=$?
4203 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4204 + (exit $ac_status); }; }; then
4205 + smart_lib="-L$try -lldap"
4206 +else
4207 + echo "$as_me: failed program was:" >&5
4208 +sed 's/^/| /' conftest.$ac_ext >&5
4209 +
4210 +
4211 +fi
4212 +
4213 +rm -f core conftest.err conftest.$ac_objext \
4214 + conftest$ac_exeext conftest.$ac_ext
4215 + if test "x$smart_lib" != "x"; then
4216 + break;
4217 + fi
4218 + done
4219 + LIBS="$old_LIBS"
4220 +fi
4221 +
4222 +if test "x$smart_lib" != "x"; then
4223 + { echo "$as_me:$LINENO: result: yes" >&5
4224 +echo "${ECHO_T}yes" >&6; }
4225 + eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
4226 + LIBS="$smart_lib $old_LIBS"
4227 + SMART_LIBS="$smart_lib $SMART_LIBS"
4228 +else
4229 + { echo "$as_me:$LINENO: result: no" >&5
4230 +echo "${ECHO_T}no" >&6; }
4231 +fi
4232 +
4233 + if test "x$ac_cv_lib_ldap_ldap_init" != "xyes"; then
4234 + fail="$fail libldap"
4235 + fi
4236 + fi
4237 +
4238 +
4239 + smart_try_dir=$rlm_ldap_include_dir
4240 +
4241 +
4242 +ac_safe=`echo "ldap.h" | sed 'y%./+-%__pm%'`
4243 +{ echo "$as_me:$LINENO: checking for ldap.h" >&5
4244 +echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; }
4245 +
4246 +old_CFLAGS="$CFLAGS"
4247 +smart_include=
4248 +smart_include_dir=
4249 +
4250 +if test "x$smart_try_dir" != "x"; then
4251 + for try in $smart_try_dir; do
4252 + CFLAGS="$old_CFLAGS -I$try"
4253 + cat >conftest.$ac_ext <<_ACEOF
4254 +/* confdefs.h. */
4255 +_ACEOF
4256 +cat confdefs.h >>conftest.$ac_ext
4257 +cat >>conftest.$ac_ext <<_ACEOF
4258 +/* end confdefs.h. */
4259 +
4260 + #include <ldap.h>
4261 +int
4262 +main ()
4263 +{
4264 + int a = 1;
4265 + ;
4266 + return 0;
4267 +}
4268 +_ACEOF
4269 +rm -f conftest.$ac_objext
4270 +if { (ac_try="$ac_compile"
4271 +case "(($ac_try" in
4272 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4273 + *) ac_try_echo=$ac_try;;
4274 +esac
4275 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4276 + (eval "$ac_compile") 2>conftest.er1
4277 + ac_status=$?
4278 + grep -v '^ *+' conftest.er1 >conftest.err
4279 + rm -f conftest.er1
4280 + cat conftest.err >&5
4281 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4282 + (exit $ac_status); } &&
4283 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4284 + { (case "(($ac_try" in
4285 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4286 + *) ac_try_echo=$ac_try;;
4287 +esac
4288 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4289 + (eval "$ac_try") 2>&5
4290 + ac_status=$?
4291 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4292 + (exit $ac_status); }; } &&
4293 + { ac_try='test -s conftest.$ac_objext'
4294 + { (case "(($ac_try" in
4295 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4296 + *) ac_try_echo=$ac_try;;
4297 +esac
4298 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4299 + (eval "$ac_try") 2>&5
4300 + ac_status=$?
4301 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4302 + (exit $ac_status); }; }; then
4303 + smart_include="-I$try"
4304 +else
4305 + echo "$as_me: failed program was:" >&5
4306 +sed 's/^/| /' conftest.$ac_ext >&5
4307 +
4308 + smart_include=
4309 +fi
4310 +
4311 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4312 + if test "x$smart_include" != "x"; then
4313 + break;
4314 + fi
4315 + done
4316 + CFLAGS="$old_CFLAGS"
4317 +fi
4318 +
4319 +if test "x$smart_include" = "x"; then
4320 + cat >conftest.$ac_ext <<_ACEOF
4321 +/* confdefs.h. */
4322 +_ACEOF
4323 +cat confdefs.h >>conftest.$ac_ext
4324 +cat >>conftest.$ac_ext <<_ACEOF
4325 +/* end confdefs.h. */
4326 +
4327 + #include <ldap.h>
4328 +int
4329 +main ()
4330 +{
4331 + int a = 1;
4332 + ;
4333 + return 0;
4334 +}
4335 +_ACEOF
4336 +rm -f conftest.$ac_objext
4337 +if { (ac_try="$ac_compile"
4338 +case "(($ac_try" in
4339 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4340 + *) ac_try_echo=$ac_try;;
4341 +esac
4342 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4343 + (eval "$ac_compile") 2>conftest.er1
4344 + ac_status=$?
4345 + grep -v '^ *+' conftest.er1 >conftest.err
4346 + rm -f conftest.er1
4347 + cat conftest.err >&5
4348 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4349 + (exit $ac_status); } &&
4350 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4351 + { (case "(($ac_try" in
4352 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4353 + *) ac_try_echo=$ac_try;;
4354 +esac
4355 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4356 + (eval "$ac_try") 2>&5
4357 + ac_status=$?
4358 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4359 + (exit $ac_status); }; } &&
4360 + { ac_try='test -s conftest.$ac_objext'
4361 + { (case "(($ac_try" in
4362 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4363 + *) ac_try_echo=$ac_try;;
4364 +esac
4365 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4366 + (eval "$ac_try") 2>&5
4367 + ac_status=$?
4368 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4369 + (exit $ac_status); }; }; then
4370 + smart_include=" "
4371 +else
4372 + echo "$as_me: failed program was:" >&5
4373 +sed 's/^/| /' conftest.$ac_ext >&5
4374 +
4375 + smart_include=
4376 +fi
4377 +
4378 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4379 +fi
4380 +
4381 +if test "x$smart_include" = "x"; then
4382 +
4383 +
4384 +if test "x$LOCATE" != "x"; then
4385 + DIRS=
4386 + file=ldap.h
4387 +
4388 + for x in `${LOCATE} $file 2>/dev/null`; do
4389 + base=`echo $x | sed "s%/${file}%%"`
4390 + if test "x$x" = "x$base"; then
4391 + continue;
4392 + fi
4393 +
4394 + dir=`${DIRNAME} $x 2>/dev/null`
4395 + exclude=`echo ${dir} | ${GREP} /home`
4396 + if test "x$exclude" != "x"; then
4397 + continue
4398 + fi
4399 +
4400 + already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}`
4401 + if test "x$already" = "x"; then
4402 + DIRS="$DIRS $dir"
4403 + fi
4404 + done
4405 +fi
4406 +
4407 +eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
4408 +
4409 +
4410 + for try in $smart_include_dir /usr/local/include /opt/include; do
4411 + CFLAGS="$old_CFLAGS -I$try"
4412 + cat >conftest.$ac_ext <<_ACEOF
4413 +/* confdefs.h. */
4414 +_ACEOF
4415 +cat confdefs.h >>conftest.$ac_ext
4416 +cat >>conftest.$ac_ext <<_ACEOF
4417 +/* end confdefs.h. */
4418 +
4419 + #include <ldap.h>
4420 +int
4421 +main ()
4422 +{
4423 + int a = 1;
4424 + ;
4425 + return 0;
4426 +}
4427 +_ACEOF
4428 +rm -f conftest.$ac_objext
4429 +if { (ac_try="$ac_compile"
4430 +case "(($ac_try" in
4431 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4432 + *) ac_try_echo=$ac_try;;
4433 +esac
4434 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4435 + (eval "$ac_compile") 2>conftest.er1
4436 + ac_status=$?
4437 + grep -v '^ *+' conftest.er1 >conftest.err
4438 + rm -f conftest.er1
4439 + cat conftest.err >&5
4440 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4441 + (exit $ac_status); } &&
4442 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4443 + { (case "(($ac_try" in
4444 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4445 + *) ac_try_echo=$ac_try;;
4446 +esac
4447 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4448 + (eval "$ac_try") 2>&5
4449 + ac_status=$?
4450 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4451 + (exit $ac_status); }; } &&
4452 + { ac_try='test -s conftest.$ac_objext'
4453 + { (case "(($ac_try" in
4454 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4455 + *) ac_try_echo=$ac_try;;
4456 +esac
4457 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4458 + (eval "$ac_try") 2>&5
4459 + ac_status=$?
4460 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4461 + (exit $ac_status); }; }; then
4462 + smart_include="-I$try"
4463 +else
4464 + echo "$as_me: failed program was:" >&5
4465 +sed 's/^/| /' conftest.$ac_ext >&5
4466 +
4467 + smart_include=
4468 +fi
4469 +
4470 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4471 + if test "x$smart_include" != "x"; then
4472 + break;
4473 + fi
4474 + done
4475 + CFLAGS="$old_CFLAGS"
4476 +fi
4477 +
4478 +if test "x$smart_include" != "x"; then
4479 + { echo "$as_me:$LINENO: result: yes" >&5
4480 +echo "${ECHO_T}yes" >&6; }
4481 + eval "ac_cv_header_$ac_safe=yes"
4482 + CFLAGS="$old_CFLAGS $smart_include"
4483 + SMART_CFLAGS="$SMART_CFLAGS $smart_include"
4484 +else
4485 + { echo "$as_me:$LINENO: result: no" >&5
4486 +echo "${ECHO_T}no" >&6; }
4487 +fi
4488 +
4489 + if test "$ac_cv_header_ldap_h" != "yes"; then
4490 + fail="$fail ldap.h"
4491 + fi
4492 +
4493 +
4494 if test "x$fail" = "x"; then
4495 - echo "$as_me:$LINENO: checking for ldap_start_tls_s" >&5
4496 -echo $ECHO_N "checking for ldap_start_tls_s... $ECHO_C" >&6
4497 + { echo "$as_me:$LINENO: checking for ldap_start_tls_s" >&5
4498 +echo $ECHO_N "checking for ldap_start_tls_s... $ECHO_C" >&6; }
4499 if test "${ac_cv_func_ldap_start_tls_s+set}" = set; then
4500 echo $ECHO_N "(cached) $ECHO_C" >&6
4501 else
4502 @@ -3158,53 +4309,59 @@
4503
4504 #undef ldap_start_tls_s
4505
4506 -/* Override any gcc2 internal prototype to avoid an error. */
4507 +/* Override any GCC internal prototype to avoid an error.
4508 + Use char because int might match the return type of a GCC
4509 + builtin and then its argument prototype would still apply. */
4510 #ifdef __cplusplus
4511 extern "C"
4512 -{
4513 #endif
4514 -/* We use char because int might match the return type of a gcc2
4515 - builtin and then its argument prototype would still apply. */
4516 char ldap_start_tls_s ();
4517 /* The GNU C library defines this for functions which it implements
4518 to always fail with ENOSYS. Some functions are actually named
4519 something starting with __ and the normal name is an alias. */
4520 -#if defined (__stub_ldap_start_tls_s) || defined (__stub___ldap_start_tls_s)
4521 +#if defined __stub_ldap_start_tls_s || defined __stub___ldap_start_tls_s
4522 choke me
4523 -#else
4524 -char (*f) () = ldap_start_tls_s;
4525 -#endif
4526 -#ifdef __cplusplus
4527 -}
4528 #endif
4529
4530 int
4531 main ()
4532 {
4533 -return f != ldap_start_tls_s;
4534 +return ldap_start_tls_s ();
4535 ;
4536 return 0;
4537 }
4538 _ACEOF
4539 rm -f conftest.$ac_objext conftest$ac_exeext
4540 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4541 - (eval $ac_link) 2>conftest.er1
4542 +if { (ac_try="$ac_link"
4543 +case "(($ac_try" in
4544 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4545 + *) ac_try_echo=$ac_try;;
4546 +esac
4547 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4548 + (eval "$ac_link") 2>conftest.er1
4549 ac_status=$?
4550 grep -v '^ *+' conftest.er1 >conftest.err
4551 rm -f conftest.er1
4552 cat conftest.err >&5
4553 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4554 (exit $ac_status); } &&
4555 - { ac_try='test -z "$ac_c_werror_flag"
4556 - || test ! -s conftest.err'
4557 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4558 - (eval $ac_try) 2>&5
4559 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4560 + { (case "(($ac_try" in
4561 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4562 + *) ac_try_echo=$ac_try;;
4563 +esac
4564 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4565 + (eval "$ac_try") 2>&5
4566 ac_status=$?
4567 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4568 (exit $ac_status); }; } &&
4569 { ac_try='test -s conftest$ac_exeext'
4570 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4571 - (eval $ac_try) 2>&5
4572 + { (case "(($ac_try" in
4573 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4574 + *) ac_try_echo=$ac_try;;
4575 +esac
4576 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4577 + (eval "$ac_try") 2>&5
4578 ac_status=$?
4579 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4580 (exit $ac_status); }; }; then
4581 @@ -3213,19 +4370,20 @@
4582 echo "$as_me: failed program was:" >&5
4583 sed 's/^/| /' conftest.$ac_ext >&5
4584
4585 -ac_cv_func_ldap_start_tls_s=no
4586 + ac_cv_func_ldap_start_tls_s=no
4587 fi
4588 -rm -f conftest.err conftest.$ac_objext \
4589 +
4590 +rm -f core conftest.err conftest.$ac_objext \
4591 conftest$ac_exeext conftest.$ac_ext
4592 fi
4593 -echo "$as_me:$LINENO: result: $ac_cv_func_ldap_start_tls_s" >&5
4594 -echo "${ECHO_T}$ac_cv_func_ldap_start_tls_s" >&6
4595 +{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_start_tls_s" >&5
4596 +echo "${ECHO_T}$ac_cv_func_ldap_start_tls_s" >&6; }
4597 if test $ac_cv_func_ldap_start_tls_s = yes; then
4598 SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_START_TLS"
4599 fi
4600
4601 - echo "$as_me:$LINENO: checking for ldap_initialize" >&5
4602 -echo $ECHO_N "checking for ldap_initialize... $ECHO_C" >&6
4603 + { echo "$as_me:$LINENO: checking for ldap_initialize" >&5
4604 +echo $ECHO_N "checking for ldap_initialize... $ECHO_C" >&6; }
4605 if test "${ac_cv_func_ldap_initialize+set}" = set; then
4606 echo $ECHO_N "(cached) $ECHO_C" >&6
4607 else
4608 @@ -3252,53 +4410,59 @@
4609
4610 #undef ldap_initialize
4611
4612 -/* Override any gcc2 internal prototype to avoid an error. */
4613 +/* Override any GCC internal prototype to avoid an error.
4614 + Use char because int might match the return type of a GCC
4615 + builtin and then its argument prototype would still apply. */
4616 #ifdef __cplusplus
4617 extern "C"
4618 -{
4619 #endif
4620 -/* We use char because int might match the return type of a gcc2
4621 - builtin and then its argument prototype would still apply. */
4622 char ldap_initialize ();
4623 /* The GNU C library defines this for functions which it implements
4624 to always fail with ENOSYS. Some functions are actually named
4625 something starting with __ and the normal name is an alias. */
4626 -#if defined (__stub_ldap_initialize) || defined (__stub___ldap_initialize)
4627 +#if defined __stub_ldap_initialize || defined __stub___ldap_initialize
4628 choke me
4629 -#else
4630 -char (*f) () = ldap_initialize;
4631 -#endif
4632 -#ifdef __cplusplus
4633 -}
4634 #endif
4635
4636 int
4637 main ()
4638 {
4639 -return f != ldap_initialize;
4640 +return ldap_initialize ();
4641 ;
4642 return 0;
4643 }
4644 _ACEOF
4645 rm -f conftest.$ac_objext conftest$ac_exeext
4646 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4647 - (eval $ac_link) 2>conftest.er1
4648 +if { (ac_try="$ac_link"
4649 +case "(($ac_try" in
4650 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4651 + *) ac_try_echo=$ac_try;;
4652 +esac
4653 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4654 + (eval "$ac_link") 2>conftest.er1
4655 ac_status=$?
4656 grep -v '^ *+' conftest.er1 >conftest.err
4657 rm -f conftest.er1
4658 cat conftest.err >&5
4659 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4660 (exit $ac_status); } &&
4661 - { ac_try='test -z "$ac_c_werror_flag"
4662 - || test ! -s conftest.err'
4663 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4664 - (eval $ac_try) 2>&5
4665 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4666 + { (case "(($ac_try" in
4667 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4668 + *) ac_try_echo=$ac_try;;
4669 +esac
4670 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4671 + (eval "$ac_try") 2>&5
4672 ac_status=$?
4673 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4674 (exit $ac_status); }; } &&
4675 { ac_try='test -s conftest$ac_exeext'
4676 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4677 - (eval $ac_try) 2>&5
4678 + { (case "(($ac_try" in
4679 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4680 + *) ac_try_echo=$ac_try;;
4681 +esac
4682 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4683 + (eval "$ac_try") 2>&5
4684 ac_status=$?
4685 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4686 (exit $ac_status); }; }; then
4687 @@ -3307,19 +4471,20 @@
4688 echo "$as_me: failed program was:" >&5
4689 sed 's/^/| /' conftest.$ac_ext >&5
4690
4691 -ac_cv_func_ldap_initialize=no
4692 + ac_cv_func_ldap_initialize=no
4693 fi
4694 -rm -f conftest.err conftest.$ac_objext \
4695 +
4696 +rm -f core conftest.err conftest.$ac_objext \
4697 conftest$ac_exeext conftest.$ac_ext
4698 fi
4699 -echo "$as_me:$LINENO: result: $ac_cv_func_ldap_initialize" >&5
4700 -echo "${ECHO_T}$ac_cv_func_ldap_initialize" >&6
4701 +{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_initialize" >&5
4702 +echo "${ECHO_T}$ac_cv_func_ldap_initialize" >&6; }
4703 if test $ac_cv_func_ldap_initialize = yes; then
4704 SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_INITIALIZE"
4705 fi
4706
4707 - echo "$as_me:$LINENO: checking for ldap_int_tls_config" >&5
4708 -echo $ECHO_N "checking for ldap_int_tls_config... $ECHO_C" >&6
4709 + { echo "$as_me:$LINENO: checking for ldap_int_tls_config" >&5
4710 +echo $ECHO_N "checking for ldap_int_tls_config... $ECHO_C" >&6; }
4711 if test "${ac_cv_func_ldap_int_tls_config+set}" = set; then
4712 echo $ECHO_N "(cached) $ECHO_C" >&6
4713 else
4714 @@ -3346,53 +4511,59 @@
4715
4716 #undef ldap_int_tls_config
4717
4718 -/* Override any gcc2 internal prototype to avoid an error. */
4719 +/* Override any GCC internal prototype to avoid an error.
4720 + Use char because int might match the return type of a GCC
4721 + builtin and then its argument prototype would still apply. */
4722 #ifdef __cplusplus
4723 extern "C"
4724 -{
4725 #endif
4726 -/* We use char because int might match the return type of a gcc2
4727 - builtin and then its argument prototype would still apply. */
4728 char ldap_int_tls_config ();
4729 /* The GNU C library defines this for functions which it implements
4730 to always fail with ENOSYS. Some functions are actually named
4731 something starting with __ and the normal name is an alias. */
4732 -#if defined (__stub_ldap_int_tls_config) || defined (__stub___ldap_int_tls_config)
4733 +#if defined __stub_ldap_int_tls_config || defined __stub___ldap_int_tls_config
4734 choke me
4735 -#else
4736 -char (*f) () = ldap_int_tls_config;
4737 -#endif
4738 -#ifdef __cplusplus
4739 -}
4740 #endif
4741
4742 int
4743 main ()
4744 {
4745 -return f != ldap_int_tls_config;
4746 +return ldap_int_tls_config ();
4747 ;
4748 return 0;
4749 }
4750 _ACEOF
4751 rm -f conftest.$ac_objext conftest$ac_exeext
4752 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4753 - (eval $ac_link) 2>conftest.er1
4754 +if { (ac_try="$ac_link"
4755 +case "(($ac_try" in
4756 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4757 + *) ac_try_echo=$ac_try;;
4758 +esac
4759 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4760 + (eval "$ac_link") 2>conftest.er1
4761 ac_status=$?
4762 grep -v '^ *+' conftest.er1 >conftest.err
4763 rm -f conftest.er1
4764 cat conftest.err >&5
4765 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4766 (exit $ac_status); } &&
4767 - { ac_try='test -z "$ac_c_werror_flag"
4768 - || test ! -s conftest.err'
4769 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4770 - (eval $ac_try) 2>&5
4771 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4772 + { (case "(($ac_try" in
4773 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4774 + *) ac_try_echo=$ac_try;;
4775 +esac
4776 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4777 + (eval "$ac_try") 2>&5
4778 ac_status=$?
4779 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4780 (exit $ac_status); }; } &&
4781 { ac_try='test -s conftest$ac_exeext'
4782 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4783 - (eval $ac_try) 2>&5
4784 + { (case "(($ac_try" in
4785 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4786 + *) ac_try_echo=$ac_try;;
4787 +esac
4788 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4789 + (eval "$ac_try") 2>&5
4790 ac_status=$?
4791 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4792 (exit $ac_status); }; }; then
4793 @@ -3401,13 +4572,14 @@
4794 echo "$as_me: failed program was:" >&5
4795 sed 's/^/| /' conftest.$ac_ext >&5
4796
4797 -ac_cv_func_ldap_int_tls_config=no
4798 + ac_cv_func_ldap_int_tls_config=no
4799 fi
4800 -rm -f conftest.err conftest.$ac_objext \
4801 +
4802 +rm -f core conftest.err conftest.$ac_objext \
4803 conftest$ac_exeext conftest.$ac_ext
4804 fi
4805 -echo "$as_me:$LINENO: result: $ac_cv_func_ldap_int_tls_config" >&5
4806 -echo "${ECHO_T}$ac_cv_func_ldap_int_tls_config" >&6
4807 +{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_int_tls_config" >&5
4808 +echo "${ECHO_T}$ac_cv_func_ldap_int_tls_config" >&6; }
4809 if test $ac_cv_func_ldap_int_tls_config = yes; then
4810 SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_INT_TLS_CONFIG"
4811 fi
4812 @@ -3444,10 +4616,9 @@
4813
4814 WITH_EDIRECTORY=no
4815
4816 -# Check whether --with-edir or --without-edir was given.
4817 +# Check whether --with-edir was given.
4818 if test "${with_edir+set}" = set; then
4819 - withval="$with_edir"
4820 - case "$withval" in
4821 + withval=$with_edir; case "$withval" in
4822 yes)
4823 SMART_CFLAGS="$SMART_CFLAGS -DNOVELL_UNIVERSAL_PASSWORD -DNOVELL"
4824 edir="edir_ldapext.c"
4825 @@ -3456,7 +4627,8 @@
4826 ;;
4827 esac
4828
4829 -fi;
4830 +fi
4831 +
4832
4833 ldap_ldflags=$SMART_LIBS
4834 ldap_cflags=$SMART_CFLAGS
4835 @@ -3464,7 +4636,8 @@
4836
4837
4838
4839 - ac_config_files="$ac_config_files Makefile"
4840 +ac_config_files="$ac_config_files Makefile"
4841 +
4842 cat >confcache <<\_ACEOF
4843 # This file is a shell script that caches the results of configure
4844 # tests run on this system so they can be shared between configure
4845 @@ -3483,104 +4656,108 @@
4846
4847 # The following way of writing the cache mishandles newlines in values,
4848 # but we know of no workaround that is simple, portable, and efficient.
4849 -# So, don't put newlines in cache variables' values.
4850 +# So, we kill variables containing newlines.
4851 # Ultrix sh set writes to stderr and can't be redirected directly,
4852 # and sets the high bit in the cache file unless we assign to the vars.
4853 -{
4854 +(
4855 + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
4856 + eval ac_val=\$$ac_var
4857 + case $ac_val in #(
4858 + *${as_nl}*)
4859 + case $ac_var in #(
4860 + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
4861 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
4862 + esac
4863 + case $ac_var in #(
4864 + _ | IFS | as_nl) ;; #(
4865 + *) $as_unset $ac_var ;;
4866 + esac ;;
4867 + esac
4868 + done
4869 +
4870 (set) 2>&1 |
4871 - case `(ac_space=' '; set | grep ac_space) 2>&1` in
4872 - *ac_space=\ *)
4873 + case $as_nl`(ac_space=' '; set) 2>&1` in #(
4874 + *${as_nl}ac_space=\ *)
4875 # `set' does not quote correctly, so add quotes (double-quote
4876 # substitution turns \\\\ into \\, and sed turns \\ into \).
4877 sed -n \
4878 "s/'/'\\\\''/g;
4879 s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
4880 - ;;
4881 + ;; #(
4882 *)
4883 # `set' quotes correctly as required by POSIX, so do not add quotes.
4884 - sed -n \
4885 - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
4886 + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
4887 ;;
4888 - esac;
4889 -} |
4890 + esac |
4891 + sort
4892 +) |
4893 sed '
4894 + /^ac_cv_env_/b end
4895 t clear
4896 - : clear
4897 + :clear
4898 s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
4899 t end
4900 - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
4901 - : end' >>confcache
4902 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
4903 - if test -w $cache_file; then
4904 - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
4905 + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
4906 + :end' >>confcache
4907 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
4908 + if test -w "$cache_file"; then
4909 + test "x$cache_file" != "x/dev/null" &&
4910 + { echo "$as_me:$LINENO: updating cache $cache_file" >&5
4911 +echo "$as_me: updating cache $cache_file" >&6;}
4912 cat confcache >$cache_file
4913 else
4914 - echo "not updating unwritable cache $cache_file"
4915 - fi
4916 -fi
4917 -rm -f confcache
4918 -
4919 -test "x$prefix" = xNONE && prefix=$ac_default_prefix
4920 -# Let make expand exec_prefix.
4921 -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
4922 -
4923 -# VPATH may cause trouble with some makes, so we remove $(srcdir),
4924 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
4925 -# trailing colons and then remove the whole line if VPATH becomes empty
4926 -# (actually we leave an empty line to preserve line numbers).
4927 -if test "x$srcdir" = x.; then
4928 - ac_vpsub='/^[ ]*VPATH[ ]*=/{
4929 -s/:*\$(srcdir):*/:/;
4930 -s/:*\${srcdir}:*/:/;
4931 -s/:*@srcdir@:*/:/;
4932 -s/^\([^=]*=[ ]*\):*/\1/;
4933 -s/:*$//;
4934 -s/^[^=]*=[ ]*$//;
4935 -}'
4936 + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
4937 +echo "$as_me: not updating unwritable cache $cache_file" >&6;}
4938 + fi
4939 fi
4940 +rm -f confcache
4941 +
4942 +test "x$prefix" = xNONE && prefix=$ac_default_prefix
4943 +# Let make expand exec_prefix.
4944 +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
4945
4946 # Transform confdefs.h into DEFS.
4947 # Protect against shell expansion while executing Makefile rules.
4948 # Protect against Makefile macro expansion.
4949 #
4950 # If the first sed substitution is executed (which looks for macros that
4951 -# take arguments), then we branch to the quote section. Otherwise,
4952 +# take arguments), then branch to the quote section. Otherwise,
4953 # look for a macro that doesn't take arguments.
4954 -cat >confdef2opt.sed <<\_ACEOF
4955 +ac_script='
4956 t clear
4957 -: clear
4958 -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
4959 +:clear
4960 +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
4961 t quote
4962 -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
4963 +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
4964 t quote
4965 -d
4966 -: quote
4967 -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
4968 -s,\[,\\&,g
4969 -s,\],\\&,g
4970 -s,\$,$$,g
4971 -p
4972 -_ACEOF
4973 -# We use echo to avoid assuming a particular line-breaking character.
4974 -# The extra dot is to prevent the shell from consuming trailing
4975 -# line-breaks from the sub-command output. A line-break within
4976 -# single-quotes doesn't work because, if this script is created in a
4977 -# platform that uses two characters for line-breaks (e.g., DOS), tr
4978 -# would break.
4979 -ac_LF_and_DOT=`echo; echo .`
4980 -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
4981 -rm -f confdef2opt.sed
4982 +b any
4983 +:quote
4984 +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
4985 +s/\[/\\&/g
4986 +s/\]/\\&/g
4987 +s/\$/$$/g
4988 +H
4989 +:any
4990 +${
4991 + g
4992 + s/^\n//
4993 + s/\n/ /g
4994 + p
4995 +}
4996 +'
4997 +DEFS=`sed -n "$ac_script" confdefs.h`
4998
4999
5000 ac_libobjs=
5001 ac_ltlibobjs=
5002 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
5003 # 1. Remove the extension, and $U if already installed.
5004 - ac_i=`echo "$ac_i" |
5005 - sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
5006 - # 2. Add them.
5007 - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
5008 - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
5009 + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
5010 + ac_i=`echo "$ac_i" | sed "$ac_script"`
5011 + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
5012 + # will be set to the directory where LIBOBJS objects are built.
5013 + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
5014 + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
5015 done
5016 LIBOBJS=$ac_libobjs
5017
5018 @@ -3618,11 +4795,35 @@
5019 # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
5020 # is contrary to our usage. Disable this feature.
5021 alias -g '${1+"$@"}'='"$@"'
5022 -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
5023 - set -o posix
5024 + setopt NO_GLOB_SUBST
5025 +else
5026 + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
5027 fi
5028 +BIN_SH=xpg4; export BIN_SH # for Tru64
5029 DUALCASE=1; export DUALCASE # for MKS sh
5030
5031 +
5032 +# PATH needs CR
5033 +# Avoid depending upon Character Ranges.
5034 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
5035 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
5036 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
5037 +as_cr_digits='0123456789'
5038 +as_cr_alnum=$as_cr_Letters$as_cr_digits
5039 +
5040 +# The user is always right.
5041 +if test "${PATH_SEPARATOR+set}" != set; then
5042 + echo "#! /bin/sh" >conf$$.sh
5043 + echo "exit 0" >>conf$$.sh
5044 + chmod +x conf$$.sh
5045 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
5046 + PATH_SEPARATOR=';'
5047 + else
5048 + PATH_SEPARATOR=:
5049 + fi
5050 + rm -f conf$$.sh
5051 +fi
5052 +
5053 # Support unset when possible.
5054 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
5055 as_unset=unset
5056 @@ -3631,8 +4832,43 @@
5057 fi
5058
5059
5060 +# IFS
5061 +# We need space, tab and new line, in precisely that order. Quoting is
5062 +# there to prevent editors from complaining about space-tab.
5063 +# (If _AS_PATH_WALK were called with IFS unset, it would disable word
5064 +# splitting by setting IFS to empty value.)
5065 +as_nl='
5066 +'
5067 +IFS=" "" $as_nl"
5068 +
5069 +# Find who we are. Look in the path if we contain no directory separator.
5070 +case $0 in
5071 + *[\\/]* ) as_myself=$0 ;;
5072 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5073 +for as_dir in $PATH
5074 +do
5075 + IFS=$as_save_IFS
5076 + test -z "$as_dir" && as_dir=.
5077 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
5078 +done
5079 +IFS=$as_save_IFS
5080 +
5081 + ;;
5082 +esac
5083 +# We did not find ourselves, most probably we were run as `sh COMMAND'
5084 +# in which case we are not to be found in the path.
5085 +if test "x$as_myself" = x; then
5086 + as_myself=$0
5087 +fi
5088 +if test ! -f "$as_myself"; then
5089 + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
5090 + { (exit 1); exit 1; }
5091 +fi
5092 +
5093 # Work around bugs in pre-3.0 UWIN ksh.
5094 -$as_unset ENV MAIL MAILPATH
5095 +for as_var in ENV MAIL MAILPATH
5096 +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
5097 +done
5098 PS1='$ '
5099 PS2='> '
5100 PS4='+ '
5101 @@ -3646,18 +4882,19 @@
5102 if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
5103 eval $as_var=C; export $as_var
5104 else
5105 - $as_unset $as_var
5106 + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
5107 fi
5108 done
5109
5110 # Required to use basename.
5111 -if expr a : '\(a\)' >/dev/null 2>&1; then
5112 +if expr a : '\(a\)' >/dev/null 2>&1 &&
5113 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
5114 as_expr=expr
5115 else
5116 as_expr=false
5117 fi
5118
5119 -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
5120 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
5121 as_basename=basename
5122 else
5123 as_basename=false
5124 @@ -3665,159 +4902,120 @@
5125
5126
5127 # Name of the executable.
5128 -as_me=`$as_basename "$0" ||
5129 +as_me=`$as_basename -- "$0" ||
5130 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
5131 X"$0" : 'X\(//\)$' \| \
5132 - X"$0" : 'X\(/\)$' \| \
5133 - . : '\(.\)' 2>/dev/null ||
5134 + X"$0" : 'X\(/\)' \| . 2>/dev/null ||
5135 echo X/"$0" |
5136 - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
5137 - /^X\/\(\/\/\)$/{ s//\1/; q; }
5138 - /^X\/\(\/\).*/{ s//\1/; q; }
5139 - s/.*/./; q'`
5140 -
5141 -
5142 -# PATH needs CR, and LINENO needs CR and PATH.
5143 -# Avoid depending upon Character Ranges.
5144 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
5145 -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
5146 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
5147 -as_cr_digits='0123456789'
5148 -as_cr_alnum=$as_cr_Letters$as_cr_digits
5149 + sed '/^.*\/\([^/][^/]*\)\/*$/{
5150 + s//\1/
5151 + q
5152 + }
5153 + /^X\/\(\/\/\)$/{
5154 + s//\1/
5155 + q
5156 + }
5157 + /^X\/\(\/\).*/{
5158 + s//\1/
5159 + q
5160 + }
5161 + s/.*/./; q'`
5162
5163 -# The user is always right.
5164 -if test "${PATH_SEPARATOR+set}" != set; then
5165 - echo "#! /bin/sh" >conf$$.sh
5166 - echo "exit 0" >>conf$$.sh
5167 - chmod +x conf$$.sh
5168 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
5169 - PATH_SEPARATOR=';'
5170 - else
5171 - PATH_SEPARATOR=:
5172 - fi
5173 - rm -f conf$$.sh
5174 -fi
5175 +# CDPATH.
5176 +$as_unset CDPATH
5177
5178
5179 - as_lineno_1=$LINENO
5180 - as_lineno_2=$LINENO
5181 - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
5182 - test "x$as_lineno_1" != "x$as_lineno_2" &&
5183 - test "x$as_lineno_3" = "x$as_lineno_2" || {
5184 - # Find who we are. Look in the path if we contain no path at all
5185 - # relative or not.
5186 - case $0 in
5187 - *[\\/]* ) as_myself=$0 ;;
5188 - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5189 -for as_dir in $PATH
5190 -do
5191 - IFS=$as_save_IFS
5192 - test -z "$as_dir" && as_dir=.
5193 - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
5194 -done
5195
5196 - ;;
5197 - esac
5198 - # We did not find ourselves, most probably we were run as `sh COMMAND'
5199 - # in which case we are not to be found in the path.
5200 - if test "x$as_myself" = x; then
5201 - as_myself=$0
5202 - fi
5203 - if test ! -f "$as_myself"; then
5204 - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
5205 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
5206 - { (exit 1); exit 1; }; }
5207 - fi
5208 - case $CONFIG_SHELL in
5209 - '')
5210 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5211 -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
5212 -do
5213 - IFS=$as_save_IFS
5214 - test -z "$as_dir" && as_dir=.
5215 - for as_base in sh bash ksh sh5; do
5216 - case $as_dir in
5217 - /*)
5218 - if ("$as_dir/$as_base" -c '
5219 as_lineno_1=$LINENO
5220 as_lineno_2=$LINENO
5221 - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
5222 test "x$as_lineno_1" != "x$as_lineno_2" &&
5223 - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
5224 - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
5225 - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
5226 - CONFIG_SHELL=$as_dir/$as_base
5227 - export CONFIG_SHELL
5228 - exec "$CONFIG_SHELL" "$0" ${1+"$@"}
5229 - fi;;
5230 - esac
5231 - done
5232 -done
5233 -;;
5234 - esac
5235 + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
5236
5237 # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
5238 # uniformly replaced by the line number. The first 'sed' inserts a
5239 - # line-number line before each line; the second 'sed' does the real
5240 - # work. The second script uses 'N' to pair each line-number line
5241 - # with the numbered line, and appends trailing '-' during
5242 - # substitution so that $LINENO is not a special case at line end.
5243 + # line-number line after each line using $LINENO; the second 'sed'
5244 + # does the real work. The second script uses 'N' to pair each
5245 + # line-number line with the line containing $LINENO, and appends
5246 + # trailing '-' during substitution so that $LINENO is not a special
5247 + # case at line end.
5248 # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
5249 - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
5250 - sed '=' <$as_myself |
5251 + # scripts with optimization help from Paolo Bonzini. Blame Lee
5252 + # E. McMahon (1931-1989) for sed's syntax. :-)
5253 + sed -n '
5254 + p
5255 + /[$]LINENO/=
5256 + ' <$as_myself |
5257 sed '
5258 + s/[$]LINENO.*/&-/
5259 + t lineno
5260 + b
5261 + :lineno
5262 N
5263 - s,$,-,
5264 - : loop
5265 - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
5266 + :loop
5267 + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
5268 t loop
5269 - s,-$,,
5270 - s,^['$as_cr_digits']*\n,,
5271 + s/-\n.*//
5272 ' >$as_me.lineno &&
5273 - chmod +x $as_me.lineno ||
5274 - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
5275 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
5276 + chmod +x "$as_me.lineno" ||
5277 + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
5278 { (exit 1); exit 1; }; }
5279
5280 # Don't try to exec as it changes $[0], causing all sort of problems
5281 # (the dirname of $[0] is not the place where we might find the
5282 - # original and so on. Autoconf is especially sensible to this).
5283 - . ./$as_me.lineno
5284 + # original and so on. Autoconf is especially sensitive to this).
5285 + . "./$as_me.lineno"
5286 # Exit status is that of the last command.
5287 exit
5288 }
5289
5290
5291 -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
5292 - *c*,-n*) ECHO_N= ECHO_C='
5293 -' ECHO_T=' ' ;;
5294 - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
5295 - *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
5296 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
5297 + as_dirname=dirname
5298 +else
5299 + as_dirname=false
5300 +fi
5301 +
5302 +ECHO_C= ECHO_N= ECHO_T=
5303 +case `echo -n x` in
5304 +-n*)
5305 + case `echo 'x\c'` in
5306 + *c*) ECHO_T=' ';; # ECHO_T is single tab character.
5307 + *) ECHO_C='\c';;
5308 + esac;;
5309 +*)
5310 + ECHO_N='-n';;
5311 esac
5312
5313 -if expr a : '\(a\)' >/dev/null 2>&1; then
5314 +if expr a : '\(a\)' >/dev/null 2>&1 &&
5315 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
5316 as_expr=expr
5317 else
5318 as_expr=false
5319 fi
5320
5321 rm -f conf$$ conf$$.exe conf$$.file
5322 +if test -d conf$$.dir; then
5323 + rm -f conf$$.dir/conf$$.file
5324 +else
5325 + rm -f conf$$.dir
5326 + mkdir conf$$.dir
5327 +fi
5328 echo >conf$$.file
5329 if ln -s conf$$.file conf$$ 2>/dev/null; then
5330 - # We could just check for DJGPP; but this test a) works b) is more generic
5331 - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
5332 - if test -f conf$$.exe; then
5333 - # Don't use ln at all; we don't have any links
5334 + as_ln_s='ln -s'
5335 + # ... but there are two gotchas:
5336 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
5337 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
5338 + # In both cases, we have to default to `cp -p'.
5339 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
5340 as_ln_s='cp -p'
5341 - else
5342 - as_ln_s='ln -s'
5343 - fi
5344 elif ln conf$$.file conf$$ 2>/dev/null; then
5345 as_ln_s=ln
5346 else
5347 as_ln_s='cp -p'
5348 fi
5349 -rm -f conf$$ conf$$.exe conf$$.file
5350 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
5351 +rmdir conf$$.dir 2>/dev/null
5352
5353 if mkdir -p . 2>/dev/null; then
5354 as_mkdir_p=:
5355 @@ -3826,7 +5024,19 @@
5356 as_mkdir_p=false
5357 fi
5358
5359 -as_executable_p="test -f"
5360 +# Find out whether ``test -x'' works. Don't use a zero-byte file, as
5361 +# systems may use methods other than mode bits to determine executability.
5362 +cat >conf$$.file <<_ASEOF
5363 +#! /bin/sh
5364 +exit 0
5365 +_ASEOF
5366 +chmod +x conf$$.file
5367 +if test -x conf$$.file >/dev/null 2>&1; then
5368 + as_executable_p="test -x"
5369 +else
5370 + as_executable_p=:
5371 +fi
5372 +rm -f conf$$.file
5373
5374 # Sed expression to map a string onto a valid CPP name.
5375 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
5376 @@ -3835,31 +5045,14 @@
5377 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
5378
5379
5380 -# IFS
5381 -# We need space, tab and new line, in precisely that order.
5382 -as_nl='
5383 -'
5384 -IFS=" $as_nl"
5385 -
5386 -# CDPATH.
5387 -$as_unset CDPATH
5388 -
5389 exec 6>&1
5390
5391 -# Open the log real soon, to keep \$[0] and so on meaningful, and to
5392 +# Save the log message, to keep $[0] and so on meaningful, and to
5393 # report actual input values of CONFIG_FILES etc. instead of their
5394 -# values after options handling. Logging --version etc. is OK.
5395 -exec 5>>config.log
5396 -{
5397 - echo
5398 - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
5399 -## Running $as_me. ##
5400 -_ASBOX
5401 -} >&5
5402 -cat >&5 <<_CSEOF
5403 -
5404 +# values after options handling.
5405 +ac_log="
5406 This file was extended by $as_me, which was
5407 -generated by GNU Autoconf 2.59. Invocation command line was
5408 +generated by GNU Autoconf 2.60. Invocation command line was
5409
5410 CONFIG_FILES = $CONFIG_FILES
5411 CONFIG_HEADERS = $CONFIG_HEADERS
5412 @@ -3867,30 +5060,18 @@
5413 CONFIG_COMMANDS = $CONFIG_COMMANDS
5414 $ $0 $@
5415
5416 -_CSEOF
5417 -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
5418 -echo >&5
5419 +on `(hostname || uname -n) 2>/dev/null | sed 1q`
5420 +"
5421 +
5422 _ACEOF
5423
5424 +cat >>$CONFIG_STATUS <<_ACEOF
5425 # Files that config.status was made for.
5426 -if test -n "$ac_config_files"; then
5427 - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
5428 -fi
5429 -
5430 -if test -n "$ac_config_headers"; then
5431 - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
5432 -fi
5433 -
5434 -if test -n "$ac_config_links"; then
5435 - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
5436 -fi
5437 +config_files="$ac_config_files"
5438
5439 -if test -n "$ac_config_commands"; then
5440 - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
5441 -fi
5442 +_ACEOF
5443
5444 cat >>$CONFIG_STATUS <<\_ACEOF
5445 -
5446 ac_cs_usage="\
5447 \`$as_me' instantiates files from templates according to the
5448 current configuration.
5449 @@ -3909,18 +5090,20 @@
5450 $config_files
5451
5452 Report bugs to <bug-autoconf@gnu.org>."
5453 -_ACEOF
5454
5455 +_ACEOF
5456 cat >>$CONFIG_STATUS <<_ACEOF
5457 ac_cs_version="\\
5458 config.status
5459 -configured by $0, generated by GNU Autoconf 2.59,
5460 - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
5461 +configured by $0, generated by GNU Autoconf 2.60,
5462 + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
5463
5464 -Copyright (C) 2003 Free Software Foundation, Inc.
5465 +Copyright (C) 2006 Free Software Foundation, Inc.
5466 This config.status script is free software; the Free Software Foundation
5467 gives unlimited permission to copy, distribute and modify it."
5468 -srcdir=$srcdir
5469 +
5470 +ac_pwd='$ac_pwd'
5471 +srcdir='$srcdir'
5472 _ACEOF
5473
5474 cat >>$CONFIG_STATUS <<\_ACEOF
5475 @@ -3931,60 +5114,42 @@
5476 do
5477 case $1 in
5478 --*=*)
5479 - ac_option=`expr "x$1" : 'x\([^=]*\)='`
5480 - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
5481 + ac_option=`expr "X$1" : 'X\([^=]*\)='`
5482 + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
5483 ac_shift=:
5484 ;;
5485 - -*)
5486 + *)
5487 ac_option=$1
5488 ac_optarg=$2
5489 ac_shift=shift
5490 ;;
5491 - *) # This is not an option, so the user has probably given explicit
5492 - # arguments.
5493 - ac_option=$1
5494 - ac_need_defaults=false;;
5495 esac
5496
5497 case $ac_option in
5498 # Handling of the options.
5499 -_ACEOF
5500 -cat >>$CONFIG_STATUS <<\_ACEOF
5501 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
5502 ac_cs_recheck=: ;;
5503 - --version | --vers* | -V )
5504 - echo "$ac_cs_version"; exit 0 ;;
5505 - --he | --h)
5506 - # Conflict between --help and --header
5507 - { { echo "$as_me:$LINENO: error: ambiguous option: $1
5508 -Try \`$0 --help' for more information." >&5
5509 -echo "$as_me: error: ambiguous option: $1
5510 -Try \`$0 --help' for more information." >&2;}
5511 - { (exit 1); exit 1; }; };;
5512 - --help | --hel | -h )
5513 - echo "$ac_cs_usage"; exit 0 ;;
5514 - --debug | --d* | -d )
5515 + --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
5516 + echo "$ac_cs_version"; exit ;;
5517 + --debug | --debu | --deb | --de | --d | -d )
5518 debug=: ;;
5519 --file | --fil | --fi | --f )
5520 $ac_shift
5521 CONFIG_FILES="$CONFIG_FILES $ac_optarg"
5522 ac_need_defaults=false;;
5523 - --header | --heade | --head | --hea )
5524 - $ac_shift
5525 - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
5526 - ac_need_defaults=false;;
5527 + --he | --h | --help | --hel | -h )
5528 + echo "$ac_cs_usage"; exit ;;
5529 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
5530 | -silent | --silent | --silen | --sile | --sil | --si | --s)
5531 ac_cs_silent=: ;;
5532
5533 # This is an error.
5534 - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
5535 -Try \`$0 --help' for more information." >&5
5536 -echo "$as_me: error: unrecognized option: $1
5537 -Try \`$0 --help' for more information." >&2;}
5538 + -*) { echo "$as_me: error: unrecognized option: $1
5539 +Try \`$0 --help' for more information." >&2
5540 { (exit 1); exit 1; }; } ;;
5541
5542 - *) ac_config_targets="$ac_config_targets $1" ;;
5543 + *) ac_config_targets="$ac_config_targets $1"
5544 + ac_need_defaults=false ;;
5545
5546 esac
5547 shift
5548 @@ -4000,28 +5165,42 @@
5549 _ACEOF
5550 cat >>$CONFIG_STATUS <<_ACEOF
5551 if \$ac_cs_recheck; then
5552 - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
5553 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
5554 + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
5555 + CONFIG_SHELL=$SHELL
5556 + export CONFIG_SHELL
5557 + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
5558 fi
5559
5560 _ACEOF
5561 +cat >>$CONFIG_STATUS <<\_ACEOF
5562 +exec 5>>config.log
5563 +{
5564 + echo
5565 + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
5566 +## Running $as_me. ##
5567 +_ASBOX
5568 + echo "$ac_log"
5569 +} >&5
5570
5571 -
5572 -
5573 -
5574 +_ACEOF
5575 +cat >>$CONFIG_STATUS <<_ACEOF
5576 +_ACEOF
5577
5578 cat >>$CONFIG_STATUS <<\_ACEOF
5579 +
5580 +# Handling of arguments.
5581 for ac_config_target in $ac_config_targets
5582 do
5583 - case "$ac_config_target" in
5584 - # Handling of arguments.
5585 - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
5586 + case $ac_config_target in
5587 + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
5588 +
5589 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
5590 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
5591 { (exit 1); exit 1; }; };;
5592 esac
5593 done
5594
5595 +
5596 # If the user did not use the arguments to specify the items to instantiate,
5597 # then the envvar interface is used. Set only those that are not.
5598 # We use the long form for the default assignment because of an extremely
5599 @@ -4031,322 +5210,400 @@
5600 fi
5601
5602 # Have a temporary directory for convenience. Make it in the build tree
5603 -# simply because there is no reason to put it here, and in addition,
5604 +# simply because there is no reason against having it here, and in addition,
5605 # creating and moving files from /tmp can sometimes cause problems.
5606 -# Create a temporary directory, and hook for its removal unless debugging.
5607 +# Hook for its removal unless debugging.
5608 +# Note that there is a small window in which the directory will not be cleaned:
5609 +# after its creation but before its name has been assigned to `$tmp'.
5610 $debug ||
5611 {
5612 - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
5613 + tmp=
5614 + trap 'exit_status=$?
5615 + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
5616 +' 0
5617 trap '{ (exit 1); exit 1; }' 1 2 13 15
5618 }
5619 -
5620 # Create a (secure) tmp directory for tmp files.
5621
5622 {
5623 - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
5624 + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
5625 test -n "$tmp" && test -d "$tmp"
5626 } ||
5627 {
5628 - tmp=./confstat$$-$RANDOM
5629 - (umask 077 && mkdir $tmp)
5630 + tmp=./conf$$-$RANDOM
5631 + (umask 077 && mkdir "$tmp")
5632 } ||
5633 {
5634 echo "$me: cannot create a temporary directory in ." >&2
5635 { (exit 1); exit 1; }
5636 }
5637
5638 -_ACEOF
5639 -
5640 -cat >>$CONFIG_STATUS <<_ACEOF
5641 -
5642 #
5643 -# CONFIG_FILES section.
5644 +# Set up the sed scripts for CONFIG_FILES section.
5645 #
5646
5647 # No need to generate the scripts if there are no CONFIG_FILES.
5648 # This happens for instance when ./config.status config.h
5649 -if test -n "\$CONFIG_FILES"; then
5650 - # Protect against being on the right side of a sed subst in config.status.
5651 - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
5652 - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
5653 -s,@SHELL@,$SHELL,;t t
5654 -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
5655 -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
5656 -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
5657 -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
5658 -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
5659 -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
5660 -s,@exec_prefix@,$exec_prefix,;t t
5661 -s,@prefix@,$prefix,;t t
5662 -s,@program_transform_name@,$program_transform_name,;t t
5663 -s,@bindir@,$bindir,;t t
5664 -s,@sbindir@,$sbindir,;t t
5665 -s,@libexecdir@,$libexecdir,;t t
5666 -s,@datadir@,$datadir,;t t
5667 -s,@sysconfdir@,$sysconfdir,;t t
5668 -s,@sharedstatedir@,$sharedstatedir,;t t
5669 -s,@localstatedir@,$localstatedir,;t t
5670 -s,@libdir@,$libdir,;t t
5671 -s,@includedir@,$includedir,;t t
5672 -s,@oldincludedir@,$oldincludedir,;t t
5673 -s,@infodir@,$infodir,;t t
5674 -s,@mandir@,$mandir,;t t
5675 -s,@build_alias@,$build_alias,;t t
5676 -s,@host_alias@,$host_alias,;t t
5677 -s,@target_alias@,$target_alias,;t t
5678 -s,@DEFS@,$DEFS,;t t
5679 -s,@ECHO_C@,$ECHO_C,;t t
5680 -s,@ECHO_N@,$ECHO_N,;t t
5681 -s,@ECHO_T@,$ECHO_T,;t t
5682 -s,@LIBS@,$LIBS,;t t
5683 -s,@CC@,$CC,;t t
5684 -s,@CFLAGS@,$CFLAGS,;t t
5685 -s,@LDFLAGS@,$LDFLAGS,;t t
5686 -s,@CPPFLAGS@,$CPPFLAGS,;t t
5687 -s,@ac_ct_CC@,$ac_ct_CC,;t t
5688 -s,@EXEEXT@,$EXEEXT,;t t
5689 -s,@OBJEXT@,$OBJEXT,;t t
5690 -s,@edir@,$edir,;t t
5691 -s,@ldap_ldflags@,$ldap_ldflags,;t t
5692 -s,@ldap_cflags@,$ldap_cflags,;t t
5693 -s,@targetname@,$targetname,;t t
5694 -s,@LIBOBJS@,$LIBOBJS,;t t
5695 -s,@LTLIBOBJS@,$LTLIBOBJS,;t t
5696 -CEOF
5697 +if test -n "$CONFIG_FILES"; then
5698
5699 _ACEOF
5700
5701 - cat >>$CONFIG_STATUS <<\_ACEOF
5702 - # Split the substitutions into bite-sized pieces for seds with
5703 - # small command number limits, like on Digital OSF/1 and HP-UX.
5704 - ac_max_sed_lines=48
5705 - ac_sed_frag=1 # Number of current file.
5706 - ac_beg=1 # First line for current file.
5707 - ac_end=$ac_max_sed_lines # Line after last line for current file.
5708 - ac_more_lines=:
5709 - ac_sed_cmds=
5710 - while $ac_more_lines; do
5711 - if test $ac_beg -gt 1; then
5712 - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
5713 - else
5714 - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
5715 - fi
5716 - if test ! -s $tmp/subs.frag; then
5717 - ac_more_lines=false
5718 - else
5719 - # The purpose of the label and of the branching condition is to
5720 - # speed up the sed processing (if there are no `@' at all, there
5721 - # is no need to browse any of the substitutions).
5722 - # These are the two extra sed commands mentioned above.
5723 - (echo ':t
5724 - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
5725 - if test -z "$ac_sed_cmds"; then
5726 - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
5727 - else
5728 - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
5729 - fi
5730 - ac_sed_frag=`expr $ac_sed_frag + 1`
5731 - ac_beg=$ac_end
5732 - ac_end=`expr $ac_end + $ac_max_sed_lines`
5733 - fi
5734 - done
5735 - if test -z "$ac_sed_cmds"; then
5736 - ac_sed_cmds=cat
5737 +
5738 +
5739 +ac_delim='%!_!# '
5740 +for ac_last_try in false false false false false :; do
5741 + cat >conf$$subs.sed <<_ACEOF
5742 +SHELL!$SHELL$ac_delim
5743 +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
5744 +PACKAGE_NAME!$PACKAGE_NAME$ac_delim
5745 +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
5746 +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
5747 +PACKAGE_STRING!$PACKAGE_STRING$ac_delim
5748 +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
5749 +exec_prefix!$exec_prefix$ac_delim
5750 +prefix!$prefix$ac_delim
5751 +program_transform_name!$program_transform_name$ac_delim
5752 +bindir!$bindir$ac_delim
5753 +sbindir!$sbindir$ac_delim
5754 +libexecdir!$libexecdir$ac_delim
5755 +datarootdir!$datarootdir$ac_delim
5756 +datadir!$datadir$ac_delim
5757 +sysconfdir!$sysconfdir$ac_delim
5758 +sharedstatedir!$sharedstatedir$ac_delim
5759 +localstatedir!$localstatedir$ac_delim
5760 +includedir!$includedir$ac_delim
5761 +oldincludedir!$oldincludedir$ac_delim
5762 +docdir!$docdir$ac_delim
5763 +infodir!$infodir$ac_delim
5764 +htmldir!$htmldir$ac_delim
5765 +dvidir!$dvidir$ac_delim
5766 +pdfdir!$pdfdir$ac_delim
5767 +psdir!$psdir$ac_delim
5768 +libdir!$libdir$ac_delim
5769 +localedir!$localedir$ac_delim
5770 +mandir!$mandir$ac_delim
5771 +DEFS!$DEFS$ac_delim
5772 +ECHO_C!$ECHO_C$ac_delim
5773 +ECHO_N!$ECHO_N$ac_delim
5774 +ECHO_T!$ECHO_T$ac_delim
5775 +LIBS!$LIBS$ac_delim
5776 +build_alias!$build_alias$ac_delim
5777 +host_alias!$host_alias$ac_delim
5778 +target_alias!$target_alias$ac_delim
5779 +CC!$CC$ac_delim
5780 +CFLAGS!$CFLAGS$ac_delim
5781 +LDFLAGS!$LDFLAGS$ac_delim
5782 +CPPFLAGS!$CPPFLAGS$ac_delim
5783 +ac_ct_CC!$ac_ct_CC$ac_delim
5784 +EXEEXT!$EXEEXT$ac_delim
5785 +OBJEXT!$OBJEXT$ac_delim
5786 +edir!$edir$ac_delim
5787 +ldap_ldflags!$ldap_ldflags$ac_delim
5788 +ldap_cflags!$ldap_cflags$ac_delim
5789 +targetname!$targetname$ac_delim
5790 +LIBOBJS!$LIBOBJS$ac_delim
5791 +LTLIBOBJS!$LTLIBOBJS$ac_delim
5792 +_ACEOF
5793 +
5794 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then
5795 + break
5796 + elif $ac_last_try; then
5797 + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
5798 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
5799 + { (exit 1); exit 1; }; }
5800 + else
5801 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
5802 fi
5803 -fi # test -n "$CONFIG_FILES"
5804 +done
5805 +
5806 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
5807 +if test -n "$ac_eof"; then
5808 + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
5809 + ac_eof=`expr $ac_eof + 1`
5810 +fi
5811
5812 +cat >>$CONFIG_STATUS <<_ACEOF
5813 +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
5814 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
5815 +_ACEOF
5816 +sed '
5817 +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
5818 +s/^/s,@/; s/!/@,|#_!!_#|/
5819 +:n
5820 +t n
5821 +s/'"$ac_delim"'$/,g/; t
5822 +s/$/\\/; p
5823 +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
5824 +' >>$CONFIG_STATUS <conf$$subs.sed
5825 +rm -f conf$$subs.sed
5826 +cat >>$CONFIG_STATUS <<_ACEOF
5827 +:end
5828 +s/|#_!!_#|//g
5829 +CEOF$ac_eof
5830 _ACEOF
5831 +
5832 +
5833 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
5834 +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
5835 +# trailing colons and then remove the whole line if VPATH becomes empty
5836 +# (actually we leave an empty line to preserve line numbers).
5837 +if test "x$srcdir" = x.; then
5838 + ac_vpsub='/^[ ]*VPATH[ ]*=/{
5839 +s/:*\$(srcdir):*/:/
5840 +s/:*\${srcdir}:*/:/
5841 +s/:*@srcdir@:*/:/
5842 +s/^\([^=]*=[ ]*\):*/\1/
5843 +s/:*$//
5844 +s/^[^=]*=[ ]*$//
5845 +}'
5846 +fi
5847 +
5848 cat >>$CONFIG_STATUS <<\_ACEOF
5849 -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
5850 - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
5851 - case $ac_file in
5852 - - | *:- | *:-:* ) # input from stdin
5853 - cat >$tmp/stdin
5854 - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
5855 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
5856 - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
5857 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
5858 - * ) ac_file_in=$ac_file.in ;;
5859 +fi # test -n "$CONFIG_FILES"
5860 +
5861 +
5862 +for ac_tag in :F $CONFIG_FILES
5863 +do
5864 + case $ac_tag in
5865 + :[FHLC]) ac_mode=$ac_tag; continue;;
5866 + esac
5867 + case $ac_mode$ac_tag in
5868 + :[FHL]*:*);;
5869 + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
5870 +echo "$as_me: error: Invalid tag $ac_tag." >&2;}
5871 + { (exit 1); exit 1; }; };;
5872 + :[FH]-) ac_tag=-:-;;
5873 + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
5874 + esac
5875 + ac_save_IFS=$IFS
5876 + IFS=:
5877 + set x $ac_tag
5878 + IFS=$ac_save_IFS
5879 + shift
5880 + ac_file=$1
5881 + shift
5882 +
5883 + case $ac_mode in
5884 + :L) ac_source=$1;;
5885 + :[FH])
5886 + ac_file_inputs=
5887 + for ac_f
5888 + do
5889 + case $ac_f in
5890 + -) ac_f="$tmp/stdin";;
5891 + *) # Look for the file first in the build tree, then in the source tree
5892 + # (if the path is not absolute). The absolute path cannot be DOS-style,
5893 + # because $ac_f cannot contain `:'.
5894 + test -f "$ac_f" ||
5895 + case $ac_f in
5896 + [\\/$]*) false;;
5897 + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
5898 + esac ||
5899 + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
5900 +echo "$as_me: error: cannot find input file: $ac_f" >&2;}
5901 + { (exit 1); exit 1; }; };;
5902 + esac
5903 + ac_file_inputs="$ac_file_inputs $ac_f"
5904 + done
5905 +
5906 + # Let's still pretend it is `configure' which instantiates (i.e., don't
5907 + # use $as_me), people would be surprised to read:
5908 + # /* config.h. Generated by config.status. */
5909 + configure_input="Generated from "`IFS=:
5910 + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
5911 + if test x"$ac_file" != x-; then
5912 + configure_input="$ac_file. $configure_input"
5913 + { echo "$as_me:$LINENO: creating $ac_file" >&5
5914 +echo "$as_me: creating $ac_file" >&6;}
5915 + fi
5916 +
5917 + case $ac_tag in
5918 + *:-:* | *:-) cat >"$tmp/stdin";;
5919 + esac
5920 + ;;
5921 esac
5922
5923 - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
5924 - ac_dir=`(dirname "$ac_file") 2>/dev/null ||
5925 + ac_dir=`$as_dirname -- "$ac_file" ||
5926 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
5927 X"$ac_file" : 'X\(//\)[^/]' \| \
5928 X"$ac_file" : 'X\(//\)$' \| \
5929 - X"$ac_file" : 'X\(/\)' \| \
5930 - . : '\(.\)' 2>/dev/null ||
5931 + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
5932 echo X"$ac_file" |
5933 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
5934 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
5935 - /^X\(\/\/\)$/{ s//\1/; q; }
5936 - /^X\(\/\).*/{ s//\1/; q; }
5937 - s/.*/./; q'`
5938 - { if $as_mkdir_p; then
5939 - mkdir -p "$ac_dir"
5940 - else
5941 - as_dir="$ac_dir"
5942 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
5943 + s//\1/
5944 + q
5945 + }
5946 + /^X\(\/\/\)[^/].*/{
5947 + s//\1/
5948 + q
5949 + }
5950 + /^X\(\/\/\)$/{
5951 + s//\1/
5952 + q
5953 + }
5954 + /^X\(\/\).*/{
5955 + s//\1/
5956 + q
5957 + }
5958 + s/.*/./; q'`
5959 + { as_dir="$ac_dir"
5960 + case $as_dir in #(
5961 + -*) as_dir=./$as_dir;;
5962 + esac
5963 + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
5964 as_dirs=
5965 - while test ! -d "$as_dir"; do
5966 - as_dirs="$as_dir $as_dirs"
5967 - as_dir=`(dirname "$as_dir") 2>/dev/null ||
5968 + while :; do
5969 + case $as_dir in #(
5970 + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
5971 + *) as_qdir=$as_dir;;
5972 + esac
5973 + as_dirs="'$as_qdir' $as_dirs"
5974 + as_dir=`$as_dirname -- "$as_dir" ||
5975 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
5976 X"$as_dir" : 'X\(//\)[^/]' \| \
5977 X"$as_dir" : 'X\(//\)$' \| \
5978 - X"$as_dir" : 'X\(/\)' \| \
5979 - . : '\(.\)' 2>/dev/null ||
5980 + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
5981 echo X"$as_dir" |
5982 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
5983 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
5984 - /^X\(\/\/\)$/{ s//\1/; q; }
5985 - /^X\(\/\).*/{ s//\1/; q; }
5986 - s/.*/./; q'`
5987 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
5988 + s//\1/
5989 + q
5990 + }
5991 + /^X\(\/\/\)[^/].*/{
5992 + s//\1/
5993 + q
5994 + }
5995 + /^X\(\/\/\)$/{
5996 + s//\1/
5997 + q
5998 + }
5999 + /^X\(\/\).*/{
6000 + s//\1/
6001 + q
6002 + }
6003 + s/.*/./; q'`
6004 + test -d "$as_dir" && break
6005 done
6006 - test ! -n "$as_dirs" || mkdir $as_dirs
6007 - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
6008 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
6009 + test -z "$as_dirs" || eval "mkdir $as_dirs"
6010 + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
6011 +echo "$as_me: error: cannot create directory $as_dir" >&2;}
6012 { (exit 1); exit 1; }; }; }
6013 -
6014 ac_builddir=.
6015
6016 -if test "$ac_dir" != .; then
6017 +case "$ac_dir" in
6018 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
6019 +*)
6020 ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
6021 - # A "../" for each directory in $ac_dir_suffix.
6022 - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
6023 -else
6024 - ac_dir_suffix= ac_top_builddir=
6025 -fi
6026 + # A ".." for each directory in $ac_dir_suffix.
6027 + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
6028 + case $ac_top_builddir_sub in
6029 + "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
6030 + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
6031 + esac ;;
6032 +esac
6033 +ac_abs_top_builddir=$ac_pwd
6034 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
6035 +# for backward compatibility:
6036 +ac_top_builddir=$ac_top_build_prefix
6037
6038 case $srcdir in
6039 - .) # No --srcdir option. We are building in place.
6040 + .) # We are building in place.
6041 ac_srcdir=.
6042 - if test -z "$ac_top_builddir"; then
6043 - ac_top_srcdir=.
6044 - else
6045 - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
6046 - fi ;;
6047 - [\\/]* | ?:[\\/]* ) # Absolute path.
6048 + ac_top_srcdir=$ac_top_builddir_sub
6049 + ac_abs_top_srcdir=$ac_pwd ;;
6050 + [\\/]* | ?:[\\/]* ) # Absolute name.
6051 ac_srcdir=$srcdir$ac_dir_suffix;
6052 - ac_top_srcdir=$srcdir ;;
6053 - *) # Relative path.
6054 - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
6055 - ac_top_srcdir=$ac_top_builddir$srcdir ;;
6056 -esac
6057 -
6058 -# Do not use `cd foo && pwd` to compute absolute paths, because
6059 -# the directories may not exist.
6060 -case `pwd` in
6061 -.) ac_abs_builddir="$ac_dir";;
6062 -*)
6063 - case "$ac_dir" in
6064 - .) ac_abs_builddir=`pwd`;;
6065 - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
6066 - *) ac_abs_builddir=`pwd`/"$ac_dir";;
6067 - esac;;
6068 -esac
6069 -case $ac_abs_builddir in
6070 -.) ac_abs_top_builddir=${ac_top_builddir}.;;
6071 -*)
6072 - case ${ac_top_builddir}. in
6073 - .) ac_abs_top_builddir=$ac_abs_builddir;;
6074 - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
6075 - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
6076 - esac;;
6077 -esac
6078 -case $ac_abs_builddir in
6079 -.) ac_abs_srcdir=$ac_srcdir;;
6080 -*)
6081 - case $ac_srcdir in
6082 - .) ac_abs_srcdir=$ac_abs_builddir;;
6083 - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
6084 - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
6085 - esac;;
6086 -esac
6087 -case $ac_abs_builddir in
6088 -.) ac_abs_top_srcdir=$ac_top_srcdir;;
6089 -*)
6090 - case $ac_top_srcdir in
6091 - .) ac_abs_top_srcdir=$ac_abs_builddir;;
6092 - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
6093 - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
6094 - esac;;
6095 + ac_top_srcdir=$srcdir
6096 + ac_abs_top_srcdir=$srcdir ;;
6097 + *) # Relative name.
6098 + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
6099 + ac_top_srcdir=$ac_top_build_prefix$srcdir
6100 + ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
6101 esac
6102 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
6103
6104
6105 + case $ac_mode in
6106 + :F)
6107 + #
6108 + # CONFIG_FILE
6109 + #
6110
6111 - if test x"$ac_file" != x-; then
6112 - { echo "$as_me:$LINENO: creating $ac_file" >&5
6113 -echo "$as_me: creating $ac_file" >&6;}
6114 - rm -f "$ac_file"
6115 - fi
6116 - # Let's still pretend it is `configure' which instantiates (i.e., don't
6117 - # use $as_me), people would be surprised to read:
6118 - # /* config.h. Generated by config.status. */
6119 - if test x"$ac_file" = x-; then
6120 - configure_input=
6121 - else
6122 - configure_input="$ac_file. "
6123 - fi
6124 - configure_input=$configure_input"Generated from `echo $ac_file_in |
6125 - sed 's,.*/,,'` by configure."
6126 +_ACEOF
6127
6128 - # First look for the input files in the build tree, otherwise in the
6129 - # src tree.
6130 - ac_file_inputs=`IFS=:
6131 - for f in $ac_file_in; do
6132 - case $f in
6133 - -) echo $tmp/stdin ;;
6134 - [\\/$]*)
6135 - # Absolute (can't be DOS-style, as IFS=:)
6136 - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
6137 -echo "$as_me: error: cannot find input file: $f" >&2;}
6138 - { (exit 1); exit 1; }; }
6139 - echo "$f";;
6140 - *) # Relative
6141 - if test -f "$f"; then
6142 - # Build tree
6143 - echo "$f"
6144 - elif test -f "$srcdir/$f"; then
6145 - # Source tree
6146 - echo "$srcdir/$f"
6147 - else
6148 - # /dev/null tree
6149 - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
6150 -echo "$as_me: error: cannot find input file: $f" >&2;}
6151 - { (exit 1); exit 1; }; }
6152 - fi;;
6153 - esac
6154 - done` || { (exit 1); exit 1; }
6155 +cat >>$CONFIG_STATUS <<\_ACEOF
6156 +# If the template does not know about datarootdir, expand it.
6157 +# FIXME: This hack should be removed a few years after 2.60.
6158 +ac_datarootdir_hack=; ac_datarootdir_seen=
6159 +
6160 +case `sed -n '/datarootdir/ {
6161 + p
6162 + q
6163 +}
6164 +/@datadir@/p
6165 +/@docdir@/p
6166 +/@infodir@/p
6167 +/@localedir@/p
6168 +/@mandir@/p
6169 +' $ac_file_inputs` in
6170 +*datarootdir*) ac_datarootdir_seen=yes;;
6171 +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
6172 + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
6173 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
6174 _ACEOF
6175 cat >>$CONFIG_STATUS <<_ACEOF
6176 + ac_datarootdir_hack='
6177 + s&@datadir@&$datadir&g
6178 + s&@docdir@&$docdir&g
6179 + s&@infodir@&$infodir&g
6180 + s&@localedir@&$localedir&g
6181 + s&@mandir@&$mandir&g
6182 + s&\\\${datarootdir}&$datarootdir&g' ;;
6183 +esac
6184 +_ACEOF
6185 +
6186 +# Neutralize VPATH when `$srcdir' = `.'.
6187 +# Shell code in configure.ac might set extrasub.
6188 +# FIXME: do we really want to maintain this feature?
6189 +cat >>$CONFIG_STATUS <<_ACEOF
6190 sed "$ac_vpsub
6191 $extrasub
6192 _ACEOF
6193 cat >>$CONFIG_STATUS <<\_ACEOF
6194 :t
6195 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
6196 -s,@configure_input@,$configure_input,;t t
6197 -s,@srcdir@,$ac_srcdir,;t t
6198 -s,@abs_srcdir@,$ac_abs_srcdir,;t t
6199 -s,@top_srcdir@,$ac_top_srcdir,;t t
6200 -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
6201 -s,@builddir@,$ac_builddir,;t t
6202 -s,@abs_builddir@,$ac_abs_builddir,;t t
6203 -s,@top_builddir@,$ac_top_builddir,;t t
6204 -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
6205 -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
6206 - rm -f $tmp/stdin
6207 - if test x"$ac_file" != x-; then
6208 - mv $tmp/out $ac_file
6209 - else
6210 - cat $tmp/out
6211 - rm -f $tmp/out
6212 - fi
6213 +s&@configure_input@&$configure_input&;t t
6214 +s&@top_builddir@&$ac_top_builddir_sub&;t t
6215 +s&@srcdir@&$ac_srcdir&;t t
6216 +s&@abs_srcdir@&$ac_abs_srcdir&;t t
6217 +s&@top_srcdir@&$ac_top_srcdir&;t t
6218 +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
6219 +s&@builddir@&$ac_builddir&;t t
6220 +s&@abs_builddir@&$ac_abs_builddir&;t t
6221 +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
6222 +$ac_datarootdir_hack
6223 +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
6224 +
6225 +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
6226 + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
6227 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
6228 + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
6229 +which seems to be undefined. Please make sure it is defined." >&5
6230 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
6231 +which seems to be undefined. Please make sure it is defined." >&2;}
6232
6233 -done
6234 -_ACEOF
6235 + rm -f "$tmp/stdin"
6236 + case $ac_file in
6237 + -) cat "$tmp/out"; rm -f "$tmp/out";;
6238 + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
6239 + esac
6240 + ;;
6241 +
6242 +
6243 +
6244 + esac
6245 +
6246 +done # for ac_tag
6247
6248 -cat >>$CONFIG_STATUS <<\_ACEOF
6249
6250 { (exit 0); exit 0; }
6251 _ACEOF
6252 diff -ruN freeradius-1.1.6-old/src/modules/rlm_ldap/configure.in freeradius-1.1.6-new/src/modules/rlm_ldap/configure.in
6253 --- freeradius-1.1.6-old/src/modules/rlm_ldap/configure.in 2005-08-22 16:50:46.000000000 +0200
6254 +++ freeradius-1.1.6-new/src/modules/rlm_ldap/configure.in 2007-04-13 01:52:06.000000000 +0200
6255 @@ -90,6 +90,10 @@
6256 dnl Static linking will probably not work, but nobody ever
6257 dnl complained about it.
6258 smart_try_dir=$rlm_ldap_lib_dir
6259 +
6260 + AC_SMART_CHECK_LIB(sasl, sasl_encode)
6261 + AC_SMART_CHECK_LIB(lber, ber_init)
6262 +
6263 if test "x$rlm_ldap_with_threads" = "xyes"; then
6264 AC_SMART_CHECK_LIB(ldap_r, ldap_init)
6265 if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then
OpenWrt SVN history