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