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