[packages] freeradius: update to v1.1.8, force use of system libtool & libltdl
[openwrt/svn-archive/archive.git] / net / freeradius / patches / 004-ldap_configure.patch
1 --- a/src/modules/rlm_ldap/configure
2 +++ b/src/modules/rlm_ldap/configure
3 @@ -1,10 +1,10 @@
4 #! /bin/sh
5 -# From configure.in Revision: 1.10.2.4 .
6 +# From configure.in Revision.
7 # Guess values for system-dependent variables and create Makefiles.
8 -# Generated by GNU Autoconf 2.61.
9 +# Generated by GNU Autoconf 2.63.
10 #
11 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
12 -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
13 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 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 @@ -16,7 +16,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
18 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
19 emulate sh
20 NULLCMD=:
21 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
22 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
23 # is contrary to our usage. Disable this feature.
24 alias -g '${1+"$@"}'='"$@"'
25 setopt NO_GLOB_SUBST
26 @@ -38,17 +38,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
27 as_cr_digits='0123456789'
28 as_cr_alnum=$as_cr_Letters$as_cr_digits
29
30 -# The user is always right.
31 -if test "${PATH_SEPARATOR+set}" != set; then
32 - echo "#! /bin/sh" >conf$$.sh
33 - echo "exit 0" >>conf$$.sh
34 - chmod +x conf$$.sh
35 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
36 - PATH_SEPARATOR=';'
37 +as_nl='
38 +'
39 +export as_nl
40 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
41 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
42 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
43 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
44 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
45 + as_echo='printf %s\n'
46 + as_echo_n='printf %s'
47 +else
48 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
49 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
50 + as_echo_n='/usr/ucb/echo -n'
51 else
52 - PATH_SEPARATOR=:
53 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
54 + as_echo_n_body='eval
55 + arg=$1;
56 + case $arg in
57 + *"$as_nl"*)
58 + expr "X$arg" : "X\\(.*\\)$as_nl";
59 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
60 + esac;
61 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
62 + '
63 + export as_echo_n_body
64 + as_echo_n='sh -c $as_echo_n_body as_echo'
65 fi
66 - rm -f conf$$.sh
67 + export as_echo_body
68 + as_echo='sh -c $as_echo_body as_echo'
69 +fi
70 +
71 +# The user is always right.
72 +if test "${PATH_SEPARATOR+set}" != set; then
73 + PATH_SEPARATOR=:
74 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
75 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
76 + PATH_SEPARATOR=';'
77 + }
78 fi
79
80 # Support unset when possible.
81 @@ -64,8 +92,6 @@ fi
82 # there to prevent editors from complaining about space-tab.
83 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
84 # splitting by setting IFS to empty value.)
85 -as_nl='
86 -'
87 IFS=" "" $as_nl"
88
89 # Find who we are. Look in the path if we contain no directory separator.
90 @@ -88,7 +114,7 @@ if test "x$as_myself" = x; then
91 as_myself=$0
92 fi
93 if test ! -f "$as_myself"; then
94 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
95 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
96 { (exit 1); exit 1; }
97 fi
98
99 @@ -101,17 +127,10 @@ PS2='> '
100 PS4='+ '
101
102 # NLS nuisances.
103 -for as_var in \
104 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
105 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
106 - LC_TELEPHONE LC_TIME
107 -do
108 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
109 - eval $as_var=C; export $as_var
110 - else
111 - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
112 - fi
113 -done
114 +LC_ALL=C
115 +export LC_ALL
116 +LANGUAGE=C
117 +export LANGUAGE
118
119 # Required to use basename.
120 if expr a : '\(a\)' >/dev/null 2>&1 &&
121 @@ -133,7 +152,7 @@ as_me=`$as_basename -- "$0" ||
122 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
123 X"$0" : 'X\(//\)$' \| \
124 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
125 -echo X/"$0" |
126 +$as_echo X/"$0" |
127 sed '/^.*\/\([^/][^/]*\)\/*$/{
128 s//\1/
129 q
130 @@ -159,7 +178,7 @@ else
131 as_have_required=no
132 fi
133
134 - if test $as_have_required = yes && (eval ":
135 + if test $as_have_required = yes && (eval ":
136 (as_func_return () {
137 (exit \$1)
138 }
139 @@ -241,7 +260,7 @@ IFS=$as_save_IFS
140 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
141 emulate sh
142 NULLCMD=:
143 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
144 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
145 # is contrary to our usage. Disable this feature.
146 alias -g '${1+"$@"}'='"$@"'
147 setopt NO_GLOB_SUBST
148 @@ -262,7 +281,7 @@ _ASEOF
149 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
150 emulate sh
151 NULLCMD=:
152 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
153 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
154 # is contrary to our usage. Disable this feature.
155 alias -g '${1+"$@"}'='"$@"'
156 setopt NO_GLOB_SUBST
157 @@ -342,10 +361,10 @@ fi
158
159 if test "x$CONFIG_SHELL" != x; then
160 for as_var in BASH_ENV ENV
161 - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
162 - done
163 - export CONFIG_SHELL
164 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
165 + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
166 + done
167 + export CONFIG_SHELL
168 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
169 fi
170
171
172 @@ -414,9 +433,10 @@ fi
173
174 test \$exitcode = 0") || {
175 echo No shell found that supports shell functions.
176 - echo Please tell autoconf@gnu.org about your system,
177 - echo including any error possibly output before this
178 - echo message
179 + echo Please tell bug-autoconf@gnu.org about your system,
180 + echo including any error possibly output before this message.
181 + echo This can help us improve future autoconf versions.
182 + echo Configuration will now proceed without shell functions.
183 }
184
185
186 @@ -452,7 +472,7 @@ test \$exitcode = 0") || {
187 s/-\n.*//
188 ' >$as_me.lineno &&
189 chmod +x "$as_me.lineno" ||
190 - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
191 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
192 { (exit 1); exit 1; }; }
193
194 # Don't try to exec as it changes $[0], causing all sort of problems
195 @@ -480,7 +500,6 @@ case `echo -n x` in
196 *)
197 ECHO_N='-n';;
198 esac
199 -
200 if expr a : '\(a\)' >/dev/null 2>&1 &&
201 test "X`expr 00001 : '.*\(...\)'`" = X001; then
202 as_expr=expr
203 @@ -493,19 +512,22 @@ if test -d conf$$.dir; then
204 rm -f conf$$.dir/conf$$.file
205 else
206 rm -f conf$$.dir
207 - mkdir conf$$.dir
208 + mkdir conf$$.dir 2>/dev/null
209 fi
210 -echo >conf$$.file
211 -if ln -s conf$$.file conf$$ 2>/dev/null; then
212 - as_ln_s='ln -s'
213 - # ... but there are two gotchas:
214 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
215 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
216 - # In both cases, we have to default to `cp -p'.
217 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
218 +if (echo >conf$$.file) 2>/dev/null; then
219 + if ln -s conf$$.file conf$$ 2>/dev/null; then
220 + as_ln_s='ln -s'
221 + # ... but there are two gotchas:
222 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
223 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
224 + # In both cases, we have to default to `cp -p'.
225 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
226 + as_ln_s='cp -p'
227 + elif ln conf$$.file conf$$ 2>/dev/null; then
228 + as_ln_s=ln
229 + else
230 as_ln_s='cp -p'
231 -elif ln conf$$.file conf$$ 2>/dev/null; then
232 - as_ln_s=ln
233 + fi
234 else
235 as_ln_s='cp -p'
236 fi
237 @@ -530,10 +552,10 @@ else
238 as_test_x='
239 eval sh -c '\''
240 if test -d "$1"; then
241 - test -d "$1/.";
242 + test -d "$1/.";
243 else
244 case $1 in
245 - -*)set "./$1";;
246 + -*)set "./$1";;
247 esac;
248 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
249 ???[sx]*):;;*)false;;esac;fi
250 @@ -578,57 +600,65 @@ PACKAGE_STRING=
251 PACKAGE_BUGREPORT=
252
253 ac_unique_file="rlm_ldap.c"
254 -ac_subst_vars='SHELL
255 -PATH_SEPARATOR
256 -PACKAGE_NAME
257 -PACKAGE_TARNAME
258 -PACKAGE_VERSION
259 -PACKAGE_STRING
260 -PACKAGE_BUGREPORT
261 -exec_prefix
262 -prefix
263 -program_transform_name
264 -bindir
265 -sbindir
266 -libexecdir
267 -datarootdir
268 -datadir
269 -sysconfdir
270 -sharedstatedir
271 -localstatedir
272 -includedir
273 -oldincludedir
274 -docdir
275 -infodir
276 -htmldir
277 -dvidir
278 -pdfdir
279 -psdir
280 -libdir
281 -localedir
282 -mandir
283 -DEFS
284 -ECHO_C
285 -ECHO_N
286 -ECHO_T
287 -LIBS
288 -build_alias
289 -host_alias
290 -target_alias
291 -CC
292 -CFLAGS
293 -LDFLAGS
294 -CPPFLAGS
295 -ac_ct_CC
296 -EXEEXT
297 -OBJEXT
298 -edir
299 -ldap_ldflags
300 -ldap_cflags
301 -targetname
302 +ac_subst_vars='LTLIBOBJS
303 LIBOBJS
304 -LTLIBOBJS'
305 +targetname
306 +ldap_cflags
307 +ldap_ldflags
308 +edir
309 +OBJEXT
310 +EXEEXT
311 +ac_ct_CC
312 +CPPFLAGS
313 +LDFLAGS
314 +CFLAGS
315 +CC
316 +target_alias
317 +host_alias
318 +build_alias
319 +LIBS
320 +ECHO_T
321 +ECHO_N
322 +ECHO_C
323 +DEFS
324 +mandir
325 +localedir
326 +libdir
327 +psdir
328 +pdfdir
329 +dvidir
330 +htmldir
331 +infodir
332 +docdir
333 +oldincludedir
334 +includedir
335 +localstatedir
336 +sharedstatedir
337 +sysconfdir
338 +datadir
339 +datarootdir
340 +libexecdir
341 +sbindir
342 +bindir
343 +program_transform_name
344 +prefix
345 +exec_prefix
346 +PACKAGE_BUGREPORT
347 +PACKAGE_STRING
348 +PACKAGE_VERSION
349 +PACKAGE_TARNAME
350 +PACKAGE_NAME
351 +PATH_SEPARATOR
352 +SHELL'
353 ac_subst_files=''
354 +ac_user_opts='
355 +enable_option_checking
356 +with_rlm_ldap_lib_dir
357 +with_rlm_ldap_include_dir
358 +enable_shared
359 +with_threads
360 +with_edir
361 +'
362 ac_precious_vars='build_alias
363 host_alias
364 target_alias
365 @@ -642,6 +672,8 @@ CPPFLAGS'
366 # Initialize some variables set by options.
367 ac_init_help=
368 ac_init_version=false
369 +ac_unrecognized_opts=
370 +ac_unrecognized_sep=
371 # The variables have the same names as the options, with
372 # dashes changed to underlines.
373 cache_file=/dev/null
374 @@ -740,13 +772,21 @@ do
375 datarootdir=$ac_optarg ;;
376
377 -disable-* | --disable-*)
378 - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
379 + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
380 # Reject names that are not valid shell variable names.
381 - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
382 - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
383 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
384 + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
385 { (exit 1); exit 1; }; }
386 - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
387 - eval enable_$ac_feature=no ;;
388 + ac_useropt_orig=$ac_useropt
389 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
390 + case $ac_user_opts in
391 + *"
392 +"enable_$ac_useropt"
393 +"*) ;;
394 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
395 + ac_unrecognized_sep=', ';;
396 + esac
397 + eval enable_$ac_useropt=no ;;
398
399 -docdir | --docdir | --docdi | --doc | --do)
400 ac_prev=docdir ;;
401 @@ -759,13 +799,21 @@ do
402 dvidir=$ac_optarg ;;
403
404 -enable-* | --enable-*)
405 - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
406 + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
407 # Reject names that are not valid shell variable names.
408 - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
409 - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
410 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
411 + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
412 { (exit 1); exit 1; }; }
413 - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
414 - eval enable_$ac_feature=\$ac_optarg ;;
415 + ac_useropt_orig=$ac_useropt
416 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
417 + case $ac_user_opts in
418 + *"
419 +"enable_$ac_useropt"
420 +"*) ;;
421 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
422 + ac_unrecognized_sep=', ';;
423 + esac
424 + eval enable_$ac_useropt=\$ac_optarg ;;
425
426 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
427 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
428 @@ -956,22 +1004,38 @@ do
429 ac_init_version=: ;;
430
431 -with-* | --with-*)
432 - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
433 + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
434 # Reject names that are not valid shell variable names.
435 - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
436 - { echo "$as_me: error: invalid package name: $ac_package" >&2
437 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
438 + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
439 { (exit 1); exit 1; }; }
440 - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
441 - eval with_$ac_package=\$ac_optarg ;;
442 + ac_useropt_orig=$ac_useropt
443 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
444 + case $ac_user_opts in
445 + *"
446 +"with_$ac_useropt"
447 +"*) ;;
448 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
449 + ac_unrecognized_sep=', ';;
450 + esac
451 + eval with_$ac_useropt=\$ac_optarg ;;
452
453 -without-* | --without-*)
454 - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
455 + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
456 # Reject names that are not valid shell variable names.
457 - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
458 - { echo "$as_me: error: invalid package name: $ac_package" >&2
459 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
460 + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
461 { (exit 1); exit 1; }; }
462 - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
463 - eval with_$ac_package=no ;;
464 + ac_useropt_orig=$ac_useropt
465 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
466 + case $ac_user_opts in
467 + *"
468 +"with_$ac_useropt"
469 +"*) ;;
470 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
471 + ac_unrecognized_sep=', ';;
472 + esac
473 + eval with_$ac_useropt=no ;;
474
475 --x)
476 # Obsolete; use --with-x.
477 @@ -991,7 +1055,7 @@ do
478 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
479 x_libraries=$ac_optarg ;;
480
481 - -*) { echo "$as_me: error: unrecognized option: $ac_option
482 + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
483 Try \`$0 --help' for more information." >&2
484 { (exit 1); exit 1; }; }
485 ;;
486 @@ -1000,16 +1064,16 @@ Try \`$0 --help' for more information."
487 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
488 # Reject names that are not valid shell variable names.
489 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
490 - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
491 + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
492 { (exit 1); exit 1; }; }
493 eval $ac_envvar=\$ac_optarg
494 export $ac_envvar ;;
495
496 *)
497 # FIXME: should be removed in autoconf 3.0.
498 - echo "$as_me: WARNING: you should use --build, --host, --target" >&2
499 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
500 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
501 - echo "$as_me: WARNING: invalid host type: $ac_option" >&2
502 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
503 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
504 ;;
505
506 @@ -1018,22 +1082,38 @@ done
507
508 if test -n "$ac_prev"; then
509 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
510 - { echo "$as_me: error: missing argument to $ac_option" >&2
511 + { $as_echo "$as_me: error: missing argument to $ac_option" >&2
512 { (exit 1); exit 1; }; }
513 fi
514
515 -# Be sure to have absolute directory names.
516 +if test -n "$ac_unrecognized_opts"; then
517 + case $enable_option_checking in
518 + no) ;;
519 + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
520 + { (exit 1); exit 1; }; } ;;
521 + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
522 + esac
523 +fi
524 +
525 +# Check all directory arguments for consistency.
526 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
527 datadir sysconfdir sharedstatedir localstatedir includedir \
528 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
529 libdir localedir mandir
530 do
531 eval ac_val=\$$ac_var
532 + # Remove trailing slashes.
533 + case $ac_val in
534 + */ )
535 + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
536 + eval $ac_var=\$ac_val;;
537 + esac
538 + # Be sure to have absolute directory names.
539 case $ac_val in
540 [\\/$]* | ?:[\\/]* ) continue;;
541 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
542 esac
543 - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
544 + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
545 { (exit 1); exit 1; }; }
546 done
547
548 @@ -1048,7 +1128,7 @@ target=$target_alias
549 if test "x$host_alias" != x; then
550 if test "x$build_alias" = x; then
551 cross_compiling=maybe
552 - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
553 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
554 If a cross compiler is detected then cross compile mode will be used." >&2
555 elif test "x$build_alias" != "x$host_alias"; then
556 cross_compiling=yes
557 @@ -1064,10 +1144,10 @@ test "$silent" = yes && exec 6>/dev/null
558 ac_pwd=`pwd` && test -n "$ac_pwd" &&
559 ac_ls_di=`ls -di .` &&
560 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
561 - { echo "$as_me: error: Working directory cannot be determined" >&2
562 + { $as_echo "$as_me: error: working directory cannot be determined" >&2
563 { (exit 1); exit 1; }; }
564 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
565 - { echo "$as_me: error: pwd does not report name of working directory" >&2
566 + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
567 { (exit 1); exit 1; }; }
568
569
570 @@ -1075,12 +1155,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
571 if test -z "$srcdir"; then
572 ac_srcdir_defaulted=yes
573 # Try the directory containing this script, then the parent directory.
574 - ac_confdir=`$as_dirname -- "$0" ||
575 -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
576 - X"$0" : 'X\(//\)[^/]' \| \
577 - X"$0" : 'X\(//\)$' \| \
578 - X"$0" : 'X\(/\)' \| . 2>/dev/null ||
579 -echo X"$0" |
580 + ac_confdir=`$as_dirname -- "$as_myself" ||
581 +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
582 + X"$as_myself" : 'X\(//\)[^/]' \| \
583 + X"$as_myself" : 'X\(//\)$' \| \
584 + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
585 +$as_echo X"$as_myself" |
586 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
587 s//\1/
588 q
589 @@ -1107,12 +1187,12 @@ else
590 fi
591 if test ! -r "$srcdir/$ac_unique_file"; then
592 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
593 - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
594 + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
595 { (exit 1); exit 1; }; }
596 fi
597 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
598 ac_abs_confdir=`(
599 - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
600 + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
601 { (exit 1); exit 1; }; }
602 pwd)`
603 # When building in place, set srcdir=.
604 @@ -1161,9 +1241,9 @@ Configuration:
605
606 Installation directories:
607 --prefix=PREFIX install architecture-independent files in PREFIX
608 - [$ac_default_prefix]
609 + [$ac_default_prefix]
610 --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
611 - [PREFIX]
612 + [PREFIX]
613
614 By default, \`make install' will install all the files in
615 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
616 @@ -1173,25 +1253,25 @@ for instance \`--prefix=\$HOME'.
617 For better control, use the options below.
618
619 Fine tuning of the installation directories:
620 - --bindir=DIR user executables [EPREFIX/bin]
621 - --sbindir=DIR system admin executables [EPREFIX/sbin]
622 - --libexecdir=DIR program executables [EPREFIX/libexec]
623 - --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
624 - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
625 - --localstatedir=DIR modifiable single-machine data [PREFIX/var]
626 - --libdir=DIR object code libraries [EPREFIX/lib]
627 - --includedir=DIR C header files [PREFIX/include]
628 - --oldincludedir=DIR C header files for non-gcc [/usr/include]
629 - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
630 - --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
631 - --infodir=DIR info documentation [DATAROOTDIR/info]
632 - --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
633 - --mandir=DIR man documentation [DATAROOTDIR/man]
634 - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
635 - --htmldir=DIR html documentation [DOCDIR]
636 - --dvidir=DIR dvi documentation [DOCDIR]
637 - --pdfdir=DIR pdf documentation [DOCDIR]
638 - --psdir=DIR ps documentation [DOCDIR]
639 + --bindir=DIR user executables [EPREFIX/bin]
640 + --sbindir=DIR system admin executables [EPREFIX/sbin]
641 + --libexecdir=DIR program executables [EPREFIX/libexec]
642 + --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
643 + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
644 + --localstatedir=DIR modifiable single-machine data [PREFIX/var]
645 + --libdir=DIR object code libraries [EPREFIX/lib]
646 + --includedir=DIR C header files [PREFIX/include]
647 + --oldincludedir=DIR C header files for non-gcc [/usr/include]
648 + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
649 + --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
650 + --infodir=DIR info documentation [DATAROOTDIR/info]
651 + --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
652 + --mandir=DIR man documentation [DATAROOTDIR/man]
653 + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
654 + --htmldir=DIR html documentation [DOCDIR]
655 + --dvidir=DIR dvi documentation [DOCDIR]
656 + --pdfdir=DIR pdf documentation [DOCDIR]
657 + --psdir=DIR ps documentation [DOCDIR]
658 _ACEOF
659
660 cat <<\_ACEOF
661 @@ -1203,6 +1283,7 @@ if test -n "$ac_init_help"; then
662 cat <<\_ACEOF
663
664 Optional Features:
665 + --disable-option-checking ignore unrecognized --enable/--with options
666 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
667 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
668 --enable-shared[=PKGS] build shared libraries [default=yes]
669 @@ -1234,15 +1315,17 @@ fi
670 if test "$ac_init_help" = "recursive"; then
671 # If there are subdirs, report their specific --help.
672 for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
673 - test -d "$ac_dir" || continue
674 + test -d "$ac_dir" ||
675 + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
676 + continue
677 ac_builddir=.
678
679 case "$ac_dir" in
680 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
681 *)
682 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
683 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
684 # A ".." for each directory in $ac_dir_suffix.
685 - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
686 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
687 case $ac_top_builddir_sub in
688 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
689 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
690 @@ -1278,7 +1361,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
691 echo &&
692 $SHELL "$ac_srcdir/configure" --help=recursive
693 else
694 - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
695 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
696 fi || ac_status=$?
697 cd "$ac_pwd" || { ac_status=$?; break; }
698 done
699 @@ -1288,10 +1371,10 @@ test -n "$ac_init_help" && exit $ac_stat
700 if $ac_init_version; then
701 cat <<\_ACEOF
702 configure
703 -generated by GNU Autoconf 2.61
704 +generated by GNU Autoconf 2.63
705
706 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
707 -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
708 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
709 This configure script is free software; the Free Software Foundation
710 gives unlimited permission to copy, distribute and modify it.
711 _ACEOF
712 @@ -1302,7 +1385,7 @@ This file contains any messages produced
713 running configure, to aid debugging if configure makes a mistake.
714
715 It was created by $as_me, which was
716 -generated by GNU Autoconf 2.61. Invocation command line was
717 +generated by GNU Autoconf 2.63. Invocation command line was
718
719 $ $0 $@
720
721 @@ -1338,7 +1421,7 @@ for as_dir in $PATH
722 do
723 IFS=$as_save_IFS
724 test -z "$as_dir" && as_dir=.
725 - echo "PATH: $as_dir"
726 + $as_echo "PATH: $as_dir"
727 done
728 IFS=$as_save_IFS
729
730 @@ -1373,7 +1456,7 @@ do
731 | -silent | --silent | --silen | --sile | --sil)
732 continue ;;
733 *\'*)
734 - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
735 + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
736 esac
737 case $ac_pass in
738 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
739 @@ -1425,11 +1508,12 @@ _ASBOX
740 case $ac_val in #(
741 *${as_nl}*)
742 case $ac_var in #(
743 - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
744 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
745 + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
746 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
747 esac
748 case $ac_var in #(
749 _ | IFS | as_nl) ;; #(
750 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
751 *) $as_unset $ac_var ;;
752 esac ;;
753 esac
754 @@ -1459,9 +1543,9 @@ _ASBOX
755 do
756 eval ac_val=\$$ac_var
757 case $ac_val in
758 - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
759 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
760 esac
761 - echo "$ac_var='\''$ac_val'\''"
762 + $as_echo "$ac_var='\''$ac_val'\''"
763 done | sort
764 echo
765
766 @@ -1476,9 +1560,9 @@ _ASBOX
767 do
768 eval ac_val=\$$ac_var
769 case $ac_val in
770 - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
771 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
772 esac
773 - echo "$ac_var='\''$ac_val'\''"
774 + $as_echo "$ac_var='\''$ac_val'\''"
775 done | sort
776 echo
777 fi
778 @@ -1494,8 +1578,8 @@ _ASBOX
779 echo
780 fi
781 test "$ac_signal" != 0 &&
782 - echo "$as_me: caught signal $ac_signal"
783 - echo "$as_me: exit $exit_status"
784 + $as_echo "$as_me: caught signal $ac_signal"
785 + $as_echo "$as_me: exit $exit_status"
786 } >&5
787 rm -f core *.core core.conftest.* &&
788 rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
789 @@ -1537,21 +1621,24 @@ _ACEOF
790
791
792 # Let the site file select an alternate cache file if it wants to.
793 -# Prefer explicitly selected file to automatically selected ones.
794 +# Prefer an explicitly selected file to automatically selected ones.
795 +ac_site_file1=NONE
796 +ac_site_file2=NONE
797 if test -n "$CONFIG_SITE"; then
798 - set x "$CONFIG_SITE"
799 + ac_site_file1=$CONFIG_SITE
800 elif test "x$prefix" != xNONE; then
801 - set x "$prefix/share/config.site" "$prefix/etc/config.site"
802 + ac_site_file1=$prefix/share/config.site
803 + ac_site_file2=$prefix/etc/config.site
804 else
805 - set x "$ac_default_prefix/share/config.site" \
806 - "$ac_default_prefix/etc/config.site"
807 + ac_site_file1=$ac_default_prefix/share/config.site
808 + ac_site_file2=$ac_default_prefix/etc/config.site
809 fi
810 -shift
811 -for ac_site_file
812 +for ac_site_file in "$ac_site_file1" "$ac_site_file2"
813 do
814 + test "x$ac_site_file" = xNONE && continue
815 if test -r "$ac_site_file"; then
816 - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
817 -echo "$as_me: loading site script $ac_site_file" >&6;}
818 + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
819 +$as_echo "$as_me: loading site script $ac_site_file" >&6;}
820 sed 's/^/| /' "$ac_site_file" >&5
821 . "$ac_site_file"
822 fi
823 @@ -1561,16 +1648,16 @@ if test -r "$cache_file"; then
824 # Some versions of bash will fail to source /dev/null (special
825 # files actually), so we avoid doing that.
826 if test -f "$cache_file"; then
827 - { echo "$as_me:$LINENO: loading cache $cache_file" >&5
828 -echo "$as_me: loading cache $cache_file" >&6;}
829 + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
830 +$as_echo "$as_me: loading cache $cache_file" >&6;}
831 case $cache_file in
832 [\\/]* | ?:[\\/]* ) . "$cache_file";;
833 *) . "./$cache_file";;
834 esac
835 fi
836 else
837 - { echo "$as_me:$LINENO: creating cache $cache_file" >&5
838 -echo "$as_me: creating cache $cache_file" >&6;}
839 + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
840 +$as_echo "$as_me: creating cache $cache_file" >&6;}
841 >$cache_file
842 fi
843
844 @@ -1584,29 +1671,38 @@ for ac_var in $ac_precious_vars; do
845 eval ac_new_val=\$ac_env_${ac_var}_value
846 case $ac_old_set,$ac_new_set in
847 set,)
848 - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
849 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
850 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
851 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
852 ac_cache_corrupted=: ;;
853 ,set)
854 - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
855 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
856 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
857 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
858 ac_cache_corrupted=: ;;
859 ,);;
860 *)
861 if test "x$ac_old_val" != "x$ac_new_val"; then
862 - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
863 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
864 - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
865 -echo "$as_me: former value: $ac_old_val" >&2;}
866 - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
867 -echo "$as_me: current value: $ac_new_val" >&2;}
868 - ac_cache_corrupted=:
869 + # differences in whitespace do not lead to failure.
870 + ac_old_val_w=`echo x $ac_old_val`
871 + ac_new_val_w=`echo x $ac_new_val`
872 + if test "$ac_old_val_w" != "$ac_new_val_w"; then
873 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
874 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
875 + ac_cache_corrupted=:
876 + else
877 + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
878 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
879 + eval $ac_var=\$ac_old_val
880 + fi
881 + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
882 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
883 + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
884 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
885 fi;;
886 esac
887 # Pass precious variables to config.status.
888 if test "$ac_new_set" = set; then
889 case $ac_new_val in
890 - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
891 + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
892 *) ac_arg=$ac_var=$ac_new_val ;;
893 esac
894 case " $ac_configure_args " in
895 @@ -1616,10 +1712,12 @@ echo "$as_me: current value: $ac_new_v
896 fi
897 done
898 if $ac_cache_corrupted; then
899 - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
900 -echo "$as_me: error: changes in the environment can compromise the build" >&2;}
901 - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
902 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
903 + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
904 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
905 + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
906 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
907 + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
908 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
909 { (exit 1); exit 1; }; }
910 fi
911
912 @@ -1662,10 +1760,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
913 if test -n "$ac_tool_prefix"; then
914 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
915 set dummy ${ac_tool_prefix}gcc; ac_word=$2
916 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
917 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
918 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
919 +$as_echo_n "checking for $ac_word... " >&6; }
920 if test "${ac_cv_prog_CC+set}" = set; then
921 - echo $ECHO_N "(cached) $ECHO_C" >&6
922 + $as_echo_n "(cached) " >&6
923 else
924 if test -n "$CC"; then
925 ac_cv_prog_CC="$CC" # Let the user override the test.
926 @@ -1678,7 +1776,7 @@ do
927 for ac_exec_ext in '' $ac_executable_extensions; do
928 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
929 ac_cv_prog_CC="${ac_tool_prefix}gcc"
930 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
931 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
932 break 2
933 fi
934 done
935 @@ -1689,11 +1787,11 @@ fi
936 fi
937 CC=$ac_cv_prog_CC
938 if test -n "$CC"; then
939 - { echo "$as_me:$LINENO: result: $CC" >&5
940 -echo "${ECHO_T}$CC" >&6; }
941 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
942 +$as_echo "$CC" >&6; }
943 else
944 - { echo "$as_me:$LINENO: result: no" >&5
945 -echo "${ECHO_T}no" >&6; }
946 + { $as_echo "$as_me:$LINENO: result: no" >&5
947 +$as_echo "no" >&6; }
948 fi
949
950
951 @@ -1702,10 +1800,10 @@ if test -z "$ac_cv_prog_CC"; then
952 ac_ct_CC=$CC
953 # Extract the first word of "gcc", so it can be a program name with args.
954 set dummy gcc; ac_word=$2
955 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
956 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
957 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
958 +$as_echo_n "checking for $ac_word... " >&6; }
959 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
960 - echo $ECHO_N "(cached) $ECHO_C" >&6
961 + $as_echo_n "(cached) " >&6
962 else
963 if test -n "$ac_ct_CC"; then
964 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
965 @@ -1718,7 +1816,7 @@ do
966 for ac_exec_ext in '' $ac_executable_extensions; do
967 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
968 ac_cv_prog_ac_ct_CC="gcc"
969 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
970 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
971 break 2
972 fi
973 done
974 @@ -1729,11 +1827,11 @@ fi
975 fi
976 ac_ct_CC=$ac_cv_prog_ac_ct_CC
977 if test -n "$ac_ct_CC"; then
978 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
979 -echo "${ECHO_T}$ac_ct_CC" >&6; }
980 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
981 +$as_echo "$ac_ct_CC" >&6; }
982 else
983 - { echo "$as_me:$LINENO: result: no" >&5
984 -echo "${ECHO_T}no" >&6; }
985 + { $as_echo "$as_me:$LINENO: result: no" >&5
986 +$as_echo "no" >&6; }
987 fi
988
989 if test "x$ac_ct_CC" = x; then
990 @@ -1741,12 +1839,8 @@ fi
991 else
992 case $cross_compiling:$ac_tool_warned in
993 yes:)
994 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
995 -whose name does not start with the host triplet. If you think this
996 -configuration is useful to you, please write to autoconf@gnu.org." >&5
997 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
998 -whose name does not start with the host triplet. If you think this
999 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1000 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
1001 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1002 ac_tool_warned=yes ;;
1003 esac
1004 CC=$ac_ct_CC
1005 @@ -1759,10 +1853,10 @@ if test -z "$CC"; then
1006 if test -n "$ac_tool_prefix"; then
1007 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
1008 set dummy ${ac_tool_prefix}cc; ac_word=$2
1009 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1010 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1011 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1012 +$as_echo_n "checking for $ac_word... " >&6; }
1013 if test "${ac_cv_prog_CC+set}" = set; then
1014 - echo $ECHO_N "(cached) $ECHO_C" >&6
1015 + $as_echo_n "(cached) " >&6
1016 else
1017 if test -n "$CC"; then
1018 ac_cv_prog_CC="$CC" # Let the user override the test.
1019 @@ -1775,7 +1869,7 @@ do
1020 for ac_exec_ext in '' $ac_executable_extensions; do
1021 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1022 ac_cv_prog_CC="${ac_tool_prefix}cc"
1023 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1024 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1025 break 2
1026 fi
1027 done
1028 @@ -1786,11 +1880,11 @@ fi
1029 fi
1030 CC=$ac_cv_prog_CC
1031 if test -n "$CC"; then
1032 - { echo "$as_me:$LINENO: result: $CC" >&5
1033 -echo "${ECHO_T}$CC" >&6; }
1034 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1035 +$as_echo "$CC" >&6; }
1036 else
1037 - { echo "$as_me:$LINENO: result: no" >&5
1038 -echo "${ECHO_T}no" >&6; }
1039 + { $as_echo "$as_me:$LINENO: result: no" >&5
1040 +$as_echo "no" >&6; }
1041 fi
1042
1043
1044 @@ -1799,10 +1893,10 @@ fi
1045 if test -z "$CC"; then
1046 # Extract the first word of "cc", so it can be a program name with args.
1047 set dummy cc; ac_word=$2
1048 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1049 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1050 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1051 +$as_echo_n "checking for $ac_word... " >&6; }
1052 if test "${ac_cv_prog_CC+set}" = set; then
1053 - echo $ECHO_N "(cached) $ECHO_C" >&6
1054 + $as_echo_n "(cached) " >&6
1055 else
1056 if test -n "$CC"; then
1057 ac_cv_prog_CC="$CC" # Let the user override the test.
1058 @@ -1820,7 +1914,7 @@ do
1059 continue
1060 fi
1061 ac_cv_prog_CC="cc"
1062 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1063 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1064 break 2
1065 fi
1066 done
1067 @@ -1843,11 +1937,11 @@ fi
1068 fi
1069 CC=$ac_cv_prog_CC
1070 if test -n "$CC"; then
1071 - { echo "$as_me:$LINENO: result: $CC" >&5
1072 -echo "${ECHO_T}$CC" >&6; }
1073 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1074 +$as_echo "$CC" >&6; }
1075 else
1076 - { echo "$as_me:$LINENO: result: no" >&5
1077 -echo "${ECHO_T}no" >&6; }
1078 + { $as_echo "$as_me:$LINENO: result: no" >&5
1079 +$as_echo "no" >&6; }
1080 fi
1081
1082
1083 @@ -1858,10 +1952,10 @@ if test -z "$CC"; then
1084 do
1085 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1086 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1087 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1088 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1089 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1090 +$as_echo_n "checking for $ac_word... " >&6; }
1091 if test "${ac_cv_prog_CC+set}" = set; then
1092 - echo $ECHO_N "(cached) $ECHO_C" >&6
1093 + $as_echo_n "(cached) " >&6
1094 else
1095 if test -n "$CC"; then
1096 ac_cv_prog_CC="$CC" # Let the user override the test.
1097 @@ -1874,7 +1968,7 @@ do
1098 for ac_exec_ext in '' $ac_executable_extensions; do
1099 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1100 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
1101 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1102 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1103 break 2
1104 fi
1105 done
1106 @@ -1885,11 +1979,11 @@ fi
1107 fi
1108 CC=$ac_cv_prog_CC
1109 if test -n "$CC"; then
1110 - { echo "$as_me:$LINENO: result: $CC" >&5
1111 -echo "${ECHO_T}$CC" >&6; }
1112 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1113 +$as_echo "$CC" >&6; }
1114 else
1115 - { echo "$as_me:$LINENO: result: no" >&5
1116 -echo "${ECHO_T}no" >&6; }
1117 + { $as_echo "$as_me:$LINENO: result: no" >&5
1118 +$as_echo "no" >&6; }
1119 fi
1120
1121
1122 @@ -1902,10 +1996,10 @@ if test -z "$CC"; then
1123 do
1124 # Extract the first word of "$ac_prog", so it can be a program name with args.
1125 set dummy $ac_prog; ac_word=$2
1126 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1127 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1128 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1129 +$as_echo_n "checking for $ac_word... " >&6; }
1130 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1131 - echo $ECHO_N "(cached) $ECHO_C" >&6
1132 + $as_echo_n "(cached) " >&6
1133 else
1134 if test -n "$ac_ct_CC"; then
1135 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1136 @@ -1918,7 +2012,7 @@ do
1137 for ac_exec_ext in '' $ac_executable_extensions; do
1138 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1139 ac_cv_prog_ac_ct_CC="$ac_prog"
1140 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1141 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1142 break 2
1143 fi
1144 done
1145 @@ -1929,11 +2023,11 @@ fi
1146 fi
1147 ac_ct_CC=$ac_cv_prog_ac_ct_CC
1148 if test -n "$ac_ct_CC"; then
1149 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1150 -echo "${ECHO_T}$ac_ct_CC" >&6; }
1151 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1152 +$as_echo "$ac_ct_CC" >&6; }
1153 else
1154 - { echo "$as_me:$LINENO: result: no" >&5
1155 -echo "${ECHO_T}no" >&6; }
1156 + { $as_echo "$as_me:$LINENO: result: no" >&5
1157 +$as_echo "no" >&6; }
1158 fi
1159
1160
1161 @@ -1945,12 +2039,8 @@ done
1162 else
1163 case $cross_compiling:$ac_tool_warned in
1164 yes:)
1165 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1166 -whose name does not start with the host triplet. If you think this
1167 -configuration is useful to you, please write to autoconf@gnu.org." >&5
1168 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1169 -whose name does not start with the host triplet. If you think this
1170 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1171 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
1172 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1173 ac_tool_warned=yes ;;
1174 esac
1175 CC=$ac_ct_CC
1176 @@ -1960,44 +2050,50 @@ fi
1177 fi
1178
1179
1180 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1181 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1182 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1183 +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1184 See \`config.log' for more details." >&5
1185 -echo "$as_me: error: no acceptable C compiler found in \$PATH
1186 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
1187 See \`config.log' for more details." >&2;}
1188 - { (exit 1); exit 1; }; }
1189 + { (exit 1); exit 1; }; }; }
1190
1191 # Provide some information about the compiler.
1192 -echo "$as_me:$LINENO: checking for C compiler version" >&5
1193 -ac_compiler=`set X $ac_compile; echo $2`
1194 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
1195 +set X $ac_compile
1196 +ac_compiler=$2
1197 { (ac_try="$ac_compiler --version >&5"
1198 case "(($ac_try" in
1199 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1200 *) ac_try_echo=$ac_try;;
1201 esac
1202 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1203 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1204 +$as_echo "$ac_try_echo") >&5
1205 (eval "$ac_compiler --version >&5") 2>&5
1206 ac_status=$?
1207 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1208 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1209 (exit $ac_status); }
1210 { (ac_try="$ac_compiler -v >&5"
1211 case "(($ac_try" in
1212 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1213 *) ac_try_echo=$ac_try;;
1214 esac
1215 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1216 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1217 +$as_echo "$ac_try_echo") >&5
1218 (eval "$ac_compiler -v >&5") 2>&5
1219 ac_status=$?
1220 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1221 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1222 (exit $ac_status); }
1223 { (ac_try="$ac_compiler -V >&5"
1224 case "(($ac_try" in
1225 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1226 *) ac_try_echo=$ac_try;;
1227 esac
1228 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1229 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1230 +$as_echo "$ac_try_echo") >&5
1231 (eval "$ac_compiler -V >&5") 2>&5
1232 ac_status=$?
1233 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1234 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1235 (exit $ac_status); }
1236
1237 cat >conftest.$ac_ext <<_ACEOF
1238 @@ -2016,27 +2112,22 @@ main ()
1239 }
1240 _ACEOF
1241 ac_clean_files_save=$ac_clean_files
1242 -ac_clean_files="$ac_clean_files a.out a.exe b.out"
1243 +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
1244 # Try to create an executable without -o first, disregard a.out.
1245 # It will help us diagnose broken compilers, and finding out an intuition
1246 # of exeext.
1247 -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
1248 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
1249 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
1250 -#
1251 -# List of possible output files, starting from the most likely.
1252 -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
1253 -# only as a last resort. b.out is created by i960 compilers.
1254 -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
1255 -#
1256 -# The IRIX 6 linker writes into existing files which may not be
1257 -# executable, retaining their permissions. Remove them first so a
1258 -# subsequent execution test works.
1259 +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
1260 +$as_echo_n "checking for C compiler default output file name... " >&6; }
1261 +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
1262 +
1263 +# The possible output files:
1264 +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
1265 +
1266 ac_rmfiles=
1267 for ac_file in $ac_files
1268 do
1269 case $ac_file in
1270 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
1271 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
1272 * ) ac_rmfiles="$ac_rmfiles $ac_file";;
1273 esac
1274 done
1275 @@ -2047,10 +2138,11 @@ case "(($ac_try" in
1276 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1277 *) ac_try_echo=$ac_try;;
1278 esac
1279 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1280 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1281 +$as_echo "$ac_try_echo") >&5
1282 (eval "$ac_link_default") 2>&5
1283 ac_status=$?
1284 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1285 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1286 (exit $ac_status); }; then
1287 # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
1288 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
1289 @@ -2061,7 +2153,7 @@ for ac_file in $ac_files ''
1290 do
1291 test -f "$ac_file" || continue
1292 case $ac_file in
1293 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
1294 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
1295 ;;
1296 [ab].out )
1297 # We found the default executable, but exeext='' is most
1298 @@ -2088,25 +2180,27 @@ else
1299 ac_file=''
1300 fi
1301
1302 -{ echo "$as_me:$LINENO: result: $ac_file" >&5
1303 -echo "${ECHO_T}$ac_file" >&6; }
1304 +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
1305 +$as_echo "$ac_file" >&6; }
1306 if test -z "$ac_file"; then
1307 - echo "$as_me: failed program was:" >&5
1308 + $as_echo "$as_me: failed program was:" >&5
1309 sed 's/^/| /' conftest.$ac_ext >&5
1310
1311 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
1312 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1313 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1314 +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
1315 See \`config.log' for more details." >&5
1316 -echo "$as_me: error: C compiler cannot create executables
1317 +$as_echo "$as_me: error: C compiler cannot create executables
1318 See \`config.log' for more details." >&2;}
1319 - { (exit 77); exit 77; }; }
1320 + { (exit 77); exit 77; }; }; }
1321 fi
1322
1323 ac_exeext=$ac_cv_exeext
1324
1325 # Check that the compiler produces executables we can run. If not, either
1326 # the compiler is broken, or we cross compile.
1327 -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
1328 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
1329 +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
1330 +$as_echo_n "checking whether the C compiler works... " >&6; }
1331 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
1332 # If not cross compiling, check that we can run a simple program.
1333 if test "$cross_compiling" != yes; then
1334 @@ -2115,49 +2209,53 @@ if test "$cross_compiling" != yes; then
1335 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1336 *) ac_try_echo=$ac_try;;
1337 esac
1338 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1339 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1340 +$as_echo "$ac_try_echo") >&5
1341 (eval "$ac_try") 2>&5
1342 ac_status=$?
1343 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1344 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1345 (exit $ac_status); }; }; then
1346 cross_compiling=no
1347 else
1348 if test "$cross_compiling" = maybe; then
1349 cross_compiling=yes
1350 else
1351 - { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
1352 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1353 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1354 +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
1355 If you meant to cross compile, use \`--host'.
1356 See \`config.log' for more details." >&5
1357 -echo "$as_me: error: cannot run C compiled programs.
1358 +$as_echo "$as_me: error: cannot run C compiled programs.
1359 If you meant to cross compile, use \`--host'.
1360 See \`config.log' for more details." >&2;}
1361 - { (exit 1); exit 1; }; }
1362 + { (exit 1); exit 1; }; }; }
1363 fi
1364 fi
1365 fi
1366 -{ echo "$as_me:$LINENO: result: yes" >&5
1367 -echo "${ECHO_T}yes" >&6; }
1368 +{ $as_echo "$as_me:$LINENO: result: yes" >&5
1369 +$as_echo "yes" >&6; }
1370
1371 -rm -f a.out a.exe conftest$ac_cv_exeext b.out
1372 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
1373 ac_clean_files=$ac_clean_files_save
1374 # Check that the compiler produces executables we can run. If not, either
1375 # the compiler is broken, or we cross compile.
1376 -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
1377 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
1378 -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
1379 -echo "${ECHO_T}$cross_compiling" >&6; }
1380 +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
1381 +$as_echo_n "checking whether we are cross compiling... " >&6; }
1382 +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
1383 +$as_echo "$cross_compiling" >&6; }
1384
1385 -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
1386 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
1387 +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
1388 +$as_echo_n "checking for suffix of executables... " >&6; }
1389 if { (ac_try="$ac_link"
1390 case "(($ac_try" in
1391 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1392 *) ac_try_echo=$ac_try;;
1393 esac
1394 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1395 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1396 +$as_echo "$ac_try_echo") >&5
1397 (eval "$ac_link") 2>&5
1398 ac_status=$?
1399 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1400 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1401 (exit $ac_status); }; then
1402 # If both `conftest.exe' and `conftest' are `present' (well, observable)
1403 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
1404 @@ -2166,31 +2264,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
1405 for ac_file in conftest.exe conftest conftest.*; do
1406 test -f "$ac_file" || continue
1407 case $ac_file in
1408 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
1409 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
1410 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
1411 break;;
1412 * ) break;;
1413 esac
1414 done
1415 else
1416 - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
1417 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1418 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1419 +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
1420 See \`config.log' for more details." >&5
1421 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
1422 +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
1423 See \`config.log' for more details." >&2;}
1424 - { (exit 1); exit 1; }; }
1425 + { (exit 1); exit 1; }; }; }
1426 fi
1427
1428 rm -f conftest$ac_cv_exeext
1429 -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
1430 -echo "${ECHO_T}$ac_cv_exeext" >&6; }
1431 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
1432 +$as_echo "$ac_cv_exeext" >&6; }
1433
1434 rm -f conftest.$ac_ext
1435 EXEEXT=$ac_cv_exeext
1436 ac_exeext=$EXEEXT
1437 -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
1438 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
1439 +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
1440 +$as_echo_n "checking for suffix of object files... " >&6; }
1441 if test "${ac_cv_objext+set}" = set; then
1442 - echo $ECHO_N "(cached) $ECHO_C" >&6
1443 + $as_echo_n "(cached) " >&6
1444 else
1445 cat >conftest.$ac_ext <<_ACEOF
1446 /* confdefs.h. */
1447 @@ -2213,40 +2313,43 @@ case "(($ac_try" in
1448 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1449 *) ac_try_echo=$ac_try;;
1450 esac
1451 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1452 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1453 +$as_echo "$ac_try_echo") >&5
1454 (eval "$ac_compile") 2>&5
1455 ac_status=$?
1456 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1457 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1458 (exit $ac_status); }; then
1459 for ac_file in conftest.o conftest.obj conftest.*; do
1460 test -f "$ac_file" || continue;
1461 case $ac_file in
1462 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
1463 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
1464 *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
1465 break;;
1466 esac
1467 done
1468 else
1469 - echo "$as_me: failed program was:" >&5
1470 + $as_echo "$as_me: failed program was:" >&5
1471 sed 's/^/| /' conftest.$ac_ext >&5
1472
1473 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
1474 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1475 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1476 +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
1477 See \`config.log' for more details." >&5
1478 -echo "$as_me: error: cannot compute suffix of object files: cannot compile
1479 +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
1480 See \`config.log' for more details." >&2;}
1481 - { (exit 1); exit 1; }; }
1482 + { (exit 1); exit 1; }; }; }
1483 fi
1484
1485 rm -f conftest.$ac_cv_objext conftest.$ac_ext
1486 fi
1487 -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
1488 -echo "${ECHO_T}$ac_cv_objext" >&6; }
1489 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
1490 +$as_echo "$ac_cv_objext" >&6; }
1491 OBJEXT=$ac_cv_objext
1492 ac_objext=$OBJEXT
1493 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
1494 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
1495 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
1496 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
1497 if test "${ac_cv_c_compiler_gnu+set}" = set; then
1498 - echo $ECHO_N "(cached) $ECHO_C" >&6
1499 + $as_echo_n "(cached) " >&6
1500 else
1501 cat >conftest.$ac_ext <<_ACEOF
1502 /* confdefs.h. */
1503 @@ -2272,20 +2375,21 @@ case "(($ac_try" in
1504 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1505 *) ac_try_echo=$ac_try;;
1506 esac
1507 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1508 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1509 +$as_echo "$ac_try_echo") >&5
1510 (eval "$ac_compile") 2>conftest.er1
1511 ac_status=$?
1512 grep -v '^ *+' conftest.er1 >conftest.err
1513 rm -f conftest.er1
1514 cat conftest.err >&5
1515 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1516 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1517 (exit $ac_status); } && {
1518 test -z "$ac_c_werror_flag" ||
1519 test ! -s conftest.err
1520 } && test -s conftest.$ac_objext; then
1521 ac_compiler_gnu=yes
1522 else
1523 - echo "$as_me: failed program was:" >&5
1524 + $as_echo "$as_me: failed program was:" >&5
1525 sed 's/^/| /' conftest.$ac_ext >&5
1526
1527 ac_compiler_gnu=no
1528 @@ -2295,15 +2399,19 @@ rm -f core conftest.err conftest.$ac_obj
1529 ac_cv_c_compiler_gnu=$ac_compiler_gnu
1530
1531 fi
1532 -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
1533 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
1534 -GCC=`test $ac_compiler_gnu = yes && echo yes`
1535 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
1536 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
1537 +if test $ac_compiler_gnu = yes; then
1538 + GCC=yes
1539 +else
1540 + GCC=
1541 +fi
1542 ac_test_CFLAGS=${CFLAGS+set}
1543 ac_save_CFLAGS=$CFLAGS
1544 -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
1545 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
1546 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
1547 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
1548 if test "${ac_cv_prog_cc_g+set}" = set; then
1549 - echo $ECHO_N "(cached) $ECHO_C" >&6
1550 + $as_echo_n "(cached) " >&6
1551 else
1552 ac_save_c_werror_flag=$ac_c_werror_flag
1553 ac_c_werror_flag=yes
1554 @@ -2330,20 +2438,21 @@ case "(($ac_try" in
1555 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1556 *) ac_try_echo=$ac_try;;
1557 esac
1558 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1559 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1560 +$as_echo "$ac_try_echo") >&5
1561 (eval "$ac_compile") 2>conftest.er1
1562 ac_status=$?
1563 grep -v '^ *+' conftest.er1 >conftest.err
1564 rm -f conftest.er1
1565 cat conftest.err >&5
1566 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1567 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1568 (exit $ac_status); } && {
1569 test -z "$ac_c_werror_flag" ||
1570 test ! -s conftest.err
1571 } && test -s conftest.$ac_objext; then
1572 ac_cv_prog_cc_g=yes
1573 else
1574 - echo "$as_me: failed program was:" >&5
1575 + $as_echo "$as_me: failed program was:" >&5
1576 sed 's/^/| /' conftest.$ac_ext >&5
1577
1578 CFLAGS=""
1579 @@ -2368,20 +2477,21 @@ case "(($ac_try" in
1580 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1581 *) ac_try_echo=$ac_try;;
1582 esac
1583 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1584 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1585 +$as_echo "$ac_try_echo") >&5
1586 (eval "$ac_compile") 2>conftest.er1
1587 ac_status=$?
1588 grep -v '^ *+' conftest.er1 >conftest.err
1589 rm -f conftest.er1
1590 cat conftest.err >&5
1591 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1592 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1593 (exit $ac_status); } && {
1594 test -z "$ac_c_werror_flag" ||
1595 test ! -s conftest.err
1596 } && test -s conftest.$ac_objext; then
1597 :
1598 else
1599 - echo "$as_me: failed program was:" >&5
1600 + $as_echo "$as_me: failed program was:" >&5
1601 sed 's/^/| /' conftest.$ac_ext >&5
1602
1603 ac_c_werror_flag=$ac_save_c_werror_flag
1604 @@ -2407,20 +2517,21 @@ case "(($ac_try" in
1605 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1606 *) ac_try_echo=$ac_try;;
1607 esac
1608 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1609 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1610 +$as_echo "$ac_try_echo") >&5
1611 (eval "$ac_compile") 2>conftest.er1
1612 ac_status=$?
1613 grep -v '^ *+' conftest.er1 >conftest.err
1614 rm -f conftest.er1
1615 cat conftest.err >&5
1616 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1617 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1618 (exit $ac_status); } && {
1619 test -z "$ac_c_werror_flag" ||
1620 test ! -s conftest.err
1621 } && test -s conftest.$ac_objext; then
1622 ac_cv_prog_cc_g=yes
1623 else
1624 - echo "$as_me: failed program was:" >&5
1625 + $as_echo "$as_me: failed program was:" >&5
1626 sed 's/^/| /' conftest.$ac_ext >&5
1627
1628
1629 @@ -2435,8 +2546,8 @@ fi
1630 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1631 ac_c_werror_flag=$ac_save_c_werror_flag
1632 fi
1633 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
1634 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
1635 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
1636 +$as_echo "$ac_cv_prog_cc_g" >&6; }
1637 if test "$ac_test_CFLAGS" = set; then
1638 CFLAGS=$ac_save_CFLAGS
1639 elif test $ac_cv_prog_cc_g = yes; then
1640 @@ -2452,10 +2563,10 @@ else
1641 CFLAGS=
1642 fi
1643 fi
1644 -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
1645 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
1646 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
1647 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
1648 if test "${ac_cv_prog_cc_c89+set}" = set; then
1649 - echo $ECHO_N "(cached) $ECHO_C" >&6
1650 + $as_echo_n "(cached) " >&6
1651 else
1652 ac_cv_prog_cc_c89=no
1653 ac_save_CC=$CC
1654 @@ -2526,20 +2637,21 @@ case "(($ac_try" in
1655 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1656 *) ac_try_echo=$ac_try;;
1657 esac
1658 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1659 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1660 +$as_echo "$ac_try_echo") >&5
1661 (eval "$ac_compile") 2>conftest.er1
1662 ac_status=$?
1663 grep -v '^ *+' conftest.er1 >conftest.err
1664 rm -f conftest.er1
1665 cat conftest.err >&5
1666 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1667 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1668 (exit $ac_status); } && {
1669 test -z "$ac_c_werror_flag" ||
1670 test ! -s conftest.err
1671 } && test -s conftest.$ac_objext; then
1672 ac_cv_prog_cc_c89=$ac_arg
1673 else
1674 - echo "$as_me: failed program was:" >&5
1675 + $as_echo "$as_me: failed program was:" >&5
1676 sed 's/^/| /' conftest.$ac_ext >&5
1677
1678
1679 @@ -2555,15 +2667,15 @@ fi
1680 # AC_CACHE_VAL
1681 case "x$ac_cv_prog_cc_c89" in
1682 x)
1683 - { echo "$as_me:$LINENO: result: none needed" >&5
1684 -echo "${ECHO_T}none needed" >&6; } ;;
1685 + { $as_echo "$as_me:$LINENO: result: none needed" >&5
1686 +$as_echo "none needed" >&6; } ;;
1687 xno)
1688 - { echo "$as_me:$LINENO: result: unsupported" >&5
1689 -echo "${ECHO_T}unsupported" >&6; } ;;
1690 + { $as_echo "$as_me:$LINENO: result: unsupported" >&5
1691 +$as_echo "unsupported" >&6; } ;;
1692 *)
1693 CC="$CC $ac_cv_prog_cc_c89"
1694 - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
1695 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
1696 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
1697 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
1698 esac
1699
1700
1701 @@ -2581,8 +2693,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
1702 if test "${with_rlm_ldap_lib_dir+set}" = set; then
1703 withval=$with_rlm_ldap_lib_dir; case "$withval" in
1704 no)
1705 - { { echo "$as_me:$LINENO: error: Need rlm-ldap-lib-dir" >&5
1706 -echo "$as_me: error: Need rlm-ldap-lib-dir" >&2;}
1707 + { { $as_echo "$as_me:$LINENO: error: Need rlm-ldap-lib-dir" >&5
1708 +$as_echo "$as_me: error: Need rlm-ldap-lib-dir" >&2;}
1709 { (exit 1); exit 1; }; }
1710 ;;
1711 yes)
1712 @@ -2601,8 +2713,8 @@ fi
1713 if test "${with_rlm_ldap_include_dir+set}" = set; then
1714 withval=$with_rlm_ldap_include_dir; case "$withval" in
1715 no)
1716 - { { echo "$as_me:$LINENO: error: Need rlm-ldap-include-dir" >&5
1717 -echo "$as_me: error: Need rlm-ldap-include-dir" >&2;}
1718 + { { $as_echo "$as_me:$LINENO: error: Need rlm-ldap-include-dir" >&5
1719 +$as_echo "$as_me: error: Need rlm-ldap-include-dir" >&2;}
1720 { (exit 1); exit 1; }; }
1721 ;;
1722 yes)
1723 @@ -2641,8 +2753,8 @@ fi
1724
1725
1726 if test "x$enable_shared" = "xno"; then
1727 - { echo "$as_me:$LINENO: WARNING: Static linking with libldap will probably result in unresolved symbols." >&5
1728 -echo "$as_me: WARNING: Static linking with libldap will probably result in unresolved symbols." >&2;}
1729 + { $as_echo "$as_me:$LINENO: WARNING: Static linking with libldap will probably result in unresolved symbols." >&5
1730 +$as_echo "$as_me: WARNING: Static linking with libldap will probably result in unresolved symbols." >&2;}
1731 fi
1732
1733 rlm_ldap_with_threads=yes
1734 @@ -2661,10 +2773,10 @@ fi
1735
1736
1737 if test "x$rlm_ldap_with_threads" = "xyes"; then
1738 - { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
1739 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
1740 + { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
1741 +$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
1742 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
1743 - echo $ECHO_N "(cached) $ECHO_C" >&6
1744 + $as_echo_n "(cached) " >&6
1745 else
1746 ac_check_lib_save_LIBS=$LIBS
1747 LIBS="-lpthread $LIBS"
1748 @@ -2696,39 +2808,43 @@ case "(($ac_try" in
1749 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1750 *) ac_try_echo=$ac_try;;
1751 esac
1752 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1753 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1754 +$as_echo "$ac_try_echo") >&5
1755 (eval "$ac_link") 2>conftest.er1
1756 ac_status=$?
1757 grep -v '^ *+' conftest.er1 >conftest.err
1758 rm -f conftest.er1
1759 cat conftest.err >&5
1760 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1761 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1762 (exit $ac_status); } && {
1763 test -z "$ac_c_werror_flag" ||
1764 test ! -s conftest.err
1765 - } && test -s conftest$ac_exeext &&
1766 - $as_test_x conftest$ac_exeext; then
1767 + } && test -s conftest$ac_exeext && {
1768 + test "$cross_compiling" = yes ||
1769 + $as_test_x conftest$ac_exeext
1770 + }; then
1771 ac_cv_lib_pthread_pthread_create=yes
1772 else
1773 - echo "$as_me: failed program was:" >&5
1774 + $as_echo "$as_me: failed program was:" >&5
1775 sed 's/^/| /' conftest.$ac_ext >&5
1776
1777 ac_cv_lib_pthread_pthread_create=no
1778 fi
1779
1780 +rm -rf conftest.dSYM
1781 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1782 conftest$ac_exeext conftest.$ac_ext
1783 LIBS=$ac_check_lib_save_LIBS
1784 fi
1785 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
1786 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
1787 -if test $ac_cv_lib_pthread_pthread_create = yes; then
1788 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
1789 +$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
1790 +if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
1791 LIBS="-lpthread $LIBS"
1792 else
1793 - { echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
1794 -echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6; }
1795 + { $as_echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
1796 +$as_echo_n "checking for pthread_create in -lc_r... " >&6; }
1797 if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then
1798 - echo $ECHO_N "(cached) $ECHO_C" >&6
1799 + $as_echo_n "(cached) " >&6
1800 else
1801 ac_check_lib_save_LIBS=$LIBS
1802 LIBS="-lc_r $LIBS"
1803 @@ -2761,33 +2877,37 @@ case "(($ac_try" in
1804 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1805 *) ac_try_echo=$ac_try;;
1806 esac
1807 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1808 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1809 +$as_echo "$ac_try_echo") >&5
1810 (eval "$ac_link") 2>conftest.er1
1811 ac_status=$?
1812 grep -v '^ *+' conftest.er1 >conftest.err
1813 rm -f conftest.er1
1814 cat conftest.err >&5
1815 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1816 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1817 (exit $ac_status); } && {
1818 test -z "$ac_c_werror_flag" ||
1819 test ! -s conftest.err
1820 - } && test -s conftest$ac_exeext &&
1821 - $as_test_x conftest$ac_exeext; then
1822 + } && test -s conftest$ac_exeext && {
1823 + test "$cross_compiling" = yes ||
1824 + $as_test_x conftest$ac_exeext
1825 + }; then
1826 ac_cv_lib_c_r_pthread_create=yes
1827 else
1828 - echo "$as_me: failed program was:" >&5
1829 + $as_echo "$as_me: failed program was:" >&5
1830 sed 's/^/| /' conftest.$ac_ext >&5
1831
1832 ac_cv_lib_c_r_pthread_create=no
1833 fi
1834
1835 +rm -rf conftest.dSYM
1836 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1837 conftest$ac_exeext conftest.$ac_ext
1838 LIBS=$ac_check_lib_save_LIBS
1839 fi
1840 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5
1841 -echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6; }
1842 -if test $ac_cv_lib_c_r_pthread_create = yes; then
1843 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5
1844 +$as_echo "$ac_cv_lib_c_r_pthread_create" >&6; }
1845 +if test "x$ac_cv_lib_c_r_pthread_create" = x""yes; then
1846 LIBS="-lc_r $LIBS"
1847 else
1848 rlm_ldap_with_threads="no"
1849 @@ -2800,13 +2920,13 @@ fi
1850 fi
1851
1852 smart_try_dir=$rlm_ldap_lib_dir
1853 - if test "x$rlm_ldap_with_threads" = "xyes"; then
1854
1855
1856 -sm_lib_safe=`echo "ldap_r" | sed 'y%./+-%__p_%'`
1857 -sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
1858 -{ echo "$as_me:$LINENO: checking for ldap_init in -lldap_r" >&5
1859 -echo $ECHO_N "checking for ldap_init in -lldap_r... $ECHO_C" >&6; }
1860 +
1861 +sm_lib_safe=`echo "sasl" | sed 'y%./+-%__p_%'`
1862 +sm_func_safe=`echo "sasl_encode" | sed 'y%./+-%__p_%'`
1863 +{ $as_echo "$as_me:$LINENO: checking for sasl_encode in -lsasl" >&5
1864 +$as_echo_n "checking for sasl_encode in -lsasl... " >&6; }
1865
1866 old_LIBS="$LIBS"
1867 smart_lib=
1868 @@ -2814,18 +2934,18 @@ smart_lib_dir=
1869
1870 if test "x$smart_try_dir" != "x"; then
1871 for try in $smart_try_dir; do
1872 - LIBS="-L$try -lldap_r $old_LIBS"
1873 + LIBS="-L$try -lsasl $old_LIBS"
1874 cat >conftest.$ac_ext <<_ACEOF
1875 /* confdefs.h. */
1876 _ACEOF
1877 cat confdefs.h >>conftest.$ac_ext
1878 cat >>conftest.$ac_ext <<_ACEOF
1879 /* end confdefs.h. */
1880 -extern char ldap_init();
1881 +extern char sasl_encode();
1882 int
1883 main ()
1884 {
1885 - ldap_init()
1886 + sasl_encode()
1887 ;
1888 return 0;
1889 }
1890 @@ -2836,26 +2956,30 @@ case "(($ac_try" in
1891 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1892 *) ac_try_echo=$ac_try;;
1893 esac
1894 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1895 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1896 +$as_echo "$ac_try_echo") >&5
1897 (eval "$ac_link") 2>conftest.er1
1898 ac_status=$?
1899 grep -v '^ *+' conftest.er1 >conftest.err
1900 rm -f conftest.er1
1901 cat conftest.err >&5
1902 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1903 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1904 (exit $ac_status); } && {
1905 test -z "$ac_c_werror_flag" ||
1906 test ! -s conftest.err
1907 - } && test -s conftest$ac_exeext &&
1908 - $as_test_x conftest$ac_exeext; then
1909 - smart_lib="-L$try -lldap_r"
1910 + } && test -s conftest$ac_exeext && {
1911 + test "$cross_compiling" = yes ||
1912 + $as_test_x conftest$ac_exeext
1913 + }; then
1914 + smart_lib="-L$try -lsasl"
1915 else
1916 - echo "$as_me: failed program was:" >&5
1917 + $as_echo "$as_me: failed program was:" >&5
1918 sed 's/^/| /' conftest.$ac_ext >&5
1919
1920
1921 fi
1922
1923 +rm -rf conftest.dSYM
1924 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1925 conftest$ac_exeext conftest.$ac_ext
1926 if test "x$smart_lib" != "x"; then
1927 @@ -2866,18 +2990,18 @@ rm -f core conftest.err conftest.$ac_obj
1928 fi
1929
1930 if test "x$smart_lib" = "x"; then
1931 - LIBS="-lldap_r $old_LIBS"
1932 + LIBS="-lsasl $old_LIBS"
1933 cat >conftest.$ac_ext <<_ACEOF
1934 /* confdefs.h. */
1935 _ACEOF
1936 cat confdefs.h >>conftest.$ac_ext
1937 cat >>conftest.$ac_ext <<_ACEOF
1938 /* end confdefs.h. */
1939 -extern char ldap_init();
1940 +extern char sasl_encode();
1941 int
1942 main ()
1943 {
1944 - ldap_init()
1945 + sasl_encode()
1946 ;
1947 return 0;
1948 }
1949 @@ -2888,26 +3012,30 @@ case "(($ac_try" in
1950 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1951 *) ac_try_echo=$ac_try;;
1952 esac
1953 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1954 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1955 +$as_echo "$ac_try_echo") >&5
1956 (eval "$ac_link") 2>conftest.er1
1957 ac_status=$?
1958 grep -v '^ *+' conftest.er1 >conftest.err
1959 rm -f conftest.er1
1960 cat conftest.err >&5
1961 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1962 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1963 (exit $ac_status); } && {
1964 test -z "$ac_c_werror_flag" ||
1965 test ! -s conftest.err
1966 - } && test -s conftest$ac_exeext &&
1967 - $as_test_x conftest$ac_exeext; then
1968 - smart_lib="-lldap_r"
1969 + } && test -s conftest$ac_exeext && {
1970 + test "$cross_compiling" = yes ||
1971 + $as_test_x conftest$ac_exeext
1972 + }; then
1973 + smart_lib="-lsasl"
1974 else
1975 - echo "$as_me: failed program was:" >&5
1976 + $as_echo "$as_me: failed program was:" >&5
1977 sed 's/^/| /' conftest.$ac_ext >&5
1978
1979
1980 fi
1981
1982 +rm -rf conftest.dSYM
1983 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1984 conftest$ac_exeext conftest.$ac_ext
1985 LIBS="$old_LIBS"
1986 @@ -2918,7 +3046,7 @@ if test "x$smart_lib" = "x"; then
1987
1988 if test "x$LOCATE" != "x"; then
1989 DIRS=
1990 - file=libldap_r${libltdl_cv_shlibext}
1991 + file=libsasl${libltdl_cv_shlibext}
1992
1993 for x in `${LOCATE} $file 2>/dev/null`; do
1994 base=`echo $x | sed "s%/${file}%%"`
1995 @@ -2945,7 +3073,7 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D
1996
1997 if test "x$LOCATE" != "x"; then
1998 DIRS=
1999 - file=libldap_r.a
2000 + file=libsasl.a
2001
2002 for x in `${LOCATE} $file 2>/dev/null`; do
2003 base=`echo $x | sed "s%/${file}%%"`
2004 @@ -2970,18 +3098,18 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D
2005
2006
2007 for try in $smart_lib_dir /usr/local/lib /opt/lib; do
2008 - LIBS="-L$try -lldap_r $old_LIBS"
2009 + LIBS="-L$try -lsasl $old_LIBS"
2010 cat >conftest.$ac_ext <<_ACEOF
2011 /* confdefs.h. */
2012 _ACEOF
2013 cat confdefs.h >>conftest.$ac_ext
2014 cat >>conftest.$ac_ext <<_ACEOF
2015 /* end confdefs.h. */
2016 -extern char ldap_init();
2017 +extern char sasl_encode();
2018 int
2019 main ()
2020 {
2021 - ldap_init()
2022 + sasl_encode()
2023 ;
2024 return 0;
2025 }
2026 @@ -2992,26 +3120,30 @@ case "(($ac_try" in
2027 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2028 *) ac_try_echo=$ac_try;;
2029 esac
2030 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2031 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2032 +$as_echo "$ac_try_echo") >&5
2033 (eval "$ac_link") 2>conftest.er1
2034 ac_status=$?
2035 grep -v '^ *+' conftest.er1 >conftest.err
2036 rm -f conftest.er1
2037 cat conftest.err >&5
2038 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2039 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2040 (exit $ac_status); } && {
2041 test -z "$ac_c_werror_flag" ||
2042 test ! -s conftest.err
2043 - } && test -s conftest$ac_exeext &&
2044 - $as_test_x conftest$ac_exeext; then
2045 - smart_lib="-L$try -lldap_r"
2046 + } && test -s conftest$ac_exeext && {
2047 + test "$cross_compiling" = yes ||
2048 + $as_test_x conftest$ac_exeext
2049 + }; then
2050 + smart_lib="-L$try -lsasl"
2051 else
2052 - echo "$as_me: failed program was:" >&5
2053 + $as_echo "$as_me: failed program was:" >&5
2054 sed 's/^/| /' conftest.$ac_ext >&5
2055
2056
2057 fi
2058
2059 +rm -rf conftest.dSYM
2060 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2061 conftest$ac_exeext conftest.$ac_ext
2062 if test "x$smart_lib" != "x"; then
2063 @@ -3022,26 +3154,22 @@ rm -f core conftest.err conftest.$ac_obj
2064 fi
2065
2066 if test "x$smart_lib" != "x"; then
2067 - { echo "$as_me:$LINENO: result: yes" >&5
2068 -echo "${ECHO_T}yes" >&6; }
2069 + { $as_echo "$as_me:$LINENO: result: yes" >&5
2070 +$as_echo "yes" >&6; }
2071 eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
2072 LIBS="$smart_lib $old_LIBS"
2073 SMART_LIBS="$smart_lib $SMART_LIBS"
2074 else
2075 - { echo "$as_me:$LINENO: result: no" >&5
2076 -echo "${ECHO_T}no" >&6; }
2077 + { $as_echo "$as_me:$LINENO: result: no" >&5
2078 +$as_echo "no" >&6; }
2079 fi
2080
2081 - if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then
2082 - fail="$fail libldap_r"
2083 - fi
2084 - else
2085
2086
2087 -sm_lib_safe=`echo "ldap" | sed 'y%./+-%__p_%'`
2088 -sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
2089 -{ echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
2090 -echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6; }
2091 +sm_lib_safe=`echo "lber" | sed 'y%./+-%__p_%'`
2092 +sm_func_safe=`echo "ber_init" | sed 'y%./+-%__p_%'`
2093 +{ $as_echo "$as_me:$LINENO: checking for ber_init in -llber" >&5
2094 +$as_echo_n "checking for ber_init in -llber... " >&6; }
2095
2096 old_LIBS="$LIBS"
2097 smart_lib=
2098 @@ -3049,18 +3177,18 @@ smart_lib_dir=
2099
2100 if test "x$smart_try_dir" != "x"; then
2101 for try in $smart_try_dir; do
2102 - LIBS="-L$try -lldap $old_LIBS"
2103 + LIBS="-L$try -llber $old_LIBS"
2104 cat >conftest.$ac_ext <<_ACEOF
2105 /* confdefs.h. */
2106 _ACEOF
2107 cat confdefs.h >>conftest.$ac_ext
2108 cat >>conftest.$ac_ext <<_ACEOF
2109 /* end confdefs.h. */
2110 -extern char ldap_init();
2111 +extern char ber_init();
2112 int
2113 main ()
2114 {
2115 - ldap_init()
2116 + ber_init()
2117 ;
2118 return 0;
2119 }
2120 @@ -3071,26 +3199,30 @@ case "(($ac_try" in
2121 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2122 *) ac_try_echo=$ac_try;;
2123 esac
2124 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2125 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2126 +$as_echo "$ac_try_echo") >&5
2127 (eval "$ac_link") 2>conftest.er1
2128 ac_status=$?
2129 grep -v '^ *+' conftest.er1 >conftest.err
2130 rm -f conftest.er1
2131 cat conftest.err >&5
2132 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2133 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2134 (exit $ac_status); } && {
2135 test -z "$ac_c_werror_flag" ||
2136 test ! -s conftest.err
2137 - } && test -s conftest$ac_exeext &&
2138 - $as_test_x conftest$ac_exeext; then
2139 - smart_lib="-L$try -lldap"
2140 + } && test -s conftest$ac_exeext && {
2141 + test "$cross_compiling" = yes ||
2142 + $as_test_x conftest$ac_exeext
2143 + }; then
2144 + smart_lib="-L$try -llber"
2145 else
2146 - echo "$as_me: failed program was:" >&5
2147 + $as_echo "$as_me: failed program was:" >&5
2148 sed 's/^/| /' conftest.$ac_ext >&5
2149
2150
2151 fi
2152
2153 +rm -rf conftest.dSYM
2154 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2155 conftest$ac_exeext conftest.$ac_ext
2156 if test "x$smart_lib" != "x"; then
2157 @@ -3101,18 +3233,18 @@ rm -f core conftest.err conftest.$ac_obj
2158 fi
2159
2160 if test "x$smart_lib" = "x"; then
2161 - LIBS="-lldap $old_LIBS"
2162 + LIBS="-llber $old_LIBS"
2163 cat >conftest.$ac_ext <<_ACEOF
2164 /* confdefs.h. */
2165 _ACEOF
2166 cat confdefs.h >>conftest.$ac_ext
2167 cat >>conftest.$ac_ext <<_ACEOF
2168 /* end confdefs.h. */
2169 -extern char ldap_init();
2170 +extern char ber_init();
2171 int
2172 main ()
2173 {
2174 - ldap_init()
2175 + ber_init()
2176 ;
2177 return 0;
2178 }
2179 @@ -3123,26 +3255,30 @@ case "(($ac_try" in
2180 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2181 *) ac_try_echo=$ac_try;;
2182 esac
2183 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2184 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2185 +$as_echo "$ac_try_echo") >&5
2186 (eval "$ac_link") 2>conftest.er1
2187 ac_status=$?
2188 grep -v '^ *+' conftest.er1 >conftest.err
2189 rm -f conftest.er1
2190 cat conftest.err >&5
2191 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2192 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2193 (exit $ac_status); } && {
2194 test -z "$ac_c_werror_flag" ||
2195 test ! -s conftest.err
2196 - } && test -s conftest$ac_exeext &&
2197 - $as_test_x conftest$ac_exeext; then
2198 - smart_lib="-lldap"
2199 + } && test -s conftest$ac_exeext && {
2200 + test "$cross_compiling" = yes ||
2201 + $as_test_x conftest$ac_exeext
2202 + }; then
2203 + smart_lib="-llber"
2204 else
2205 - echo "$as_me: failed program was:" >&5
2206 + $as_echo "$as_me: failed program was:" >&5
2207 sed 's/^/| /' conftest.$ac_ext >&5
2208
2209
2210 fi
2211
2212 +rm -rf conftest.dSYM
2213 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2214 conftest$ac_exeext conftest.$ac_ext
2215 LIBS="$old_LIBS"
2216 @@ -3153,7 +3289,7 @@ if test "x$smart_lib" = "x"; then
2217
2218 if test "x$LOCATE" != "x"; then
2219 DIRS=
2220 - file=libldap${libltdl_cv_shlibext}
2221 + file=liblber${libltdl_cv_shlibext}
2222
2223 for x in `${LOCATE} $file 2>/dev/null`; do
2224 base=`echo $x | sed "s%/${file}%%"`
2225 @@ -3180,7 +3316,7 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D
2226
2227 if test "x$LOCATE" != "x"; then
2228 DIRS=
2229 - file=libldap.a
2230 + file=liblber.a
2231
2232 for x in `${LOCATE} $file 2>/dev/null`; do
2233 base=`echo $x | sed "s%/${file}%%"`
2234 @@ -3205,18 +3341,18 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D
2235
2236
2237 for try in $smart_lib_dir /usr/local/lib /opt/lib; do
2238 - LIBS="-L$try -lldap $old_LIBS"
2239 + LIBS="-L$try -llber $old_LIBS"
2240 cat >conftest.$ac_ext <<_ACEOF
2241 /* confdefs.h. */
2242 _ACEOF
2243 cat confdefs.h >>conftest.$ac_ext
2244 cat >>conftest.$ac_ext <<_ACEOF
2245 /* end confdefs.h. */
2246 -extern char ldap_init();
2247 +extern char ber_init();
2248 int
2249 main ()
2250 {
2251 - ldap_init()
2252 + ber_init()
2253 ;
2254 return 0;
2255 }
2256 @@ -3227,26 +3363,30 @@ case "(($ac_try" in
2257 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2258 *) ac_try_echo=$ac_try;;
2259 esac
2260 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2261 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2262 +$as_echo "$ac_try_echo") >&5
2263 (eval "$ac_link") 2>conftest.er1
2264 ac_status=$?
2265 grep -v '^ *+' conftest.er1 >conftest.err
2266 rm -f conftest.er1
2267 cat conftest.err >&5
2268 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2269 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2270 (exit $ac_status); } && {
2271 test -z "$ac_c_werror_flag" ||
2272 test ! -s conftest.err
2273 - } && test -s conftest$ac_exeext &&
2274 - $as_test_x conftest$ac_exeext; then
2275 - smart_lib="-L$try -lldap"
2276 + } && test -s conftest$ac_exeext && {
2277 + test "$cross_compiling" = yes ||
2278 + $as_test_x conftest$ac_exeext
2279 + }; then
2280 + smart_lib="-L$try -llber"
2281 else
2282 - echo "$as_me: failed program was:" >&5
2283 + $as_echo "$as_me: failed program was:" >&5
2284 sed 's/^/| /' conftest.$ac_ext >&5
2285
2286
2287 fi
2288
2289 +rm -rf conftest.dSYM
2290 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2291 conftest$ac_exeext conftest.$ac_ext
2292 if test "x$smart_lib" != "x"; then
2293 @@ -3257,136 +3397,144 @@ rm -f core conftest.err conftest.$ac_obj
2294 fi
2295
2296 if test "x$smart_lib" != "x"; then
2297 - { echo "$as_me:$LINENO: result: yes" >&5
2298 -echo "${ECHO_T}yes" >&6; }
2299 + { $as_echo "$as_me:$LINENO: result: yes" >&5
2300 +$as_echo "yes" >&6; }
2301 eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
2302 LIBS="$smart_lib $old_LIBS"
2303 SMART_LIBS="$smart_lib $SMART_LIBS"
2304 else
2305 - { echo "$as_me:$LINENO: result: no" >&5
2306 -echo "${ECHO_T}no" >&6; }
2307 + { $as_echo "$as_me:$LINENO: result: no" >&5
2308 +$as_echo "no" >&6; }
2309 fi
2310
2311 - if test "x$ac_cv_lib_ldap_ldap_init" != "xyes"; then
2312 - fail="$fail libldap"
2313 - fi
2314 - fi
2315 -
2316
2317 - smart_try_dir=$rlm_ldap_include_dir
2318 + if test "x$rlm_ldap_with_threads" = "xyes"; then
2319
2320
2321 -ac_safe=`echo "ldap.h" | sed 'y%./+-%__pm%'`
2322 -{ echo "$as_me:$LINENO: checking for ldap.h" >&5
2323 -echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; }
2324 +sm_lib_safe=`echo "ldap_r" | sed 'y%./+-%__p_%'`
2325 +sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
2326 +{ $as_echo "$as_me:$LINENO: checking for ldap_init in -lldap_r" >&5
2327 +$as_echo_n "checking for ldap_init in -lldap_r... " >&6; }
2328
2329 -old_CFLAGS="$CFLAGS"
2330 -smart_include=
2331 -smart_include_dir=
2332 +old_LIBS="$LIBS"
2333 +smart_lib=
2334 +smart_lib_dir=
2335
2336 if test "x$smart_try_dir" != "x"; then
2337 for try in $smart_try_dir; do
2338 - CFLAGS="$old_CFLAGS -I$try"
2339 + LIBS="-L$try -lldap_r $old_LIBS"
2340 cat >conftest.$ac_ext <<_ACEOF
2341 /* confdefs.h. */
2342 _ACEOF
2343 cat confdefs.h >>conftest.$ac_ext
2344 cat >>conftest.$ac_ext <<_ACEOF
2345 /* end confdefs.h. */
2346 -
2347 - #include <ldap.h>
2348 +extern char ldap_init();
2349 int
2350 main ()
2351 {
2352 - int a = 1;
2353 + ldap_init()
2354 ;
2355 return 0;
2356 }
2357 _ACEOF
2358 -rm -f conftest.$ac_objext
2359 -if { (ac_try="$ac_compile"
2360 +rm -f conftest.$ac_objext conftest$ac_exeext
2361 +if { (ac_try="$ac_link"
2362 case "(($ac_try" in
2363 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2364 *) ac_try_echo=$ac_try;;
2365 esac
2366 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2367 - (eval "$ac_compile") 2>conftest.er1
2368 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2369 +$as_echo "$ac_try_echo") >&5
2370 + (eval "$ac_link") 2>conftest.er1
2371 ac_status=$?
2372 grep -v '^ *+' conftest.er1 >conftest.err
2373 rm -f conftest.er1
2374 cat conftest.err >&5
2375 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2376 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2377 (exit $ac_status); } && {
2378 test -z "$ac_c_werror_flag" ||
2379 test ! -s conftest.err
2380 - } && test -s conftest.$ac_objext; then
2381 - smart_include="-I$try"
2382 + } && test -s conftest$ac_exeext && {
2383 + test "$cross_compiling" = yes ||
2384 + $as_test_x conftest$ac_exeext
2385 + }; then
2386 + smart_lib="-L$try -lldap_r"
2387 else
2388 - echo "$as_me: failed program was:" >&5
2389 + $as_echo "$as_me: failed program was:" >&5
2390 sed 's/^/| /' conftest.$ac_ext >&5
2391
2392 - smart_include=
2393 +
2394 fi
2395
2396 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2397 - if test "x$smart_include" != "x"; then
2398 +rm -rf conftest.dSYM
2399 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2400 + conftest$ac_exeext conftest.$ac_ext
2401 + if test "x$smart_lib" != "x"; then
2402 break;
2403 fi
2404 done
2405 - CFLAGS="$old_CFLAGS"
2406 + LIBS="$old_LIBS"
2407 fi
2408
2409 -if test "x$smart_include" = "x"; then
2410 +if test "x$smart_lib" = "x"; then
2411 + LIBS="-lldap_r $old_LIBS"
2412 cat >conftest.$ac_ext <<_ACEOF
2413 /* confdefs.h. */
2414 _ACEOF
2415 cat confdefs.h >>conftest.$ac_ext
2416 cat >>conftest.$ac_ext <<_ACEOF
2417 /* end confdefs.h. */
2418 -
2419 - #include <ldap.h>
2420 +extern char ldap_init();
2421 int
2422 main ()
2423 {
2424 - int a = 1;
2425 + ldap_init()
2426 ;
2427 return 0;
2428 }
2429 _ACEOF
2430 -rm -f conftest.$ac_objext
2431 -if { (ac_try="$ac_compile"
2432 +rm -f conftest.$ac_objext conftest$ac_exeext
2433 +if { (ac_try="$ac_link"
2434 case "(($ac_try" in
2435 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2436 *) ac_try_echo=$ac_try;;
2437 esac
2438 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2439 - (eval "$ac_compile") 2>conftest.er1
2440 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2441 +$as_echo "$ac_try_echo") >&5
2442 + (eval "$ac_link") 2>conftest.er1
2443 ac_status=$?
2444 grep -v '^ *+' conftest.er1 >conftest.err
2445 rm -f conftest.er1
2446 cat conftest.err >&5
2447 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2448 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2449 (exit $ac_status); } && {
2450 test -z "$ac_c_werror_flag" ||
2451 test ! -s conftest.err
2452 - } && test -s conftest.$ac_objext; then
2453 - smart_include=" "
2454 + } && test -s conftest$ac_exeext && {
2455 + test "$cross_compiling" = yes ||
2456 + $as_test_x conftest$ac_exeext
2457 + }; then
2458 + smart_lib="-lldap_r"
2459 else
2460 - echo "$as_me: failed program was:" >&5
2461 + $as_echo "$as_me: failed program was:" >&5
2462 sed 's/^/| /' conftest.$ac_ext >&5
2463
2464 - smart_include=
2465 +
2466 fi
2467
2468 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2469 +rm -rf conftest.dSYM
2470 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2471 + conftest$ac_exeext conftest.$ac_ext
2472 + LIBS="$old_LIBS"
2473 fi
2474
2475 -if test "x$smart_include" = "x"; then
2476 +if test "x$smart_lib" = "x"; then
2477
2478
2479 if test "x$LOCATE" != "x"; then
2480 DIRS=
2481 - file=ldap.h
2482 + file=libldap_r${libltdl_cv_shlibext}
2483
2484 for x in `${LOCATE} $file 2>/dev/null`; do
2485 base=`echo $x | sed "s%/${file}%%"`
2486 @@ -3400,20 +3548,506 @@ if test "x$LOCATE" != "x"; then
2487 continue
2488 fi
2489
2490 - already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}`
2491 + already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
2492 if test "x$already" = "x"; then
2493 DIRS="$DIRS $dir"
2494 fi
2495 done
2496 fi
2497
2498 -eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
2499 +eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
2500
2501
2502 - for try in $smart_include_dir /usr/local/include /opt/include; do
2503 - CFLAGS="$old_CFLAGS -I$try"
2504 - cat >conftest.$ac_ext <<_ACEOF
2505 -/* confdefs.h. */
2506 +
2507 +if test "x$LOCATE" != "x"; then
2508 + DIRS=
2509 + file=libldap_r.a
2510 +
2511 + for x in `${LOCATE} $file 2>/dev/null`; do
2512 + base=`echo $x | sed "s%/${file}%%"`
2513 + if test "x$x" = "x$base"; then
2514 + continue;
2515 + fi
2516 +
2517 + dir=`${DIRNAME} $x 2>/dev/null`
2518 + exclude=`echo ${dir} | ${GREP} /home`
2519 + if test "x$exclude" != "x"; then
2520 + continue
2521 + fi
2522 +
2523 + already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
2524 + if test "x$already" = "x"; then
2525 + DIRS="$DIRS $dir"
2526 + fi
2527 + done
2528 +fi
2529 +
2530 +eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
2531 +
2532 +
2533 + for try in $smart_lib_dir /usr/local/lib /opt/lib; do
2534 + LIBS="-L$try -lldap_r $old_LIBS"
2535 + cat >conftest.$ac_ext <<_ACEOF
2536 +/* confdefs.h. */
2537 +_ACEOF
2538 +cat confdefs.h >>conftest.$ac_ext
2539 +cat >>conftest.$ac_ext <<_ACEOF
2540 +/* end confdefs.h. */
2541 +extern char ldap_init();
2542 +int
2543 +main ()
2544 +{
2545 + ldap_init()
2546 + ;
2547 + return 0;
2548 +}
2549 +_ACEOF
2550 +rm -f conftest.$ac_objext conftest$ac_exeext
2551 +if { (ac_try="$ac_link"
2552 +case "(($ac_try" in
2553 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2554 + *) ac_try_echo=$ac_try;;
2555 +esac
2556 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2557 +$as_echo "$ac_try_echo") >&5
2558 + (eval "$ac_link") 2>conftest.er1
2559 + ac_status=$?
2560 + grep -v '^ *+' conftest.er1 >conftest.err
2561 + rm -f conftest.er1
2562 + cat conftest.err >&5
2563 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2564 + (exit $ac_status); } && {
2565 + test -z "$ac_c_werror_flag" ||
2566 + test ! -s conftest.err
2567 + } && test -s conftest$ac_exeext && {
2568 + test "$cross_compiling" = yes ||
2569 + $as_test_x conftest$ac_exeext
2570 + }; then
2571 + smart_lib="-L$try -lldap_r"
2572 +else
2573 + $as_echo "$as_me: failed program was:" >&5
2574 +sed 's/^/| /' conftest.$ac_ext >&5
2575 +
2576 +
2577 +fi
2578 +
2579 +rm -rf conftest.dSYM
2580 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2581 + conftest$ac_exeext conftest.$ac_ext
2582 + if test "x$smart_lib" != "x"; then
2583 + break;
2584 + fi
2585 + done
2586 + LIBS="$old_LIBS"
2587 +fi
2588 +
2589 +if test "x$smart_lib" != "x"; then
2590 + { $as_echo "$as_me:$LINENO: result: yes" >&5
2591 +$as_echo "yes" >&6; }
2592 + eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
2593 + LIBS="$smart_lib $old_LIBS"
2594 + SMART_LIBS="$smart_lib $SMART_LIBS"
2595 +else
2596 + { $as_echo "$as_me:$LINENO: result: no" >&5
2597 +$as_echo "no" >&6; }
2598 +fi
2599 +
2600 + if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then
2601 + fail="$fail libldap_r"
2602 + fi
2603 + else
2604 +
2605 +
2606 +sm_lib_safe=`echo "ldap" | sed 'y%./+-%__p_%'`
2607 +sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
2608 +{ $as_echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
2609 +$as_echo_n "checking for ldap_init in -lldap... " >&6; }
2610 +
2611 +old_LIBS="$LIBS"
2612 +smart_lib=
2613 +smart_lib_dir=
2614 +
2615 +if test "x$smart_try_dir" != "x"; then
2616 + for try in $smart_try_dir; do
2617 + LIBS="-L$try -lldap $old_LIBS"
2618 + cat >conftest.$ac_ext <<_ACEOF
2619 +/* confdefs.h. */
2620 +_ACEOF
2621 +cat confdefs.h >>conftest.$ac_ext
2622 +cat >>conftest.$ac_ext <<_ACEOF
2623 +/* end confdefs.h. */
2624 +extern char ldap_init();
2625 +int
2626 +main ()
2627 +{
2628 + ldap_init()
2629 + ;
2630 + return 0;
2631 +}
2632 +_ACEOF
2633 +rm -f conftest.$ac_objext conftest$ac_exeext
2634 +if { (ac_try="$ac_link"
2635 +case "(($ac_try" in
2636 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2637 + *) ac_try_echo=$ac_try;;
2638 +esac
2639 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2640 +$as_echo "$ac_try_echo") >&5
2641 + (eval "$ac_link") 2>conftest.er1
2642 + ac_status=$?
2643 + grep -v '^ *+' conftest.er1 >conftest.err
2644 + rm -f conftest.er1
2645 + cat conftest.err >&5
2646 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2647 + (exit $ac_status); } && {
2648 + test -z "$ac_c_werror_flag" ||
2649 + test ! -s conftest.err
2650 + } && test -s conftest$ac_exeext && {
2651 + test "$cross_compiling" = yes ||
2652 + $as_test_x conftest$ac_exeext
2653 + }; then
2654 + smart_lib="-L$try -lldap"
2655 +else
2656 + $as_echo "$as_me: failed program was:" >&5
2657 +sed 's/^/| /' conftest.$ac_ext >&5
2658 +
2659 +
2660 +fi
2661 +
2662 +rm -rf conftest.dSYM
2663 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2664 + conftest$ac_exeext conftest.$ac_ext
2665 + if test "x$smart_lib" != "x"; then
2666 + break;
2667 + fi
2668 + done
2669 + LIBS="$old_LIBS"
2670 +fi
2671 +
2672 +if test "x$smart_lib" = "x"; then
2673 + LIBS="-lldap $old_LIBS"
2674 + cat >conftest.$ac_ext <<_ACEOF
2675 +/* confdefs.h. */
2676 +_ACEOF
2677 +cat confdefs.h >>conftest.$ac_ext
2678 +cat >>conftest.$ac_ext <<_ACEOF
2679 +/* end confdefs.h. */
2680 +extern char ldap_init();
2681 +int
2682 +main ()
2683 +{
2684 + ldap_init()
2685 + ;
2686 + return 0;
2687 +}
2688 +_ACEOF
2689 +rm -f conftest.$ac_objext conftest$ac_exeext
2690 +if { (ac_try="$ac_link"
2691 +case "(($ac_try" in
2692 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2693 + *) ac_try_echo=$ac_try;;
2694 +esac
2695 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2696 +$as_echo "$ac_try_echo") >&5
2697 + (eval "$ac_link") 2>conftest.er1
2698 + ac_status=$?
2699 + grep -v '^ *+' conftest.er1 >conftest.err
2700 + rm -f conftest.er1
2701 + cat conftest.err >&5
2702 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2703 + (exit $ac_status); } && {
2704 + test -z "$ac_c_werror_flag" ||
2705 + test ! -s conftest.err
2706 + } && test -s conftest$ac_exeext && {
2707 + test "$cross_compiling" = yes ||
2708 + $as_test_x conftest$ac_exeext
2709 + }; then
2710 + smart_lib="-lldap"
2711 +else
2712 + $as_echo "$as_me: failed program was:" >&5
2713 +sed 's/^/| /' conftest.$ac_ext >&5
2714 +
2715 +
2716 +fi
2717 +
2718 +rm -rf conftest.dSYM
2719 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2720 + conftest$ac_exeext conftest.$ac_ext
2721 + LIBS="$old_LIBS"
2722 +fi
2723 +
2724 +if test "x$smart_lib" = "x"; then
2725 +
2726 +
2727 +if test "x$LOCATE" != "x"; then
2728 + DIRS=
2729 + file=libldap${libltdl_cv_shlibext}
2730 +
2731 + for x in `${LOCATE} $file 2>/dev/null`; do
2732 + base=`echo $x | sed "s%/${file}%%"`
2733 + if test "x$x" = "x$base"; then
2734 + continue;
2735 + fi
2736 +
2737 + dir=`${DIRNAME} $x 2>/dev/null`
2738 + exclude=`echo ${dir} | ${GREP} /home`
2739 + if test "x$exclude" != "x"; then
2740 + continue
2741 + fi
2742 +
2743 + already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
2744 + if test "x$already" = "x"; then
2745 + DIRS="$DIRS $dir"
2746 + fi
2747 + done
2748 +fi
2749 +
2750 +eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
2751 +
2752 +
2753 +
2754 +if test "x$LOCATE" != "x"; then
2755 + DIRS=
2756 + file=libldap.a
2757 +
2758 + for x in `${LOCATE} $file 2>/dev/null`; do
2759 + base=`echo $x | sed "s%/${file}%%"`
2760 + if test "x$x" = "x$base"; then
2761 + continue;
2762 + fi
2763 +
2764 + dir=`${DIRNAME} $x 2>/dev/null`
2765 + exclude=`echo ${dir} | ${GREP} /home`
2766 + if test "x$exclude" != "x"; then
2767 + continue
2768 + fi
2769 +
2770 + already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
2771 + if test "x$already" = "x"; then
2772 + DIRS="$DIRS $dir"
2773 + fi
2774 + done
2775 +fi
2776 +
2777 +eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
2778 +
2779 +
2780 + for try in $smart_lib_dir /usr/local/lib /opt/lib; do
2781 + LIBS="-L$try -lldap $old_LIBS"
2782 + cat >conftest.$ac_ext <<_ACEOF
2783 +/* confdefs.h. */
2784 +_ACEOF
2785 +cat confdefs.h >>conftest.$ac_ext
2786 +cat >>conftest.$ac_ext <<_ACEOF
2787 +/* end confdefs.h. */
2788 +extern char ldap_init();
2789 +int
2790 +main ()
2791 +{
2792 + ldap_init()
2793 + ;
2794 + return 0;
2795 +}
2796 +_ACEOF
2797 +rm -f conftest.$ac_objext conftest$ac_exeext
2798 +if { (ac_try="$ac_link"
2799 +case "(($ac_try" in
2800 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2801 + *) ac_try_echo=$ac_try;;
2802 +esac
2803 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2804 +$as_echo "$ac_try_echo") >&5
2805 + (eval "$ac_link") 2>conftest.er1
2806 + ac_status=$?
2807 + grep -v '^ *+' conftest.er1 >conftest.err
2808 + rm -f conftest.er1
2809 + cat conftest.err >&5
2810 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2811 + (exit $ac_status); } && {
2812 + test -z "$ac_c_werror_flag" ||
2813 + test ! -s conftest.err
2814 + } && test -s conftest$ac_exeext && {
2815 + test "$cross_compiling" = yes ||
2816 + $as_test_x conftest$ac_exeext
2817 + }; then
2818 + smart_lib="-L$try -lldap"
2819 +else
2820 + $as_echo "$as_me: failed program was:" >&5
2821 +sed 's/^/| /' conftest.$ac_ext >&5
2822 +
2823 +
2824 +fi
2825 +
2826 +rm -rf conftest.dSYM
2827 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2828 + conftest$ac_exeext conftest.$ac_ext
2829 + if test "x$smart_lib" != "x"; then
2830 + break;
2831 + fi
2832 + done
2833 + LIBS="$old_LIBS"
2834 +fi
2835 +
2836 +if test "x$smart_lib" != "x"; then
2837 + { $as_echo "$as_me:$LINENO: result: yes" >&5
2838 +$as_echo "yes" >&6; }
2839 + eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
2840 + LIBS="$smart_lib $old_LIBS"
2841 + SMART_LIBS="$smart_lib $SMART_LIBS"
2842 +else
2843 + { $as_echo "$as_me:$LINENO: result: no" >&5
2844 +$as_echo "no" >&6; }
2845 +fi
2846 +
2847 + if test "x$ac_cv_lib_ldap_ldap_init" != "xyes"; then
2848 + fail="$fail libldap"
2849 + fi
2850 + fi
2851 +
2852 +
2853 + smart_try_dir=$rlm_ldap_include_dir
2854 +
2855 +
2856 +ac_safe=`echo "ldap.h" | sed 'y%./+-%__pm%'`
2857 +{ $as_echo "$as_me:$LINENO: checking for ldap.h" >&5
2858 +$as_echo_n "checking for ldap.h... " >&6; }
2859 +
2860 +old_CFLAGS="$CFLAGS"
2861 +smart_include=
2862 +smart_include_dir=
2863 +
2864 +if test "x$smart_try_dir" != "x"; then
2865 + for try in $smart_try_dir; do
2866 + CFLAGS="$old_CFLAGS -I$try"
2867 + cat >conftest.$ac_ext <<_ACEOF
2868 +/* confdefs.h. */
2869 +_ACEOF
2870 +cat confdefs.h >>conftest.$ac_ext
2871 +cat >>conftest.$ac_ext <<_ACEOF
2872 +/* end confdefs.h. */
2873 +
2874 + #include <ldap.h>
2875 +int
2876 +main ()
2877 +{
2878 + int a = 1;
2879 + ;
2880 + return 0;
2881 +}
2882 +_ACEOF
2883 +rm -f conftest.$ac_objext
2884 +if { (ac_try="$ac_compile"
2885 +case "(($ac_try" in
2886 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2887 + *) ac_try_echo=$ac_try;;
2888 +esac
2889 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2890 +$as_echo "$ac_try_echo") >&5
2891 + (eval "$ac_compile") 2>conftest.er1
2892 + ac_status=$?
2893 + grep -v '^ *+' conftest.er1 >conftest.err
2894 + rm -f conftest.er1
2895 + cat conftest.err >&5
2896 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2897 + (exit $ac_status); } && {
2898 + test -z "$ac_c_werror_flag" ||
2899 + test ! -s conftest.err
2900 + } && test -s conftest.$ac_objext; then
2901 + smart_include="-I$try"
2902 +else
2903 + $as_echo "$as_me: failed program was:" >&5
2904 +sed 's/^/| /' conftest.$ac_ext >&5
2905 +
2906 + smart_include=
2907 +fi
2908 +
2909 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2910 + if test "x$smart_include" != "x"; then
2911 + break;
2912 + fi
2913 + done
2914 + CFLAGS="$old_CFLAGS"
2915 +fi
2916 +
2917 +if test "x$smart_include" = "x"; then
2918 + cat >conftest.$ac_ext <<_ACEOF
2919 +/* confdefs.h. */
2920 +_ACEOF
2921 +cat confdefs.h >>conftest.$ac_ext
2922 +cat >>conftest.$ac_ext <<_ACEOF
2923 +/* end confdefs.h. */
2924 +
2925 + #include <ldap.h>
2926 +int
2927 +main ()
2928 +{
2929 + int a = 1;
2930 + ;
2931 + return 0;
2932 +}
2933 +_ACEOF
2934 +rm -f conftest.$ac_objext
2935 +if { (ac_try="$ac_compile"
2936 +case "(($ac_try" in
2937 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2938 + *) ac_try_echo=$ac_try;;
2939 +esac
2940 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2941 +$as_echo "$ac_try_echo") >&5
2942 + (eval "$ac_compile") 2>conftest.er1
2943 + ac_status=$?
2944 + grep -v '^ *+' conftest.er1 >conftest.err
2945 + rm -f conftest.er1
2946 + cat conftest.err >&5
2947 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2948 + (exit $ac_status); } && {
2949 + test -z "$ac_c_werror_flag" ||
2950 + test ! -s conftest.err
2951 + } && test -s conftest.$ac_objext; then
2952 + smart_include=" "
2953 +else
2954 + $as_echo "$as_me: failed program was:" >&5
2955 +sed 's/^/| /' conftest.$ac_ext >&5
2956 +
2957 + smart_include=
2958 +fi
2959 +
2960 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2961 +fi
2962 +
2963 +if test "x$smart_include" = "x"; then
2964 +
2965 +
2966 +if test "x$LOCATE" != "x"; then
2967 + DIRS=
2968 + file=ldap.h
2969 +
2970 + for x in `${LOCATE} $file 2>/dev/null`; do
2971 + base=`echo $x | sed "s%/${file}%%"`
2972 + if test "x$x" = "x$base"; then
2973 + continue;
2974 + fi
2975 +
2976 + dir=`${DIRNAME} $x 2>/dev/null`
2977 + exclude=`echo ${dir} | ${GREP} /home`
2978 + if test "x$exclude" != "x"; then
2979 + continue
2980 + fi
2981 +
2982 + already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}`
2983 + if test "x$already" = "x"; then
2984 + DIRS="$DIRS $dir"
2985 + fi
2986 + done
2987 +fi
2988 +
2989 +eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
2990 +
2991 +
2992 + for try in $smart_include_dir /usr/local/include /opt/include; do
2993 + CFLAGS="$old_CFLAGS -I$try"
2994 + cat >conftest.$ac_ext <<_ACEOF
2995 +/* confdefs.h. */
2996 _ACEOF
2997 cat confdefs.h >>conftest.$ac_ext
2998 cat >>conftest.$ac_ext <<_ACEOF
2999 @@ -3434,20 +4068,21 @@ case "(($ac_try" in
3000 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3001 *) ac_try_echo=$ac_try;;
3002 esac
3003 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3004 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3005 +$as_echo "$ac_try_echo") >&5
3006 (eval "$ac_compile") 2>conftest.er1
3007 ac_status=$?
3008 grep -v '^ *+' conftest.er1 >conftest.err
3009 rm -f conftest.er1
3010 cat conftest.err >&5
3011 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3012 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3013 (exit $ac_status); } && {
3014 test -z "$ac_c_werror_flag" ||
3015 test ! -s conftest.err
3016 } && test -s conftest.$ac_objext; then
3017 smart_include="-I$try"
3018 else
3019 - echo "$as_me: failed program was:" >&5
3020 + $as_echo "$as_me: failed program was:" >&5
3021 sed 's/^/| /' conftest.$ac_ext >&5
3022
3023 smart_include=
3024 @@ -3462,14 +4097,14 @@ rm -f core conftest.err conftest.$ac_obj
3025 fi
3026
3027 if test "x$smart_include" != "x"; then
3028 - { echo "$as_me:$LINENO: result: yes" >&5
3029 -echo "${ECHO_T}yes" >&6; }
3030 + { $as_echo "$as_me:$LINENO: result: yes" >&5
3031 +$as_echo "yes" >&6; }
3032 eval "ac_cv_header_$ac_safe=yes"
3033 CFLAGS="$old_CFLAGS $smart_include"
3034 SMART_CFLAGS="$SMART_CFLAGS $smart_include"
3035 else
3036 - { echo "$as_me:$LINENO: result: no" >&5
3037 -echo "${ECHO_T}no" >&6; }
3038 + { $as_echo "$as_me:$LINENO: result: no" >&5
3039 +$as_echo "no" >&6; }
3040 fi
3041
3042 if test "$ac_cv_header_ldap_h" != "yes"; then
3043 @@ -3478,10 +4113,10 @@ fi
3044
3045
3046 if test "x$fail" = "x"; then
3047 - { echo "$as_me:$LINENO: checking for ldap_start_tls_s" >&5
3048 -echo $ECHO_N "checking for ldap_start_tls_s... $ECHO_C" >&6; }
3049 + { $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s" >&5
3050 +$as_echo_n "checking for ldap_start_tls_s... " >&6; }
3051 if test "${ac_cv_func_ldap_start_tls_s+set}" = set; then
3052 - echo $ECHO_N "(cached) $ECHO_C" >&6
3053 + $as_echo_n "(cached) " >&6
3054 else
3055 cat >conftest.$ac_ext <<_ACEOF
3056 /* confdefs.h. */
3057 @@ -3534,39 +4169,43 @@ case "(($ac_try" in
3058 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3059 *) ac_try_echo=$ac_try;;
3060 esac
3061 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3062 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3063 +$as_echo "$ac_try_echo") >&5
3064 (eval "$ac_link") 2>conftest.er1
3065 ac_status=$?
3066 grep -v '^ *+' conftest.er1 >conftest.err
3067 rm -f conftest.er1
3068 cat conftest.err >&5
3069 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3070 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3071 (exit $ac_status); } && {
3072 test -z "$ac_c_werror_flag" ||
3073 test ! -s conftest.err
3074 - } && test -s conftest$ac_exeext &&
3075 - $as_test_x conftest$ac_exeext; then
3076 + } && test -s conftest$ac_exeext && {
3077 + test "$cross_compiling" = yes ||
3078 + $as_test_x conftest$ac_exeext
3079 + }; then
3080 ac_cv_func_ldap_start_tls_s=yes
3081 else
3082 - echo "$as_me: failed program was:" >&5
3083 + $as_echo "$as_me: failed program was:" >&5
3084 sed 's/^/| /' conftest.$ac_ext >&5
3085
3086 ac_cv_func_ldap_start_tls_s=no
3087 fi
3088
3089 +rm -rf conftest.dSYM
3090 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3091 conftest$ac_exeext conftest.$ac_ext
3092 fi
3093 -{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_start_tls_s" >&5
3094 -echo "${ECHO_T}$ac_cv_func_ldap_start_tls_s" >&6; }
3095 -if test $ac_cv_func_ldap_start_tls_s = yes; then
3096 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldap_start_tls_s" >&5
3097 +$as_echo "$ac_cv_func_ldap_start_tls_s" >&6; }
3098 +if test "x$ac_cv_func_ldap_start_tls_s" = x""yes; then
3099 SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_START_TLS"
3100 fi
3101
3102 - { echo "$as_me:$LINENO: checking for ldap_initialize" >&5
3103 -echo $ECHO_N "checking for ldap_initialize... $ECHO_C" >&6; }
3104 + { $as_echo "$as_me:$LINENO: checking for ldap_initialize" >&5
3105 +$as_echo_n "checking for ldap_initialize... " >&6; }
3106 if test "${ac_cv_func_ldap_initialize+set}" = set; then
3107 - echo $ECHO_N "(cached) $ECHO_C" >&6
3108 + $as_echo_n "(cached) " >&6
3109 else
3110 cat >conftest.$ac_ext <<_ACEOF
3111 /* confdefs.h. */
3112 @@ -3619,39 +4258,43 @@ case "(($ac_try" in
3113 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3114 *) ac_try_echo=$ac_try;;
3115 esac
3116 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3117 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3118 +$as_echo "$ac_try_echo") >&5
3119 (eval "$ac_link") 2>conftest.er1
3120 ac_status=$?
3121 grep -v '^ *+' conftest.er1 >conftest.err
3122 rm -f conftest.er1
3123 cat conftest.err >&5
3124 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3125 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3126 (exit $ac_status); } && {
3127 test -z "$ac_c_werror_flag" ||
3128 test ! -s conftest.err
3129 - } && test -s conftest$ac_exeext &&
3130 - $as_test_x conftest$ac_exeext; then
3131 + } && test -s conftest$ac_exeext && {
3132 + test "$cross_compiling" = yes ||
3133 + $as_test_x conftest$ac_exeext
3134 + }; then
3135 ac_cv_func_ldap_initialize=yes
3136 else
3137 - echo "$as_me: failed program was:" >&5
3138 + $as_echo "$as_me: failed program was:" >&5
3139 sed 's/^/| /' conftest.$ac_ext >&5
3140
3141 ac_cv_func_ldap_initialize=no
3142 fi
3143
3144 +rm -rf conftest.dSYM
3145 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3146 conftest$ac_exeext conftest.$ac_ext
3147 fi
3148 -{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_initialize" >&5
3149 -echo "${ECHO_T}$ac_cv_func_ldap_initialize" >&6; }
3150 -if test $ac_cv_func_ldap_initialize = yes; then
3151 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldap_initialize" >&5
3152 +$as_echo "$ac_cv_func_ldap_initialize" >&6; }
3153 +if test "x$ac_cv_func_ldap_initialize" = x""yes; then
3154 SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_INITIALIZE"
3155 fi
3156
3157 - { echo "$as_me:$LINENO: checking for ldap_int_tls_config" >&5
3158 -echo $ECHO_N "checking for ldap_int_tls_config... $ECHO_C" >&6; }
3159 + { $as_echo "$as_me:$LINENO: checking for ldap_int_tls_config" >&5
3160 +$as_echo_n "checking for ldap_int_tls_config... " >&6; }
3161 if test "${ac_cv_func_ldap_int_tls_config+set}" = set; then
3162 - echo $ECHO_N "(cached) $ECHO_C" >&6
3163 + $as_echo_n "(cached) " >&6
3164 else
3165 cat >conftest.$ac_ext <<_ACEOF
3166 /* confdefs.h. */
3167 @@ -3704,32 +4347,36 @@ case "(($ac_try" in
3168 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3169 *) ac_try_echo=$ac_try;;
3170 esac
3171 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3172 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3173 +$as_echo "$ac_try_echo") >&5
3174 (eval "$ac_link") 2>conftest.er1
3175 ac_status=$?
3176 grep -v '^ *+' conftest.er1 >conftest.err
3177 rm -f conftest.er1
3178 cat conftest.err >&5
3179 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3180 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3181 (exit $ac_status); } && {
3182 test -z "$ac_c_werror_flag" ||
3183 test ! -s conftest.err
3184 - } && test -s conftest$ac_exeext &&
3185 - $as_test_x conftest$ac_exeext; then
3186 + } && test -s conftest$ac_exeext && {
3187 + test "$cross_compiling" = yes ||
3188 + $as_test_x conftest$ac_exeext
3189 + }; then
3190 ac_cv_func_ldap_int_tls_config=yes
3191 else
3192 - echo "$as_me: failed program was:" >&5
3193 + $as_echo "$as_me: failed program was:" >&5
3194 sed 's/^/| /' conftest.$ac_ext >&5
3195
3196 ac_cv_func_ldap_int_tls_config=no
3197 fi
3198
3199 +rm -rf conftest.dSYM
3200 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3201 conftest$ac_exeext conftest.$ac_ext
3202 fi
3203 -{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_int_tls_config" >&5
3204 -echo "${ECHO_T}$ac_cv_func_ldap_int_tls_config" >&6; }
3205 -if test $ac_cv_func_ldap_int_tls_config = yes; then
3206 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldap_int_tls_config" >&5
3207 +$as_echo "$ac_cv_func_ldap_int_tls_config" >&6; }
3208 +if test "x$ac_cv_func_ldap_int_tls_config" = x""yes; then
3209 SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_INT_TLS_CONFIG"
3210 fi
3211
3212 @@ -3743,21 +4390,21 @@ fi
3213
3214 if test x"$fail" != x""; then
3215 if test x"${enable_strict_dependencies}" = x"yes"; then
3216 - { { echo "$as_me:$LINENO: error: set --without-rlm_ldap to disable it explicitly." >&5
3217 -echo "$as_me: error: set --without-rlm_ldap to disable it explicitly." >&2;}
3218 + { { $as_echo "$as_me:$LINENO: error: set --without-rlm_ldap to disable it explicitly." >&5
3219 +$as_echo "$as_me: error: set --without-rlm_ldap to disable it explicitly." >&2;}
3220 { (exit 1); exit 1; }; }
3221 else
3222 - { echo "$as_me:$LINENO: WARNING: silently not building rlm_ldap." >&5
3223 -echo "$as_me: WARNING: silently not building rlm_ldap." >&2;}
3224 - { echo "$as_me:$LINENO: WARNING: FAILURE: rlm_ldap requires: $fail." >&5
3225 -echo "$as_me: WARNING: FAILURE: rlm_ldap requires: $fail." >&2;}
3226 + { $as_echo "$as_me:$LINENO: WARNING: silently not building rlm_ldap." >&5
3227 +$as_echo "$as_me: WARNING: silently not building rlm_ldap." >&2;}
3228 + { $as_echo "$as_me:$LINENO: WARNING: FAILURE: rlm_ldap requires: $fail." >&5
3229 +$as_echo "$as_me: WARNING: FAILURE: rlm_ldap requires: $fail." >&2;}
3230 if test x"$headersuggestion" != x; then
3231 - { echo "$as_me:$LINENO: WARNING: $headersuggestion" >&5
3232 -echo "$as_me: WARNING: $headersuggestion" >&2;}
3233 + { $as_echo "$as_me:$LINENO: WARNING: $headersuggestion" >&5
3234 +$as_echo "$as_me: WARNING: $headersuggestion" >&2;}
3235 fi
3236 if test x"$libsuggestion" != x; then
3237 - { echo "$as_me:$LINENO: WARNING: $libsuggestion" >&5
3238 -echo "$as_me: WARNING: $libsuggestion" >&2;}
3239 + { $as_echo "$as_me:$LINENO: WARNING: $libsuggestion" >&5
3240 +$as_echo "$as_me: WARNING: $libsuggestion" >&2;}
3241 fi
3242 targetname=""
3243 fi
3244 @@ -3785,7 +4432,11 @@ ldap_cflags="$SMART_CFLAGS -DLDAP_DEPREC
3245
3246
3247
3248 -ac_config_files="$ac_config_files Makefile"
3249 +
3250 + unset ac_cv_env_LIBS_set
3251 + unset ac_cv_env_LIBS_value
3252 +
3253 + ac_config_files="$ac_config_files Makefile"
3254
3255 cat >confcache <<\_ACEOF
3256 # This file is a shell script that caches the results of configure
3257 @@ -3814,11 +4465,12 @@ _ACEOF
3258 case $ac_val in #(
3259 *${as_nl}*)
3260 case $ac_var in #(
3261 - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
3262 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
3263 + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
3264 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
3265 esac
3266 case $ac_var in #(
3267 _ | IFS | as_nl) ;; #(
3268 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
3269 *) $as_unset $ac_var ;;
3270 esac ;;
3271 esac
3272 @@ -3851,12 +4503,12 @@ echo "$as_me: WARNING: Cache variable $a
3273 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
3274 if test -w "$cache_file"; then
3275 test "x$cache_file" != "x/dev/null" &&
3276 - { echo "$as_me:$LINENO: updating cache $cache_file" >&5
3277 -echo "$as_me: updating cache $cache_file" >&6;}
3278 + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
3279 +$as_echo "$as_me: updating cache $cache_file" >&6;}
3280 cat confcache >$cache_file
3281 else
3282 - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
3283 -echo "$as_me: not updating unwritable cache $cache_file" >&6;}
3284 + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
3285 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
3286 fi
3287 fi
3288 rm -f confcache
3289 @@ -3873,6 +4525,12 @@ test "x$exec_prefix" = xNONE && exec_pre
3290 # take arguments), then branch to the quote section. Otherwise,
3291 # look for a macro that doesn't take arguments.
3292 ac_script='
3293 +:mline
3294 +/\\$/{
3295 + N
3296 + s,\\\n,,
3297 + b mline
3298 +}
3299 t clear
3300 :clear
3301 s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
3302 @@ -3902,7 +4560,7 @@ ac_ltlibobjs=
3303 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
3304 # 1. Remove the extension, and $U if already installed.
3305 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
3306 - ac_i=`echo "$ac_i" | sed "$ac_script"`
3307 + ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
3308 # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
3309 # will be set to the directory where LIBOBJS objects are built.
3310 ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
3311 @@ -3915,11 +4573,12 @@ LTLIBOBJS=$ac_ltlibobjs
3312
3313
3314 : ${CONFIG_STATUS=./config.status}
3315 +ac_write_fail=0
3316 ac_clean_files_save=$ac_clean_files
3317 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
3318 -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
3319 -echo "$as_me: creating $CONFIG_STATUS" >&6;}
3320 -cat >$CONFIG_STATUS <<_ACEOF
3321 +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
3322 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
3323 +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3324 #! $SHELL
3325 # Generated by $as_me.
3326 # Run this file to recreate the current configuration.
3327 @@ -3932,7 +4591,7 @@ ac_cs_silent=false
3328 SHELL=\${CONFIG_SHELL-$SHELL}
3329 _ACEOF
3330
3331 -cat >>$CONFIG_STATUS <<\_ACEOF
3332 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3333 ## --------------------- ##
3334 ## M4sh Initialization. ##
3335 ## --------------------- ##
3336 @@ -3942,7 +4601,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
3337 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
3338 emulate sh
3339 NULLCMD=:
3340 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
3341 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
3342 # is contrary to our usage. Disable this feature.
3343 alias -g '${1+"$@"}'='"$@"'
3344 setopt NO_GLOB_SUBST
3345 @@ -3964,17 +4623,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
3346 as_cr_digits='0123456789'
3347 as_cr_alnum=$as_cr_Letters$as_cr_digits
3348
3349 -# The user is always right.
3350 -if test "${PATH_SEPARATOR+set}" != set; then
3351 - echo "#! /bin/sh" >conf$$.sh
3352 - echo "exit 0" >>conf$$.sh
3353 - chmod +x conf$$.sh
3354 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
3355 - PATH_SEPARATOR=';'
3356 +as_nl='
3357 +'
3358 +export as_nl
3359 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
3360 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
3361 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
3362 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
3363 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
3364 + as_echo='printf %s\n'
3365 + as_echo_n='printf %s'
3366 +else
3367 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
3368 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
3369 + as_echo_n='/usr/ucb/echo -n'
3370 else
3371 - PATH_SEPARATOR=:
3372 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
3373 + as_echo_n_body='eval
3374 + arg=$1;
3375 + case $arg in
3376 + *"$as_nl"*)
3377 + expr "X$arg" : "X\\(.*\\)$as_nl";
3378 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
3379 + esac;
3380 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
3381 + '
3382 + export as_echo_n_body
3383 + as_echo_n='sh -c $as_echo_n_body as_echo'
3384 fi
3385 - rm -f conf$$.sh
3386 + export as_echo_body
3387 + as_echo='sh -c $as_echo_body as_echo'
3388 +fi
3389 +
3390 +# The user is always right.
3391 +if test "${PATH_SEPARATOR+set}" != set; then
3392 + PATH_SEPARATOR=:
3393 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
3394 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
3395 + PATH_SEPARATOR=';'
3396 + }
3397 fi
3398
3399 # Support unset when possible.
3400 @@ -3990,8 +4677,6 @@ fi
3401 # there to prevent editors from complaining about space-tab.
3402 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
3403 # splitting by setting IFS to empty value.)
3404 -as_nl='
3405 -'
3406 IFS=" "" $as_nl"
3407
3408 # Find who we are. Look in the path if we contain no directory separator.
3409 @@ -4014,7 +4699,7 @@ if test "x$as_myself" = x; then
3410 as_myself=$0
3411 fi
3412 if test ! -f "$as_myself"; then
3413 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
3414 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
3415 { (exit 1); exit 1; }
3416 fi
3417
3418 @@ -4027,17 +4712,10 @@ PS2='> '
3419 PS4='+ '
3420
3421 # NLS nuisances.
3422 -for as_var in \
3423 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
3424 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
3425 - LC_TELEPHONE LC_TIME
3426 -do
3427 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
3428 - eval $as_var=C; export $as_var
3429 - else
3430 - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
3431 - fi
3432 -done
3433 +LC_ALL=C
3434 +export LC_ALL
3435 +LANGUAGE=C
3436 +export LANGUAGE
3437
3438 # Required to use basename.
3439 if expr a : '\(a\)' >/dev/null 2>&1 &&
3440 @@ -4059,7 +4737,7 @@ as_me=`$as_basename -- "$0" ||
3441 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
3442 X"$0" : 'X\(//\)$' \| \
3443 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
3444 -echo X/"$0" |
3445 +$as_echo X/"$0" |
3446 sed '/^.*\/\([^/][^/]*\)\/*$/{
3447 s//\1/
3448 q
3449 @@ -4110,7 +4788,7 @@ $as_unset CDPATH
3450 s/-\n.*//
3451 ' >$as_me.lineno &&
3452 chmod +x "$as_me.lineno" ||
3453 - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
3454 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
3455 { (exit 1); exit 1; }; }
3456
3457 # Don't try to exec as it changes $[0], causing all sort of problems
3458 @@ -4138,7 +4816,6 @@ case `echo -n x` in
3459 *)
3460 ECHO_N='-n';;
3461 esac
3462 -
3463 if expr a : '\(a\)' >/dev/null 2>&1 &&
3464 test "X`expr 00001 : '.*\(...\)'`" = X001; then
3465 as_expr=expr
3466 @@ -4151,19 +4828,22 @@ if test -d conf$$.dir; then
3467 rm -f conf$$.dir/conf$$.file
3468 else
3469 rm -f conf$$.dir
3470 - mkdir conf$$.dir
3471 + mkdir conf$$.dir 2>/dev/null
3472 fi
3473 -echo >conf$$.file
3474 -if ln -s conf$$.file conf$$ 2>/dev/null; then
3475 - as_ln_s='ln -s'
3476 - # ... but there are two gotchas:
3477 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
3478 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
3479 - # In both cases, we have to default to `cp -p'.
3480 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
3481 +if (echo >conf$$.file) 2>/dev/null; then
3482 + if ln -s conf$$.file conf$$ 2>/dev/null; then
3483 + as_ln_s='ln -s'
3484 + # ... but there are two gotchas:
3485 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
3486 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
3487 + # In both cases, we have to default to `cp -p'.
3488 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
3489 + as_ln_s='cp -p'
3490 + elif ln conf$$.file conf$$ 2>/dev/null; then
3491 + as_ln_s=ln
3492 + else
3493 as_ln_s='cp -p'
3494 -elif ln conf$$.file conf$$ 2>/dev/null; then
3495 - as_ln_s=ln
3496 + fi
3497 else
3498 as_ln_s='cp -p'
3499 fi
3500 @@ -4188,10 +4868,10 @@ else
3501 as_test_x='
3502 eval sh -c '\''
3503 if test -d "$1"; then
3504 - test -d "$1/.";
3505 + test -d "$1/.";
3506 else
3507 case $1 in
3508 - -*)set "./$1";;
3509 + -*)set "./$1";;
3510 esac;
3511 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
3512 ???[sx]*):;;*)false;;esac;fi
3513 @@ -4214,7 +4894,7 @@ exec 6>&1
3514 # values after options handling.
3515 ac_log="
3516 This file was extended by $as_me, which was
3517 -generated by GNU Autoconf 2.61. Invocation command line was
3518 +generated by GNU Autoconf 2.63. Invocation command line was
3519
3520 CONFIG_FILES = $CONFIG_FILES
3521 CONFIG_HEADERS = $CONFIG_HEADERS
3522 @@ -4227,26 +4907,33 @@ on `(hostname || uname -n) 2>/dev/null |
3523
3524 _ACEOF
3525
3526 -cat >>$CONFIG_STATUS <<_ACEOF
3527 +case $ac_config_files in *"
3528 +"*) set x $ac_config_files; shift; ac_config_files=$*;;
3529 +esac
3530 +
3531 +
3532 +
3533 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3534 # Files that config.status was made for.
3535 config_files="$ac_config_files"
3536
3537 _ACEOF
3538
3539 -cat >>$CONFIG_STATUS <<\_ACEOF
3540 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3541 ac_cs_usage="\
3542 \`$as_me' instantiates files from templates according to the
3543 current configuration.
3544
3545 -Usage: $0 [OPTIONS] [FILE]...
3546 +Usage: $0 [OPTION]... [FILE]...
3547
3548 -h, --help print this help, then exit
3549 -V, --version print version number and configuration settings, then exit
3550 - -q, --quiet do not print progress messages
3551 + -q, --quiet, --silent