]>
Commit | Line | Data |
---|---|---|
e5fd101c PS |
1 | autofs-5.0.4 - configure libtirpc fix |
2 | ||
3 | From: Ian Kent <raven@themaw.net> | |
4 | ||
5 | Cleanup configure defines for libtirpc. | |
6 | Add WITH_LIBTIRPC to the -V status report. | |
7 | Add a check for libtirpc.so.1 for the libtirpc workaround in case libtirpc.so | |
8 | is not present. | |
9 | --- | |
10 | ||
11 | CHANGELOG | 3 | |
12 | aclocal.m4 | 3 | |
13 | configure | 2769 ++++++++++++++++++++++++++++----------------------- | |
14 | daemon/automount.c | 12 | |
15 | include/config.h.in | 5 | |
16 | 5 files changed, 1539 insertions(+), 1253 deletions(-) | |
17 | ||
18 | ||
19 | diff --git a/CHANGELOG b/CHANGELOG | |
20 | index b8ad22e..ad74b7d 100644 | |
21 | --- a/CHANGELOG | |
22 | +++ b/CHANGELOG | |
23 | @@ -22,6 +22,9 @@ | |
24 | - update to provide ipv6 address parsing. | |
25 | - easy alloca replacements fix. | |
26 | - add check for alternate libxml2 library for libxml2 tsd workaround. | |
27 | +- add check for alternate libtirpc library for libtirpc tsd workaround. | |
28 | +- cleanup configure defines for libtirpc. | |
29 | +- add WITH_LIBTIRPC to -V status report. | |
30 | ||
31 | 4/11/2008 autofs-5.0.4 | |
32 | ----------------------- | |
33 | diff --git a/aclocal.m4 b/aclocal.m4 | |
34 | index 5777fcd..e7f1a30 100644 | |
35 | --- a/aclocal.m4 | |
36 | +++ b/aclocal.m4 | |
37 | @@ -364,7 +364,8 @@ AC_TRY_LINK( | |
38 | [ AC_MSG_RESULT(no) ]) | |
39 | ||
40 | if test "$af_have_libtirpc" = "yes"; then | |
41 | - AC_DEFINE(TIRPC_WORKAROUND,1, [Use libtirpc tsd usage workaround]) | |
42 | + AC_DEFINE(WITH_LIBTIRPC,1, [Define to 1 if you have the libtirpc library installed]) | |
43 | + AC_DEFINE(TIRPC_WORKAROUND,1, [Define to 1 to use the libtirpc tsd usage workaround]) | |
44 | TIRPCLIB="-ltirpc" | |
45 | fi | |
46 | ||
47 | diff --git a/configure b/configure | |
48 | index 8a6d944..995a472 100755 | |
49 | --- a/configure | |
50 | +++ b/configure | |
51 | @@ -1,9 +1,9 @@ | |
52 | #! /bin/sh | |
53 | # Guess values for system-dependent variables and create Makefiles. | |
54 | -# Generated by GNU Autoconf 2.61. | |
55 | +# Generated by GNU Autoconf 2.63. | |
56 | # | |
57 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | |
58 | -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | |
59 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | |
60 | # This configure script is free software; the Free Software Foundation | |
61 | # gives unlimited permission to copy, distribute and modify it. | |
62 | ## --------------------- ## | |
63 | @@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh | |
64 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
65 | emulate sh | |
66 | NULLCMD=: | |
67 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | |
68 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which | |
69 | # is contrary to our usage. Disable this feature. | |
70 | alias -g '${1+"$@"}'='"$@"' | |
71 | setopt NO_GLOB_SUBST | |
72 | @@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS | |
73 | as_cr_digits='0123456789' | |
74 | as_cr_alnum=$as_cr_Letters$as_cr_digits | |
75 | ||
76 | -# The user is always right. | |
77 | -if test "${PATH_SEPARATOR+set}" != set; then | |
78 | - echo "#! /bin/sh" >conf$$.sh | |
79 | - echo "exit 0" >>conf$$.sh | |
80 | - chmod +x conf$$.sh | |
81 | - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | |
82 | - PATH_SEPARATOR=';' | |
83 | +as_nl=' | |
84 | +' | |
85 | +export as_nl | |
86 | +# Printing a long string crashes Solaris 7 /usr/bin/printf. | |
87 | +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' | |
88 | +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo | |
89 | +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo | |
90 | +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then | |
91 | + as_echo='printf %s\n' | |
92 | + as_echo_n='printf %s' | |
93 | +else | |
94 | + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then | |
95 | + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' | |
96 | + as_echo_n='/usr/ucb/echo -n' | |
97 | else | |
98 | - PATH_SEPARATOR=: | |
99 | + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' | |
100 | + as_echo_n_body='eval | |
101 | + arg=$1; | |
102 | + case $arg in | |
103 | + *"$as_nl"*) | |
104 | + expr "X$arg" : "X\\(.*\\)$as_nl"; | |
105 | + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; | |
106 | + esac; | |
107 | + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" | |
108 | + ' | |
109 | + export as_echo_n_body | |
110 | + as_echo_n='sh -c $as_echo_n_body as_echo' | |
111 | fi | |
112 | - rm -f conf$$.sh | |
113 | + export as_echo_body | |
114 | + as_echo='sh -c $as_echo_body as_echo' | |
115 | +fi | |
116 | + | |
117 | +# The user is always right. | |
118 | +if test "${PATH_SEPARATOR+set}" != set; then | |
119 | + PATH_SEPARATOR=: | |
120 | + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { | |
121 | + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || | |
122 | + PATH_SEPARATOR=';' | |
123 | + } | |
124 | fi | |
125 | ||
126 | # Support unset when possible. | |
127 | @@ -63,8 +91,6 @@ fi | |
128 | # there to prevent editors from complaining about space-tab. | |
129 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word | |
130 | # splitting by setting IFS to empty value.) | |
131 | -as_nl=' | |
132 | -' | |
133 | IFS=" "" $as_nl" | |
134 | ||
135 | # Find who we are. Look in the path if we contain no directory separator. | |
136 | @@ -87,7 +113,7 @@ if test "x$as_myself" = x; then | |
137 | as_myself=$0 | |
138 | fi | |
139 | if test ! -f "$as_myself"; then | |
140 | - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | |
141 | + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | |
142 | { (exit 1); exit 1; } | |
143 | fi | |
144 | ||
145 | @@ -100,17 +126,10 @@ PS2='> ' | |
146 | PS4='+ ' | |
147 | ||
148 | # NLS nuisances. | |
149 | -for as_var in \ | |
150 | - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ | |
151 | - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | |
152 | - LC_TELEPHONE LC_TIME | |
153 | -do | |
154 | - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | |
155 | - eval $as_var=C; export $as_var | |
156 | - else | |
157 | - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | |
158 | - fi | |
159 | -done | |
160 | +LC_ALL=C | |
161 | +export LC_ALL | |
162 | +LANGUAGE=C | |
163 | +export LANGUAGE | |
164 | ||
165 | # Required to use basename. | |
166 | if expr a : '\(a\)' >/dev/null 2>&1 && | |
167 | @@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" || | |
168 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | |
169 | X"$0" : 'X\(//\)$' \| \ | |
170 | X"$0" : 'X\(/\)' \| . 2>/dev/null || | |
171 | -echo X/"$0" | | |
172 | +$as_echo X/"$0" | | |
173 | sed '/^.*\/\([^/][^/]*\)\/*$/{ | |
174 | s//\1/ | |
175 | q | |
176 | @@ -158,7 +177,7 @@ else | |
177 | as_have_required=no | |
178 | fi | |
179 | ||
180 | - if test $as_have_required = yes && (eval ": | |
181 | + if test $as_have_required = yes && (eval ": | |
182 | (as_func_return () { | |
183 | (exit \$1) | |
184 | } | |
185 | @@ -240,7 +259,7 @@ IFS=$as_save_IFS | |
186 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
187 | emulate sh | |
188 | NULLCMD=: | |
189 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | |
190 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which | |
191 | # is contrary to our usage. Disable this feature. | |
192 | alias -g '${1+"$@"}'='"$@"' | |
193 | setopt NO_GLOB_SUBST | |
194 | @@ -261,7 +280,7 @@ _ASEOF | |
195 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
196 | emulate sh | |
197 | NULLCMD=: | |
198 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | |
199 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which | |
200 | # is contrary to our usage. Disable this feature. | |
201 | alias -g '${1+"$@"}'='"$@"' | |
202 | setopt NO_GLOB_SUBST | |
203 | @@ -341,10 +360,10 @@ fi | |
204 | ||
205 | if test "x$CONFIG_SHELL" != x; then | |
206 | for as_var in BASH_ENV ENV | |
207 | - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | |
208 | - done | |
209 | - export CONFIG_SHELL | |
210 | - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} | |
211 | + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | |
212 | + done | |
213 | + export CONFIG_SHELL | |
214 | + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} | |
215 | fi | |
216 | ||
217 | ||
218 | @@ -413,9 +432,10 @@ fi | |
219 | ||
220 | test \$exitcode = 0") || { | |
221 | echo No shell found that supports shell functions. | |
222 | - echo Please tell autoconf@gnu.org about your system, | |
223 | - echo including any error possibly output before this | |
224 | - echo message | |
225 | + echo Please tell bug-autoconf@gnu.org about your system, | |
226 | + echo including any error possibly output before this message. | |
227 | + echo This can help us improve future autoconf versions. | |
228 | + echo Configuration will now proceed without shell functions. | |
229 | } | |
230 | ||
231 | ||
232 | @@ -451,7 +471,7 @@ test \$exitcode = 0") || { | |
233 | s/-\n.*// | |
234 | ' >$as_me.lineno && | |
235 | chmod +x "$as_me.lineno" || | |
236 | - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | |
237 | + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | |
238 | { (exit 1); exit 1; }; } | |
239 | ||
240 | # Don't try to exec as it changes $[0], causing all sort of problems | |
241 | @@ -479,7 +499,6 @@ case `echo -n x` in | |
242 | *) | |
243 | ECHO_N='-n';; | |
244 | esac | |
245 | - | |
246 | if expr a : '\(a\)' >/dev/null 2>&1 && | |
247 | test "X`expr 00001 : '.*\(...\)'`" = X001; then | |
248 | as_expr=expr | |
249 | @@ -492,19 +511,22 @@ if test -d conf$$.dir; then | |
250 | rm -f conf$$.dir/conf$$.file | |
251 | else | |
252 | rm -f conf$$.dir | |
253 | - mkdir conf$$.dir | |
254 | -fi | |
255 | -echo >conf$$.file | |
256 | -if ln -s conf$$.file conf$$ 2>/dev/null; then | |
257 | - as_ln_s='ln -s' | |
258 | - # ... but there are two gotchas: | |
259 | - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | |
260 | - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | |
261 | - # In both cases, we have to default to `cp -p'. | |
262 | - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | |
263 | + mkdir conf$$.dir 2>/dev/null | |
264 | +fi | |
265 | +if (echo >conf$$.file) 2>/dev/null; then | |
266 | + if ln -s conf$$.file conf$$ 2>/dev/null; then | |
267 | + as_ln_s='ln -s' | |
268 | + # ... but there are two gotchas: | |
269 | + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | |
270 | + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | |
271 | + # In both cases, we have to default to `cp -p'. | |
272 | + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | |
273 | + as_ln_s='cp -p' | |
274 | + elif ln conf$$.file conf$$ 2>/dev/null; then | |
275 | + as_ln_s=ln | |
276 | + else | |
277 | as_ln_s='cp -p' | |
278 | -elif ln conf$$.file conf$$ 2>/dev/null; then | |
279 | - as_ln_s=ln | |
280 | + fi | |
281 | else | |
282 | as_ln_s='cp -p' | |
283 | fi | |
284 | @@ -529,10 +551,10 @@ else | |
285 | as_test_x=' | |
286 | eval sh -c '\'' | |
287 | if test -d "$1"; then | |
288 | - test -d "$1/."; | |
289 | + test -d "$1/."; | |
290 | else | |
291 | case $1 in | |
292 | - -*)set "./$1";; | |
293 | + -*)set "./$1";; | |
294 | esac; | |
295 | case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | |
296 | ???[sx]*):;;*)false;;esac;fi | |
297 | @@ -614,98 +636,115 @@ ac_includes_default="\ | |
298 | # include <unistd.h> | |
299 | #endif" | |
300 | ||
301 | -ac_subst_vars='SHELL | |
302 | -PATH_SEPARATOR | |
303 | -PACKAGE_NAME | |
304 | -PACKAGE_TARNAME | |
305 | -PACKAGE_VERSION | |
306 | -PACKAGE_STRING | |
307 | -PACKAGE_BUGREPORT | |
308 | -exec_prefix | |
309 | -prefix | |
310 | -program_transform_name | |
311 | -bindir | |
312 | -sbindir | |
313 | -libexecdir | |
314 | -datarootdir | |
315 | -datadir | |
316 | -sysconfdir | |
317 | -sharedstatedir | |
318 | -localstatedir | |
319 | -includedir | |
320 | -oldincludedir | |
321 | -docdir | |
322 | -infodir | |
323 | -htmldir | |
324 | -dvidir | |
325 | -pdfdir | |
326 | -psdir | |
327 | -libdir | |
328 | -localedir | |
329 | -mandir | |
330 | -DEFS | |
331 | -ECHO_C | |
332 | -ECHO_N | |
333 | -ECHO_T | |
334 | -LIBS | |
335 | -build_alias | |
336 | -host_alias | |
337 | -target_alias | |
338 | -initdir | |
339 | -confdir | |
340 | -mapdir | |
341 | -fifodir | |
342 | -flagdir | |
343 | -CC | |
344 | -CFLAGS | |
345 | -LDFLAGS | |
346 | -CPPFLAGS | |
347 | -ac_ct_CC | |
348 | -EXEEXT | |
349 | -OBJEXT | |
350 | -TIRPCLIB | |
351 | -DMALLOCLIB | |
352 | -MOUNT | |
353 | -HAVE_MOUNT | |
354 | -UMOUNT | |
355 | -HAVE_UMOUNT | |
356 | -E2FSCK | |
357 | -HAVE_E2FSCK | |
358 | -E3FSCK | |
359 | -HAVE_E3FSCK | |
360 | -MODPROBE | |
361 | -HAVE_MODPROBE | |
362 | -LEX | |
363 | -PATH_LEX | |
364 | -YACC | |
365 | -PATH_YACC | |
366 | -RANLIB | |
367 | -PATH_RANLIB | |
368 | -RPCGEN | |
369 | -PATH_RPCGEN | |
370 | -XML_CONFIG | |
371 | -LIBNSL | |
372 | -LIBRESOLV | |
373 | -HAVE_HESIOD | |
374 | -LIBHESIOD | |
375 | -HESIOD_FLAGS | |
376 | -CPP | |
377 | -GREP | |
378 | -EGREP | |
379 | -HAVE_NISPLUS | |
380 | -LDAP_FLAGS | |
381 | -HAVE_LDAP | |
382 | -LIBLDAP | |
383 | -XML_FLAGS | |
384 | -XML_LIBS | |
385 | -SASL_FLAGS | |
386 | -HAVE_SASL | |
387 | -LIBSASL | |
388 | -DAEMON_CFLAGS | |
389 | -DAEMON_LDFLAGS | |
390 | +ac_subst_vars='LTLIBOBJS | |
391 | LIBOBJS | |
392 | -LTLIBOBJS' | |
393 | +DAEMON_LDFLAGS | |
394 | +DAEMON_CFLAGS | |
395 | +LIBSASL | |
396 | +HAVE_SASL | |
397 | +SASL_FLAGS | |
398 | +XML_LIBS | |
399 | +XML_FLAGS | |
400 | +LIBLDAP | |
401 | +HAVE_LDAP | |
402 | +LDAP_FLAGS | |
403 | +HAVE_NISPLUS | |
404 | +EGREP | |
405 | +GREP | |
406 | +CPP | |
407 | +HESIOD_FLAGS | |
408 | +LIBHESIOD | |
409 | +HAVE_HESIOD | |
410 | +LIBRESOLV | |
411 | +LIBNSL | |
412 | +XML_CONFIG | |
413 | +PATH_RPCGEN | |
414 | +RPCGEN | |
415 | +PATH_RANLIB | |
416 | +RANLIB | |
417 | +PATH_YACC | |
418 | +YACC | |
419 | +PATH_LEX | |
420 | +LEX | |
421 | +HAVE_MODPROBE | |
422 | +MODPROBE | |
423 | +HAVE_E3FSCK | |
424 | +E3FSCK | |
425 | +HAVE_E2FSCK | |
426 | +E2FSCK | |
427 | +HAVE_UMOUNT | |
428 | +UMOUNT | |
429 | +HAVE_MOUNT | |
430 | +MOUNT | |
431 | +DMALLOCLIB | |
432 | +TIRPCLIB | |
433 | +OBJEXT | |
434 | +EXEEXT | |
435 | +ac_ct_CC | |
436 | +CPPFLAGS | |
437 | +LDFLAGS | |
438 | +CFLAGS | |
439 | +CC | |
440 | +flagdir | |
441 | +fifodir | |
442 | +mapdir | |
443 | +confdir | |
444 | +initdir | |
445 | +target_alias | |
446 | +host_alias | |
447 | +build_alias | |
448 | +LIBS | |
449 | +ECHO_T | |
450 | +ECHO_N | |
451 | +ECHO_C | |
452 | +DEFS | |
453 | +mandir | |
454 | +localedir | |
455 | +libdir | |
456 | +psdir | |
457 | +pdfdir | |
458 | +dvidir | |
459 | +htmldir | |
460 | +infodir | |
461 | +docdir | |
462 | +oldincludedir | |
463 | +includedir | |
464 | +localstatedir | |
465 | +sharedstatedir | |
466 | +sysconfdir | |
467 | +datadir | |
468 | +datarootdir | |
469 | +libexecdir | |
470 | +sbindir | |
471 | +bindir | |
472 | +program_transform_name | |
473 | +prefix | |
474 | +exec_prefix | |
475 | +PACKAGE_BUGREPORT | |
476 | +PACKAGE_STRING | |
477 | +PACKAGE_VERSION | |
478 | +PACKAGE_TARNAME | |
479 | +PACKAGE_NAME | |
480 | +PATH_SEPARATOR | |
481 | +SHELL' | |
482 | ac_subst_files='' | |
483 | +ac_user_opts=' | |
484 | +enable_option_checking | |
485 | +with_path | |
486 | +with_confdir | |
487 | +with_mapdir | |
488 | +with_fifodir | |
489 | +with_flagdir | |
490 | +with_libtirpc | |
491 | +with_dmalloc | |
492 | +with_hesiod | |
493 | +with_openldap | |
494 | +with_sasl | |
495 | +enable_ext_env | |
496 | +enable_mount_locking | |
497 | +enable_forced_shutdown | |
498 | +enable_ignore_busy | |
499 | +' | |
500 | ac_precious_vars='build_alias | |
501 | host_alias | |
502 | target_alias | |
503 | @@ -720,6 +759,8 @@ CPP' | |
504 | # Initialize some variables set by options. | |
505 | ac_init_help= | |
506 | ac_init_version=false | |
507 | +ac_unrecognized_opts= | |
508 | +ac_unrecognized_sep= | |
509 | # The variables have the same names as the options, with | |
510 | # dashes changed to underlines. | |
511 | cache_file=/dev/null | |
512 | @@ -818,13 +859,21 @@ do | |
513 | datarootdir=$ac_optarg ;; | |
514 | ||
515 | -disable-* | --disable-*) | |
516 | - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | |
517 | + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | |
518 | # Reject names that are not valid shell variable names. | |
519 | - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
520 | - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | |
521 | + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | |
522 | + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 | |
523 | { (exit 1); exit 1; }; } | |
524 | - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` | |
525 | - eval enable_$ac_feature=no ;; | |
526 | + ac_useropt_orig=$ac_useropt | |
527 | + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | |
528 | + case $ac_user_opts in | |
529 | + *" | |
530 | +"enable_$ac_useropt" | |
531 | +"*) ;; | |
532 | + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" | |
533 | + ac_unrecognized_sep=', ';; | |
534 | + esac | |
535 | + eval enable_$ac_useropt=no ;; | |
536 | ||
537 | -docdir | --docdir | --docdi | --doc | --do) | |
538 | ac_prev=docdir ;; | |
539 | @@ -837,13 +886,21 @@ do | |
540 | dvidir=$ac_optarg ;; | |
541 | ||
542 | -enable-* | --enable-*) | |
543 | - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | |
544 | + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | |
545 | # Reject names that are not valid shell variable names. | |
546 | - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
547 | - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | |
548 | + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | |
549 | + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 | |
550 | { (exit 1); exit 1; }; } | |
551 | - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` | |
552 | - eval enable_$ac_feature=\$ac_optarg ;; | |
553 | + ac_useropt_orig=$ac_useropt | |
554 | + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | |
555 | + case $ac_user_opts in | |
556 | + *" | |
557 | +"enable_$ac_useropt" | |
558 | +"*) ;; | |
559 | + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" | |
560 | + ac_unrecognized_sep=', ';; | |
561 | + esac | |
562 | + eval enable_$ac_useropt=\$ac_optarg ;; | |
563 | ||
564 | -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | |
565 | | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ | |
566 | @@ -1034,22 +1091,38 @@ do | |
567 | ac_init_version=: ;; | |
568 | ||
569 | -with-* | --with-*) | |
570 | - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` | |
571 | + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` | |
572 | # Reject names that are not valid shell variable names. | |
573 | - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
574 | - { echo "$as_me: error: invalid package name: $ac_package" >&2 | |
575 | + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | |
576 | + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 | |
577 | { (exit 1); exit 1; }; } | |
578 | - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` | |
579 | - eval with_$ac_package=\$ac_optarg ;; | |
580 | + ac_useropt_orig=$ac_useropt | |
581 | + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | |
582 | + case $ac_user_opts in | |
583 | + *" | |
584 | +"with_$ac_useropt" | |
585 | +"*) ;; | |
586 | + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" | |
587 | + ac_unrecognized_sep=', ';; | |
588 | + esac | |
589 | + eval with_$ac_useropt=\$ac_optarg ;; | |
590 | ||
591 | -without-* | --without-*) | |
592 | - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` | |
593 | + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` | |
594 | # Reject names that are not valid shell variable names. | |
595 | - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
596 | - { echo "$as_me: error: invalid package name: $ac_package" >&2 | |
597 | + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | |
598 | + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 | |
599 | { (exit 1); exit 1; }; } | |
600 | - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` | |
601 | - eval with_$ac_package=no ;; | |
602 | + ac_useropt_orig=$ac_useropt | |
603 | + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | |
604 | + case $ac_user_opts in | |
605 | + *" | |
606 | +"with_$ac_useropt" | |
607 | +"*) ;; | |
608 | + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" | |
609 | + ac_unrecognized_sep=', ';; | |
610 | + esac | |
611 | + eval with_$ac_useropt=no ;; | |
612 | ||
613 | --x) | |
614 | # Obsolete; use --with-x. | |
615 | @@ -1069,7 +1142,7 @@ do | |
616 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) | |
617 | x_libraries=$ac_optarg ;; | |
618 | ||
619 | - -*) { echo "$as_me: error: unrecognized option: $ac_option | |
620 | + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option | |
621 | Try \`$0 --help' for more information." >&2 | |
622 | { (exit 1); exit 1; }; } | |
623 | ;; | |
624 | @@ -1078,16 +1151,16 @@ Try \`$0 --help' for more information." >&2 | |
625 | ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` | |
626 | # Reject names that are not valid shell variable names. | |
627 | expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && | |
628 | - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 | |
629 | + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 | |
630 | { (exit 1); exit 1; }; } | |
631 | eval $ac_envvar=\$ac_optarg | |
632 | export $ac_envvar ;; | |
633 | ||
634 | *) | |
635 | # FIXME: should be removed in autoconf 3.0. | |
636 | - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 | |
637 | + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 | |
638 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
639 | - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 | |
640 | + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 | |
641 | : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} | |
642 | ;; | |
643 | ||
644 | @@ -1096,22 +1169,38 @@ done | |
645 | ||
646 | if test -n "$ac_prev"; then | |
647 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` | |
648 | - { echo "$as_me: error: missing argument to $ac_option" >&2 | |
649 | + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 | |
650 | { (exit 1); exit 1; }; } | |
651 | fi | |
652 | ||
653 | -# Be sure to have absolute directory names. | |
654 | +if test -n "$ac_unrecognized_opts"; then | |
655 | + case $enable_option_checking in | |
656 | + no) ;; | |
657 | + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 | |
658 | + { (exit 1); exit 1; }; } ;; | |
659 | + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; | |
660 | + esac | |
661 | +fi | |
662 | + | |
663 | +# Check all directory arguments for consistency. | |
664 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ | |
665 | datadir sysconfdir sharedstatedir localstatedir includedir \ | |
666 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ | |
667 | libdir localedir mandir | |
668 | do | |
669 | eval ac_val=\$$ac_var | |
670 | + # Remove trailing slashes. | |
671 | + case $ac_val in | |
672 | + */ ) | |
673 | + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` | |
674 | + eval $ac_var=\$ac_val;; | |
675 | + esac | |
676 | + # Be sure to have absolute directory names. | |
677 | case $ac_val in | |
678 | [\\/$]* | ?:[\\/]* ) continue;; | |
679 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; | |
680 | esac | |
681 | - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | |
682 | + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | |
683 | { (exit 1); exit 1; }; } | |
684 | done | |
685 | ||
686 | @@ -1126,7 +1215,7 @@ target=$target_alias | |
687 | if test "x$host_alias" != x; then | |
688 | if test "x$build_alias" = x; then | |
689 | cross_compiling=maybe | |
690 | - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. | |
691 | + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. | |
692 | If a cross compiler is detected then cross compile mode will be used." >&2 | |
693 | elif test "x$build_alias" != "x$host_alias"; then | |
694 | cross_compiling=yes | |
695 | @@ -1142,10 +1231,10 @@ test "$silent" = yes && exec 6>/dev/null | |
696 | ac_pwd=`pwd` && test -n "$ac_pwd" && | |
697 | ac_ls_di=`ls -di .` && | |
698 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || | |
699 | - { echo "$as_me: error: Working directory cannot be determined" >&2 | |
700 | + { $as_echo "$as_me: error: working directory cannot be determined" >&2 | |
701 | { (exit 1); exit 1; }; } | |
702 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || | |
703 | - { echo "$as_me: error: pwd does not report name of working directory" >&2 | |
704 | + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 | |
705 | { (exit 1); exit 1; }; } | |
706 | ||
707 | ||
708 | @@ -1153,12 +1242,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || | |
709 | if test -z "$srcdir"; then | |
710 | ac_srcdir_defaulted=yes | |
711 | # Try the directory containing this script, then the parent directory. | |
712 | - ac_confdir=`$as_dirname -- "$0" || | |
713 | -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
714 | - X"$0" : 'X\(//\)[^/]' \| \ | |
715 | - X"$0" : 'X\(//\)$' \| \ | |
716 | - X"$0" : 'X\(/\)' \| . 2>/dev/null || | |
717 | -echo X"$0" | | |
718 | + ac_confdir=`$as_dirname -- "$as_myself" || | |
719 | +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
720 | + X"$as_myself" : 'X\(//\)[^/]' \| \ | |
721 | + X"$as_myself" : 'X\(//\)$' \| \ | |
722 | + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || | |
723 | +$as_echo X"$as_myself" | | |
724 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | |
725 | s//\1/ | |
726 | q | |
727 | @@ -1185,12 +1274,12 @@ else | |
728 | fi | |
729 | if test ! -r "$srcdir/$ac_unique_file"; then | |
730 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." | |
731 | - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 | |
732 | + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 | |
733 | { (exit 1); exit 1; }; } | |
734 | fi | |
735 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" | |
736 | ac_abs_confdir=`( | |
737 | - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 | |
738 | + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 | |
739 | { (exit 1); exit 1; }; } | |
740 | pwd)` | |
741 | # When building in place, set srcdir=. | |
742 | @@ -1239,9 +1328,9 @@ Configuration: | |
743 | ||
744 | Installation directories: | |
745 | --prefix=PREFIX install architecture-independent files in PREFIX | |
746 | - [$ac_default_prefix] | |
747 | + [$ac_default_prefix] | |
748 | --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX | |
749 | - [PREFIX] | |
750 | + [PREFIX] | |
751 | ||
752 | By default, \`make install' will install all the files in | |
753 | \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify | |
754 | @@ -1251,25 +1340,25 @@ for instance \`--prefix=\$HOME'. | |
755 | For better control, use the options below. | |
756 | ||
757 | Fine tuning of the installation directories: | |
758 | - --bindir=DIR user executables [EPREFIX/bin] | |
759 | - --sbindir=DIR system admin executables [EPREFIX/sbin] | |
760 | - --libexecdir=DIR program executables [EPREFIX/libexec] | |
761 | - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] | |
762 | - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] | |
763 | - --localstatedir=DIR modifiable single-machine data [PREFIX/var] | |
764 | - --libdir=DIR object code libraries [EPREFIX/lib] | |
765 | - --includedir=DIR C header files [PREFIX/include] | |
766 | - --oldincludedir=DIR C header files for non-gcc [/usr/include] | |
767 | - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] | |
768 | - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] | |
769 | - --infodir=DIR info documentation [DATAROOTDIR/info] | |
770 | - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] | |
771 | - --mandir=DIR man documentation [DATAROOTDIR/man] | |
772 | - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] | |
773 | - --htmldir=DIR html documentation [DOCDIR] | |
774 | - --dvidir=DIR dvi documentation [DOCDIR] | |
775 | - --pdfdir=DIR pdf documentation [DOCDIR] | |
776 | - --psdir=DIR ps documentation [DOCDIR] | |
777 | + --bindir=DIR user executables [EPREFIX/bin] | |
778 | + --sbindir=DIR system admin executables [EPREFIX/sbin] | |
779 | + --libexecdir=DIR program executables [EPREFIX/libexec] | |
780 | + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] | |
781 | + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] | |
782 | + --localstatedir=DIR modifiable single-machine data [PREFIX/var] | |
783 | + --libdir=DIR object code libraries [EPREFIX/lib] | |
784 | + --includedir=DIR C header files [PREFIX/include] | |
785 | + --oldincludedir=DIR C header files for non-gcc [/usr/include] | |
786 | + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] | |
787 | + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] | |
788 | + --infodir=DIR info documentation [DATAROOTDIR/info] | |
789 | + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] | |
790 | + --mandir=DIR man documentation [DATAROOTDIR/man] | |
791 | + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] | |
792 | + --htmldir=DIR html documentation [DOCDIR] | |
793 | + --dvidir=DIR dvi documentation [DOCDIR] | |
794 | + --pdfdir=DIR pdf documentation [DOCDIR] | |
795 | + --psdir=DIR ps documentation [DOCDIR] | |
796 | _ACEOF | |
797 | ||
798 | cat <<\_ACEOF | |
799 | @@ -1281,6 +1370,7 @@ if test -n "$ac_init_help"; then | |
800 | cat <<\_ACEOF | |
801 | ||
802 | Optional Features: | |
803 | + --disable-option-checking ignore unrecognized --enable/--with options | |
804 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | |
805 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | |
806 | --disable-ext-env disable search in environment for substitution variable | |
807 | @@ -1325,15 +1415,17 @@ fi | |
808 | if test "$ac_init_help" = "recursive"; then | |
809 | # If there are subdirs, report their specific --help. | |
810 | for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue | |
811 | - test -d "$ac_dir" || continue | |
812 | + test -d "$ac_dir" || | |
813 | + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || | |
814 | + continue | |
815 | ac_builddir=. | |
816 | ||
817 | case "$ac_dir" in | |
818 | .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; | |
819 | *) | |
820 | - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | |
821 | + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` | |
822 | # A ".." for each directory in $ac_dir_suffix. | |
823 | - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` | |
824 | + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` | |
825 | case $ac_top_builddir_sub in | |
826 | "") ac_top_builddir_sub=. ac_top_build_prefix= ;; | |
827 | *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; | |
828 | @@ -1369,7 +1461,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix | |
829 | echo && | |
830 | $SHELL "$ac_srcdir/configure" --help=recursive | |
831 | else | |
832 | - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 | |
833 | + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 | |
834 | fi || ac_status=$? | |
835 | cd "$ac_pwd" || { ac_status=$?; break; } | |
836 | done | |
837 | @@ -1379,10 +1471,10 @@ test -n "$ac_init_help" && exit $ac_status | |
838 | if $ac_init_version; then | |
839 | cat <<\_ACEOF | |
840 | configure | |
841 | -generated by GNU Autoconf 2.61 | |
842 | +generated by GNU Autoconf 2.63 | |
843 | ||
844 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | |
845 | -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | |
846 | +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | |
847 | This configure script is free software; the Free Software Foundation | |
848 | gives unlimited permission to copy, distribute and modify it. | |
849 | _ACEOF | |
850 | @@ -1393,7 +1485,7 @@ This file contains any messages produced by compilers while | |
851 | running configure, to aid debugging if configure makes a mistake. | |
852 | ||
853 | It was created by $as_me, which was | |
854 | -generated by GNU Autoconf 2.61. Invocation command line was | |
855 | +generated by GNU Autoconf 2.63. Invocation command line was | |
856 | ||
857 | $ $0 $@ | |
858 | ||
859 | @@ -1429,7 +1521,7 @@ for as_dir in $PATH | |
860 | do | |
861 | IFS=$as_save_IFS | |
862 | test -z "$as_dir" && as_dir=. | |
863 | - echo "PATH: $as_dir" | |
864 | + $as_echo "PATH: $as_dir" | |
865 | done | |
866 | IFS=$as_save_IFS | |
867 | ||
868 | @@ -1464,7 +1556,7 @@ do | |
869 | | -silent | --silent | --silen | --sile | --sil) | |
870 | continue ;; | |
871 | *\'*) | |
872 | - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; | |
873 | + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; | |
874 | esac | |
875 | case $ac_pass in | |
876 | 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; | |
877 | @@ -1516,11 +1608,12 @@ _ASBOX | |
878 | case $ac_val in #( | |
879 | *${as_nl}*) | |
880 | case $ac_var in #( | |
881 | - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 | |
882 | -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; | |
883 | + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 | |
884 | +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; | |
885 | esac | |
886 | case $ac_var in #( | |
887 | _ | IFS | as_nl) ;; #( | |
888 | + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( | |
889 | *) $as_unset $ac_var ;; | |
890 | esac ;; | |
891 | esac | |
892 | @@ -1550,9 +1643,9 @@ _ASBOX | |
893 | do | |
894 | eval ac_val=\$$ac_var | |
895 | case $ac_val in | |
896 | - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | |
897 | + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | |
898 | esac | |
899 | - echo "$ac_var='\''$ac_val'\''" | |
900 | + $as_echo "$ac_var='\''$ac_val'\''" | |
901 | done | sort | |
902 | echo | |
903 | ||
904 | @@ -1567,9 +1660,9 @@ _ASBOX | |
905 | do | |
906 | eval ac_val=\$$ac_var | |
907 | case $ac_val in | |
908 | - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | |
909 | + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | |
910 | esac | |
911 | - echo "$ac_var='\''$ac_val'\''" | |
912 | + $as_echo "$ac_var='\''$ac_val'\''" | |
913 | done | sort | |
914 | echo | |
915 | fi | |
916 | @@ -1585,8 +1678,8 @@ _ASBOX | |
917 | echo | |
918 | fi | |
919 | test "$ac_signal" != 0 && | |
920 | - echo "$as_me: caught signal $ac_signal" | |
921 | - echo "$as_me: exit $exit_status" | |
922 | + $as_echo "$as_me: caught signal $ac_signal" | |
923 | + $as_echo "$as_me: exit $exit_status" | |
924 | } >&5 | |
925 | rm -f core *.core core.conftest.* && | |
926 | rm -f -r conftest* confdefs* conf$$* $ac_clean_files && | |
927 | @@ -1628,21 +1721,24 @@ _ACEOF | |
928 | ||
929 | ||
930 | # Let the site file select an alternate cache file if it wants to. | |
931 | -# Prefer explicitly selected file to automatically selected ones. | |
932 | +# Prefer an explicitly selected file to automatically selected ones. | |
933 | +ac_site_file1=NONE | |
934 | +ac_site_file2=NONE | |
935 | if test -n "$CONFIG_SITE"; then | |
936 | - set x "$CONFIG_SITE" | |
937 | + ac_site_file1=$CONFIG_SITE | |
938 | elif test "x$prefix" != xNONE; then | |
939 | - set x "$prefix/share/config.site" "$prefix/etc/config.site" | |
940 | + ac_site_file1=$prefix/share/config.site | |
941 | + ac_site_file2=$prefix/etc/config.site | |
942 | else | |
943 | - set x "$ac_default_prefix/share/config.site" \ | |
944 | - "$ac_default_prefix/etc/config.site" | |
945 | + ac_site_file1=$ac_default_prefix/share/config.site | |
946 | + ac_site_file2=$ac_default_prefix/etc/config.site | |
947 | fi | |
948 | -shift | |
949 | -for ac_site_file | |
950 | +for ac_site_file in "$ac_site_file1" "$ac_site_file2" | |
951 | do | |
952 | + test "x$ac_site_file" = xNONE && continue | |
953 | if test -r "$ac_site_file"; then | |
954 | - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 | |
955 | -echo "$as_me: loading site script $ac_site_file" >&6;} | |
956 | + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 | |
957 | +$as_echo "$as_me: loading site script $ac_site_file" >&6;} | |
958 | sed 's/^/| /' "$ac_site_file" >&5 | |
959 | . "$ac_site_file" | |
960 | fi | |
961 | @@ -1659,29 +1755,38 @@ for ac_var in $ac_precious_vars; do | |
962 | eval ac_new_val=\$ac_env_${ac_var}_value | |
963 | case $ac_old_set,$ac_new_set in | |
964 | set,) | |
965 | - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | |
966 | -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} | |
967 | + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | |
968 | +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} | |
969 | ac_cache_corrupted=: ;; | |
970 | ,set) | |
971 | - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 | |
972 | -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} | |
973 | + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 | |
974 | +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} | |
975 | ac_cache_corrupted=: ;; | |
976 | ,);; | |
977 | *) | |
978 | if test "x$ac_old_val" != "x$ac_new_val"; then | |
979 | - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 | |
980 | -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} | |
981 | - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 | |
982 | -echo "$as_me: former value: $ac_old_val" >&2;} | |
983 | - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 | |
984 | -echo "$as_me: current value: $ac_new_val" >&2;} | |
985 | - ac_cache_corrupted=: | |
986 | + # differences in whitespace do not lead to failure. | |
987 | + ac_old_val_w=`echo x $ac_old_val` | |
988 | + ac_new_val_w=`echo x $ac_new_val` | |
989 | + if test "$ac_old_val_w" != "$ac_new_val_w"; then | |
990 | + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 | |
991 | +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} | |
992 | + ac_cache_corrupted=: | |
993 | + else | |
994 | + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 | |
995 | +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} | |
996 | + eval $ac_var=\$ac_old_val | |
997 | + fi | |
998 | + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 | |
999 | +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} | |
1000 | + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 | |
1001 | +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} | |
1002 | fi;; | |
1003 | esac | |
1004 | # Pass precious variables to config.status. | |
1005 | if test "$ac_new_set" = set; then | |
1006 | case $ac_new_val in | |
1007 | - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; | |
1008 | + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; | |
1009 | *) ac_arg=$ac_var=$ac_new_val ;; | |
1010 | esac | |
1011 | case " $ac_configure_args " in | |
1012 | @@ -1691,10 +1796,12 @@ echo "$as_me: current value: $ac_new_val" >&2;} | |
1013 | fi | |
1014 | done | |
1015 | if $ac_cache_corrupted; then | |
1016 | - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 | |
1017 | -echo "$as_me: error: changes in the environment can compromise the build" >&2;} | |
1018 | - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 | |
1019 | -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} | |
1020 | + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | |
1021 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
1022 | + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 | |
1023 | +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} | |
1024 | + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 | |
1025 | +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} | |
1026 | { (exit 1); exit 1; }; } | |
1027 | fi | |
1028 | ||
1029 | @@ -1744,24 +1851,24 @@ if test "${with_path+set}" = set; then | |
1030 | fi | |
1031 | ||
1032 | ||
1033 | -{ echo "$as_me:$LINENO: checking for binaries in" >&5 | |
1034 | -echo $ECHO_N "checking for binaries in... $ECHO_C" >&6; } | |
1035 | -{ echo "$as_me:$LINENO: result: $searchpath" >&5 | |
1036 | -echo "${ECHO_T}$searchpath" >&6; } | |
1037 | +{ $as_echo "$as_me:$LINENO: checking for binaries in" >&5 | |
1038 | +$as_echo_n "checking for binaries in... " >&6; } | |
1039 | +{ $as_echo "$as_me:$LINENO: result: $searchpath" >&5 | |
1040 | +$as_echo "$searchpath" >&6; } | |
1041 | ||
1042 | # | |
1043 | # Make sure we have "/proc" | |
1044 | # | |
1045 | -{ echo "$as_me:$LINENO: checking for Linux proc filesystem" >&5 | |
1046 | -echo $ECHO_N "checking for Linux proc filesystem... $ECHO_C" >&6; } | |
1047 | +{ $as_echo "$as_me:$LINENO: checking for Linux proc filesystem" >&5 | |
1048 | +$as_echo_n "checking for Linux proc filesystem... " >&6; } | |
1049 | if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" | |
1050 | then | |
1051 | linux_procfs=yes | |
1052 | else | |
1053 | linux_procfs=no | |
1054 | fi | |
1055 | -{ echo "$as_me:$LINENO: result: $linux_procfs" >&5 | |
1056 | -echo "${ECHO_T}$linux_procfs" >&6; } | |
1057 | +{ $as_echo "$as_me:$LINENO: result: $linux_procfs" >&5 | |
1058 | +$as_echo "$linux_procfs" >&6; } | |
1059 | if test $linux_procfs = yes | |
1060 | then | |
1061 | ||
1062 | @@ -1775,14 +1882,14 @@ fi | |
1063 | # Location of init.d directory? | |
1064 | # | |
1065 | if test -z "$initdir"; then | |
1066 | - { echo "$as_me:$LINENO: checking location of the init.d directory" >&5 | |
1067 | -echo $ECHO_N "checking location of the init.d directory... $ECHO_C" >&6; } | |
1068 | + { $as_echo "$as_me:$LINENO: checking location of the init.d directory" >&5 | |
1069 | +$as_echo_n "checking location of the init.d directory... " >&6; } | |
1070 | for init_d in /etc/init.d /etc/rc.d/init.d; do | |
1071 | if test -z "$initdir"; then | |
1072 | if test -d "$init_d"; then | |
1073 | initdir="$init_d" | |
1074 | - { echo "$as_me:$LINENO: result: $initdir" >&5 | |
1075 | -echo "${ECHO_T}$initdir" >&6; } | |
1076 | + { $as_echo "$as_me:$LINENO: result: $initdir" >&5 | |
1077 | +$as_echo "$initdir" >&6; } | |
1078 | fi | |
1079 | fi | |
1080 | done | |
1081 | @@ -1813,10 +1920,10 @@ if test "${with_confdir+set}" = set; then | |
1082 | ||
1083 | fi | |
1084 | ||
1085 | -{ echo "$as_me:$LINENO: checking for autofs configuration file directory" >&5 | |
1086 | -echo $ECHO_N "checking for autofs configuration file directory... $ECHO_C" >&6; } | |
1087 | -{ echo "$as_me:$LINENO: result: $confdir" >&5 | |
1088 | -echo "${ECHO_T}$confdir" >&6; } | |
1089 | +{ $as_echo "$as_me:$LINENO: checking for autofs configuration file directory" >&5 | |
1090 | +$as_echo_n "checking for autofs configuration file directory... " >&6; } | |
1091 | +{ $as_echo "$as_me:$LINENO: result: $confdir" >&5 | |
1092 | +$as_echo "$confdir" >&6; } | |
1093 | ||
1094 | ||
1095 | # | |
1096 | @@ -1843,10 +1950,10 @@ if test "${with_mapdir+set}" = set; then | |
1097 | ||
1098 | fi | |
1099 | ||
1100 | -{ echo "$as_me:$LINENO: checking for autofs maps directory" >&5 | |
1101 | -echo $ECHO_N "checking for autofs maps directory... $ECHO_C" >&6; } | |
1102 | -{ echo "$as_me:$LINENO: result: $mapdir" >&5 | |
1103 | -echo "${ECHO_T}$mapdir" >&6; } | |
1104 | +{ $as_echo "$as_me:$LINENO: checking for autofs maps directory" >&5 | |
1105 | +$as_echo_n "checking for autofs maps directory... " >&6; } | |
1106 | +{ $as_echo "$as_me:$LINENO: result: $mapdir" >&5 | |
1107 | +$as_echo "$mapdir" >&6; } | |
1108 | ||
1109 | ||
1110 | # | |
1111 | @@ -1873,10 +1980,10 @@ if test "${with_fifodir+set}" = set; then | |
1112 | ||
1113 | fi | |
1114 | ||
1115 | -{ echo "$as_me:$LINENO: checking for autofs fifos directory" >&5 | |
1116 | -echo $ECHO_N "checking for autofs fifos directory... $ECHO_C" >&6; } | |
1117 | -{ echo "$as_me:$LINENO: result: $fifodir" >&5 | |
1118 | -echo "${ECHO_T}$fifodir" >&6; } | |
1119 | +{ $as_echo "$as_me:$LINENO: checking for autofs fifos directory" >&5 | |
1120 | +$as_echo_n "checking for autofs fifos directory... " >&6; } | |
1121 | +{ $as_echo "$as_me:$LINENO: result: $fifodir" >&5 | |
1122 | +$as_echo "$fifodir" >&6; } | |
1123 | ||
1124 | ||
1125 | # | |
1126 | @@ -1903,10 +2010,10 @@ if test "${with_flagdir+set}" = set; then | |
1127 | ||
1128 | fi | |
1129 | ||
1130 | -{ echo "$as_me:$LINENO: checking for autofs flag file directory" >&5 | |
1131 | -echo $ECHO_N "checking for autofs flag file directory... $ECHO_C" >&6; } | |
1132 | -{ echo "$as_me:$LINENO: result: $flagdir" >&5 | |
1133 | -echo "${ECHO_T}$flagdir" >&6; } | |
1134 | +{ $as_echo "$as_me:$LINENO: checking for autofs flag file directory" >&5 | |
1135 | +$as_echo_n "checking for autofs flag file directory... " >&6; } | |
1136 | +{ $as_echo "$as_me:$LINENO: result: $flagdir" >&5 | |
1137 | +$as_echo "$flagdir" >&6; } | |
1138 | ||
1139 | ||
1140 | # | |
1141 | @@ -1920,10 +2027,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
1142 | if test -n "$ac_tool_prefix"; then | |
1143 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | |
1144 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 | |
1145 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
1146 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
1147 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
1148 | +$as_echo_n "checking for $ac_word... " >&6; } | |
1149 | if test "${ac_cv_prog_CC+set}" = set; then | |
1150 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
1151 | + $as_echo_n "(cached) " >&6 | |
1152 | else | |
1153 | if test -n "$CC"; then | |
1154 | ac_cv_prog_CC="$CC" # Let the user override the test. | |
1155 | @@ -1936,7 +2043,7 @@ do | |
1156 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1157 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1158 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | |
1159 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1160 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1161 | break 2 | |
1162 | fi | |
1163 | done | |
1164 | @@ -1947,11 +2054,11 @@ fi | |
1165 | fi | |
1166 | CC=$ac_cv_prog_CC | |
1167 | if test -n "$CC"; then | |
1168 | - { echo "$as_me:$LINENO: result: $CC" >&5 | |
1169 | -echo "${ECHO_T}$CC" >&6; } | |
1170 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 | |
1171 | +$as_echo "$CC" >&6; } | |
1172 | else | |
1173 | - { echo "$as_me:$LINENO: result: no" >&5 | |
1174 | -echo "${ECHO_T}no" >&6; } | |
1175 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
1176 | +$as_echo "no" >&6; } | |
1177 | fi | |
1178 | ||
1179 | ||
1180 | @@ -1960,10 +2067,10 @@ if test -z "$ac_cv_prog_CC"; then | |
1181 | ac_ct_CC=$CC | |
1182 | # Extract the first word of "gcc", so it can be a program name with args. | |
1183 | set dummy gcc; ac_word=$2 | |
1184 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
1185 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
1186 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
1187 | +$as_echo_n "checking for $ac_word... " >&6; } | |
1188 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | |
1189 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
1190 | + $as_echo_n "(cached) " >&6 | |
1191 | else | |
1192 | if test -n "$ac_ct_CC"; then | |
1193 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | |
1194 | @@ -1976,7 +2083,7 @@ do | |
1195 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1196 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1197 | ac_cv_prog_ac_ct_CC="gcc" | |
1198 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1199 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1200 | break 2 | |
1201 | fi | |
1202 | done | |
1203 | @@ -1987,11 +2094,11 @@ fi | |
1204 | fi | |
1205 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | |
1206 | if test -n "$ac_ct_CC"; then | |
1207 | - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
1208 | -echo "${ECHO_T}$ac_ct_CC" >&6; } | |
1209 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
1210 | +$as_echo "$ac_ct_CC" >&6; } | |
1211 | else | |
1212 | - { echo "$as_me:$LINENO: result: no" >&5 | |
1213 | -echo "${ECHO_T}no" >&6; } | |
1214 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
1215 | +$as_echo "no" >&6; } | |
1216 | fi | |
1217 | ||
1218 | if test "x$ac_ct_CC" = x; then | |
1219 | @@ -1999,12 +2106,8 @@ fi | |
1220 | else | |
1221 | case $cross_compiling:$ac_tool_warned in | |
1222 | yes:) | |
1223 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
1224 | -whose name does not start with the host triplet. If you think this | |
1225 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
1226 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
1227 | -whose name does not start with the host triplet. If you think this | |
1228 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
1229 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | |
1230 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | |
1231 | ac_tool_warned=yes ;; | |
1232 | esac | |
1233 | CC=$ac_ct_CC | |
1234 | @@ -2017,10 +2120,10 @@ if test -z "$CC"; then | |
1235 | if test -n "$ac_tool_prefix"; then | |
1236 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | |
1237 | set dummy ${ac_tool_prefix}cc; ac_word=$2 | |
1238 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
1239 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
1240 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
1241 | +$as_echo_n "checking for $ac_word... " >&6; } | |
1242 | if test "${ac_cv_prog_CC+set}" = set; then | |
1243 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
1244 | + $as_echo_n "(cached) " >&6 | |
1245 | else | |
1246 | if test -n "$CC"; then | |
1247 | ac_cv_prog_CC="$CC" # Let the user override the test. | |
1248 | @@ -2033,7 +2136,7 @@ do | |
1249 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1250 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1251 | ac_cv_prog_CC="${ac_tool_prefix}cc" | |
1252 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1253 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1254 | break 2 | |
1255 | fi | |
1256 | done | |
1257 | @@ -2044,11 +2147,11 @@ fi | |
1258 | fi | |
1259 | CC=$ac_cv_prog_CC | |
1260 | if test -n "$CC"; then | |
1261 | - { echo "$as_me:$LINENO: result: $CC" >&5 | |
1262 | -echo "${ECHO_T}$CC" >&6; } | |
1263 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 | |
1264 | +$as_echo "$CC" >&6; } | |
1265 | else | |
1266 | - { echo "$as_me:$LINENO: result: no" >&5 | |
1267 | -echo "${ECHO_T}no" >&6; } | |
1268 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
1269 | +$as_echo "no" >&6; } | |
1270 | fi | |
1271 | ||
1272 | ||
1273 | @@ -2057,10 +2160,10 @@ fi | |
1274 | if test -z "$CC"; then | |
1275 | # Extract the first word of "cc", so it can be a program name with args. | |
1276 | set dummy cc; ac_word=$2 | |
1277 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
1278 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
1279 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
1280 | +$as_echo_n "checking for $ac_word... " >&6; } | |
1281 | if test "${ac_cv_prog_CC+set}" = set; then | |
1282 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
1283 | + $as_echo_n "(cached) " >&6 | |
1284 | else | |
1285 | if test -n "$CC"; then | |
1286 | ac_cv_prog_CC="$CC" # Let the user override the test. | |
1287 | @@ -2078,7 +2181,7 @@ do | |
1288 | continue | |
1289 | fi | |
1290 | ac_cv_prog_CC="cc" | |
1291 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1292 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1293 | break 2 | |
1294 | fi | |
1295 | done | |
1296 | @@ -2101,11 +2204,11 @@ fi | |
1297 | fi | |
1298 | CC=$ac_cv_prog_CC | |
1299 | if test -n "$CC"; then | |
1300 | - { echo "$as_me:$LINENO: result: $CC" >&5 | |
1301 | -echo "${ECHO_T}$CC" >&6; } | |
1302 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 | |
1303 | +$as_echo "$CC" >&6; } | |
1304 | else | |
1305 | - { echo "$as_me:$LINENO: result: no" >&5 | |
1306 | -echo "${ECHO_T}no" >&6; } | |
1307 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
1308 | +$as_echo "no" >&6; } | |
1309 | fi | |
1310 | ||
1311 | ||
1312 | @@ -2116,10 +2219,10 @@ if test -z "$CC"; then | |
1313 | do | |
1314 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | |
1315 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | |
1316 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
1317 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
1318 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
1319 | +$as_echo_n "checking for $ac_word... " >&6; } | |
1320 | if test "${ac_cv_prog_CC+set}" = set; then | |
1321 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
1322 | + $as_echo_n "(cached) " >&6 | |
1323 | else | |
1324 | if test -n "$CC"; then | |
1325 | ac_cv_prog_CC="$CC" # Let the user override the test. | |
1326 | @@ -2132,7 +2235,7 @@ do | |
1327 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1328 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1329 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | |
1330 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1331 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1332 | break 2 | |
1333 | fi | |
1334 | done | |
1335 | @@ -2143,11 +2246,11 @@ fi | |
1336 | fi | |
1337 | CC=$ac_cv_prog_CC | |
1338 | if test -n "$CC"; then | |
1339 | - { echo "$as_me:$LINENO: result: $CC" >&5 | |
1340 | -echo "${ECHO_T}$CC" >&6; } | |
1341 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 | |
1342 | +$as_echo "$CC" >&6; } | |
1343 | else | |
1344 | - { echo "$as_me:$LINENO: result: no" >&5 | |
1345 | -echo "${ECHO_T}no" >&6; } | |
1346 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
1347 | +$as_echo "no" >&6; } | |
1348 | fi | |
1349 | ||
1350 | ||
1351 | @@ -2160,10 +2263,10 @@ if test -z "$CC"; then | |
1352 | do | |
1353 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
1354 | set dummy $ac_prog; ac_word=$2 | |
1355 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
1356 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
1357 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
1358 | +$as_echo_n "checking for $ac_word... " >&6; } | |
1359 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | |
1360 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
1361 | + $as_echo_n "(cached) " >&6 | |
1362 | else | |
1363 | if test -n "$ac_ct_CC"; then | |
1364 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | |
1365 | @@ -2176,7 +2279,7 @@ do | |
1366 | for ac_exec_ext in '' $ac_executable_extensions; do | |
1367 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
1368 | ac_cv_prog_ac_ct_CC="$ac_prog" | |
1369 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1370 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
1371 | break 2 | |
1372 | fi | |
1373 | done | |
1374 | @@ -2187,11 +2290,11 @@ fi | |
1375 | fi | |
1376 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | |
1377 | if test -n "$ac_ct_CC"; then | |
1378 | - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
1379 | -echo "${ECHO_T}$ac_ct_CC" >&6; } | |
1380 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
1381 | +$as_echo "$ac_ct_CC" >&6; } | |
1382 | else | |
1383 | - { echo "$as_me:$LINENO: result: no" >&5 | |
1384 | -echo "${ECHO_T}no" >&6; } | |
1385 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
1386 | +$as_echo "no" >&6; } | |
1387 | fi | |
1388 | ||
1389 | ||
1390 | @@ -2203,12 +2306,8 @@ done | |
1391 | else | |
1392 | case $cross_compiling:$ac_tool_warned in | |
1393 | yes:) | |
1394 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
1395 | -whose name does not start with the host triplet. If you think this | |
1396 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
1397 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
1398 | -whose name does not start with the host triplet. If you think this | |
1399 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
1400 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | |
1401 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | |
1402 | ac_tool_warned=yes ;; | |
1403 | esac | |
1404 | CC=$ac_ct_CC | |
1405 | @@ -2218,44 +2317,50 @@ fi | |
1406 | fi | |
1407 | ||
1408 | ||
1409 | -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH | |
1410 | +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | |
1411 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
1412 | +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH | |
1413 | See \`config.log' for more details." >&5 | |
1414 | -echo "$as_me: error: no acceptable C compiler found in \$PATH | |
1415 | +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH | |
1416 | See \`config.log' for more details." >&2;} | |
1417 | - { (exit 1); exit 1; }; } | |
1418 | + { (exit 1); exit 1; }; }; } | |
1419 | ||
1420 | # Provide some information about the compiler. | |
1421 | -echo "$as_me:$LINENO: checking for C compiler version" >&5 | |
1422 | -ac_compiler=`set X $ac_compile; echo $2` | |
1423 | +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 | |
1424 | +set X $ac_compile | |
1425 | +ac_compiler=$2 | |
1426 | { (ac_try="$ac_compiler --version >&5" | |
1427 | case "(($ac_try" in | |
1428 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1429 | *) ac_try_echo=$ac_try;; | |
1430 | esac | |
1431 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1432 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
1433 | +$as_echo "$ac_try_echo") >&5 | |
1434 | (eval "$ac_compiler --version >&5") 2>&5 | |
1435 | ac_status=$? | |
1436 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1437 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1438 | (exit $ac_status); } | |
1439 | { (ac_try="$ac_compiler -v >&5" | |
1440 | case "(($ac_try" in | |
1441 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1442 | *) ac_try_echo=$ac_try;; | |
1443 | esac | |
1444 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1445 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
1446 | +$as_echo "$ac_try_echo") >&5 | |
1447 | (eval "$ac_compiler -v >&5") 2>&5 | |
1448 | ac_status=$? | |
1449 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1450 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1451 | (exit $ac_status); } | |
1452 | { (ac_try="$ac_compiler -V >&5" | |
1453 | case "(($ac_try" in | |
1454 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1455 | *) ac_try_echo=$ac_try;; | |
1456 | esac | |
1457 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1458 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
1459 | +$as_echo "$ac_try_echo") >&5 | |
1460 | (eval "$ac_compiler -V >&5") 2>&5 | |
1461 | ac_status=$? | |
1462 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1463 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1464 | (exit $ac_status); } | |
1465 | ||
1466 | cat >conftest.$ac_ext <<_ACEOF | |
1467 | @@ -2274,27 +2379,22 @@ main () | |
1468 | } | |
1469 | _ACEOF | |
1470 | ac_clean_files_save=$ac_clean_files | |
1471 | -ac_clean_files="$ac_clean_files a.out a.exe b.out" | |
1472 | +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" | |
1473 | # Try to create an executable without -o first, disregard a.out. | |
1474 | # It will help us diagnose broken compilers, and finding out an intuition | |
1475 | # of exeext. | |
1476 | -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | |
1477 | -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } | |
1478 | -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | |
1479 | -# | |
1480 | -# List of possible output files, starting from the most likely. | |
1481 | -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) | |
1482 | -# only as a last resort. b.out is created by i960 compilers. | |
1483 | -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' | |
1484 | -# | |
1485 | -# The IRIX 6 linker writes into existing files which may not be | |
1486 | -# executable, retaining their permissions. Remove them first so a | |
1487 | -# subsequent execution test works. | |
1488 | +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | |
1489 | +$as_echo_n "checking for C compiler default output file name... " >&6; } | |
1490 | +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | |
1491 | + | |
1492 | +# The possible output files: | |
1493 | +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" | |
1494 | + | |
1495 | ac_rmfiles= | |
1496 | for ac_file in $ac_files | |
1497 | do | |
1498 | case $ac_file in | |
1499 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; | |
1500 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; | |
1501 | * ) ac_rmfiles="$ac_rmfiles $ac_file";; | |
1502 | esac | |
1503 | done | |
1504 | @@ -2305,10 +2405,11 @@ 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_link_default") 2>&5 | |
1512 | ac_status=$? | |
1513 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1514 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1515 | (exit $ac_status); }; then | |
1516 | # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. | |
1517 | # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' | |
1518 | @@ -2319,7 +2420,7 @@ for ac_file in $ac_files '' | |
1519 | do | |
1520 | test -f "$ac_file" || continue | |
1521 | case $ac_file in | |
1522 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) | |
1523 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) | |
1524 | ;; | |
1525 | [ab].out ) | |
1526 | # We found the default executable, but exeext='' is most | |
1527 | @@ -2346,25 +2447,27 @@ else | |
1528 | ac_file='' | |
1529 | fi | |
1530 | ||
1531 | -{ echo "$as_me:$LINENO: result: $ac_file" >&5 | |
1532 | -echo "${ECHO_T}$ac_file" >&6; } | |
1533 | +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 | |
1534 | +$as_echo "$ac_file" >&6; } | |
1535 | if test -z "$ac_file"; then | |
1536 | - echo "$as_me: failed program was:" >&5 | |
1537 | + $as_echo "$as_me: failed program was:" >&5 | |
1538 | sed 's/^/| /' conftest.$ac_ext >&5 | |
1539 | ||
1540 | -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables | |
1541 | +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | |
1542 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
1543 | +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables | |
1544 | See \`config.log' for more details." >&5 | |
1545 | -echo "$as_me: error: C compiler cannot create executables | |
1546 | +$as_echo "$as_me: error: C compiler cannot create executables | |
1547 | See \`config.log' for more details." >&2;} | |
1548 | - { (exit 77); exit 77; }; } | |
1549 | + { (exit 77); exit 77; }; }; } | |
1550 | fi | |
1551 | ||
1552 | ac_exeext=$ac_cv_exeext | |
1553 | ||
1554 | # Check that the compiler produces executables we can run. If not, either | |
1555 | # the compiler is broken, or we cross compile. | |
1556 | -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 | |
1557 | -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } | |
1558 | +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 | |
1559 | +$as_echo_n "checking whether the C compiler works... " >&6; } | |
1560 | # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 | |
1561 | # If not cross compiling, check that we can run a simple program. | |
1562 | if test "$cross_compiling" != yes; then | |
1563 | @@ -2373,49 +2476,53 @@ if test "$cross_compiling" != yes; then | |
1564 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1565 | *) ac_try_echo=$ac_try;; | |
1566 | esac | |
1567 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1568 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
1569 | +$as_echo "$ac_try_echo") >&5 | |
1570 | (eval "$ac_try") 2>&5 | |
1571 | ac_status=$? | |
1572 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1573 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1574 | (exit $ac_status); }; }; then | |
1575 | cross_compiling=no | |
1576 | else | |
1577 | if test "$cross_compiling" = maybe; then | |
1578 | cross_compiling=yes | |
1579 | else | |
1580 | - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. | |
1581 | + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | |
1582 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
1583 | +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. | |
1584 | If you meant to cross compile, use \`--host'. | |
1585 | See \`config.log' for more details." >&5 | |
1586 | -echo "$as_me: error: cannot run C compiled programs. | |
1587 | +$as_echo "$as_me: error: cannot run C compiled programs. | |
1588 | If you meant to cross compile, use \`--host'. | |
1589 | See \`config.log' for more details." >&2;} | |
1590 | - { (exit 1); exit 1; }; } | |
1591 | + { (exit 1); exit 1; }; }; } | |
1592 | fi | |
1593 | fi | |
1594 | fi | |
1595 | -{ echo "$as_me:$LINENO: result: yes" >&5 | |
1596 | -echo "${ECHO_T}yes" >&6; } | |
1597 | +{ $as_echo "$as_me:$LINENO: result: yes" >&5 | |
1598 | +$as_echo "yes" >&6; } | |
1599 | ||
1600 | -rm -f a.out a.exe conftest$ac_cv_exeext b.out | |
1601 | +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out | |
1602 | ac_clean_files=$ac_clean_files_save | |
1603 | # Check that the compiler produces executables we can run. If not, either | |
1604 | # the compiler is broken, or we cross compile. | |
1605 | -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 | |
1606 | -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } | |
1607 | -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 | |
1608 | -echo "${ECHO_T}$cross_compiling" >&6; } | |
1609 | +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 | |
1610 | +$as_echo_n "checking whether we are cross compiling... " >&6; } | |
1611 | +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 | |
1612 | +$as_echo "$cross_compiling" >&6; } | |
1613 | ||
1614 | -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 | |
1615 | -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } | |
1616 | +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 | |
1617 | +$as_echo_n "checking for suffix of executables... " >&6; } | |
1618 | if { (ac_try="$ac_link" | |
1619 | case "(($ac_try" in | |
1620 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1621 | *) ac_try_echo=$ac_try;; | |
1622 | esac | |
1623 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1624 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
1625 | +$as_echo "$ac_try_echo") >&5 | |
1626 | (eval "$ac_link") 2>&5 | |
1627 | ac_status=$? | |
1628 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1629 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1630 | (exit $ac_status); }; then | |
1631 | # If both `conftest.exe' and `conftest' are `present' (well, observable) | |
1632 | # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will | |
1633 | @@ -2424,31 +2531,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1634 | for ac_file in conftest.exe conftest conftest.*; do | |
1635 | test -f "$ac_file" || continue | |
1636 | case $ac_file in | |
1637 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; | |
1638 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; | |
1639 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | |
1640 | break;; | |
1641 | * ) break;; | |
1642 | esac | |
1643 | done | |
1644 | else | |
1645 | - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link | |
1646 | + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | |
1647 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
1648 | +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link | |
1649 | See \`config.log' for more details." >&5 | |
1650 | -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link | |
1651 | +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link | |
1652 | See \`config.log' for more details." >&2;} | |
1653 | - { (exit 1); exit 1; }; } | |
1654 | + { (exit 1); exit 1; }; }; } | |
1655 | fi | |
1656 | ||
1657 | rm -f conftest$ac_cv_exeext | |
1658 | -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 | |
1659 | -echo "${ECHO_T}$ac_cv_exeext" >&6; } | |
1660 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 | |
1661 | +$as_echo "$ac_cv_exeext" >&6; } | |
1662 | ||
1663 | rm -f conftest.$ac_ext | |
1664 | EXEEXT=$ac_cv_exeext | |
1665 | ac_exeext=$EXEEXT | |
1666 | -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 | |
1667 | -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } | |
1668 | +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 | |
1669 | +$as_echo_n "checking for suffix of object files... " >&6; } | |
1670 | if test "${ac_cv_objext+set}" = set; then | |
1671 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
1672 | + $as_echo_n "(cached) " >&6 | |
1673 | else | |
1674 | cat >conftest.$ac_ext <<_ACEOF | |
1675 | /* confdefs.h. */ | |
1676 | @@ -2471,40 +2580,43 @@ case "(($ac_try" in | |
1677 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1678 | *) ac_try_echo=$ac_try;; | |
1679 | esac | |
1680 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1681 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
1682 | +$as_echo "$ac_try_echo") >&5 | |
1683 | (eval "$ac_compile") 2>&5 | |
1684 | ac_status=$? | |
1685 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1686 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1687 | (exit $ac_status); }; then | |
1688 | for ac_file in conftest.o conftest.obj conftest.*; do | |
1689 | test -f "$ac_file" || continue; | |
1690 | case $ac_file in | |
1691 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; | |
1692 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; | |
1693 | *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` | |
1694 | break;; | |
1695 | esac | |
1696 | done | |
1697 | else | |
1698 | - echo "$as_me: failed program was:" >&5 | |
1699 | + $as_echo "$as_me: failed program was:" >&5 | |
1700 | sed 's/^/| /' conftest.$ac_ext >&5 | |
1701 | ||
1702 | -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile | |
1703 | +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | |
1704 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
1705 | +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile | |
1706 | See \`config.log' for more details." >&5 | |
1707 | -echo "$as_me: error: cannot compute suffix of object files: cannot compile | |
1708 | +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile | |
1709 | See \`config.log' for more details." >&2;} | |
1710 | - { (exit 1); exit 1; }; } | |
1711 | + { (exit 1); exit 1; }; }; } | |
1712 | fi | |
1713 | ||
1714 | rm -f conftest.$ac_cv_objext conftest.$ac_ext | |
1715 | fi | |
1716 | -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 | |
1717 | -echo "${ECHO_T}$ac_cv_objext" >&6; } | |
1718 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 | |
1719 | +$as_echo "$ac_cv_objext" >&6; } | |
1720 | OBJEXT=$ac_cv_objext | |
1721 | ac_objext=$OBJEXT | |
1722 | -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | |
1723 | -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } | |
1724 | +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | |
1725 | +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } | |
1726 | if test "${ac_cv_c_compiler_gnu+set}" = set; then | |
1727 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
1728 | + $as_echo_n "(cached) " >&6 | |
1729 | else | |
1730 | cat >conftest.$ac_ext <<_ACEOF | |
1731 | /* confdefs.h. */ | |
1732 | @@ -2530,20 +2642,21 @@ case "(($ac_try" in | |
1733 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1734 | *) ac_try_echo=$ac_try;; | |
1735 | esac | |
1736 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1737 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
1738 | +$as_echo "$ac_try_echo") >&5 | |
1739 | (eval "$ac_compile") 2>conftest.er1 | |
1740 | ac_status=$? | |
1741 | grep -v '^ *+' conftest.er1 >conftest.err | |
1742 | rm -f conftest.er1 | |
1743 | cat conftest.err >&5 | |
1744 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1745 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1746 | (exit $ac_status); } && { | |
1747 | test -z "$ac_c_werror_flag" || | |
1748 | test ! -s conftest.err | |
1749 | } && test -s conftest.$ac_objext; then | |
1750 | ac_compiler_gnu=yes | |
1751 | else | |
1752 | - echo "$as_me: failed program was:" >&5 | |
1753 | + $as_echo "$as_me: failed program was:" >&5 | |
1754 | sed 's/^/| /' conftest.$ac_ext >&5 | |
1755 | ||
1756 | ac_compiler_gnu=no | |
1757 | @@ -2553,15 +2666,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
1758 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | |
1759 | ||
1760 | fi | |
1761 | -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | |
1762 | -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } | |
1763 | -GCC=`test $ac_compiler_gnu = yes && echo yes` | |
1764 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | |
1765 | +$as_echo "$ac_cv_c_compiler_gnu" >&6; } | |
1766 | +if test $ac_compiler_gnu = yes; then | |
1767 | + GCC=yes | |
1768 | +else | |
1769 | + GCC= | |
1770 | +fi | |
1771 | ac_test_CFLAGS=${CFLAGS+set} | |
1772 | ac_save_CFLAGS=$CFLAGS | |
1773 | -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | |
1774 | -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } | |
1775 | +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | |
1776 | +$as_echo_n "checking whether $CC accepts -g... " >&6; } | |
1777 | if test "${ac_cv_prog_cc_g+set}" = set; then | |
1778 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
1779 | + $as_echo_n "(cached) " >&6 | |
1780 | else | |
1781 | ac_save_c_werror_flag=$ac_c_werror_flag | |
1782 | ac_c_werror_flag=yes | |
1783 | @@ -2588,20 +2705,21 @@ case "(($ac_try" in | |
1784 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1785 | *) ac_try_echo=$ac_try;; | |
1786 | esac | |
1787 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1788 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
1789 | +$as_echo "$ac_try_echo") >&5 | |
1790 | (eval "$ac_compile") 2>conftest.er1 | |
1791 | ac_status=$? | |
1792 | grep -v '^ *+' conftest.er1 >conftest.err | |
1793 | rm -f conftest.er1 | |
1794 | cat conftest.err >&5 | |
1795 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1796 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1797 | (exit $ac_status); } && { | |
1798 | test -z "$ac_c_werror_flag" || | |
1799 | test ! -s conftest.err | |
1800 | } && test -s conftest.$ac_objext; then | |
1801 | ac_cv_prog_cc_g=yes | |
1802 | else | |
1803 | - echo "$as_me: failed program was:" >&5 | |
1804 | + $as_echo "$as_me: failed program was:" >&5 | |
1805 | sed 's/^/| /' conftest.$ac_ext >&5 | |
1806 | ||
1807 | CFLAGS="" | |
1808 | @@ -2626,20 +2744,21 @@ case "(($ac_try" in | |
1809 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1810 | *) ac_try_echo=$ac_try;; | |
1811 | esac | |
1812 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1813 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
1814 | +$as_echo "$ac_try_echo") >&5 | |
1815 | (eval "$ac_compile") 2>conftest.er1 | |
1816 | ac_status=$? | |
1817 | grep -v '^ *+' conftest.er1 >conftest.err | |
1818 | rm -f conftest.er1 | |
1819 | cat conftest.err >&5 | |
1820 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1821 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1822 | (exit $ac_status); } && { | |
1823 | test -z "$ac_c_werror_flag" || | |
1824 | test ! -s conftest.err | |
1825 | } && test -s conftest.$ac_objext; then | |
1826 | : | |
1827 | else | |
1828 | - echo "$as_me: failed program was:" >&5 | |
1829 | + $as_echo "$as_me: failed program was:" >&5 | |
1830 | sed 's/^/| /' conftest.$ac_ext >&5 | |
1831 | ||
1832 | ac_c_werror_flag=$ac_save_c_werror_flag | |
1833 | @@ -2665,20 +2784,21 @@ case "(($ac_try" in | |
1834 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1835 | *) ac_try_echo=$ac_try;; | |
1836 | esac | |
1837 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1838 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
1839 | +$as_echo "$ac_try_echo") >&5 | |
1840 | (eval "$ac_compile") 2>conftest.er1 | |
1841 | ac_status=$? | |
1842 | grep -v '^ *+' conftest.er1 >conftest.err | |
1843 | rm -f conftest.er1 | |
1844 | cat conftest.err >&5 | |
1845 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1846 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1847 | (exit $ac_status); } && { | |
1848 | test -z "$ac_c_werror_flag" || | |
1849 | test ! -s conftest.err | |
1850 | } && test -s conftest.$ac_objext; then | |
1851 | ac_cv_prog_cc_g=yes | |
1852 | else | |
1853 | - echo "$as_me: failed program was:" >&5 | |
1854 | + $as_echo "$as_me: failed program was:" >&5 | |
1855 | sed 's/^/| /' conftest.$ac_ext >&5 | |
1856 | ||
1857 | ||
1858 | @@ -2693,8 +2813,8 @@ fi | |
1859 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
1860 | ac_c_werror_flag=$ac_save_c_werror_flag | |
1861 | fi | |
1862 | -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | |
1863 | -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } | |
1864 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | |
1865 | +$as_echo "$ac_cv_prog_cc_g" >&6; } | |
1866 | if test "$ac_test_CFLAGS" = set; then | |
1867 | CFLAGS=$ac_save_CFLAGS | |
1868 | elif test $ac_cv_prog_cc_g = yes; then | |
1869 | @@ -2710,10 +2830,10 @@ else | |
1870 | CFLAGS= | |
1871 | fi | |
1872 | fi | |
1873 | -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | |
1874 | -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } | |
1875 | +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | |
1876 | +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } | |
1877 | if test "${ac_cv_prog_cc_c89+set}" = set; then | |
1878 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
1879 | + $as_echo_n "(cached) " >&6 | |
1880 | else | |
1881 | ac_cv_prog_cc_c89=no | |
1882 | ac_save_CC=$CC | |
1883 | @@ -2784,20 +2904,21 @@ case "(($ac_try" in | |
1884 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1885 | *) ac_try_echo=$ac_try;; | |
1886 | esac | |
1887 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1888 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
1889 | +$as_echo "$ac_try_echo") >&5 | |
1890 | (eval "$ac_compile") 2>conftest.er1 | |
1891 | ac_status=$? | |
1892 | grep -v '^ *+' conftest.er1 >conftest.err | |
1893 | rm -f conftest.er1 | |
1894 | cat conftest.err >&5 | |
1895 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1896 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1897 | (exit $ac_status); } && { | |
1898 | test -z "$ac_c_werror_flag" || | |
1899 | test ! -s conftest.err | |
1900 | } && test -s conftest.$ac_objext; then | |
1901 | ac_cv_prog_cc_c89=$ac_arg | |
1902 | else | |
1903 | - echo "$as_me: failed program was:" >&5 | |
1904 | + $as_echo "$as_me: failed program was:" >&5 | |
1905 | sed 's/^/| /' conftest.$ac_ext >&5 | |
1906 | ||
1907 | ||
1908 | @@ -2813,15 +2934,15 @@ fi | |
1909 | # AC_CACHE_VAL | |
1910 | case "x$ac_cv_prog_cc_c89" in | |
1911 | x) | |
1912 | - { echo "$as_me:$LINENO: result: none needed" >&5 | |
1913 | -echo "${ECHO_T}none needed" >&6; } ;; | |
1914 | + { $as_echo "$as_me:$LINENO: result: none needed" >&5 | |
1915 | +$as_echo "none needed" >&6; } ;; | |
1916 | xno) | |
1917 | - { echo "$as_me:$LINENO: result: unsupported" >&5 | |
1918 | -echo "${ECHO_T}unsupported" >&6; } ;; | |
1919 | + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 | |
1920 | +$as_echo "unsupported" >&6; } ;; | |
1921 | *) | |
1922 | CC="$CC $ac_cv_prog_cc_c89" | |
1923 | - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | |
1924 | -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; | |
1925 | + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | |
1926 | +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; | |
1927 | esac | |
1928 | ||
1929 | ||
1930 | @@ -2832,8 +2953,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ | |
1931 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
1932 | ||
1933 | ||
1934 | -{ echo "$as_me:$LINENO: checking if libtirpc is requested and available" >&5 | |
1935 | -echo $ECHO_N "checking if libtirpc is requested and available... $ECHO_C" >&6; } | |
1936 | +{ $as_echo "$as_me:$LINENO: checking if libtirpc is requested and available" >&5 | |
1937 | +$as_echo_n "checking if libtirpc is requested and available... " >&6; } | |
1938 | ||
1939 | # Check whether --with-libtirpc was given. | |
1940 | if test "${with_libtirpc+set}" = set; then | |
1941 | @@ -2870,35 +2991,44 @@ case "(($ac_try" in | |
1942 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
1943 | *) ac_try_echo=$ac_try;; | |
1944 | esac | |
1945 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
1946 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
1947 | +$as_echo "$ac_try_echo") >&5 | |
1948 | (eval "$ac_link") 2>conftest.er1 | |
1949 | ac_status=$? | |
1950 | grep -v '^ *+' conftest.er1 >conftest.err | |
1951 | rm -f conftest.er1 | |
1952 | cat conftest.err >&5 | |
1953 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1954 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
1955 | (exit $ac_status); } && { | |
1956 | test -z "$ac_c_werror_flag" || | |
1957 | test ! -s conftest.err | |
1958 | - } && test -s conftest$ac_exeext && | |
1959 | - $as_test_x conftest$ac_exeext; then | |
1960 | + } && test -s conftest$ac_exeext && { | |
1961 | + test "$cross_compiling" = yes || | |
1962 | + $as_test_x conftest$ac_exeext | |
1963 | + }; then | |
1964 | af_have_libtirpc=yes | |
1965 | - { echo "$as_me:$LINENO: result: yes" >&5 | |
1966 | -echo "${ECHO_T}yes" >&6; } | |
1967 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 | |
1968 | +$as_echo "yes" >&6; } | |
1969 | else | |
1970 | - echo "$as_me: failed program was:" >&5 | |
1971 | + $as_echo "$as_me: failed program was:" >&5 | |
1972 | sed 's/^/| /' conftest.$ac_ext >&5 | |
1973 | ||
1974 | - { echo "$as_me:$LINENO: result: no" >&5 | |
1975 | -echo "${ECHO_T}no" >&6; } | |
1976 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
1977 | +$as_echo "no" >&6; } | |
1978 | fi | |
1979 | ||
1980 | +rm -rf conftest.dSYM | |
1981 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
1982 | conftest$ac_exeext conftest.$ac_ext | |
1983 | ||
1984 | if test "$af_have_libtirpc" = "yes"; then | |
1985 | ||
1986 | cat >>confdefs.h <<\_ACEOF | |
1987 | +#define WITH_LIBTIRPC 1 | |
1988 | +_ACEOF | |
1989 | + | |
1990 | + | |
1991 | +cat >>confdefs.h <<\_ACEOF | |
1992 | #define TIRPC_WORKAROUND 1 | |
1993 | _ACEOF | |
1994 | ||
1995 | @@ -2909,8 +3039,8 @@ fi | |
1996 | CFLAGS="$af_check_libtirpc_save_cflags" | |
1997 | LDFLAGS="$af_check_libtirpc_save_ldflags" | |
1998 | ||
1999 | - { echo "$as_me:$LINENO: checking if libtirpc has IPv6 support" >&5 | |
2000 | -echo $ECHO_N "checking if libtirpc has IPv6 support... $ECHO_C" >&6; } | |
2001 | + { $as_echo "$as_me:$LINENO: checking if libtirpc has IPv6 support" >&5 | |
2002 | +$as_echo_n "checking if libtirpc has IPv6 support... " >&6; } | |
2003 | ||
2004 | # save current flags | |
2005 | af_check_libtirpc_ipv6_save_cflags="$CFLAGS" | |
2006 | @@ -2944,29 +3074,33 @@ case "(($ac_try" in | |
2007 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2008 | *) ac_try_echo=$ac_try;; | |
2009 | esac | |
2010 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2011 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
2012 | +$as_echo "$ac_try_echo") >&5 | |
2013 | (eval "$ac_link") 2>conftest.er1 | |
2014 | ac_status=$? | |
2015 | grep -v '^ *+' conftest.er1 >conftest.err | |
2016 | rm -f conftest.er1 | |
2017 | cat conftest.err >&5 | |
2018 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2019 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2020 | (exit $ac_status); } && { | |
2021 | test -z "$ac_c_werror_flag" || | |
2022 | test ! -s conftest.err | |
2023 | - } && test -s conftest$ac_exeext && | |
2024 | - $as_test_x conftest$ac_exeext; then | |
2025 | + } && test -s conftest$ac_exeext && { | |
2026 | + test "$cross_compiling" = yes || | |
2027 | + $as_test_x conftest$ac_exeext | |
2028 | + }; then | |
2029 | af_have_libtirpc_ipv6=yes | |
2030 | - { echo "$as_me:$LINENO: result: yes" >&5 | |
2031 | -echo "${ECHO_T}yes" >&6; } | |
2032 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 | |
2033 | +$as_echo "yes" >&6; } | |
2034 | else | |
2035 | - echo "$as_me: failed program was:" >&5 | |
2036 | + $as_echo "$as_me: failed program was:" >&5 | |
2037 | sed 's/^/| /' conftest.$ac_ext >&5 | |
2038 | ||
2039 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2040 | -echo "${ECHO_T}no" >&6; } | |
2041 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2042 | +$as_echo "no" >&6; } | |
2043 | fi | |
2044 | ||
2045 | +rm -rf conftest.dSYM | |
2046 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2047 | conftest$ac_exeext conftest.$ac_ext | |
2048 | ||
2049 | @@ -2983,12 +3117,12 @@ CFLAGS="$af_check_libtirpc_ipv6_save_cflags" | |
2050 | LDFLAGS="$af_check_libtirpc_ipv6_save_ldflags" | |
2051 | ||
2052 | else | |
2053 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2054 | -echo "${ECHO_T}no" >&6; } | |
2055 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2056 | +$as_echo "no" >&6; } | |
2057 | fi | |
2058 | else | |
2059 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2060 | -echo "${ECHO_T}no" >&6; } | |
2061 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2062 | +$as_echo "no" >&6; } | |
2063 | fi | |
2064 | ||
2065 | ||
2066 | @@ -2997,14 +3131,14 @@ fi | |
2067 | # | |
2068 | # Optional include dmalloc | |
2069 | # | |
2070 | -{ echo "$as_me:$LINENO: checking if malloc debugging is wanted" >&5 | |
2071 | -echo $ECHO_N "checking if malloc debugging is wanted... $ECHO_C" >&6; } | |
2072 | +{ $as_echo "$as_me:$LINENO: checking if malloc debugging is wanted" >&5 | |
2073 | +$as_echo_n "checking if malloc debugging is wanted... " >&6; } | |
2074 | ||
2075 | # Check whether --with-dmalloc was given. | |
2076 | if test "${with_dmalloc+set}" = set; then | |
2077 | withval=$with_dmalloc; if test "$withval" = yes; then | |
2078 | - { echo "$as_me:$LINENO: result: yes" >&5 | |
2079 | -echo "${ECHO_T}yes" >&6; } | |
2080 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 | |
2081 | +$as_echo "yes" >&6; } | |
2082 | ||
2083 | cat >>confdefs.h <<\_ACEOF | |
2084 | #define WITH_DMALLOC 1 | |
2085 | @@ -3013,12 +3147,12 @@ _ACEOF | |
2086 | DMALLOCLIB="-ldmallocth" | |
2087 | LDFLAGS="$LDFLAGS -g" | |
2088 | else | |
2089 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2090 | -echo "${ECHO_T}no" >&6; } | |
2091 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2092 | +$as_echo "no" >&6; } | |
2093 | fi | |
2094 | else | |
2095 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2096 | -echo "${ECHO_T}no" >&6; } | |
2097 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2098 | +$as_echo "no" >&6; } | |
2099 | fi | |
2100 | ||
2101 | ||
2102 | @@ -3031,10 +3165,10 @@ for ac_prog in mount | |
2103 | do | |
2104 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
2105 | set dummy $ac_prog; ac_word=$2 | |
2106 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2107 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
2108 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2109 | +$as_echo_n "checking for $ac_word... " >&6; } | |
2110 | if test "${ac_cv_path_MOUNT+set}" = set; then | |
2111 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2112 | + $as_echo_n "(cached) " >&6 | |
2113 | else | |
2114 | case $MOUNT in | |
2115 | [\\/]* | ?:[\\/]*) | |
2116 | @@ -3049,7 +3183,7 @@ do | |
2117 | for ac_exec_ext in '' $ac_executable_extensions; do | |
2118 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2119 | ac_cv_path_MOUNT="$as_dir/$ac_word$ac_exec_ext" | |
2120 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2121 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2122 | break 2 | |
2123 | fi | |
2124 | done | |
2125 | @@ -3061,11 +3195,11 @@ esac | |
2126 | fi | |
2127 | MOUNT=$ac_cv_path_MOUNT | |
2128 | if test -n "$MOUNT"; then | |
2129 | - { echo "$as_me:$LINENO: result: $MOUNT" >&5 | |
2130 | -echo "${ECHO_T}$MOUNT" >&6; } | |
2131 | + { $as_echo "$as_me:$LINENO: result: $MOUNT" >&5 | |
2132 | +$as_echo "$MOUNT" >&6; } | |
2133 | else | |
2134 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2135 | -echo "${ECHO_T}no" >&6; } | |
2136 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2137 | +$as_echo "no" >&6; } | |
2138 | fi | |
2139 | ||
2140 | ||
2141 | @@ -3093,10 +3227,10 @@ for ac_prog in umount | |
2142 | do | |
2143 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
2144 | set dummy $ac_prog; ac_word=$2 | |
2145 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2146 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
2147 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2148 | +$as_echo_n "checking for $ac_word... " >&6; } | |
2149 | if test "${ac_cv_path_UMOUNT+set}" = set; then | |
2150 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2151 | + $as_echo_n "(cached) " >&6 | |
2152 | else | |
2153 | case $UMOUNT in | |
2154 | [\\/]* | ?:[\\/]*) | |
2155 | @@ -3111,7 +3245,7 @@ do | |
2156 | for ac_exec_ext in '' $ac_executable_extensions; do | |
2157 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2158 | ac_cv_path_UMOUNT="$as_dir/$ac_word$ac_exec_ext" | |
2159 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2160 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2161 | break 2 | |
2162 | fi | |
2163 | done | |
2164 | @@ -3123,11 +3257,11 @@ esac | |
2165 | fi | |
2166 | UMOUNT=$ac_cv_path_UMOUNT | |
2167 | if test -n "$UMOUNT"; then | |
2168 | - { echo "$as_me:$LINENO: result: $UMOUNT" >&5 | |
2169 | -echo "${ECHO_T}$UMOUNT" >&6; } | |
2170 | + { $as_echo "$as_me:$LINENO: result: $UMOUNT" >&5 | |
2171 | +$as_echo "$UMOUNT" >&6; } | |
2172 | else | |
2173 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2174 | -echo "${ECHO_T}no" >&6; } | |
2175 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2176 | +$as_echo "no" >&6; } | |
2177 | fi | |
2178 | ||
2179 | ||
2180 | @@ -3155,10 +3289,10 @@ for ac_prog in fsck.ext2 e2fsck | |
2181 | do | |
2182 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
2183 | set dummy $ac_prog; ac_word=$2 | |
2184 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2185 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
2186 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2187 | +$as_echo_n "checking for $ac_word... " >&6; } | |
2188 | if test "${ac_cv_path_E2FSCK+set}" = set; then | |
2189 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2190 | + $as_echo_n "(cached) " >&6 | |
2191 | else | |
2192 | case $E2FSCK in | |
2193 | [\\/]* | ?:[\\/]*) | |
2194 | @@ -3173,7 +3307,7 @@ do | |
2195 | for ac_exec_ext in '' $ac_executable_extensions; do | |
2196 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2197 | ac_cv_path_E2FSCK="$as_dir/$ac_word$ac_exec_ext" | |
2198 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2199 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2200 | break 2 | |
2201 | fi | |
2202 | done | |
2203 | @@ -3185,11 +3319,11 @@ esac | |
2204 | fi | |
2205 | E2FSCK=$ac_cv_path_E2FSCK | |
2206 | if test -n "$E2FSCK"; then | |
2207 | - { echo "$as_me:$LINENO: result: $E2FSCK" >&5 | |
2208 | -echo "${ECHO_T}$E2FSCK" >&6; } | |
2209 | + { $as_echo "$as_me:$LINENO: result: $E2FSCK" >&5 | |
2210 | +$as_echo "$E2FSCK" >&6; } | |
2211 | else | |
2212 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2213 | -echo "${ECHO_T}no" >&6; } | |
2214 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2215 | +$as_echo "no" >&6; } | |
2216 | fi | |
2217 | ||
2218 | ||
2219 | @@ -3216,10 +3350,10 @@ for ac_prog in fsck.ext3 e3fsck | |
2220 | do | |
2221 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
2222 | set dummy $ac_prog; ac_word=$2 | |
2223 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2224 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
2225 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2226 | +$as_echo_n "checking for $ac_word... " >&6; } | |
2227 | if test "${ac_cv_path_E3FSCK+set}" = set; then | |
2228 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2229 | + $as_echo_n "(cached) " >&6 | |
2230 | else | |
2231 | case $E3FSCK in | |
2232 | [\\/]* | ?:[\\/]*) | |
2233 | @@ -3234,7 +3368,7 @@ do | |
2234 | for ac_exec_ext in '' $ac_executable_extensions; do | |
2235 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2236 | ac_cv_path_E3FSCK="$as_dir/$ac_word$ac_exec_ext" | |
2237 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2238 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2239 | break 2 | |
2240 | fi | |
2241 | done | |
2242 | @@ -3246,11 +3380,11 @@ esac | |
2243 | fi | |
2244 | E3FSCK=$ac_cv_path_E3FSCK | |
2245 | if test -n "$E3FSCK"; then | |
2246 | - { echo "$as_me:$LINENO: result: $E3FSCK" >&5 | |
2247 | -echo "${ECHO_T}$E3FSCK" >&6; } | |
2248 | + { $as_echo "$as_me:$LINENO: result: $E3FSCK" >&5 | |
2249 | +$as_echo "$E3FSCK" >&6; } | |
2250 | else | |
2251 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2252 | -echo "${ECHO_T}no" >&6; } | |
2253 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2254 | +$as_echo "no" >&6; } | |
2255 | fi | |
2256 | ||
2257 | ||
2258 | @@ -3277,10 +3411,10 @@ for ac_prog in modprobe | |
2259 | do | |
2260 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
2261 | set dummy $ac_prog; ac_word=$2 | |
2262 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2263 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
2264 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2265 | +$as_echo_n "checking for $ac_word... " >&6; } | |
2266 | if test "${ac_cv_path_MODPROBE+set}" = set; then | |
2267 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2268 | + $as_echo_n "(cached) " >&6 | |
2269 | else | |
2270 | case $MODPROBE in | |
2271 | [\\/]* | ?:[\\/]*) | |
2272 | @@ -3295,7 +3429,7 @@ do | |
2273 | for ac_exec_ext in '' $ac_executable_extensions; do | |
2274 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2275 | ac_cv_path_MODPROBE="$as_dir/$ac_word$ac_exec_ext" | |
2276 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2277 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2278 | break 2 | |
2279 | fi | |
2280 | done | |
2281 | @@ -3307,11 +3441,11 @@ esac | |
2282 | fi | |
2283 | MODPROBE=$ac_cv_path_MODPROBE | |
2284 | if test -n "$MODPROBE"; then | |
2285 | - { echo "$as_me:$LINENO: result: $MODPROBE" >&5 | |
2286 | -echo "${ECHO_T}$MODPROBE" >&6; } | |
2287 | + { $as_echo "$as_me:$LINENO: result: $MODPROBE" >&5 | |
2288 | +$as_echo "$MODPROBE" >&6; } | |
2289 | else | |
2290 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2291 | -echo "${ECHO_T}no" >&6; } | |
2292 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2293 | +$as_echo "no" >&6; } | |
2294 | fi | |
2295 | ||
2296 | ||
2297 | @@ -3339,10 +3473,10 @@ for ac_prog in flex lex | |
2298 | do | |
2299 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
2300 | set dummy $ac_prog; ac_word=$2 | |
2301 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2302 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
2303 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2304 | +$as_echo_n "checking for $ac_word... " >&6; } | |
2305 | if test "${ac_cv_path_LEX+set}" = set; then | |
2306 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2307 | + $as_echo_n "(cached) " >&6 | |
2308 | else | |
2309 | case $LEX in | |
2310 | [\\/]* | ?:[\\/]*) | |
2311 | @@ -3357,7 +3491,7 @@ do | |
2312 | for ac_exec_ext in '' $ac_executable_extensions; do | |
2313 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2314 | ac_cv_path_LEX="$as_dir/$ac_word$ac_exec_ext" | |
2315 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2316 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2317 | break 2 | |
2318 | fi | |
2319 | done | |
2320 | @@ -3369,11 +3503,11 @@ esac | |
2321 | fi | |
2322 | LEX=$ac_cv_path_LEX | |
2323 | if test -n "$LEX"; then | |
2324 | - { echo "$as_me:$LINENO: result: $LEX" >&5 | |
2325 | -echo "${ECHO_T}$LEX" >&6; } | |
2326 | + { $as_echo "$as_me:$LINENO: result: $LEX" >&5 | |
2327 | +$as_echo "$LEX" >&6; } | |
2328 | else | |
2329 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2330 | -echo "${ECHO_T}no" >&6; } | |
2331 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2332 | +$as_echo "no" >&6; } | |
2333 | fi | |
2334 | ||
2335 | ||
2336 | @@ -3388,8 +3522,8 @@ _ACEOF | |
2337 | ||
2338 | PATH_LEX="$LEX" | |
2339 | else | |
2340 | - { { echo "$as_me:$LINENO: error: required program LEX not found" >&5 | |
2341 | -echo "$as_me: error: required program LEX not found" >&2;} | |
2342 | + { { $as_echo "$as_me:$LINENO: error: required program LEX not found" >&5 | |
2343 | +$as_echo "$as_me: error: required program LEX not found" >&2;} | |
2344 | { (exit 1); exit 1; }; } | |
2345 | fi | |
2346 | ||
2347 | @@ -3397,10 +3531,10 @@ for ac_prog in bison | |
2348 | do | |
2349 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
2350 | set dummy $ac_prog; ac_word=$2 | |
2351 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2352 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
2353 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2354 | +$as_echo_n "checking for $ac_word... " >&6; } | |
2355 | if test "${ac_cv_path_YACC+set}" = set; then | |
2356 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2357 | + $as_echo_n "(cached) " >&6 | |
2358 | else | |
2359 | case $YACC in | |
2360 | [\\/]* | ?:[\\/]*) | |
2361 | @@ -3415,7 +3549,7 @@ do | |
2362 | for ac_exec_ext in '' $ac_executable_extensions; do | |
2363 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2364 | ac_cv_path_YACC="$as_dir/$ac_word$ac_exec_ext" | |
2365 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2366 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2367 | break 2 | |
2368 | fi | |
2369 | done | |
2370 | @@ -3427,11 +3561,11 @@ esac | |
2371 | fi | |
2372 | YACC=$ac_cv_path_YACC | |
2373 | if test -n "$YACC"; then | |
2374 | - { echo "$as_me:$LINENO: result: $YACC" >&5 | |
2375 | -echo "${ECHO_T}$YACC" >&6; } | |
2376 | + { $as_echo "$as_me:$LINENO: result: $YACC" >&5 | |
2377 | +$as_echo "$YACC" >&6; } | |
2378 | else | |
2379 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2380 | -echo "${ECHO_T}no" >&6; } | |
2381 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2382 | +$as_echo "no" >&6; } | |
2383 | fi | |
2384 | ||
2385 | ||
2386 | @@ -3446,8 +3580,8 @@ _ACEOF | |
2387 | ||
2388 | PATH_YACC="$YACC" | |
2389 | else | |
2390 | - { { echo "$as_me:$LINENO: error: required program YACC not found" >&5 | |
2391 | -echo "$as_me: error: required program YACC not found" >&2;} | |
2392 | + { { $as_echo "$as_me:$LINENO: error: required program YACC not found" >&5 | |
2393 | +$as_echo "$as_me: error: required program YACC not found" >&2;} | |
2394 | { (exit 1); exit 1; }; } | |
2395 | fi | |
2396 | ||
2397 | @@ -3455,10 +3589,10 @@ for ac_prog in ranlib | |
2398 | do | |
2399 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
2400 | set dummy $ac_prog; ac_word=$2 | |
2401 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2402 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
2403 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2404 | +$as_echo_n "checking for $ac_word... " >&6; } | |
2405 | if test "${ac_cv_path_RANLIB+set}" = set; then | |
2406 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2407 | + $as_echo_n "(cached) " >&6 | |
2408 | else | |
2409 | case $RANLIB in | |
2410 | [\\/]* | ?:[\\/]*) | |
2411 | @@ -3473,7 +3607,7 @@ do | |
2412 | for ac_exec_ext in '' $ac_executable_extensions; do | |
2413 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2414 | ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext" | |
2415 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2416 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2417 | break 2 | |
2418 | fi | |
2419 | done | |
2420 | @@ -3485,11 +3619,11 @@ esac | |
2421 | fi | |
2422 | RANLIB=$ac_cv_path_RANLIB | |
2423 | if test -n "$RANLIB"; then | |
2424 | - { echo "$as_me:$LINENO: result: $RANLIB" >&5 | |
2425 | -echo "${ECHO_T}$RANLIB" >&6; } | |
2426 | + { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 | |
2427 | +$as_echo "$RANLIB" >&6; } | |
2428 | else | |
2429 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2430 | -echo "${ECHO_T}no" >&6; } | |
2431 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2432 | +$as_echo "no" >&6; } | |
2433 | fi | |
2434 | ||
2435 | ||
2436 | @@ -3504,8 +3638,8 @@ _ACEOF | |
2437 | ||
2438 | PATH_RANLIB="$RANLIB" | |
2439 | else | |
2440 | - { { echo "$as_me:$LINENO: error: required program RANLIB not found" >&5 | |
2441 | -echo "$as_me: error: required program RANLIB not found" >&2;} | |
2442 | + { { $as_echo "$as_me:$LINENO: error: required program RANLIB not found" >&5 | |
2443 | +$as_echo "$as_me: error: required program RANLIB not found" >&2;} | |
2444 | { (exit 1); exit 1; }; } | |
2445 | fi | |
2446 | ||
2447 | @@ -3513,10 +3647,10 @@ for ac_prog in rpcgen | |
2448 | do | |
2449 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
2450 | set dummy $ac_prog; ac_word=$2 | |
2451 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2452 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
2453 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2454 | +$as_echo_n "checking for $ac_word... " >&6; } | |
2455 | if test "${ac_cv_path_RPCGEN+set}" = set; then | |
2456 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2457 | + $as_echo_n "(cached) " >&6 | |
2458 | else | |
2459 | case $RPCGEN in | |
2460 | [\\/]* | ?:[\\/]*) | |
2461 | @@ -3531,7 +3665,7 @@ do | |
2462 | for ac_exec_ext in '' $ac_executable_extensions; do | |
2463 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2464 | ac_cv_path_RPCGEN="$as_dir/$ac_word$ac_exec_ext" | |
2465 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2466 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2467 | break 2 | |
2468 | fi | |
2469 | done | |
2470 | @@ -3543,11 +3677,11 @@ esac | |
2471 | fi | |
2472 | RPCGEN=$ac_cv_path_RPCGEN | |
2473 | if test -n "$RPCGEN"; then | |
2474 | - { echo "$as_me:$LINENO: result: $RPCGEN" >&5 | |
2475 | -echo "${ECHO_T}$RPCGEN" >&6; } | |
2476 | + { $as_echo "$as_me:$LINENO: result: $RPCGEN" >&5 | |
2477 | +$as_echo "$RPCGEN" >&6; } | |
2478 | else | |
2479 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2480 | -echo "${ECHO_T}no" >&6; } | |
2481 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2482 | +$as_echo "no" >&6; } | |
2483 | fi | |
2484 | ||
2485 | ||
2486 | @@ -3562,8 +3696,8 @@ _ACEOF | |
2487 | ||
2488 | PATH_RPCGEN="$RPCGEN" | |
2489 | else | |
2490 | - { { echo "$as_me:$LINENO: error: required program RPCGEN not found" >&5 | |
2491 | -echo "$as_me: error: required program RPCGEN not found" >&2;} | |
2492 | + { { $as_echo "$as_me:$LINENO: error: required program RPCGEN not found" >&5 | |
2493 | +$as_echo "$as_me: error: required program RPCGEN not found" >&2;} | |
2494 | { (exit 1); exit 1; }; } | |
2495 | fi | |
2496 | ||
2497 | @@ -3573,19 +3707,19 @@ fi | |
2498 | # good for portability | |
2499 | # | |
2500 | if test -n "$MOUNT" ; then | |
2501 | - { echo "$as_me:$LINENO: checking if mount accepts the -s option" >&5 | |
2502 | -echo $ECHO_N "checking if mount accepts the -s option... $ECHO_C" >&6; } | |
2503 | + { $as_echo "$as_me:$LINENO: checking if mount accepts the -s option" >&5 | |
2504 | +$as_echo_n "checking if mount accepts the -s option... " >&6; } | |
2505 | if "$MOUNT" -s > /dev/null 2>&1 ; then | |
2506 | ||
2507 | cat >>confdefs.h <<\_ACEOF | |
2508 | #define HAVE_SLOPPY_MOUNT 1 | |
2509 | _ACEOF | |
2510 | ||
2511 | - { echo "$as_me:$LINENO: result: yes" >&5 | |
2512 | -echo "${ECHO_T}yes" >&6; } | |
2513 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 | |
2514 | +$as_echo "yes" >&6; } | |
2515 | else | |
2516 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2517 | -echo "${ECHO_T}no" >&6; } | |
2518 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2519 | +$as_echo "no" >&6; } | |
2520 | fi | |
2521 | fi | |
2522 | ||
2523 | @@ -3594,10 +3728,10 @@ for ac_prog in xml2-config | |
2524 | do | |
2525 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
2526 | set dummy $ac_prog; ac_word=$2 | |
2527 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2528 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
2529 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
2530 | +$as_echo_n "checking for $ac_word... " >&6; } | |
2531 | if test "${ac_cv_path_XML_CONFIG+set}" = set; then | |
2532 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2533 | + $as_echo_n "(cached) " >&6 | |
2534 | else | |
2535 | case $XML_CONFIG in | |
2536 | [\\/]* | ?:[\\/]*) | |
2537 | @@ -3612,7 +3746,7 @@ do | |
2538 | for ac_exec_ext in '' $ac_executable_extensions; do | |
2539 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2540 | ac_cv_path_XML_CONFIG="$as_dir/$ac_word$ac_exec_ext" | |
2541 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2542 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
2543 | break 2 | |
2544 | fi | |
2545 | done | |
2546 | @@ -3624,11 +3758,11 @@ esac | |
2547 | fi | |
2548 | XML_CONFIG=$ac_cv_path_XML_CONFIG | |
2549 | if test -n "$XML_CONFIG"; then | |
2550 | - { echo "$as_me:$LINENO: result: $XML_CONFIG" >&5 | |
2551 | -echo "${ECHO_T}$XML_CONFIG" >&6; } | |
2552 | + { $as_echo "$as_me:$LINENO: result: $XML_CONFIG" >&5 | |
2553 | +$as_echo "$XML_CONFIG" >&6; } | |
2554 | else | |
2555 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2556 | -echo "${ECHO_T}no" >&6; } | |
2557 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2558 | +$as_echo "no" >&6; } | |
2559 | fi | |
2560 | ||
2561 | ||
2562 | @@ -3636,16 +3770,16 @@ fi | |
2563 | done | |
2564 | test -n "$XML_CONFIG" || XML_CONFIG="no" | |
2565 | ||
2566 | -{ echo "$as_me:$LINENO: checking for libxml2" >&5 | |
2567 | -echo $ECHO_N "checking for libxml2... $ECHO_C" >&6; } | |
2568 | +{ $as_echo "$as_me:$LINENO: checking for libxml2" >&5 | |
2569 | +$as_echo_n "checking for libxml2... " >&6; } | |
2570 | if test "$XML_CONFIG" = "no" | |
2571 | then | |
2572 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2573 | -echo "${ECHO_T}no" >&6; } | |
2574 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2575 | +$as_echo "no" >&6; } | |
2576 | HAVE_LIBXML=0 | |
2577 | else | |
2578 | - { echo "$as_me:$LINENO: result: yes" >&5 | |
2579 | -echo "${ECHO_T}yes" >&6; } | |
2580 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 | |
2581 | +$as_echo "yes" >&6; } | |
2582 | HAVE_LIBXML=1 | |
2583 | XML_LIBS=`$XML_CONFIG --libs` | |
2584 | XML_FLAGS=`$XML_CONFIG --cflags` | |
2585 | @@ -3671,10 +3805,10 @@ fi | |
2586 | # | |
2587 | # glibc/libc 6 new libraries | |
2588 | # | |
2589 | -{ echo "$as_me:$LINENO: checking for yp_match in -lnsl" >&5 | |
2590 | -echo $ECHO_N "checking for yp_match in -lnsl... $ECHO_C" >&6; } | |
2591 | +{ $as_echo "$as_me:$LINENO: checking for yp_match in -lnsl" >&5 | |
2592 | +$as_echo_n "checking for yp_match in -lnsl... " >&6; } | |
2593 | if test "${ac_cv_lib_nsl_yp_match+set}" = set; then | |
2594 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2595 | + $as_echo_n "(cached) " >&6 | |
2596 | else | |
2597 | ac_check_lib_save_LIBS=$LIBS | |
2598 | LIBS="-lnsl $LIBS" | |
2599 | @@ -3706,42 +3840,46 @@ case "(($ac_try" in | |
2600 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2601 | *) ac_try_echo=$ac_try;; | |
2602 | esac | |
2603 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2604 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
2605 | +$as_echo "$ac_try_echo") >&5 | |
2606 | (eval "$ac_link") 2>conftest.er1 | |
2607 | ac_status=$? | |
2608 | grep -v '^ *+' conftest.er1 >conftest.err | |
2609 | rm -f conftest.er1 | |
2610 | cat conftest.err >&5 | |
2611 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2612 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2613 | (exit $ac_status); } && { | |
2614 | test -z "$ac_c_werror_flag" || | |
2615 | test ! -s conftest.err | |
2616 | - } && test -s conftest$ac_exeext && | |
2617 | - $as_test_x conftest$ac_exeext; then | |
2618 | + } && test -s conftest$ac_exeext && { | |
2619 | + test "$cross_compiling" = yes || | |
2620 | + $as_test_x conftest$ac_exeext | |
2621 | + }; then | |
2622 | ac_cv_lib_nsl_yp_match=yes | |
2623 | else | |
2624 | - echo "$as_me: failed program was:" >&5 | |
2625 | + $as_echo "$as_me: failed program was:" >&5 | |
2626 | sed 's/^/| /' conftest.$ac_ext >&5 | |
2627 | ||
2628 | ac_cv_lib_nsl_yp_match=no | |
2629 | fi | |
2630 | ||
2631 | +rm -rf conftest.dSYM | |
2632 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2633 | conftest$ac_exeext conftest.$ac_ext | |
2634 | LIBS=$ac_check_lib_save_LIBS | |
2635 | fi | |
2636 | -{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_match" >&5 | |
2637 | -echo "${ECHO_T}$ac_cv_lib_nsl_yp_match" >&6; } | |
2638 | -if test $ac_cv_lib_nsl_yp_match = yes; then | |
2639 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_match" >&5 | |
2640 | +$as_echo "$ac_cv_lib_nsl_yp_match" >&6; } | |
2641 | +if test "x$ac_cv_lib_nsl_yp_match" = x""yes; then | |
2642 | LIBNSL="-lnsl" | |
2643 | fi | |
2644 | ||
2645 | ||
2646 | ||
2647 | -{ echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5 | |
2648 | -echo $ECHO_N "checking for res_query in -lresolv... $ECHO_C" >&6; } | |
2649 | +{ $as_echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5 | |
2650 | +$as_echo_n "checking for res_query in -lresolv... " >&6; } | |
2651 | if test "${ac_cv_lib_resolv_res_query+set}" = set; then | |
2652 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2653 | + $as_echo_n "(cached) " >&6 | |
2654 | else | |
2655 | ac_check_lib_save_LIBS=$LIBS | |
2656 | LIBS="-lresolv $LIBS" | |
2657 | @@ -3773,33 +3911,37 @@ case "(($ac_try" in | |
2658 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2659 | *) ac_try_echo=$ac_try;; | |
2660 | esac | |
2661 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2662 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
2663 | +$as_echo "$ac_try_echo") >&5 | |
2664 | (eval "$ac_link") 2>conftest.er1 | |
2665 | ac_status=$? | |
2666 | grep -v '^ *+' conftest.er1 >conftest.err | |
2667 | rm -f conftest.er1 | |
2668 | cat conftest.err >&5 | |
2669 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2670 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2671 | (exit $ac_status); } && { | |
2672 | test -z "$ac_c_werror_flag" || | |
2673 | test ! -s conftest.err | |
2674 | - } && test -s conftest$ac_exeext && | |
2675 | - $as_test_x conftest$ac_exeext; then | |
2676 | + } && test -s conftest$ac_exeext && { | |
2677 | + test "$cross_compiling" = yes || | |
2678 | + $as_test_x conftest$ac_exeext | |
2679 | + }; then | |
2680 | ac_cv_lib_resolv_res_query=yes | |
2681 | else | |
2682 | - echo "$as_me: failed program was:" >&5 | |
2683 | + $as_echo "$as_me: failed program was:" >&5 | |
2684 | sed 's/^/| /' conftest.$ac_ext >&5 | |
2685 | ||
2686 | ac_cv_lib_resolv_res_query=no | |
2687 | fi | |
2688 | ||
2689 | +rm -rf conftest.dSYM | |
2690 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2691 | conftest$ac_exeext conftest.$ac_ext | |
2692 | LIBS=$ac_check_lib_save_LIBS | |
2693 | fi | |
2694 | -{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5 | |
2695 | -echo "${ECHO_T}$ac_cv_lib_resolv_res_query" >&6; } | |
2696 | -if test $ac_cv_lib_resolv_res_query = yes; then | |
2697 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5 | |
2698 | +$as_echo "$ac_cv_lib_resolv_res_query" >&6; } | |
2699 | +if test "x$ac_cv_lib_resolv_res_query" = x""yes; then | |
2700 | LIBRESOLV="-lresolv" | |
2701 | fi | |
2702 | ||
2703 | @@ -3833,8 +3975,8 @@ fi | |
2704 | if test -z "$HAVE_HESIOD" -o "$HAVE_HESIOD" != "0" | |
2705 | then | |
2706 | HAVE_HESIOD=0 | |
2707 | - { echo "$as_me:$LINENO: checking for libhesiod" >&5 | |
2708 | -echo $ECHO_N "checking for libhesiod... $ECHO_C" >&6; } | |
2709 | + { $as_echo "$as_me:$LINENO: checking for libhesiod" >&5 | |
2710 | +$as_echo_n "checking for libhesiod... " >&6; } | |
2711 | ||
2712 | # save current ldflags | |
2713 | af_check_hesiod_save_ldflags="$LDFLAGS" | |
2714 | @@ -3861,30 +4003,34 @@ case "(($ac_try" in | |
2715 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2716 | *) ac_try_echo=$ac_try;; | |
2717 | esac | |
2718 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2719 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
2720 | +$as_echo "$ac_try_echo") >&5 | |
2721 | (eval "$ac_link") 2>conftest.er1 | |
2722 | ac_status=$? | |
2723 | grep -v '^ *+' conftest.er1 >conftest.err | |
2724 | rm -f conftest.er1 | |
2725 | cat conftest.err >&5 | |
2726 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2727 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2728 | (exit $ac_status); } && { | |
2729 | test -z "$ac_c_werror_flag" || | |
2730 | test ! -s conftest.err | |
2731 | - } && test -s conftest$ac_exeext && | |
2732 | - $as_test_x conftest$ac_exeext; then | |
2733 | + } && test -s conftest$ac_exeext && { | |
2734 | + test "$cross_compiling" = yes || | |
2735 | + $as_test_x conftest$ac_exeext | |
2736 | + }; then | |
2737 | HAVE_HESIOD=1 | |
2738 | LIBHESIOD="$LIBHESIOD -lhesiod -lresolv" | |
2739 | - { echo "$as_me:$LINENO: result: yes" >&5 | |
2740 | -echo "${ECHO_T}yes" >&6; } | |
2741 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 | |
2742 | +$as_echo "yes" >&6; } | |
2743 | else | |
2744 | - echo "$as_me: failed program was:" >&5 | |
2745 | + $as_echo "$as_me: failed program was:" >&5 | |
2746 | sed 's/^/| /' conftest.$ac_ext >&5 | |
2747 | ||
2748 | - { echo "$as_me:$LINENO: result: no" >&5 | |
2749 | -echo "${ECHO_T}no" >&6; } | |
2750 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
2751 | +$as_echo "no" >&6; } | |
2752 | fi | |
2753 | ||
2754 | +rm -rf conftest.dSYM | |
2755 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
2756 | conftest$ac_exeext conftest.$ac_ext | |
2757 | ||
2758 | @@ -3911,15 +4057,15 @@ ac_cpp='$CPP $CPPFLAGS' | |
2759 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
2760 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
2761 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
2762 | -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 | |
2763 | -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } | |
2764 | +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 | |
2765 | +$as_echo_n "checking how to run the C preprocessor... " >&6; } | |
2766 | # On Suns, sometimes $CPP names a directory. | |
2767 | if test -n "$CPP" && test -d "$CPP"; then | |
2768 | CPP= | |
2769 | fi | |
2770 | if test -z "$CPP"; then | |
2771 | if test "${ac_cv_prog_CPP+set}" = set; then | |
2772 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2773 | + $as_echo_n "(cached) " >&6 | |
2774 | else | |
2775 | # Double quotes because CPP needs to be expanded | |
2776 | for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" | |
2777 | @@ -3951,20 +4097,21 @@ case "(($ac_try" in | |
2778 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2779 | *) ac_try_echo=$ac_try;; | |
2780 | esac | |
2781 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2782 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
2783 | +$as_echo "$ac_try_echo") >&5 | |
2784 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
2785 | ac_status=$? | |
2786 | grep -v '^ *+' conftest.er1 >conftest.err | |
2787 | rm -f conftest.er1 | |
2788 | cat conftest.err >&5 | |
2789 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2790 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2791 | (exit $ac_status); } >/dev/null && { | |
2792 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
2793 | test ! -s conftest.err | |
2794 | }; then | |
2795 | : | |
2796 | else | |
2797 | - echo "$as_me: failed program was:" >&5 | |
2798 | + $as_echo "$as_me: failed program was:" >&5 | |
2799 | sed 's/^/| /' conftest.$ac_ext >&5 | |
2800 | ||
2801 | # Broken: fails on valid input. | |
2802 | @@ -3988,13 +4135,14 @@ case "(($ac_try" in | |
2803 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2804 | *) ac_try_echo=$ac_try;; | |
2805 | esac | |
2806 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2807 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
2808 | +$as_echo "$ac_try_echo") >&5 | |
2809 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
2810 | ac_status=$? | |
2811 | grep -v '^ *+' conftest.er1 >conftest.err | |
2812 | rm -f conftest.er1 | |
2813 | cat conftest.err >&5 | |
2814 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2815 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2816 | (exit $ac_status); } >/dev/null && { | |
2817 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
2818 | test ! -s conftest.err | |
2819 | @@ -4002,7 +4150,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2820 | # Broken: success on invalid input. | |
2821 | continue | |
2822 | else | |
2823 | - echo "$as_me: failed program was:" >&5 | |
2824 | + $as_echo "$as_me: failed program was:" >&5 | |
2825 | sed 's/^/| /' conftest.$ac_ext >&5 | |
2826 | ||
2827 | # Passes both tests. | |
2828 | @@ -4027,8 +4175,8 @@ fi | |
2829 | else | |
2830 | ac_cv_prog_CPP=$CPP | |
2831 | fi | |
2832 | -{ echo "$as_me:$LINENO: result: $CPP" >&5 | |
2833 | -echo "${ECHO_T}$CPP" >&6; } | |
2834 | +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 | |
2835 | +$as_echo "$CPP" >&6; } | |
2836 | ac_preproc_ok=false | |
2837 | for ac_c_preproc_warn_flag in '' yes | |
2838 | do | |
2839 | @@ -4056,20 +4204,21 @@ case "(($ac_try" in | |
2840 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2841 | *) ac_try_echo=$ac_try;; | |
2842 | esac | |
2843 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2844 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
2845 | +$as_echo "$ac_try_echo") >&5 | |
2846 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
2847 | ac_status=$? | |
2848 | grep -v '^ *+' conftest.er1 >conftest.err | |
2849 | rm -f conftest.er1 | |
2850 | cat conftest.err >&5 | |
2851 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2852 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2853 | (exit $ac_status); } >/dev/null && { | |
2854 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
2855 | test ! -s conftest.err | |
2856 | }; then | |
2857 | : | |
2858 | else | |
2859 | - echo "$as_me: failed program was:" >&5 | |
2860 | + $as_echo "$as_me: failed program was:" >&5 | |
2861 | sed 's/^/| /' conftest.$ac_ext >&5 | |
2862 | ||
2863 | # Broken: fails on valid input. | |
2864 | @@ -4093,13 +4242,14 @@ case "(($ac_try" in | |
2865 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
2866 | *) ac_try_echo=$ac_try;; | |
2867 | esac | |
2868 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2869 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
2870 | +$as_echo "$ac_try_echo") >&5 | |
2871 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
2872 | ac_status=$? | |
2873 | grep -v '^ *+' conftest.er1 >conftest.err | |
2874 | rm -f conftest.er1 | |
2875 | cat conftest.err >&5 | |
2876 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2877 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
2878 | (exit $ac_status); } >/dev/null && { | |
2879 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
2880 | test ! -s conftest.err | |
2881 | @@ -4107,7 +4257,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
2882 | # Broken: success on invalid input. | |
2883 | continue | |
2884 | else | |
2885 | - echo "$as_me: failed program was:" >&5 | |
2886 | + $as_echo "$as_me: failed program was:" >&5 | |
2887 | sed 's/^/| /' conftest.$ac_ext >&5 | |
2888 | ||
2889 | # Passes both tests. | |
2890 | @@ -4123,11 +4273,13 @@ rm -f conftest.err conftest.$ac_ext | |
2891 | if $ac_preproc_ok; then | |
2892 | : | |
2893 | else | |
2894 | - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check | |
2895 | + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | |
2896 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
2897 | +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check | |
2898 | See \`config.log' for more details." >&5 | |
2899 | -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check | |
2900 | +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check | |
2901 | See \`config.log' for more details." >&2;} | |
2902 | - { (exit 1); exit 1; }; } | |
2903 | + { (exit 1); exit 1; }; }; } | |
2904 | fi | |
2905 | ||
2906 | ac_ext=c | |
2907 | @@ -4137,42 +4289,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ | |
2908 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
2909 | ||
2910 | ||
2911 | -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 | |
2912 | -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } | |
2913 | -if test "${ac_cv_path_GREP+set}" = set; then | |
2914 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2915 | -else | |
2916 | - # Extract the first word of "grep ggrep" to use in msg output | |
2917 | -if test -z "$GREP"; then | |
2918 | -set dummy grep ggrep; ac_prog_name=$2 | |
2919 | +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 | |
2920 | +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } | |
2921 | if test "${ac_cv_path_GREP+set}" = set; then | |
2922 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
2923 | + $as_echo_n "(cached) " >&6 | |
2924 | else | |
2925 | + if test -z "$GREP"; then | |
2926 | ac_path_GREP_found=false | |
2927 | -# Loop through the user's path and test for each of PROGNAME-LIST | |
2928 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
2929 | + # Loop through the user's path and test for each of PROGNAME-LIST | |
2930 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
2931 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin | |
2932 | do | |
2933 | IFS=$as_save_IFS | |
2934 | test -z "$as_dir" && as_dir=. | |
2935 | for ac_prog in grep ggrep; do | |
2936 | - for ac_exec_ext in '' $ac_executable_extensions; do | |
2937 | - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | |
2938 | - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue | |
2939 | - # Check for GNU ac_path_GREP and select it if it is found. | |
2940 | + for ac_exec_ext in '' $ac_executable_extensions; do | |
2941 | + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | |
2942 | + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue | |
2943 | +# Check for GNU ac_path_GREP and select it if it is found. | |
2944 | # Check for GNU $ac_path_GREP | |
2945 | case `"$ac_path_GREP" --version 2>&1` in | |
2946 | *GNU*) | |
2947 | ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; | |
2948 | *) | |
2949 | ac_count=0 | |
2950 | - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" | |
2951 | + $as_echo_n 0123456789 >"conftest.in" | |
2952 | while : | |
2953 | do | |
2954 | cat "conftest.in" "conftest.in" >"conftest.tmp" | |
2955 | mv "conftest.tmp" "conftest.in" | |
2956 | cp "conftest.in" "conftest.nl" | |
2957 | - echo 'GREP' >> "conftest.nl" | |
2958 | + $as_echo 'GREP' >> "conftest.nl" | |
2959 | "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break | |
2960 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | |
2961 | ac_count=`expr $ac_count + 1` | |
2962 | @@ -4187,74 +4334,60 @@ case `"$ac_path_GREP" --version 2>&1` in | |
2963 | rm -f conftest.in conftest.tmp conftest.nl conftest.out;; | |
2964 | esac | |
2965 | ||
2966 | - | |
2967 | - $ac_path_GREP_found && break 3 | |
2968 | + $ac_path_GREP_found && break 3 | |
2969 | + done | |
2970 | done | |
2971 | done | |
2972 | - | |
2973 | -done | |
2974 | IFS=$as_save_IFS | |
2975 | - | |
2976 | - | |
2977 | -fi | |
2978 | - | |
2979 | -GREP="$ac_cv_path_GREP" | |
2980 | -if test -z "$GREP"; then | |
2981 | - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | |
2982 | -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | |
2983 | + if test -z "$ac_cv_path_GREP"; then | |
2984 | + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | |
2985 | +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | |
2986 | { (exit 1); exit 1; }; } | |
2987 | -fi | |
2988 | - | |
2989 | + fi | |
2990 | else | |
2991 | ac_cv_path_GREP=$GREP | |
2992 | fi | |
2993 | ||
2994 | - | |
2995 | fi | |
2996 | -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 | |
2997 | -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } | |
2998 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 | |
2999 | +$as_echo "$ac_cv_path_GREP" >&6; } | |
3000 | GREP="$ac_cv_path_GREP" | |
3001 | ||
3002 | ||
3003 | -{ echo "$as_me:$LINENO: checking for egrep" >&5 | |
3004 | -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } | |
3005 | +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 | |
3006 | +$as_echo_n "checking for egrep... " >&6; } | |
3007 | if test "${ac_cv_path_EGREP+set}" = set; then | |
3008 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3009 | + $as_echo_n "(cached) " >&6 | |
3010 | else | |
3011 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 | |
3012 | then ac_cv_path_EGREP="$GREP -E" | |
3013 | else | |
3014 | - # Extract the first word of "egrep" to use in msg output | |
3015 | -if test -z "$EGREP"; then | |
3016 | -set dummy egrep; ac_prog_name=$2 | |
3017 | -if test "${ac_cv_path_EGREP+set}" = set; then | |
3018 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3019 | -else | |
3020 | + if test -z "$EGREP"; then | |
3021 | ac_path_EGREP_found=false | |
3022 | -# Loop through the user's path and test for each of PROGNAME-LIST | |
3023 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
3024 | + # Loop through the user's path and test for each of PROGNAME-LIST | |
3025 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
3026 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin | |
3027 | do | |
3028 | IFS=$as_save_IFS | |
3029 | test -z "$as_dir" && as_dir=. | |
3030 | for ac_prog in egrep; do | |
3031 | - for ac_exec_ext in '' $ac_executable_extensions; do | |
3032 | - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | |
3033 | - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue | |
3034 | - # Check for GNU ac_path_EGREP and select it if it is found. | |
3035 | + for ac_exec_ext in '' $ac_executable_extensions; do | |
3036 | + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | |
3037 | + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue | |
3038 | +# Check for GNU ac_path_EGREP and select it if it is found. | |
3039 | # Check for GNU $ac_path_EGREP | |
3040 | case `"$ac_path_EGREP" --version 2>&1` in | |
3041 | *GNU*) | |
3042 | ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; | |
3043 | *) | |
3044 | ac_count=0 | |
3045 | - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" | |
3046 | + $as_echo_n 0123456789 >"conftest.in" | |
3047 | while : | |
3048 | do | |
3049 | cat "conftest.in" "conftest.in" >"conftest.tmp" | |
3050 | mv "conftest.tmp" "conftest.in" | |
3051 | cp "conftest.in" "conftest.nl" | |
3052 | - echo 'EGREP' >> "conftest.nl" | |
3053 | + $as_echo 'EGREP' >> "conftest.nl" | |
3054 | "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break | |
3055 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | |
3056 | ac_count=`expr $ac_count + 1` | |
3057 | @@ -4269,40 +4402,31 @@ case `"$ac_path_EGREP" --version 2>&1` in | |
3058 | rm -f conftest.in conftest.tmp conftest.nl conftest.out;; | |
3059 | esac | |
3060 | ||
3061 | - | |
3062 | - $ac_path_EGREP_found && break 3 | |
3063 | + $ac_path_EGREP_found && break 3 | |
3064 | + done | |
3065 | done | |
3066 | done | |
3067 | - | |
3068 | -done | |
3069 | IFS=$as_save_IFS | |
3070 | - | |
3071 | - | |
3072 | -fi | |
3073 | - | |
3074 | -EGREP="$ac_cv_path_EGREP" | |
3075 | -if test -z "$EGREP"; then | |
3076 | - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | |
3077 | -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | |
3078 | + if test -z "$ac_cv_path_EGREP"; then | |
3079 | + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | |
3080 | +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | |
3081 | { (exit 1); exit 1; }; } | |
3082 | -fi | |
3083 | - | |
3084 | + fi | |
3085 | else | |
3086 | ac_cv_path_EGREP=$EGREP | |
3087 | fi | |
3088 | ||
3089 | - | |
3090 | fi | |
3091 | fi | |
3092 | -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 | |
3093 | -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } | |
3094 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 | |
3095 | +$as_echo "$ac_cv_path_EGREP" >&6; } | |
3096 | EGREP="$ac_cv_path_EGREP" | |
3097 | ||
3098 | ||
3099 | -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | |
3100 | -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } | |
3101 | +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | |
3102 | +$as_echo_n "checking for ANSI C header files... " >&6; } | |
3103 | if test "${ac_cv_header_stdc+set}" = set; then | |
3104 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3105 | + $as_echo_n "(cached) " >&6 | |
3106 | else | |
3107 | cat >conftest.$ac_ext <<_ACEOF | |
3108 | /* confdefs.h. */ | |
3109 | @@ -4329,20 +4453,21 @@ case "(($ac_try" in | |
3110 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3111 | *) ac_try_echo=$ac_try;; | |
3112 | esac | |
3113 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3114 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3115 | +$as_echo "$ac_try_echo") >&5 | |
3116 | (eval "$ac_compile") 2>conftest.er1 | |
3117 | ac_status=$? | |
3118 | grep -v '^ *+' conftest.er1 >conftest.err | |
3119 | rm -f conftest.er1 | |
3120 | cat conftest.err >&5 | |
3121 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3122 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3123 | (exit $ac_status); } && { | |
3124 | test -z "$ac_c_werror_flag" || | |
3125 | test ! -s conftest.err | |
3126 | } && test -s conftest.$ac_objext; then | |
3127 | ac_cv_header_stdc=yes | |
3128 | else | |
3129 | - echo "$as_me: failed program was:" >&5 | |
3130 | + $as_echo "$as_me: failed program was:" >&5 | |
3131 | sed 's/^/| /' conftest.$ac_ext >&5 | |
3132 | ||
3133 | ac_cv_header_stdc=no | |
3134 | @@ -4434,37 +4559,40 @@ case "(($ac_try" in | |
3135 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3136 | *) ac_try_echo=$ac_try;; | |
3137 | esac | |
3138 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3139 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3140 | +$as_echo "$ac_try_echo") >&5 | |
3141 | (eval "$ac_link") 2>&5 | |
3142 | ac_status=$? | |
3143 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3144 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3145 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | |
3146 | { (case "(($ac_try" in | |
3147 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3148 | *) ac_try_echo=$ac_try;; | |
3149 | esac | |
3150 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3151 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3152 | +$as_echo "$ac_try_echo") >&5 | |
3153 | (eval "$ac_try") 2>&5 | |
3154 | ac_status=$? | |
3155 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3156 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3157 | (exit $ac_status); }; }; then | |
3158 | : | |
3159 | else | |
3160 | - echo "$as_me: program exited with status $ac_status" >&5 | |
3161 | -echo "$as_me: failed program was:" >&5 | |
3162 | + $as_echo "$as_me: program exited with status $ac_status" >&5 | |
3163 | +$as_echo "$as_me: failed program was:" >&5 | |
3164 | sed 's/^/| /' conftest.$ac_ext >&5 | |
3165 | ||
3166 | ( exit $ac_status ) | |
3167 | ac_cv_header_stdc=no | |
3168 | fi | |
3169 | +rm -rf conftest.dSYM | |
3170 | rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
3171 | fi | |
3172 | ||
3173 | ||
3174 | fi | |
3175 | fi | |
3176 | -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | |
3177 | -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } | |
3178 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | |
3179 | +$as_echo "$ac_cv_header_stdc" >&6; } | |
3180 | if test $ac_cv_header_stdc = yes; then | |
3181 | ||
3182 | cat >>confdefs.h <<\_ACEOF | |
3183 | @@ -4486,11 +4614,11 @@ fi | |
3184 | for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ | |
3185 | inttypes.h stdint.h unistd.h | |
3186 | do | |
3187 | -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | |
3188 | -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
3189 | -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | |
3190 | +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | |
3191 | +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
3192 | +$as_echo_n "checking for $ac_header... " >&6; } | |
3193 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | |
3194 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3195 | + $as_echo_n "(cached) " >&6 | |
3196 | else | |
3197 | cat >conftest.$ac_ext <<_ACEOF | |
3198 | /* confdefs.h. */ | |
3199 | @@ -4508,20 +4636,21 @@ case "(($ac_try" in | |
3200 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3201 | *) ac_try_echo=$ac_try;; | |
3202 | esac | |
3203 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3204 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3205 | +$as_echo "$ac_try_echo") >&5 | |
3206 | (eval "$ac_compile") 2>conftest.er1 | |
3207 | ac_status=$? | |
3208 | grep -v '^ *+' conftest.er1 >conftest.err | |
3209 | rm -f conftest.er1 | |
3210 | cat conftest.err >&5 | |
3211 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3212 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3213 | (exit $ac_status); } && { | |
3214 | test -z "$ac_c_werror_flag" || | |
3215 | test ! -s conftest.err | |
3216 | } && test -s conftest.$ac_objext; then | |
3217 | eval "$as_ac_Header=yes" | |
3218 | else | |
3219 | - echo "$as_me: failed program was:" >&5 | |
3220 | + $as_echo "$as_me: failed program was:" >&5 | |
3221 | sed 's/^/| /' conftest.$ac_ext >&5 | |
3222 | ||
3223 | eval "$as_ac_Header=no" | |
3224 | @@ -4529,12 +4658,15 @@ fi | |
3225 | ||
3226 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
3227 | fi | |
3228 | -ac_res=`eval echo '${'$as_ac_Header'}'` | |
3229 | - { echo "$as_me:$LINENO: result: $ac_res" >&5 | |
3230 | -echo "${ECHO_T}$ac_res" >&6; } | |
3231 | -if test `eval echo '${'$as_ac_Header'}'` = yes; then | |
3232 | +ac_res=`eval 'as_val=${'$as_ac_Header'} | |
3233 | + $as_echo "$as_val"'` | |
3234 | + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | |
3235 | +$as_echo "$ac_res" >&6; } | |
3236 | +as_val=`eval 'as_val=${'$as_ac_Header'} | |
3237 | + $as_echo "$as_val"'` | |
3238 | + if test "x$as_val" = x""yes; then | |
3239 | cat >>confdefs.h <<_ACEOF | |
3240 | -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | |
3241 | +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | |
3242 | _ACEOF | |
3243 | ||
3244 | fi | |
3245 | @@ -4543,17 +4675,17 @@ done | |
3246 | ||
3247 | ||
3248 | if test "${ac_cv_header_rpcsvc_nis_h+set}" = set; then | |
3249 | - { echo "$as_me:$LINENO: checking for rpcsvc/nis.h" >&5 | |
3250 | -echo $ECHO_N "checking for rpcsvc/nis.h... $ECHO_C" >&6; } | |
3251 | + { $as_echo "$as_me:$LINENO: checking for rpcsvc/nis.h" >&5 | |
3252 | +$as_echo_n "checking for rpcsvc/nis.h... " >&6; } | |
3253 | if test "${ac_cv_header_rpcsvc_nis_h+set}" = set; then | |
3254 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3255 | + $as_echo_n "(cached) " >&6 | |
3256 | fi | |
3257 | -{ echo "$as_me:$LINENO: result: $ac_cv_header_rpcsvc_nis_h" >&5 | |
3258 | -echo "${ECHO_T}$ac_cv_header_rpcsvc_nis_h" >&6; } | |
3259 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_rpcsvc_nis_h" >&5 | |
3260 | +$as_echo "$ac_cv_header_rpcsvc_nis_h" >&6; } | |
3261 | else | |
3262 | # Is the header compilable? | |
3263 | -{ echo "$as_me:$LINENO: checking rpcsvc/nis.h usability" >&5 | |
3264 | -echo $ECHO_N "checking rpcsvc/nis.h usability... $ECHO_C" >&6; } | |
3265 | +{ $as_echo "$as_me:$LINENO: checking rpcsvc/nis.h usability" >&5 | |
3266 | +$as_echo_n "checking rpcsvc/nis.h usability... " >&6; } | |
3267 | cat >conftest.$ac_ext <<_ACEOF | |
3268 | /* confdefs.h. */ | |
3269 | _ACEOF | |
3270 | @@ -4569,32 +4701,33 @@ case "(($ac_try" in | |
3271 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3272 | *) ac_try_echo=$ac_try;; | |
3273 | esac | |
3274 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3275 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3276 | +$as_echo "$ac_try_echo") >&5 | |
3277 | (eval "$ac_compile") 2>conftest.er1 | |
3278 | ac_status=$? | |
3279 | grep -v '^ *+' conftest.er1 >conftest.err | |
3280 | rm -f conftest.er1 | |
3281 | cat conftest.err >&5 | |
3282 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3283 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3284 | (exit $ac_status); } && { | |
3285 | test -z "$ac_c_werror_flag" || | |
3286 | test ! -s conftest.err | |
3287 | } && test -s conftest.$ac_objext; then | |
3288 | ac_header_compiler=yes | |
3289 | else | |
3290 | - echo "$as_me: failed program was:" >&5 | |
3291 | + $as_echo "$as_me: failed program was:" >&5 | |
3292 | sed 's/^/| /' conftest.$ac_ext >&5 | |
3293 | ||
3294 | ac_header_compiler=no | |
3295 | fi | |
3296 | ||
3297 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
3298 | -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | |
3299 | -echo "${ECHO_T}$ac_header_compiler" >&6; } | |
3300 | +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | |
3301 | +$as_echo "$ac_header_compiler" >&6; } | |
3302 | ||
3303 | # Is the header present? | |
3304 | -{ echo "$as_me:$LINENO: checking rpcsvc/nis.h presence" >&5 | |
3305 | -echo $ECHO_N "checking rpcsvc/nis.h presence... $ECHO_C" >&6; } | |
3306 | +{ $as_echo "$as_me:$LINENO: checking rpcsvc/nis.h presence" >&5 | |
3307 | +$as_echo_n "checking rpcsvc/nis.h presence... " >&6; } | |
3308 | cat >conftest.$ac_ext <<_ACEOF | |
3309 | /* confdefs.h. */ | |
3310 | _ACEOF | |
3311 | @@ -4608,66 +4741,67 @@ case "(($ac_try" in | |
3312 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3313 | *) ac_try_echo=$ac_try;; | |
3314 | esac | |
3315 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3316 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3317 | +$as_echo "$ac_try_echo") >&5 | |
3318 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
3319 | ac_status=$? | |
3320 | grep -v '^ *+' conftest.er1 >conftest.err | |
3321 | rm -f conftest.er1 | |
3322 | cat conftest.err >&5 | |
3323 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3324 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3325 | (exit $ac_status); } >/dev/null && { | |
3326 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
3327 | test ! -s conftest.err | |
3328 | }; then | |
3329 | ac_header_preproc=yes | |
3330 | else | |
3331 | - echo "$as_me: failed program was:" >&5 | |
3332 | + $as_echo "$as_me: failed program was:" >&5 | |
3333 | sed 's/^/| /' conftest.$ac_ext >&5 | |
3334 | ||
3335 | ac_header_preproc=no | |
3336 | fi | |
3337 | ||
3338 | rm -f conftest.err conftest.$ac_ext | |
3339 | -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | |
3340 | -echo "${ECHO_T}$ac_header_preproc" >&6; } | |
3341 | +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | |
3342 | +$as_echo "$ac_header_preproc" >&6; } | |
3343 | ||
3344 | # So? What about this header? | |
3345 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | |
3346 | yes:no: ) | |
3347 | - { echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: accepted by the compiler, rejected by the preprocessor!" >&5 | |
3348 | -echo "$as_me: WARNING: rpcsvc/nis.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | |
3349 | - { echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: proceeding with the compiler's result" >&5 | |
3350 | -echo "$as_me: WARNING: rpcsvc/nis.h: proceeding with the compiler's result" >&2;} | |
3351 | + { $as_echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: accepted by the compiler, rejected by the preprocessor!" >&5 | |
3352 | +$as_echo "$as_me: WARNING: rpcsvc/nis.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | |
3353 | + { $as_echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: proceeding with the compiler's result" >&5 | |
3354 | +$as_echo "$as_me: WARNING: rpcsvc/nis.h: proceeding with the compiler's result" >&2;} | |
3355 | ac_header_preproc=yes | |
3356 | ;; | |
3357 | no:yes:* ) | |
3358 | - { echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: present but cannot be compiled" >&5 | |
3359 | -echo "$as_me: WARNING: rpcsvc/nis.h: present but cannot be compiled" >&2;} | |
3360 | - { echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: check for missing prerequisite headers?" >&5 | |
3361 | -echo "$as_me: WARNING: rpcsvc/nis.h: check for missing prerequisite headers?" >&2;} | |
3362 | - { echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: see the Autoconf documentation" >&5 | |
3363 | -echo "$as_me: WARNING: rpcsvc/nis.h: see the Autoconf documentation" >&2;} | |
3364 | - { echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: section \"Present But Cannot Be Compiled\"" >&5 | |
3365 | -echo "$as_me: WARNING: rpcsvc/nis.h: section \"Present But Cannot Be Compiled\"" >&2;} | |
3366 | - { echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: proceeding with the preprocessor's result" >&5 | |
3367 | -echo "$as_me: WARNING: rpcsvc/nis.h: proceeding with the preprocessor's result" >&2;} | |
3368 | - { echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: in the future, the compiler will take precedence" >&5 | |
3369 | -echo "$as_me: WARNING: rpcsvc/nis.h: in the future, the compiler will take precedence" >&2;} | |
3370 | + { $as_echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: present but cannot be compiled" >&5 | |
3371 | +$as_echo "$as_me: WARNING: rpcsvc/nis.h: present but cannot be compiled" >&2;} | |
3372 | + { $as_echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: check for missing prerequisite headers?" >&5 | |
3373 | +$as_echo "$as_me: WARNING: rpcsvc/nis.h: check for missing prerequisite headers?" >&2;} | |
3374 | + { $as_echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: see the Autoconf documentation" >&5 | |
3375 | +$as_echo "$as_me: WARNING: rpcsvc/nis.h: see the Autoconf documentation" >&2;} | |
3376 | + { $as_echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: section \"Present But Cannot Be Compiled\"" >&5 | |
3377 | +$as_echo "$as_me: WARNING: rpcsvc/nis.h: section \"Present But Cannot Be Compiled\"" >&2;} | |
3378 | + { $as_echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: proceeding with the preprocessor's result" >&5 | |
3379 | +$as_echo "$as_me: WARNING: rpcsvc/nis.h: proceeding with the preprocessor's result" >&2;} | |
3380 | + { $as_echo "$as_me:$LINENO: WARNING: rpcsvc/nis.h: in the future, the compiler will take precedence" >&5 | |
3381 | +$as_echo "$as_me: WARNING: rpcsvc/nis.h: in the future, the compiler will take precedence" >&2;} | |
3382 | ||
3383 | ;; | |
3384 | esac | |
3385 | -{ echo "$as_me:$LINENO: checking for rpcsvc/nis.h" >&5 | |
3386 | -echo $ECHO_N "checking for rpcsvc/nis.h... $ECHO_C" >&6; } | |
3387 | +{ $as_echo "$as_me:$LINENO: checking for rpcsvc/nis.h" >&5 | |
3388 | +$as_echo_n "checking for rpcsvc/nis.h... " >&6; } | |
3389 | if test "${ac_cv_header_rpcsvc_nis_h+set}" = set; then | |
3390 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3391 | + $as_echo_n "(cached) " >&6 | |
3392 | else | |
3393 | ac_cv_header_rpcsvc_nis_h=$ac_header_preproc | |
3394 | fi | |
3395 | -{ echo "$as_me:$LINENO: result: $ac_cv_header_rpcsvc_nis_h" >&5 | |
3396 | -echo "${ECHO_T}$ac_cv_header_rpcsvc_nis_h" >&6; } | |
3397 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_rpcsvc_nis_h" >&5 | |
3398 | +$as_echo "$ac_cv_header_rpcsvc_nis_h" >&6; } | |
3399 | ||
3400 | fi | |
3401 | -if test $ac_cv_header_rpcsvc_nis_h = yes; then | |
3402 | +if test "x$ac_cv_header_rpcsvc_nis_h" = x""yes; then | |
3403 | HAVE_NISPLUS=1 | |
3404 | fi | |
3405 | ||
3406 | @@ -4700,10 +4834,10 @@ fi | |
3407 | if test -z "$HAVE_LDAP" -o "$HAVE_LDAP" != "0"; then | |
3408 | HAVE_LDAP=0 | |
3409 | LDAP_FLAGS="$LDAP_FLAGS -DLDAP_DEPRECATED=1" | |
3410 | - { echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5 | |
3411 | -echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6; } | |
3412 | + { $as_echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5 | |
3413 | +$as_echo_n "checking for ldap_initialize in -lldap... " >&6; } | |
3414 | if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then | |
3415 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3416 | + $as_echo_n "(cached) " >&6 | |
3417 | else | |
3418 | ac_check_lib_save_LIBS=$LIBS | |
3419 | LIBS="-lldap -llber -lresolv $LIBS $LIBS" | |
3420 | @@ -4735,33 +4869,37 @@ case "(($ac_try" in | |
3421 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3422 | *) ac_try_echo=$ac_try;; | |
3423 | esac | |
3424 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3425 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3426 | +$as_echo "$ac_try_echo") >&5 | |
3427 | (eval "$ac_link") 2>conftest.er1 | |
3428 | ac_status=$? | |
3429 | grep -v '^ *+' conftest.er1 >conftest.err | |
3430 | rm -f conftest.er1 | |
3431 | cat conftest.err >&5 | |
3432 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3433 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3434 | (exit $ac_status); } && { | |
3435 | test -z "$ac_c_werror_flag" || | |
3436 | test ! -s conftest.err | |
3437 | - } && test -s conftest$ac_exeext && | |
3438 | - $as_test_x conftest$ac_exeext; then | |
3439 | + } && test -s conftest$ac_exeext && { | |
3440 | + test "$cross_compiling" = yes || | |
3441 | + $as_test_x conftest$ac_exeext | |
3442 | + }; then | |
3443 | ac_cv_lib_ldap_ldap_initialize=yes | |
3444 | else | |
3445 | - echo "$as_me: failed program was:" >&5 | |
3446 | + $as_echo "$as_me: failed program was:" >&5 | |
3447 | sed 's/^/| /' conftest.$ac_ext >&5 | |
3448 | ||
3449 | ac_cv_lib_ldap_ldap_initialize=no | |
3450 | fi | |
3451 | ||
3452 | +rm -rf conftest.dSYM | |
3453 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
3454 | conftest$ac_exeext conftest.$ac_ext | |
3455 | LIBS=$ac_check_lib_save_LIBS | |
3456 | fi | |
3457 | -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5 | |
3458 | -echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6; } | |
3459 | -if test $ac_cv_lib_ldap_ldap_initialize = yes; then | |
3460 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5 | |
3461 | +$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; } | |
3462 | +if test "x$ac_cv_lib_ldap_ldap_initialize" = x""yes; then | |
3463 | HAVE_LDAP=1 LIBLDAP="$LIBLDAP -lldap -llber -lresolv" | |
3464 | fi | |
3465 | ||
3466 | @@ -4772,8 +4910,8 @@ cat >>confdefs.h <<\_ACEOF | |
3467 | _ACEOF | |
3468 | ||
3469 | fi | |
3470 | - { echo "$as_me:$LINENO: checking for ldap_create_page_control in -lldap" >&5 | |
3471 | -echo $ECHO_N "checking for ldap_create_page_control in -lldap... $ECHO_C" >&6; } | |
3472 | + { $as_echo "$as_me:$LINENO: checking for ldap_create_page_control in -lldap" >&5 | |
3473 | +$as_echo_n "checking for ldap_create_page_control in -lldap... " >&6; } | |
3474 | ||
3475 | # save current libs | |
3476 | af_check_ldap_create_page_control_save_libs="$LIBS" | |
3477 | @@ -4805,29 +4943,33 @@ case "(($ac_try" in | |
3478 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3479 | *) ac_try_echo=$ac_try;; | |
3480 | esac | |
3481 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3482 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3483 | +$as_echo "$ac_try_echo") >&5 | |
3484 | (eval "$ac_link") 2>conftest.er1 | |
3485 | ac_status=$? | |
3486 | grep -v '^ *+' conftest.er1 >conftest.err | |
3487 | rm -f conftest.er1 | |
3488 | cat conftest.err >&5 | |
3489 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3490 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3491 | (exit $ac_status); } && { | |
3492 | test -z "$ac_c_werror_flag" || | |
3493 | test ! -s conftest.err | |
3494 | - } && test -s conftest$ac_exeext && | |
3495 | - $as_test_x conftest$ac_exeext; then | |
3496 | + } && test -s conftest$ac_exeext && { | |
3497 | + test "$cross_compiling" = yes || | |
3498 | + $as_test_x conftest$ac_exeext | |
3499 | + }; then | |
3500 | af_have_ldap_create_page_control=yes | |
3501 | - { echo "$as_me:$LINENO: result: yes" >&5 | |
3502 | -echo "${ECHO_T}yes" >&6; } | |
3503 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 | |
3504 | +$as_echo "yes" >&6; } | |
3505 | else | |
3506 | - echo "$as_me: failed program was:" >&5 | |
3507 | + $as_echo "$as_me: failed program was:" >&5 | |
3508 | sed 's/^/| /' conftest.$ac_ext >&5 | |
3509 | ||
3510 | - { echo "$as_me:$LINENO: result: no" >&5 | |
3511 | -echo "${ECHO_T}no" >&6; } | |
3512 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
3513 | +$as_echo "no" >&6; } | |
3514 | fi | |
3515 | ||
3516 | +rm -rf conftest.dSYM | |
3517 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
3518 | conftest$ac_exeext conftest.$ac_ext | |
3519 | ||
3520 | @@ -4842,8 +4984,8 @@ fi | |
3521 | # restore libs | |
3522 | LIBS="$af_check_ldap_create_page_control_save_libs" | |
3523 | ||
3524 | - { echo "$as_me:$LINENO: checking for ldap_parse_page_control in -lldap" >&5 | |
3525 | -echo $ECHO_N "checking for ldap_parse_page_control in -lldap... $ECHO_C" >&6; } | |
3526 | + { $as_echo "$as_me:$LINENO: checking for ldap_parse_page_control in -lldap" >&5 | |
3527 | +$as_echo_n "checking for ldap_parse_page_control in -lldap... " >&6; } | |
3528 | ||
3529 | # save current libs | |
3530 | af_check_ldap_parse_page_control_save_libs="$LIBS" | |
3531 | @@ -4875,29 +5017,33 @@ case "(($ac_try" in | |
3532 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3533 | *) ac_try_echo=$ac_try;; | |
3534 | esac | |
3535 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3536 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3537 | +$as_echo "$ac_try_echo") >&5 | |
3538 | (eval "$ac_link") 2>conftest.er1 | |
3539 | ac_status=$? | |
3540 | grep -v '^ *+' conftest.er1 >conftest.err | |
3541 | rm -f conftest.er1 | |
3542 | cat conftest.err >&5 | |
3543 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3544 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3545 | (exit $ac_status); } && { | |
3546 | test -z "$ac_c_werror_flag" || | |
3547 | test ! -s conftest.err | |
3548 | - } && test -s conftest$ac_exeext && | |
3549 | - $as_test_x conftest$ac_exeext; then | |
3550 | + } && test -s conftest$ac_exeext && { | |
3551 | + test "$cross_compiling" = yes || | |
3552 | + $as_test_x conftest$ac_exeext | |
3553 | + }; then | |
3554 | af_have_ldap_parse_page_control=yes | |
3555 | - { echo "$as_me:$LINENO: result: yes" >&5 | |
3556 | -echo "${ECHO_T}yes" >&6; } | |
3557 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 | |
3558 | +$as_echo "yes" >&6; } | |
3559 | else | |
3560 | - echo "$as_me: failed program was:" >&5 | |
3561 | + $as_echo "$as_me: failed program was:" >&5 | |
3562 | sed 's/^/| /' conftest.$ac_ext >&5 | |
3563 | ||
3564 | - { echo "$as_me:$LINENO: result: no" >&5 | |
3565 | -echo "${ECHO_T}no" >&6; } | |
3566 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
3567 | +$as_echo "no" >&6; } | |
3568 | fi | |
3569 | ||
3570 | +rm -rf conftest.dSYM | |
3571 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
3572 | conftest$ac_exeext conftest.$ac_ext | |
3573 | ||
3574 | @@ -4949,10 +5095,10 @@ fi | |
3575 | if test -z "$HAVE_SASL" -o "$HAVE_SASL" != "0" -a "$HAVE_LIBXML" == "1" | |
3576 | then | |
3577 | HAVE_SASL=0 | |
3578 | - { echo "$as_me:$LINENO: checking for sasl_client_start in -lsasl2" >&5 | |
3579 | -echo $ECHO_N "checking for sasl_client_start in -lsasl2... $ECHO_C" >&6; } | |
3580 | + { $as_echo "$as_me:$LINENO: checking for sasl_client_start in -lsasl2" >&5 | |
3581 | +$as_echo_n "checking for sasl_client_start in -lsasl2... " >&6; } | |
3582 | if test "${ac_cv_lib_sasl2_sasl_client_start+set}" = set; then | |
3583 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3584 | + $as_echo_n "(cached) " >&6 | |
3585 | else | |
3586 | ac_check_lib_save_LIBS=$LIBS | |
3587 | LIBS="-lsasl2 -lsasl2 $LIBS $LIBS" | |
3588 | @@ -4984,33 +5130,37 @@ case "(($ac_try" in | |
3589 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3590 | *) ac_try_echo=$ac_try;; | |
3591 | esac | |
3592 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3593 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3594 | +$as_echo "$ac_try_echo") >&5 | |
3595 | (eval "$ac_link") 2>conftest.er1 | |
3596 | ac_status=$? | |
3597 | grep -v '^ *+' conftest.er1 >conftest.err | |
3598 | rm -f conftest.er1 | |
3599 | cat conftest.err >&5 | |
3600 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3601 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3602 | (exit $ac_status); } && { | |
3603 | test -z "$ac_c_werror_flag" || | |
3604 | test ! -s conftest.err | |
3605 | - } && test -s conftest$ac_exeext && | |
3606 | - $as_test_x conftest$ac_exeext; then | |
3607 | + } && test -s conftest$ac_exeext && { | |
3608 | + test "$cross_compiling" = yes || | |
3609 | + $as_test_x conftest$ac_exeext | |
3610 | + }; then | |
3611 | ac_cv_lib_sasl2_sasl_client_start=yes | |
3612 | else | |
3613 | - echo "$as_me: failed program was:" >&5 | |
3614 | + $as_echo "$as_me: failed program was:" >&5 | |
3615 | sed 's/^/| /' conftest.$ac_ext >&5 | |
3616 | ||
3617 | ac_cv_lib_sasl2_sasl_client_start=no | |
3618 | fi | |
3619 | ||
3620 | +rm -rf conftest.dSYM | |
3621 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
3622 | conftest$ac_exeext conftest.$ac_ext | |
3623 | LIBS=$ac_check_lib_save_LIBS | |
3624 | fi | |
3625 | -{ echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_client_start" >&5 | |
3626 | -echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_client_start" >&6; } | |
3627 | -if test $ac_cv_lib_sasl2_sasl_client_start = yes; then | |
3628 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_client_start" >&5 | |
3629 | +$as_echo "$ac_cv_lib_sasl2_sasl_client_start" >&6; } | |
3630 | +if test "x$ac_cv_lib_sasl2_sasl_client_start" = x""yes; then | |
3631 | HAVE_SASL=1 LIBSASL="$LIBSASL -lsasl2" | |
3632 | fi | |
3633 | ||
3634 | @@ -5041,10 +5191,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
3635 | if test -n "$ac_tool_prefix"; then | |
3636 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | |
3637 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 | |
3638 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
3639 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
3640 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
3641 | +$as_echo_n "checking for $ac_word... " >&6; } | |
3642 | if test "${ac_cv_prog_CC+set}" = set; then | |
3643 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3644 | + $as_echo_n "(cached) " >&6 | |
3645 | else | |
3646 | if test -n "$CC"; then | |
3647 | ac_cv_prog_CC="$CC" # Let the user override the test. | |
3648 | @@ -5057,7 +5207,7 @@ do | |
3649 | for ac_exec_ext in '' $ac_executable_extensions; do | |
3650 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
3651 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | |
3652 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
3653 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
3654 | break 2 | |
3655 | fi | |
3656 | done | |
3657 | @@ -5068,11 +5218,11 @@ fi | |
3658 | fi | |
3659 | CC=$ac_cv_prog_CC | |
3660 | if test -n "$CC"; then | |
3661 | - { echo "$as_me:$LINENO: result: $CC" >&5 | |
3662 | -echo "${ECHO_T}$CC" >&6; } | |
3663 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 | |
3664 | +$as_echo "$CC" >&6; } | |
3665 | else | |
3666 | - { echo "$as_me:$LINENO: result: no" >&5 | |
3667 | -echo "${ECHO_T}no" >&6; } | |
3668 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
3669 | +$as_echo "no" >&6; } | |
3670 | fi | |
3671 | ||
3672 | ||
3673 | @@ -5081,10 +5231,10 @@ if test -z "$ac_cv_prog_CC"; then | |
3674 | ac_ct_CC=$CC | |
3675 | # Extract the first word of "gcc", so it can be a program name with args. | |
3676 | set dummy gcc; ac_word=$2 | |
3677 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
3678 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
3679 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
3680 | +$as_echo_n "checking for $ac_word... " >&6; } | |
3681 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | |
3682 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3683 | + $as_echo_n "(cached) " >&6 | |
3684 | else | |
3685 | if test -n "$ac_ct_CC"; then | |
3686 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | |
3687 | @@ -5097,7 +5247,7 @@ do | |
3688 | for ac_exec_ext in '' $ac_executable_extensions; do | |
3689 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
3690 | ac_cv_prog_ac_ct_CC="gcc" | |
3691 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
3692 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
3693 | break 2 | |
3694 | fi | |
3695 | done | |
3696 | @@ -5108,11 +5258,11 @@ fi | |
3697 | fi | |
3698 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | |
3699 | if test -n "$ac_ct_CC"; then | |
3700 | - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
3701 | -echo "${ECHO_T}$ac_ct_CC" >&6; } | |
3702 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
3703 | +$as_echo "$ac_ct_CC" >&6; } | |
3704 | else | |
3705 | - { echo "$as_me:$LINENO: result: no" >&5 | |
3706 | -echo "${ECHO_T}no" >&6; } | |
3707 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
3708 | +$as_echo "no" >&6; } | |
3709 | fi | |
3710 | ||
3711 | if test "x$ac_ct_CC" = x; then | |
3712 | @@ -5120,12 +5270,8 @@ fi | |
3713 | else | |
3714 | case $cross_compiling:$ac_tool_warned in | |
3715 | yes:) | |
3716 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
3717 | -whose name does not start with the host triplet. If you think this | |
3718 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
3719 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
3720 | -whose name does not start with the host triplet. If you think this | |
3721 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
3722 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | |
3723 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | |
3724 | ac_tool_warned=yes ;; | |
3725 | esac | |
3726 | CC=$ac_ct_CC | |
3727 | @@ -5138,10 +5284,10 @@ if test -z "$CC"; then | |
3728 | if test -n "$ac_tool_prefix"; then | |
3729 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | |
3730 | set dummy ${ac_tool_prefix}cc; ac_word=$2 | |
3731 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
3732 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
3733 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
3734 | +$as_echo_n "checking for $ac_word... " >&6; } | |
3735 | if test "${ac_cv_prog_CC+set}" = set; then | |
3736 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3737 | + $as_echo_n "(cached) " >&6 | |
3738 | else | |
3739 | if test -n "$CC"; then | |
3740 | ac_cv_prog_CC="$CC" # Let the user override the test. | |
3741 | @@ -5154,7 +5300,7 @@ do | |
3742 | for ac_exec_ext in '' $ac_executable_extensions; do | |
3743 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
3744 | ac_cv_prog_CC="${ac_tool_prefix}cc" | |
3745 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
3746 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
3747 | break 2 | |
3748 | fi | |
3749 | done | |
3750 | @@ -5165,11 +5311,11 @@ fi | |
3751 | fi | |
3752 | CC=$ac_cv_prog_CC | |
3753 | if test -n "$CC"; then | |
3754 | - { echo "$as_me:$LINENO: result: $CC" >&5 | |
3755 | -echo "${ECHO_T}$CC" >&6; } | |
3756 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 | |
3757 | +$as_echo "$CC" >&6; } | |
3758 | else | |
3759 | - { echo "$as_me:$LINENO: result: no" >&5 | |
3760 | -echo "${ECHO_T}no" >&6; } | |
3761 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
3762 | +$as_echo "no" >&6; } | |
3763 | fi | |
3764 | ||
3765 | ||
3766 | @@ -5178,10 +5324,10 @@ fi | |
3767 | if test -z "$CC"; then | |
3768 | # Extract the first word of "cc", so it can be a program name with args. | |
3769 | set dummy cc; ac_word=$2 | |
3770 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
3771 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
3772 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
3773 | +$as_echo_n "checking for $ac_word... " >&6; } | |
3774 | if test "${ac_cv_prog_CC+set}" = set; then | |
3775 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3776 | + $as_echo_n "(cached) " >&6 | |
3777 | else | |
3778 | if test -n "$CC"; then | |
3779 | ac_cv_prog_CC="$CC" # Let the user override the test. | |
3780 | @@ -5199,7 +5345,7 @@ do | |
3781 | continue | |
3782 | fi | |
3783 | ac_cv_prog_CC="cc" | |
3784 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
3785 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
3786 | break 2 | |
3787 | fi | |
3788 | done | |
3789 | @@ -5222,11 +5368,11 @@ fi | |
3790 | fi | |
3791 | CC=$ac_cv_prog_CC | |
3792 | if test -n "$CC"; then | |
3793 | - { echo "$as_me:$LINENO: result: $CC" >&5 | |
3794 | -echo "${ECHO_T}$CC" >&6; } | |
3795 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 | |
3796 | +$as_echo "$CC" >&6; } | |
3797 | else | |
3798 | - { echo "$as_me:$LINENO: result: no" >&5 | |
3799 | -echo "${ECHO_T}no" >&6; } | |
3800 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
3801 | +$as_echo "no" >&6; } | |
3802 | fi | |
3803 | ||
3804 | ||
3805 | @@ -5237,10 +5383,10 @@ if test -z "$CC"; then | |
3806 | do | |
3807 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | |
3808 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | |
3809 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
3810 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
3811 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
3812 | +$as_echo_n "checking for $ac_word... " >&6; } | |
3813 | if test "${ac_cv_prog_CC+set}" = set; then | |
3814 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3815 | + $as_echo_n "(cached) " >&6 | |
3816 | else | |
3817 | if test -n "$CC"; then | |
3818 | ac_cv_prog_CC="$CC" # Let the user override the test. | |
3819 | @@ -5253,7 +5399,7 @@ do | |
3820 | for ac_exec_ext in '' $ac_executable_extensions; do | |
3821 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
3822 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | |
3823 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
3824 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
3825 | break 2 | |
3826 | fi | |
3827 | done | |
3828 | @@ -5264,11 +5410,11 @@ fi | |
3829 | fi | |
3830 | CC=$ac_cv_prog_CC | |
3831 | if test -n "$CC"; then | |
3832 | - { echo "$as_me:$LINENO: result: $CC" >&5 | |
3833 | -echo "${ECHO_T}$CC" >&6; } | |
3834 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 | |
3835 | +$as_echo "$CC" >&6; } | |
3836 | else | |
3837 | - { echo "$as_me:$LINENO: result: no" >&5 | |
3838 | -echo "${ECHO_T}no" >&6; } | |
3839 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
3840 | +$as_echo "no" >&6; } | |
3841 | fi | |
3842 | ||
3843 | ||
3844 | @@ -5281,10 +5427,10 @@ if test -z "$CC"; then | |
3845 | do | |
3846 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
3847 | set dummy $ac_prog; ac_word=$2 | |
3848 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
3849 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
3850 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
3851 | +$as_echo_n "checking for $ac_word... " >&6; } | |
3852 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | |
3853 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3854 | + $as_echo_n "(cached) " >&6 | |
3855 | else | |
3856 | if test -n "$ac_ct_CC"; then | |
3857 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | |
3858 | @@ -5297,7 +5443,7 @@ do | |
3859 | for ac_exec_ext in '' $ac_executable_extensions; do | |
3860 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
3861 | ac_cv_prog_ac_ct_CC="$ac_prog" | |
3862 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
3863 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
3864 | break 2 | |
3865 | fi | |
3866 | done | |
3867 | @@ -5308,11 +5454,11 @@ fi | |
3868 | fi | |
3869 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | |
3870 | if test -n "$ac_ct_CC"; then | |
3871 | - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
3872 | -echo "${ECHO_T}$ac_ct_CC" >&6; } | |
3873 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
3874 | +$as_echo "$ac_ct_CC" >&6; } | |
3875 | else | |
3876 | - { echo "$as_me:$LINENO: result: no" >&5 | |
3877 | -echo "${ECHO_T}no" >&6; } | |
3878 | + { $as_echo "$as_me:$LINENO: result: no" >&5 | |
3879 | +$as_echo "no" >&6; } | |
3880 | fi | |
3881 | ||
3882 | ||
3883 | @@ -5324,12 +5470,8 @@ done | |
3884 | else | |
3885 | case $cross_compiling:$ac_tool_warned in | |
3886 | yes:) | |
3887 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
3888 | -whose name does not start with the host triplet. If you think this | |
3889 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
3890 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
3891 | -whose name does not start with the host triplet. If you think this | |
3892 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
3893 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 | |
3894 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | |
3895 | ac_tool_warned=yes ;; | |
3896 | esac | |
3897 | CC=$ac_ct_CC | |
3898 | @@ -5339,50 +5481,56 @@ fi | |
3899 | fi | |
3900 | ||
3901 | ||
3902 | -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH | |
3903 | +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | |
3904 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
3905 | +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH | |
3906 | See \`config.log' for more details." >&5 | |
3907 | -echo "$as_me: error: no acceptable C compiler found in \$PATH | |
3908 | +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH | |
3909 | See \`config.log' for more details." >&2;} | |
3910 | - { (exit 1); exit 1; }; } | |
3911 | + { (exit 1); exit 1; }; }; } | |
3912 | ||
3913 | # Provide some information about the compiler. | |
3914 | -echo "$as_me:$LINENO: checking for C compiler version" >&5 | |
3915 | -ac_compiler=`set X $ac_compile; echo $2` | |
3916 | +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 | |
3917 | +set X $ac_compile | |
3918 | +ac_compiler=$2 | |
3919 | { (ac_try="$ac_compiler --version >&5" | |
3920 | case "(($ac_try" in | |
3921 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3922 | *) ac_try_echo=$ac_try;; | |
3923 | esac | |
3924 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3925 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3926 | +$as_echo "$ac_try_echo") >&5 | |
3927 | (eval "$ac_compiler --version >&5") 2>&5 | |
3928 | ac_status=$? | |
3929 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3930 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3931 | (exit $ac_status); } | |
3932 | { (ac_try="$ac_compiler -v >&5" | |
3933 | case "(($ac_try" in | |
3934 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3935 | *) ac_try_echo=$ac_try;; | |
3936 | esac | |
3937 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3938 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3939 | +$as_echo "$ac_try_echo") >&5 | |
3940 | (eval "$ac_compiler -v >&5") 2>&5 | |
3941 | ac_status=$? | |
3942 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3943 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3944 | (exit $ac_status); } | |
3945 | { (ac_try="$ac_compiler -V >&5" | |
3946 | case "(($ac_try" in | |
3947 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3948 | *) ac_try_echo=$ac_try;; | |
3949 | esac | |
3950 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3951 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3952 | +$as_echo "$ac_try_echo") >&5 | |
3953 | (eval "$ac_compiler -V >&5") 2>&5 | |
3954 | ac_status=$? | |
3955 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3956 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3957 | (exit $ac_status); } | |
3958 | ||
3959 | -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | |
3960 | -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } | |
3961 | +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | |
3962 | +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } | |
3963 | if test "${ac_cv_c_compiler_gnu+set}" = set; then | |
3964 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
3965 | + $as_echo_n "(cached) " >&6 | |
3966 | else | |
3967 | cat >conftest.$ac_ext <<_ACEOF | |
3968 | /* confdefs.h. */ | |
3969 | @@ -5408,20 +5556,21 @@ case "(($ac_try" in | |
3970 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
3971 | *) ac_try_echo=$ac_try;; | |
3972 | esac | |
3973 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
3974 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
3975 | +$as_echo "$ac_try_echo") >&5 | |
3976 | (eval "$ac_compile") 2>conftest.er1 | |
3977 | ac_status=$? | |
3978 | grep -v '^ *+' conftest.er1 >conftest.err | |
3979 | rm -f conftest.er1 | |
3980 | cat conftest.err >&5 | |
3981 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3982 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
3983 | (exit $ac_status); } && { | |
3984 | test -z "$ac_c_werror_flag" || | |
3985 | test ! -s conftest.err | |
3986 | } && test -s conftest.$ac_objext; then | |
3987 | ac_compiler_gnu=yes | |
3988 | else | |
3989 | - echo "$as_me: failed program was:" >&5 | |
3990 | + $as_echo "$as_me: failed program was:" >&5 | |
3991 | sed 's/^/| /' conftest.$ac_ext >&5 | |
3992 | ||
3993 | ac_compiler_gnu=no | |
3994 | @@ -5431,15 +5580,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
3995 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | |
3996 | ||
3997 | fi | |
3998 | -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | |
3999 | -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } | |
4000 | -GCC=`test $ac_compiler_gnu = yes && echo yes` | |
4001 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | |
4002 | +$as_echo "$ac_cv_c_compiler_gnu" >&6; } | |
4003 | +if test $ac_compiler_gnu = yes; then | |
4004 | + GCC=yes | |
4005 | +else | |
4006 | + GCC= | |
4007 | +fi | |
4008 | ac_test_CFLAGS=${CFLAGS+set} | |
4009 | ac_save_CFLAGS=$CFLAGS | |
4010 | -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | |
4011 | -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } | |
4012 | +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | |
4013 | +$as_echo_n "checking whether $CC accepts -g... " >&6; } | |
4014 | if test "${ac_cv_prog_cc_g+set}" = set; then | |
4015 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
4016 | + $as_echo_n "(cached) " >&6 | |
4017 | else | |
4018 | ac_save_c_werror_flag=$ac_c_werror_flag | |
4019 | ac_c_werror_flag=yes | |
4020 | @@ -5466,20 +5619,21 @@ case "(($ac_try" in | |
4021 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
4022 | *) ac_try_echo=$ac_try;; | |
4023 | esac | |
4024 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
4025 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
4026 | +$as_echo "$ac_try_echo") >&5 | |
4027 | (eval "$ac_compile") 2>conftest.er1 | |
4028 | ac_status=$? | |
4029 | grep -v '^ *+' conftest.er1 >conftest.err | |
4030 | rm -f conftest.er1 | |
4031 | cat conftest.err >&5 | |
4032 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
4033 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
4034 | (exit $ac_status); } && { | |
4035 | test -z "$ac_c_werror_flag" || | |
4036 | test ! -s conftest.err | |
4037 | } && test -s conftest.$ac_objext; then | |
4038 | ac_cv_prog_cc_g=yes | |
4039 | else | |
4040 | - echo "$as_me: failed program was:" >&5 | |
4041 | + $as_echo "$as_me: failed program was:" >&5 | |
4042 | sed 's/^/| /' conftest.$ac_ext >&5 | |
4043 | ||
4044 | CFLAGS="" | |
4045 | @@ -5504,20 +5658,21 @@ case "(($ac_try" in | |
4046 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
4047 | *) ac_try_echo=$ac_try;; | |
4048 | esac | |
4049 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
4050 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
4051 | +$as_echo "$ac_try_echo") >&5 | |
4052 | (eval "$ac_compile") 2>conftest.er1 | |
4053 | ac_status=$? | |
4054 | grep -v '^ *+' conftest.er1 >conftest.err | |
4055 | rm -f conftest.er1 | |
4056 | cat conftest.err >&5 | |
4057 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
4058 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
4059 | (exit $ac_status); } && { | |
4060 | test -z "$ac_c_werror_flag" || | |
4061 | test ! -s conftest.err | |
4062 | } && test -s conftest.$ac_objext; then | |
4063 | : | |
4064 | else | |
4065 | - echo "$as_me: failed program was:" >&5 | |
4066 | + $as_echo "$as_me: failed program was:" >&5 | |
4067 | sed 's/^/| /' conftest.$ac_ext >&5 | |
4068 | ||
4069 | ac_c_werror_flag=$ac_save_c_werror_flag | |
4070 | @@ -5543,20 +5698,21 @@ case "(($ac_try" in | |
4071 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
4072 | *) ac_try_echo=$ac_try;; | |
4073 | esac | |
4074 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
4075 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
4076 | +$as_echo "$ac_try_echo") >&5 | |
4077 | (eval "$ac_compile") 2>conftest.er1 | |
4078 | ac_status=$? | |
4079 | grep -v '^ *+' conftest.er1 >conftest.err | |
4080 | rm -f conftest.er1 | |
4081 | cat conftest.err >&5 | |
4082 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
4083 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
4084 | (exit $ac_status); } && { | |
4085 | test -z "$ac_c_werror_flag" || | |
4086 | test ! -s conftest.err | |
4087 | } && test -s conftest.$ac_objext; then | |
4088 | ac_cv_prog_cc_g=yes | |
4089 | else | |
4090 | - echo "$as_me: failed program was:" >&5 | |
4091 | + $as_echo "$as_me: failed program was:" >&5 | |
4092 | sed 's/^/| /' conftest.$ac_ext >&5 | |
4093 | ||
4094 | ||
4095 | @@ -5571,8 +5727,8 @@ fi | |
4096 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
4097 | ac_c_werror_flag=$ac_save_c_werror_flag | |
4098 | fi | |
4099 | -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | |
4100 | -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } | |
4101 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | |
4102 | +$as_echo "$ac_cv_prog_cc_g" >&6; } | |
4103 | if test "$ac_test_CFLAGS" = set; then | |
4104 | CFLAGS=$ac_save_CFLAGS | |
4105 | elif test $ac_cv_prog_cc_g = yes; then | |
4106 | @@ -5588,10 +5744,10 @@ else | |
4107 | CFLAGS= | |
4108 | fi | |
4109 | fi | |
4110 | -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | |
4111 | -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } | |
4112 | +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | |
4113 | +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } | |
4114 | if test "${ac_cv_prog_cc_c89+set}" = set; then | |
4115 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
4116 | + $as_echo_n "(cached) " >&6 | |
4117 | else | |
4118 | ac_cv_prog_cc_c89=no | |
4119 | ac_save_CC=$CC | |
4120 | @@ -5662,20 +5818,21 @@ case "(($ac_try" in | |
4121 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
4122 | *) ac_try_echo=$ac_try;; | |
4123 | esac | |
4124 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
4125 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
4126 | +$as_echo "$ac_try_echo") >&5 | |
4127 | (eval "$ac_compile") 2>conftest.er1 | |
4128 | ac_status=$? | |
4129 | grep -v '^ *+' conftest.er1 >conftest.err | |
4130 | rm -f conftest.er1 | |
4131 | cat conftest.err >&5 | |
4132 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
4133 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
4134 | (exit $ac_status); } && { | |
4135 | test -z "$ac_c_werror_flag" || | |
4136 | test ! -s conftest.err | |
4137 | } && test -s conftest.$ac_objext; then | |
4138 | ac_cv_prog_cc_c89=$ac_arg | |
4139 | else | |
4140 | - echo "$as_me: failed program was:" >&5 | |
4141 | + $as_echo "$as_me: failed program was:" >&5 | |
4142 | sed 's/^/| /' conftest.$ac_ext >&5 | |
4143 | ||
4144 | ||
4145 | @@ -5691,15 +5848,15 @@ fi | |
4146 | # AC_CACHE_VAL | |
4147 | case "x$ac_cv_prog_cc_c89" in | |
4148 | x) | |
4149 | - { echo "$as_me:$LINENO: result: none needed" >&5 | |
4150 | -echo "${ECHO_T}none needed" >&6; } ;; | |
4151 | + { $as_echo "$as_me:$LINENO: result: none needed" >&5 | |
4152 | +$as_echo "none needed" >&6; } ;; | |
4153 | xno) | |
4154 | - { echo "$as_me:$LINENO: result: unsupported" >&5 | |
4155 | -echo "${ECHO_T}unsupported" >&6; } ;; | |
4156 | + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 | |
4157 | +$as_echo "unsupported" >&6; } ;; | |
4158 | *) | |
4159 | CC="$CC $ac_cv_prog_cc_c89" | |
4160 | - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | |
4161 | -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; | |
4162 | + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | |
4163 | +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; | |
4164 | esac | |
4165 | ||
4166 | ||
4167 | @@ -5716,14 +5873,16 @@ CFLAGS=-fPIE | |
4168 | LDFLAGS=-pie | |
4169 | DAEMON_CFLAGS= | |
4170 | DAEMON_LDFLAGS= | |
4171 | -{ echo "$as_me:$LINENO: checking whether gcc -fPIE works" >&5 | |
4172 | -echo $ECHO_N "checking whether gcc -fPIE works... $ECHO_C" >&6; } | |
4173 | +{ $as_echo "$as_me:$LINENO: checking whether gcc -fPIE works" >&5 | |
4174 | +$as_echo_n "checking whether gcc -fPIE works... " >&6; } | |
4175 | if test "$cross_compiling" = yes; then | |
4176 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling | |
4177 | + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | |
4178 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
4179 | +{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling | |
4180 | See \`config.log' for more details." >&5 | |
4181 | -echo "$as_me: error: cannot run test program while cross compiling | |
4182 | +$as_echo "$as_me: error: cannot run test program while cross compiling | |
4183 | See \`config.log' for more details." >&2;} | |
4184 | - { (exit 1); exit 1; }; } | |
4185 | + { (exit 1); exit 1; }; }; } | |
4186 | else | |
4187 | cat >conftest.$ac_ext <<_ACEOF | |
4188 | /* confdefs.h. */ | |
4189 | @@ -5746,35 +5905,38 @@ case "(($ac_try" in | |
4190 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
4191 | *) ac_try_echo=$ac_try;; | |
4192 | esac | |
4193 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
4194 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
4195 | +$as_echo "$ac_try_echo") >&5 | |
4196 | (eval "$ac_link") 2>&5 | |
4197 | ac_status=$? | |
4198 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
4199 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
4200 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | |
4201 | { (case "(($ac_try" in | |
4202 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
4203 | *) ac_try_echo=$ac_try;; | |
4204 | esac | |
4205 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
4206 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
4207 | +$as_echo "$ac_try_echo") >&5 | |
4208 | (eval "$ac_try") 2>&5 | |
4209 | ac_status=$? | |
4210 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
4211 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
4212 | (exit $ac_status); }; }; then | |
4213 | gcc_supports_pie=yes | |
4214 | else | |
4215 | - echo "$as_me: program exited with status $ac_status" >&5 | |
4216 | -echo "$as_me: failed program was:" >&5 | |
4217 | + $as_echo "$as_me: program exited with status $ac_status" >&5 | |
4218 | +$as_echo "$as_me: failed program was:" >&5 | |
4219 | sed 's/^/| /' conftest.$ac_ext >&5 | |
4220 | ||
4221 | ( exit $ac_status ) | |
4222 | gcc_supports_pie=no | |
4223 | fi | |
4224 | +rm -rf conftest.dSYM | |
4225 | rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
4226 | fi | |
4227 | ||
4228 | ||
4229 | -{ echo "$as_me:$LINENO: result: $gcc_supports_pie" >&5 | |
4230 | -echo "${ECHO_T}$gcc_supports_pie" >&6; } | |
4231 | +{ $as_echo "$as_me:$LINENO: result: $gcc_supports_pie" >&5 | |
4232 | +$as_echo "$gcc_supports_pie" >&6; } | |
4233 | if test $gcc_supports_pie = yes ; then | |
4234 | DAEMON_CFLAGS="-fPIE" | |
4235 | DAEMON_LDFLAGS="-pie" | |
4236 | @@ -5875,7 +6037,7 @@ ac_ltlibobjs= | |
4237 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue | |
4238 | # 1. Remove the extension, and $U if already installed. | |
4239 | ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' | |
4240 | - ac_i=`echo "$ac_i" | sed "$ac_script"` | |
4241 | + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` | |
4242 | # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR | |
4243 | # will be set to the directory where LIBOBJS objects are built. | |
4244 | ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" | |
4245 | @@ -5888,11 +6050,12 @@ LTLIBOBJS=$ac_ltlibobjs | |
4246 | ||
4247 | ||
4248 | : ${CONFIG_STATUS=./config.status} | |
4249 | +ac_write_fail=0 | |
4250 | ac_clean_files_save=$ac_clean_files | |
4251 | ac_clean_files="$ac_clean_files $CONFIG_STATUS" | |
4252 | -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 | |
4253 | -echo "$as_me: creating $CONFIG_STATUS" >&6;} | |
4254 | -cat >$CONFIG_STATUS <<_ACEOF | |
4255 | +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 | |
4256 | +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} | |
4257 | +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |
4258 | #! $SHELL | |
4259 | # Generated by $as_me. | |
4260 | # Run this file to recreate the current configuration. | |
4261 | @@ -5905,7 +6068,7 @@ ac_cs_silent=false | |
4262 | SHELL=\${CONFIG_SHELL-$SHELL} | |
4263 | _ACEOF | |
4264 | ||
4265 | -cat >>$CONFIG_STATUS <<\_ACEOF | |
4266 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |
4267 | ## --------------------- ## | |
4268 | ## M4sh Initialization. ## | |
4269 | ## --------------------- ## | |
4270 | @@ -5915,7 +6078,7 @@ DUALCASE=1; export DUALCASE # for MKS sh | |
4271 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
4272 | emulate sh | |
4273 | NULLCMD=: | |
4274 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | |
4275 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which | |
4276 | # is contrary to our usage. Disable this feature. | |
4277 | alias -g '${1+"$@"}'='"$@"' | |
4278 | setopt NO_GLOB_SUBST | |
4279 | @@ -5937,17 +6100,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS | |
4280 | as_cr_digits='0123456789' | |
4281 | as_cr_alnum=$as_cr_Letters$as_cr_digits | |
4282 | ||
4283 | -# The user is always right. | |
4284 | -if test "${PATH_SEPARATOR+set}" != set; then | |
4285 | - echo "#! /bin/sh" >conf$$.sh | |
4286 | - echo "exit 0" >>conf$$.sh | |
4287 | - chmod +x conf$$.sh | |
4288 | - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | |
4289 | - PATH_SEPARATOR=';' | |
4290 | +as_nl=' | |
4291 | +' | |
4292 | +export as_nl | |
4293 | +# Printing a long string crashes Solaris 7 /usr/bin/printf. | |
4294 | +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' | |
4295 | +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo | |
4296 | +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo | |
4297 | +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then | |
4298 | + as_echo='printf %s\n' | |
4299 | + as_echo_n='printf %s' | |
4300 | +else | |
4301 | + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then | |
4302 | + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' | |
4303 | + as_echo_n='/usr/ucb/echo -n' | |
4304 | else | |
4305 | - PATH_SEPARATOR=: | |
4306 | + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' | |
4307 | + as_echo_n_body='eval | |
4308 | + arg=$1; | |
4309 | + case $arg in | |
4310 | + *"$as_nl"*) | |
4311 | + expr "X$arg" : "X\\(.*\\)$as_nl"; | |
4312 | + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; | |
4313 | + esac; | |
4314 | + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" | |
4315 | + ' | |
4316 | + export as_echo_n_body | |
4317 | + as_echo_n='sh -c $as_echo_n_body as_echo' | |
4318 | fi | |
4319 | - rm -f conf$$.sh | |
4320 | + export as_echo_body | |
4321 | + as_echo='sh -c $as_echo_body as_echo' | |
4322 | +fi | |
4323 | + | |
4324 | +# The user is always right. | |
4325 | +if test "${PATH_SEPARATOR+set}" != set; then | |
4326 | + PATH_SEPARATOR=: | |
4327 | + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { | |
4328 | + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || | |
4329 | + PATH_SEPARATOR=';' | |
4330 | + } | |
4331 | fi | |
4332 | ||
4333 | # Support unset when possible. | |
4334 | @@ -5963,8 +6154,6 @@ fi | |
4335 | # there to prevent editors from complaining about space-tab. | |
4336 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word | |
4337 | # splitting by setting IFS to empty value.) | |
4338 | -as_nl=' | |
4339 | -' | |
4340 | IFS=" "" $as_nl" | |
4341 | ||
4342 | # Find who we are. Look in the path if we contain no directory separator. | |
4343 | @@ -5987,7 +6176,7 @@ if test "x$as_myself" = x; then | |
4344 | as_myself=$0 | |
4345 | fi | |
4346 | if test ! -f "$as_myself"; then | |
4347 | - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | |
4348 | + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | |
4349 | { (exit 1); exit 1; } | |
4350 | fi | |
4351 | ||
4352 | @@ -6000,17 +6189,10 @@ PS2='> ' | |
4353 | PS4='+ ' | |
4354 | ||
4355 | # NLS nuisances. | |
4356 | -for as_var in \ | |
4357 | - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ | |
4358 | - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | |
4359 | - LC_TELEPHONE LC_TIME | |
4360 | -do | |
4361 | - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | |
4362 | - eval $as_var=C; export $as_var | |
4363 | - else | |
4364 | - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | |
4365 | - fi | |
4366 | -done | |
4367 | +LC_ALL=C | |
4368 | +export LC_ALL | |
4369 | +LANGUAGE=C | |
4370 | +export LANGUAGE | |
4371 | ||
4372 | # Required to use basename. | |
4373 | if expr a : '\(a\)' >/dev/null 2>&1 && | |
4374 | @@ -6032,7 +6214,7 @@ as_me=`$as_basename -- "$0" || | |
4375 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | |
4376 | X"$0" : 'X\(//\)$' \| \ | |
4377 | X"$0" : 'X\(/\)' \| . 2>/dev/null || | |
4378 | -echo X/"$0" | | |
4379 | +$as_echo X/"$0" | | |
4380 | sed '/^.*\/\([^/][^/]*\)\/*$/{ | |
4381 | s//\1/ | |
4382 | q | |
4383 | @@ -6083,7 +6265,7 @@ $as_unset CDPATH | |
4384 | s/-\n.*// | |
4385 | ' >$as_me.lineno && | |
4386 | chmod +x "$as_me.lineno" || | |
4387 | - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | |
4388 | + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | |
4389 | { (exit 1); exit 1; }; } | |
4390 | ||
4391 | # Don't try to exec as it changes $[0], causing all sort of problems | |
4392 | @@ -6111,7 +6293,6 @@ case `echo -n x` in | |
4393 | *) | |
4394 | ECHO_N='-n';; | |
4395 | esac | |
4396 | - | |
4397 | if expr a : '\(a\)' >/dev/null 2>&1 && | |
4398 | test "X`expr 00001 : '.*\(...\)'`" = X001; then | |
4399 | as_expr=expr | |
4400 | @@ -6124,19 +6305,22 @@ if test -d conf$$.dir; then | |
4401 | rm -f conf$$.dir/conf$$.file | |
4402 | else | |
4403 | rm -f conf$$.dir | |
4404 | - mkdir conf$$.dir | |
4405 | -fi | |
4406 | -echo >conf$$.file | |
4407 | -if ln -s conf$$.file conf$$ 2>/dev/null; then | |
4408 | - as_ln_s='ln -s' | |
4409 | - # ... but there are two gotchas: | |
4410 | - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | |
4411 | - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | |
4412 | - # In both cases, we have to default to `cp -p'. | |
4413 | - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | |
4414 | + mkdir conf$$.dir 2>/dev/null | |
4415 | +fi | |
4416 | +if (echo >conf$$.file) 2>/dev/null; then | |
4417 | + if ln -s conf$$.file conf$$ 2>/dev/null; then | |
4418 | + as_ln_s='ln -s' | |
4419 | + # ... but there are two gotchas: | |
4420 | + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | |
4421 | + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | |
4422 | + # In both cases, we have to default to `cp -p'. | |
4423 | + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | |
4424 | + as_ln_s='cp -p' | |
4425 | + elif ln conf$$.file conf$$ 2>/dev/null; then | |
4426 | + as_ln_s=ln | |
4427 | + else | |
4428 | as_ln_s='cp -p' | |
4429 | -elif ln conf$$.file conf$$ 2>/dev/null; then | |
4430 | - as_ln_s=ln | |
4431 | + fi | |
4432 | else | |
4433 | as_ln_s='cp -p' | |
4434 | fi | |
4435 | @@ -6161,10 +6345,10 @@ else | |
4436 | as_test_x=' | |
4437 | eval sh -c '\'' | |
4438 | if test -d "$1"; then | |
4439 | - test -d "$1/."; | |
4440 | + test -d "$1/."; | |
4441 | else | |
4442 | case $1 in | |
4443 | - -*)set "./$1";; | |
4444 | + -*)set "./$1";; | |
4445 | esac; | |
4446 | case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | |
4447 | ???[sx]*):;;*)false;;esac;fi | |
4448 | @@ -6187,7 +6371,7 @@ exec 6>&1 | |
4449 | # values after options handling. | |
4450 | ac_log=" | |
4451 | This file was extended by $as_me, which was | |
4452 | -generated by GNU Autoconf 2.61. Invocation command line was | |
4453 | +generated by GNU Autoconf 2.63. Invocation command line was | |
4454 | ||
4455 | CONFIG_FILES = $CONFIG_FILES | |
4456 | CONFIG_HEADERS = $CONFIG_HEADERS | |
4457 | @@ -6200,29 +6384,39 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q` | |
4458 | ||
4459 | _ACEOF | |
4460 | ||
4461 | -cat >>$CONFIG_STATUS <<_ACEOF | |
4462 | +case $ac_config_files in *" | |
4463 | +"*) set x $ac_config_files; shift; ac_config_files=$*;; | |
4464 | +esac | |
4465 | + | |
4466 | +case $ac_config_headers in *" | |
4467 | +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; | |
4468 | +esac | |
4469 | + | |
4470 | + | |
4471 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |
4472 | # Files that config.status was made for. | |
4473 | config_files="$ac_config_files" | |
4474 | config_headers="$ac_config_headers" | |
4475 | ||
4476 | _ACEOF | |
4477 | ||
4478 | -cat >>$CONFIG_STATUS <<\_ACEOF | |
4479 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |
4480 | ac_cs_usage="\ | |
4481 | \`$as_me' instantiates files from templates according to the | |
4482 | current configuration. | |
4483 | ||
4484 | -Usage: $0 [OPTIONS] [FILE]... | |
4485 | +Usage: $0 [OPTION]... [FILE]... | |
4486 | ||
4487 | -h, --help print this help, then exit | |
4488 | -V, --version print version number and configuration settings, then exit | |
4489 | - -q, --quiet do not print progress messages | |
4490 | + -q, --quiet, --silent | |
4491 | + do not print progress messages | |
4492 | -d, --debug don't remove temporary files | |
4493 | --recheck update $as_me by reconfiguring in the same conditions | |
4494 | - --file=FILE[:TEMPLATE] | |
4495 | - instantiate the configuration file FILE | |
4496 | - --header=FILE[:TEMPLATE] | |
4497 | - instantiate the configuration header FILE | |
4498 | + --file=FILE[:TEMPLATE] | |
4499 | + instantiate the configuration file FILE | |
4500 | + --header=FILE[:TEMPLATE] | |
4501 | + instantiate the configuration header FILE | |
4502 | ||
4503 | Configuration files: | |
4504 | $config_files | |
4505 | @@ -6233,23 +6427,23 @@ $config_headers | |
4506 | Report bugs to <bug-autoconf@gnu.org>." | |
4507 | ||
4508 | _ACEOF | |
4509 | -cat >>$CONFIG_STATUS <<_ACEOF | |
4510 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |
4511 | ac_cs_version="\\ | |
4512 | config.status | |
4513 | -configured by $0, generated by GNU Autoconf 2.61, | |
4514 | - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" | |
4515 | +configured by $0, generated by GNU Autoconf 2.63, | |
4516 | + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" | |
4517 | ||
4518 | -Copyright (C) 2006 Free Software Foundation, Inc. | |
4519 | +Copyright (C) 2008 Free Software Foundation, Inc. | |
4520 | This config.status script is free software; the Free Software Foundation | |
4521 | gives unlimited permission to copy, distribute and modify it." | |
4522 | ||
4523 | ac_pwd='$ac_pwd' | |
4524 | srcdir='$srcdir' | |
4525 | +test -n "\$AWK" || AWK=awk | |
4526 | _ACEOF | |
4527 | ||
4528 | -cat >>$CONFIG_STATUS <<\_ACEOF | |
4529 | -# If no file are specified by the user, then we need to provide default | |
4530 | -# value. By we need to know if files were specified by the user. | |
4531 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |
4532 | +# The default lists apply if the user does not specify any file. | |
4533 | ac_need_defaults=: | |
4534 | while test $# != 0 | |
4535 | do | |
4536 | @@ -6271,30 +6465,36 @@ do | |
4537 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) | |
4538 | ac_cs_recheck=: ;; | |
4539 | --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) | |
4540 | - echo "$ac_cs_version"; exit ;; | |
4541 | + $as_echo "$ac_cs_version"; exit ;; | |
4542 | --debug | --debu | --deb | --de | --d | -d ) | |
4543 | debug=: ;; | |
4544 | --file | --fil | --fi | --f ) | |
4545 | $ac_shift | |
4546 | - CONFIG_FILES="$CONFIG_FILES $ac_optarg" | |
4547 | + case $ac_optarg in | |
4548 | + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; | |
4549 | + esac | |
4550 | + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" | |
4551 | ac_need_defaults=false;; | |
4552 | --header | --heade | --head | --hea ) | |
4553 | $ac_shift | |
4554 | - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" | |
4555 | + case $ac_optarg in | |
4556 | + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; | |
4557 | + esac | |
4558 | + CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" | |
4559 | ac_need_defaults=false;; | |
4560 | --he | --h) | |
4561 | # Conflict between --help and --header | |
4562 | - { echo "$as_me: error: ambiguous option: $1 | |
4563 | + { $as_echo "$as_me: error: ambiguous option: $1 | |
4564 | Try \`$0 --help' for more information." >&2 | |
4565 | { (exit 1); exit 1; }; };; | |
4566 | --help | --hel | -h ) | |
4567 | - echo "$ac_cs_usage"; exit ;; | |
4568 | + $as_echo "$ac_cs_usage"; exit ;; | |
4569 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | |
4570 | | -silent | --silent | --silen | --sile | --sil | --si | --s) | |
4571 | ac_cs_silent=: ;; | |
4572 | ||
4573 | # This is an error. | |
4574 | - -*) { echo "$as_me: error: unrecognized option: $1 | |
4575 | + -*) { $as_echo "$as_me: error: unrecognized option: $1 | |
4576 | Try \`$0 --help' for more information." >&2 | |
4577 | { (exit 1); exit 1; }; } ;; | |
4578 | ||
4579 | @@ -6313,30 +6513,32 @@ if $ac_cs_silent; then | |
4580 | fi | |
4581 | ||
4582 | _ACEOF | |
4583 | -cat >>$CONFIG_STATUS <<_ACEOF | |
4584 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |
4585 | if \$ac_cs_recheck; then | |
4586 | - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 | |
4587 | - CONFIG_SHELL=$SHELL | |
4588 | + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | |
4589 | + shift | |
4590 | + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 | |
4591 | + CONFIG_SHELL='$SHELL' | |
4592 | export CONFIG_SHELL | |
4593 | - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | |
4594 | + exec "\$@" | |
4595 | fi | |
4596 | ||
4597 | _ACEOF | |
4598 | -cat >>$CONFIG_STATUS <<\_ACEOF | |
4599 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |
4600 | exec 5>>config.log | |
4601 | { | |
4602 | echo | |
4603 | sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX | |
4604 | ## Running $as_me. ## | |
4605 | _ASBOX | |
4606 | - echo "$ac_log" | |
4607 | + $as_echo "$ac_log" | |
4608 | } >&5 | |
4609 | ||
4610 | _ACEOF | |
4611 | -cat >>$CONFIG_STATUS <<_ACEOF | |
4612 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |
4613 | _ACEOF | |
4614 | ||
4615 | -cat >>$CONFIG_STATUS <<\_ACEOF | |
4616 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |
4617 | ||
4618 | # Handling of arguments. | |
4619 | for ac_config_target in $ac_config_targets | |
4620 | @@ -6345,8 +6547,8 @@ do | |
4621 | "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; | |
4622 | "Makefile.conf") CONFIG_FILES="$CONFIG_FILES Makefile.conf" ;; | |
4623 | ||
4624 | - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 | |
4625 | -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} | |
4626 | + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 | |
4627 | +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} | |
4628 | { (exit 1); exit 1; }; };; | |
4629 | esac | |
4630 | done | |
4631 | @@ -6386,156 +6588,144 @@ $debug || | |
4632 | (umask 077 && mkdir "$tmp") | |
4633 | } || | |
4634 | { | |
4635 | - echo "$me: cannot create a temporary directory in ." >&2 | |
4636 | + $as_echo "$as_me: cannot create a temporary directory in ." >&2 | |
4637 | { (exit 1); exit 1; } | |
4638 | } | |
4639 | ||
4640 | -# | |
4641 | -# Set up the sed scripts for CONFIG_FILES section. | |
4642 | -# | |
4643 | - | |
4644 | -# No need to generate the scripts if there are no CONFIG_FILES. | |
4645 | -# This happens for instance when ./config.status config.h | |
4646 | +# Set up the scripts for CONFIG_FILES section. | |
4647 | +# No need to generate them if there are no CONFIG_FILES. | |
4648 | +# This happens for instance with `./config.status config.h'. | |
4649 | if test -n "$CONFIG_FILES"; then | |
4650 | ||
4651 | -_ACEOF | |
4652 | ||
4653 | +ac_cr=' | |
4654 | ' | |
4655 | +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` | |
4656 | +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then | |
4657 | + ac_cs_awk_cr='\\r' | |
4658 | +else | |
4659 | + ac_cs_awk_cr=$ac_cr | |
4660 | +fi | |
4661 | + | |
4662 | +echo 'BEGIN {' >"$tmp/subs1.awk" && | |
4663 | +_ACEOF | |
4664 | ||
4665 | ||
4666 | +{ | |
4667 | + echo "cat >conf$$subs.awk <<_ACEOF" && | |
4668 | + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && | |
4669 | + echo "_ACEOF" | |
4670 | +} >conf$$subs.sh || | |
4671 | + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | |
4672 | +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | |
4673 | + { (exit 1); exit 1; }; } | |
4674 | +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` | |
4675 | ac_delim='%!_!# ' | |
4676 | for ac_last_try in false false false false false :; do | |
4677 | - cat >conf$$subs.sed <<_ACEOF | |
4678 | -SHELL!$SHELL$ac_delim | |
4679 | -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim | |
4680 | -PACKAGE_NAME!$PACKAGE_NAME$ac_delim | |
4681 | -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim | |
4682 | -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim | |
4683 | -PACKAGE_STRING!$PACKAGE_STRING$ac_delim | |
4684 | -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim | |
4685 | -exec_prefix!$exec_prefix$ac_delim | |
4686 | -prefix!$prefix$ac_delim | |
4687 | -program_transform_name!$program_transform_name$ac_delim | |
4688 | -bindir!$bindir$ac_delim | |
4689 | -sbindir!$sbindir$ac_delim | |
4690 | -libexecdir!$libexecdir$ac_delim | |
4691 | -datarootdir!$datarootdir$ac_delim | |
4692 | -datadir!$datadir$ac_delim | |
4693 | -sysconfdir!$sysconfdir$ac_delim | |
4694 | -sharedstatedir!$sharedstatedir$ac_delim | |
4695 | -localstatedir!$localstatedir$ac_delim | |
4696 | -includedir!$includedir$ac_delim | |
4697 | -oldincludedir!$oldincludedir$ac_delim | |
4698 | -docdir!$docdir$ac_delim | |
4699 | -infodir!$infodir$ac_delim | |
4700 | -htmldir!$htmldir$ac_delim | |
4701 | -dvidir!$dvidir$ac_delim | |
4702 | -pdfdir!$pdfdir$ac_delim | |
4703 | -psdir!$psdir$ac_delim | |
4704 | -libdir!$libdir$ac_delim | |
4705 | -localedir!$localedir$ac_delim | |
4706 | -mandir!$mandir$ac_delim | |
4707 | -DEFS!$DEFS$ac_delim | |
4708 | -ECHO_C!$ECHO_C$ac_delim | |
4709 | -ECHO_N!$ECHO_N$ac_delim | |
4710 | -ECHO_T!$ECHO_T$ac_delim | |
4711 | -LIBS!$LIBS$ac_delim | |
4712 | -build_alias!$build_alias$ac_delim | |
4713 | -host_alias!$host_alias$ac_delim | |
4714 | -target_alias!$target_alias$ac_delim | |
4715 | -initdir!$initdir$ac_delim | |
4716 | -confdir!$confdir$ac_delim | |
4717 | -mapdir!$mapdir$ac_delim | |
4718 | -fifodir!$fifodir$ac_delim | |
4719 | -flagdir!$flagdir$ac_delim | |
4720 | -CC!$CC$ac_delim | |
4721 | -CFLAGS!$CFLAGS$ac_delim | |
4722 | -LDFLAGS!$LDFLAGS$ac_delim | |
4723 | -CPPFLAGS!$CPPFLAGS$ac_delim | |
4724 | -ac_ct_CC!$ac_ct_CC$ac_delim | |
4725 | -EXEEXT!$EXEEXT$ac_delim | |
4726 | -OBJEXT!$OBJEXT$ac_delim | |
4727 | -TIRPCLIB!$TIRPCLIB$ac_delim | |
4728 | -DMALLOCLIB!$DMALLOCLIB$ac_delim | |
4729 | -MOUNT!$MOUNT$ac_delim | |
4730 | -HAVE_MOUNT!$HAVE_MOUNT$ac_delim | |
4731 | -UMOUNT!$UMOUNT$ac_delim | |
4732 | -HAVE_UMOUNT!$HAVE_UMOUNT$ac_delim | |
4733 | -E2FSCK!$E2FSCK$ac_delim | |
4734 | -HAVE_E2FSCK!$HAVE_E2FSCK$ac_delim | |
4735 | -E3FSCK!$E3FSCK$ac_delim | |
4736 | -HAVE_E3FSCK!$HAVE_E3FSCK$ac_delim | |
4737 | -MODPROBE!$MODPROBE$ac_delim | |
4738 | -HAVE_MODPROBE!$HAVE_MODPROBE$ac_delim | |
4739 | -LEX!$LEX$ac_delim | |
4740 | -PATH_LEX!$PATH_LEX$ac_delim | |
4741 | -YACC!$YACC$ac_delim | |
4742 | -PATH_YACC!$PATH_YACC$ac_delim | |
4743 | -RANLIB!$RANLIB$ac_delim | |
4744 | -PATH_RANLIB!$PATH_RANLIB$ac_delim | |
4745 | -RPCGEN!$RPCGEN$ac_delim | |
4746 | -PATH_RPCGEN!$PATH_RPCGEN$ac_delim | |
4747 | -XML_CONFIG!$XML_CONFIG$ac_delim | |
4748 | -LIBNSL!$LIBNSL$ac_delim | |
4749 | -LIBRESOLV!$LIBRESOLV$ac_delim | |
4750 | -HAVE_HESIOD!$HAVE_HESIOD$ac_delim | |
4751 | -LIBHESIOD!$LIBHESIOD$ac_delim | |
4752 | -HESIOD_FLAGS!$HESIOD_FLAGS$ac_delim | |
4753 | -CPP!$CPP$ac_delim | |
4754 | -GREP!$GREP$ac_delim | |
4755 | -EGREP!$EGREP$ac_delim | |
4756 | -HAVE_NISPLUS!$HAVE_NISPLUS$ac_delim | |
4757 | -LDAP_FLAGS!$LDAP_FLAGS$ac_delim | |
4758 | -HAVE_LDAP!$HAVE_LDAP$ac_delim | |
4759 | -LIBLDAP!$LIBLDAP$ac_delim | |
4760 | -XML_FLAGS!$XML_FLAGS$ac_delim | |
4761 | -XML_LIBS!$XML_LIBS$ac_delim | |
4762 | -SASL_FLAGS!$SASL_FLAGS$ac_delim | |
4763 | -HAVE_SASL!$HAVE_SASL$ac_delim | |
4764 | -LIBSASL!$LIBSASL$ac_delim | |
4765 | -DAEMON_CFLAGS!$DAEMON_CFLAGS$ac_delim | |
4766 | -DAEMON_LDFLAGS!$DAEMON_LDFLAGS$ac_delim | |
4767 | -LIBOBJS!$LIBOBJS$ac_delim | |
4768 | -LTLIBOBJS!$LTLIBOBJS$ac_delim | |
4769 | -_ACEOF | |
4770 | - | |
4771 | - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then | |
4772 | + . ./conf$$subs.sh || | |
4773 | + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | |
4774 | +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | |
4775 | + { (exit 1); exit 1; }; } | |
4776 | + | |
4777 | + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` | |
4778 | + if test $ac_delim_n = $ac_delim_num; then | |
4779 | break | |
4780 | elif $ac_last_try; then | |
4781 | - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | |
4782 | -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | |
4783 | + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | |
4784 | +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | |
4785 | { (exit 1); exit 1; }; } | |
4786 | else | |
4787 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | |
4788 | fi | |
4789 | done | |
4790 | +rm -f conf$$subs.sh | |
4791 | + | |
4792 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |
4793 | +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && | |
4794 | +_ACEOF | |
4795 | +sed -n ' | |
4796 | +h | |
4797 | +s/^/S["/; s/!.*/"]=/ | |
4798 | +p | |
4799 | +g | |
4800 | +s/^[^!]*!// | |
4801 | +:repl | |
4802 | +t repl | |
4803 | +s/'"$ac_delim"'$// | |
4804 | +t delim | |
4805 | +:nl | |
4806 | +h | |
4807 | +s/\(.\{148\}\).*/\1/ | |
4808 | +t more1 | |
4809 | +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ | |
4810 | +p | |
4811 | +n | |
4812 | +b repl | |
4813 | +:more1 | |
4814 | +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ | |
4815 | +p | |
4816 | +g | |
4817 | +s/.\{148\}// | |
4818 | +t nl | |
4819 | +:delim | |
4820 | +h | |
4821 | +s/\(.\{148\}\).*/\1/ | |
4822 | +t more2 | |
4823 | +s/["\\]/\\&/g; s/^/"/; s/$/"/ | |
4824 | +p | |
4825 | +b | |
4826 | +:more2 | |
4827 | +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ | |
4828 | +p | |
4829 | +g | |
4830 | +s/.\{148\}// | |
4831 | +t delim | |
4832 | +' <conf$$subs.awk | sed ' | |
4833 | +/^[^""]/{ | |
4834 | + N | |
4835 | + s/\n// | |
4836 | +} | |
4837 | +' >>$CONFIG_STATUS || ac_write_fail=1 | |
4838 | +rm -f conf$$subs.awk | |
4839 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |
4840 | +_ACAWK | |
4841 | +cat >>"\$tmp/subs1.awk" <<_ACAWK && | |
4842 | + for (key in S) S_is_set[key] = 1 | |
4843 | + FS = "\a" | |
4844 | ||
4845 | -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` | |
4846 | -if test -n "$ac_eof"; then | |
4847 | - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` | |
4848 | - ac_eof=`expr $ac_eof + 1` | |
4849 | -fi | |
4850 | +} | |
4851 | +{ | |
4852 | + line = $ 0 | |
4853 | + nfields = split(line, field, "@") | |
4854 | + substed = 0 | |
4855 | + len = length(field[1]) | |
4856 | + for (i = 2; i < nfields; i++) { | |
4857 | + key = field[i] | |
4858 | + keylen = length(key) | |
4859 | + if (S_is_set[key]) { | |
4860 | + value = S[key] | |
4861 | + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) | |
4862 | + len += length(value) + length(field[++i]) | |
4863 | + substed = 1 | |
4864 | + } else | |
4865 | + len += 1 + keylen | |
4866 | + } | |
4867 | + | |
4868 | + print line | |
4869 | +} | |
4870 | ||
4871 | -cat >>$CONFIG_STATUS <<_ACEOF | |
4872 | -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof | |
4873 | -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end | |
4874 | +_ACAWK | |
4875 | _ACEOF | |
4876 | -sed ' | |
4877 | -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g | |
4878 | -s/^/s,@/; s/!/@,|#_!!_#|/ | |
4879 | -:n | |
4880 | -t n | |
4881 | -s/'"$ac_delim"'$/,g/; t | |
4882 | -s/$/\\/; p | |
4883 | -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n | |
4884 | -' >>$CONFIG_STATUS <conf$$subs.sed | |
4885 | -rm -f conf$$subs.sed | |
4886 | -cat >>$CONFIG_STATUS <<_ACEOF | |
4887 | -:end | |
4888 | -s/|#_!!_#|//g | |
4889 | -CEOF$ac_eof | |
4890 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |
4891 | +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then | |
4892 | + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" | |
4893 | +else | |
4894 | + cat | |
4895 | +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ | |
4896 | + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 | |
4897 | +$as_echo "$as_me: error: could not setup config files machinery" >&2;} | |
4898 | + { (exit 1); exit 1; }; } | |
4899 | _ACEOF | |
4900 | ||
4901 | - | |
4902 | # VPATH may cause trouble with some makes, so we remove $(srcdir), | |
4903 | # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and | |
4904 | # trailing colons and then remove the whole line if VPATH becomes empty | |
4905 | @@ -6551,19 +6741,133 @@ s/^[^=]*=[ ]*$// | |
4906 | }' | |
4907 | fi | |
4908 | ||
4909 | -cat >>$CONFIG_STATUS <<\_ACEOF | |
4910 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |
4911 | fi # test -n "$CONFIG_FILES" | |
4912 | ||
4913 | +# Set up the scripts for CONFIG_HEADERS section. | |
4914 | +# No need to generate them if there are no CONFIG_HEADERS. | |
4915 | +# This happens for instance with `./config.status Makefile'. | |
4916 | +if test -n "$CONFIG_HEADERS"; then | |
4917 | +cat >"$tmp/defines.awk" <<\_ACAWK || | |
4918 | +BEGIN { | |
4919 | +_ACEOF | |
4920 | + | |
4921 | +# Transform confdefs.h into an awk script `defines.awk', embedded as | |
4922 | +# here-document in config.status, that substitutes the proper values into | |
4923 | +# config.h.in to produce config.h. | |
4924 | ||
4925 | -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS | |
4926 | +# Create a delimiter string that does not exist in confdefs.h, to ease | |
4927 | +# handling of long lines. | |
4928 | +ac_delim='%!_!# ' | |
4929 | +for ac_last_try in false false :; do | |
4930 | + ac_t=`sed -n "/$ac_delim/p" confdefs.h` | |
4931 | + if test -z "$ac_t"; then | |
4932 | + break | |
4933 | + elif $ac_last_try; then | |
4934 | + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 | |
4935 | +$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} | |
4936 | + { (exit 1); exit 1; }; } | |
4937 | + else | |
4938 | + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | |
4939 | + fi | |
4940 | +done | |
4941 | + | |
4942 | +# For the awk script, D is an array of macro values keyed by name, | |
4943 | +# likewise P contains macro parameters if any. Preserve backslash | |
4944 | +# newline sequences. | |
4945 | + | |
4946 | +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* | |
4947 | +sed -n ' | |
4948 | +s/.\{148\}/&'"$ac_delim"'/g | |
4949 | +t rset | |
4950 | +:rset | |
4951 | +s/^[ ]*#[ ]*define[ ][ ]*/ / | |
4952 | +t def | |
4953 | +d | |
4954 | +:def | |
4955 | +s/\\$// | |
4956 | +t bsnl | |
4957 | +s/["\\]/\\&/g | |
4958 | +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ | |
4959 | +D["\1"]=" \3"/p | |
4960 | +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p | |
4961 | +d | |
4962 | +:bsnl | |
4963 | +s/["\\]/\\&/g | |
4964 | +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ | |
4965 | +D["\1"]=" \3\\\\\\n"\\/p | |
4966 | +t cont | |
4967 | +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p | |
4968 | +t cont | |
4969 | +d | |
4970 | +:cont | |
4971 | +n | |
4972 | +s/.\{148\}/&'"$ac_delim"'/g | |
4973 | +t clear | |
4974 | +:clear | |
4975 | +s/\\$// | |
4976 | +t bsnlc | |
4977 | +s/["\\]/\\&/g; s/^/"/; s/$/"/p | |
4978 | +d | |
4979 | +:bsnlc | |
4980 | +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p | |
4981 | +b cont | |
4982 | +' <confdefs.h | sed ' | |
4983 | +s/'"$ac_delim"'/"\\\ | |
4984 | +"/g' >>$CONFIG_STATUS || ac_write_fail=1 | |
4985 | + | |
4986 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |
4987 | + for (key in D) D_is_set[key] = 1 | |
4988 | + FS = "\a" | |
4989 | +} | |
4990 | +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { | |
4991 | + line = \$ 0 | |
4992 | + split(line, arg, " ") | |
4993 | + if (arg[1] == "#") { | |
4994 | + defundef = arg[2] | |
4995 | + mac1 = arg[3] | |
4996 | + } else { | |
4997 | + defundef = substr(arg[1], 2) | |
4998 | + mac1 = arg[2] | |
4999 | + } | |
5000 | + split(mac1, mac2, "(") #) | |
5001 | + macro = mac2[1] | |
5002 | + prefix = substr(line, 1, index(line, defundef) - 1) | |
5003 | + if (D_is_set[macro]) { | |
5004 | + # Preserve the white space surrounding the "#". | |
5005 | + print prefix "define", macro P[macro] D[macro] | |
5006 | + next | |
5007 | + } else { | |
5008 | + # Replace #undef with comments. This is necessary, for example, | |
5009 | + # in the case of _POSIX_SOURCE, which is predefined and required | |
5010 | + # on some systems where configure will not decide to define it. | |
5011 | + if (defundef == "undef") { | |
5012 | + print "/*", prefix defundef, macro, "*/" | |
5013 | + next | |
5014 | + } | |
5015 | + } | |
5016 | +} | |
5017 | +{ print } | |
5018 | +_ACAWK | |
5019 | +_ACEOF | |
5020 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |
5021 | + { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 | |
5022 | +$as_echo "$as_me: error: could not setup config headers machinery" >&2;} | |
5023 | + { (exit 1); exit 1; }; } | |
5024 | +fi # test -n "$CONFIG_HEADERS" | |
5025 | + | |
5026 | + | |
5027 | +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " | |
5028 | +shift | |
5029 | +for ac_tag | |
5030 | do | |
5031 | case $ac_tag in | |
5032 | :[FHLC]) ac_mode=$ac_tag; continue;; | |
5033 | esac | |
5034 | case $ac_mode$ac_tag in | |
5035 | :[FHL]*:*);; | |
5036 | - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 | |
5037 | -echo "$as_me: error: Invalid tag $ac_tag." >&2;} | |
5038 | + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 | |
5039 | +$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} | |
5040 | { (exit 1); exit 1; }; };; | |
5041 | :[FH]-) ac_tag=-:-;; | |
5042 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; | |
5043 | @@ -6592,26 +6896,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;} | |
5044 | [\\/$]*) false;; | |
5045 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; | |
5046 | esac || | |
5047 | - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 | |
5048 | -echo "$as_me: error: cannot find input file: $ac_f" >&2;} | |
5049 | + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 | |
5050 | +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} | |
5051 | { (exit 1); exit 1; }; };; | |
5052 | esac | |
5053 | - ac_file_inputs="$ac_file_inputs $ac_f" | |
5054 | + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac | |
5055 | + ac_file_inputs="$ac_file_inputs '$ac_f'" | |
5056 | done | |
5057 | ||
5058 | # Let's still pretend it is `configure' which instantiates (i.e., don't | |
5059 | # use $as_me), people would be surprised to read: | |
5060 | # /* config.h. Generated by config.status. */ | |
5061 | - configure_input="Generated from "`IFS=: | |
5062 | - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." | |
5063 | + configure_input='Generated from '` | |
5064 | + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' | |
5065 | + `' by configure.' | |
5066 | if test x"$ac_file" != x-; then | |
5067 | configure_input="$ac_file. $configure_input" | |
5068 | - { echo "$as_me:$LINENO: creating $ac_file" >&5 | |
5069 | -echo "$as_me: creating $ac_file" >&6;} | |
5070 | + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 | |
5071 | +$as_echo "$as_me: creating $ac_file" >&6;} | |
5072 | fi | |
5073 | + # Neutralize special characters interpreted by sed in replacement strings. | |
5074 | + case $configure_input in #( | |
5075 | + *\&* | *\|* | *\\* ) | |
5076 | + ac_sed_conf_input=`$as_echo "$configure_input" | | |
5077 | + sed 's/[\\\\&|]/\\\\&/g'`;; #( | |
5078 | + *) ac_sed_conf_input=$configure_input;; | |
5079 | + esac | |
5080 | ||
5081 | case $ac_tag in | |
5082 | - *:-:* | *:-) cat >"$tmp/stdin";; | |
5083 | + *:-:* | *:-) cat >"$tmp/stdin" \ | |
5084 | + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 | |
5085 | +$as_echo "$as_me: error: could not create $ac_file" >&2;} | |
5086 | + { (exit 1); exit 1; }; } ;; | |
5087 | esac | |
5088 | ;; | |
5089 | esac | |
5090 | @@ -6621,7 +6937,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
5091 | X"$ac_file" : 'X\(//\)[^/]' \| \ | |
5092 | X"$ac_file" : 'X\(//\)$' \| \ | |
5093 | X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || | |
5094 | -echo X"$ac_file" | | |
5095 | +$as_echo X"$ac_file" | | |
5096 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | |
5097 | s//\1/ | |
5098 | q | |
5099 | @@ -6647,7 +6963,7 @@ echo X"$ac_file" | | |
5100 | as_dirs= | |
5101 | while :; do | |
5102 | case $as_dir in #( | |
5103 | - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( | |
5104 | + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( | |
5105 | *) as_qdir=$as_dir;; | |
5106 | esac | |
5107 | as_dirs="'$as_qdir' $as_dirs" | |
5108 | @@ -6656,7 +6972,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
5109 | X"$as_dir" : 'X\(//\)[^/]' \| \ | |
5110 | X"$as_dir" : 'X\(//\)$' \| \ | |
5111 | X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | |
5112 | -echo X"$as_dir" | | |
5113 | +$as_echo X"$as_dir" | | |
5114 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | |
5115 | s//\1/ | |
5116 | q | |
5117 | @@ -6677,17 +6993,17 @@ echo X"$as_dir" | | |
5118 | test -d "$as_dir" && break | |
5119 | done | |
5120 | test -z "$as_dirs" || eval "mkdir $as_dirs" | |
5121 | - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | |
5122 | -echo "$as_me: error: cannot create directory $as_dir" >&2;} | |
5123 | + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | |
5124 | +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} | |
5125 | { (exit 1); exit 1; }; }; } | |
5126 | ac_builddir=. | |
5127 | ||
5128 | case "$ac_dir" in | |
5129 | .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; | |
5130 | *) | |
5131 | - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | |
5132 | + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` | |
5133 | # A ".." for each directory in $ac_dir_suffix. | |
5134 | - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` | |
5135 | + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` | |
5136 | case $ac_top_builddir_sub in | |
5137 | "") ac_top_builddir_sub=. ac_top_build_prefix= ;; | |
5138 | *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; | |
5139 | @@ -6723,12 +7039,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix | |
5140 | ||
5141 | _ACEOF | |
5142 | ||
5143 | -cat >>$CONFIG_STATUS <<\_ACEOF | |
5144 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |
5145 | # If the template does not know about datarootdir, expand it. | |
5146 | # FIXME: This hack should be removed a few years after 2.60. | |
5147 | ac_datarootdir_hack=; ac_datarootdir_seen= | |
5148 | ||
5149 | -case `sed -n '/datarootdir/ { | |
5150 | +ac_sed_dataroot=' | |
5151 | +/datarootdir/ { | |
5152 | p | |
5153 | q | |
5154 | } | |
5155 | @@ -6737,13 +7054,14 @@ case `sed -n '/datarootdir/ { | |
5156 | /@infodir@/p | |
5157 | /@localedir@/p | |
5158 | /@mandir@/p | |
5159 | -' $ac_file_inputs` in | |
5160 | +' | |
5161 | +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in | |
5162 | *datarootdir*) ac_datarootdir_seen=yes;; | |
5163 | *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) | |
5164 | - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 | |
5165 | -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} | |
5166 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 | |
5167 | +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} | |
5168 | _ACEOF | |
5169 | -cat >>$CONFIG_STATUS <<_ACEOF | |
5170 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |
5171 | ac_datarootdir_hack=' | |
5172 | s&@datadir@&$datadir&g | |
5173 | s&@docdir@&$docdir&g | |
5174 | @@ -6757,15 +7075,16 @@ _ACEOF | |
5175 | # Neutralize VPATH when `$srcdir' = `.'. | |
5176 | # Shell code in configure.ac might set extrasub. | |
5177 | # FIXME: do we really want to maintain this feature? | |
5178 | -cat >>$CONFIG_STATUS <<_ACEOF | |
5179 | - sed "$ac_vpsub | |
5180 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |
5181 | +ac_sed_extra="$ac_vpsub | |
5182 | $extrasub | |
5183 | _ACEOF | |
5184 | -cat >>$CONFIG_STATUS <<\_ACEOF | |
5185 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |
5186 | :t | |
5187 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b | |
5188 | -s&@configure_input@&$configure_input&;t t | |
5189 | +s|@configure_input@|$ac_sed_conf_input|;t t | |
5190 | s&@top_builddir@&$ac_top_builddir_sub&;t t | |
5191 | +s&@top_build_prefix@&$ac_top_build_prefix&;t t | |
5192 | s&@srcdir@&$ac_srcdir&;t t | |
5193 | s&@abs_srcdir@&$ac_abs_srcdir&;t t | |
5194 | s&@top_srcdir@&$ac_top_srcdir&;t t | |
5195 | @@ -6774,119 +7093,58 @@ s&@builddir@&$ac_builddir&;t t | |
5196 | s&@abs_builddir@&$ac_abs_builddir&;t t | |
5197 | s&@abs_top_builddir@&$ac_abs_top_builddir&;t t | |
5198 | $ac_datarootdir_hack | |
5199 | -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out | |
5200 | +" | |
5201 | +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ | |
5202 | + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 | |
5203 | +$as_echo "$as_me: error: could not create $ac_file" >&2;} | |
5204 | + { (exit 1); exit 1; }; } | |
5205 | ||
5206 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && | |
5207 | { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && | |
5208 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && | |
5209 | - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' | |
5210 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' | |
5211 | which seems to be undefined. Please make sure it is defined." >&5 | |
5212 | -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' | |
5213 | +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' | |
5214 | which seems to be undefined. Please make sure it is defined." >&2;} | |
5215 | ||
5216 | rm -f "$tmp/stdin" | |
5217 | case $ac_file in | |
5218 | - -) cat "$tmp/out"; rm -f "$tmp/out";; | |
5219 | - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; | |
5220 | - esac | |
5221 | + -) cat "$tmp/out" && rm -f "$tmp/out";; | |
5222 | + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; | |
5223 | + esac \ | |
5224 | + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 | |
5225 | +$as_echo "$as_me: error: could not create $ac_file" >&2;} | |
5226 | + { (exit 1); exit 1; }; } | |
5227 | ;; | |
5228 | :H) | |
5229 | # | |
5230 | # CONFIG_HEADER | |
5231 | # | |
5232 | -_ACEOF | |
5233 | - | |
5234 | -# Transform confdefs.h into a sed script `conftest.defines', that | |
5235 | -# substitutes the proper values into config.h.in to produce config.h. | |
5236 | -rm -f conftest.defines conftest.tail | |
5237 | -# First, append a space to every undef/define line, to ease matching. | |
5238 | -echo 's/$/ /' >conftest.defines | |
5239 | -# Then, protect against being on the right side of a sed subst, or in | |
5240 | -# an unquoted here document, in config.status. If some macros were | |
5241 | -# called several times there might be several #defines for the same | |
5242 | -# symbol, which is useless. But do not sort them, since the last | |
5243 | -# AC_DEFINE must be honored. | |
5244 | -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* | |
5245 | -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where | |
5246 | -# NAME is the cpp macro being defined, VALUE is the value it is being given. | |
5247 | -# PARAMS is the parameter list in the macro definition--in most cases, it's | |
5248 | -# just an empty string. | |
5249 | -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' | |
5250 | -ac_dB='\\)[ (].*,\\1define\\2' | |
5251 | -ac_dC=' ' | |
5252 | -ac_dD=' ,' | |
5253 | - | |
5254 | -uniq confdefs.h | | |
5255 | - sed -n ' | |
5256 | - t rset | |
5257 | - :rset | |
5258 | - s/^[ ]*#[ ]*define[ ][ ]*// | |
5259 | - t ok | |
5260 | - d | |
5261 | - :ok | |
5262 | - s/[\\&,]/\\&/g | |
5263 | - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p | |
5264 | - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p | |
5265 | - ' >>conftest.defines | |
5266 | - | |
5267 | -# Remove the space that was appended to ease matching. | |
5268 | -# Then replace #undef with comments. This is necessary, for | |
5269 | -# example, in the case of _POSIX_SOURCE, which is predefined and required | |
5270 | -# on some systems where configure will not decide to define it. | |
5271 | -# (The regexp can be short, since the line contains either #define or #undef.) | |
5272 | -echo 's/ $// | |
5273 | -s,^[ #]*u.*,/* & */,' >>conftest.defines | |
5274 | - | |
5275 | -# Break up conftest.defines: | |
5276 | -ac_max_sed_lines=50 | |
5277 | - | |
5278 | -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" | |
5279 | -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" | |
5280 | -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" | |
5281 | -# et cetera. | |
5282 | -ac_in='$ac_file_inputs' | |
5283 | -ac_out='"$tmp/out1"' | |
5284 | -ac_nxt='"$tmp/out2"' | |
5285 | - | |
5286 | -while : | |
5287 | -do | |
5288 | - # Write a here document: | |
5289 | - cat >>$CONFIG_STATUS <<_ACEOF | |
5290 | - # First, check the format of the line: | |
5291 | - cat >"\$tmp/defines.sed" <<\\CEOF | |
5292 | -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def | |
5293 | -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def | |
5294 | -b | |
5295 | -:def | |
5296 | -_ACEOF | |
5297 | - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS | |
5298 | - echo 'CEOF | |
5299 | - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS | |
5300 | - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in | |
5301 | - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail | |
5302 | - grep . conftest.tail >/dev/null || break | |
5303 | - rm -f conftest.defines | |
5304 | - mv conftest.tail conftest.defines | |
5305 | -done | |
5306 | -rm -f conftest.defines conftest.tail | |
5307 | - | |
5308 | -echo "ac_result=$ac_in" >>$CONFIG_STATUS | |
5309 | -cat >>$CONFIG_STATUS <<\_ACEOF | |
5310 | if test x"$ac_file" != x-; then | |
5311 | - echo "/* $configure_input */" >"$tmp/config.h" | |
5312 | - cat "$ac_result" >>"$tmp/config.h" | |
5313 | - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then | |
5314 | - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 | |
5315 | -echo "$as_me: $ac_file is unchanged" >&6;} | |
5316 | + { | |
5317 | + $as_echo "/* $configure_input */" \ | |
5318 | + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" | |
5319 | + } >"$tmp/config.h" \ | |
5320 | + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 | |
5321 | +$as_echo "$as_me: error: could not create $ac_file" >&2;} | |
5322 | + { (exit 1); exit 1; }; } | |
5323 | + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then | |
5324 | + { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 | |
5325 | +$as_echo "$as_me: $ac_file is unchanged" >&6;} | |
5326 | else | |
5327 | - rm -f $ac_file | |
5328 | - mv "$tmp/config.h" $ac_file | |
5329 | + rm -f "$ac_file" | |
5330 | + mv "$tmp/config.h" "$ac_file" \ | |
5331 | + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 | |
5332 | +$as_echo "$as_me: error: could not create $ac_file" >&2;} | |
5333 | + { (exit 1); exit 1; }; } | |
5334 | fi | |
5335 | else | |
5336 | - echo "/* $configure_input */" | |
5337 | - cat "$ac_result" | |
5338 | + $as_echo "/* $configure_input */" \ | |
5339 | + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ | |
5340 | + || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 | |
5341 | +$as_echo "$as_me: error: could not create -" >&2;} | |
5342 | + { (exit 1); exit 1; }; } | |
5343 | fi | |
5344 | - rm -f "$tmp/out12" | |
5345 | ;; | |
5346 | ||
5347 | ||
5348 | @@ -6900,6 +7158,11 @@ _ACEOF | |
5349 | chmod +x $CONFIG_STATUS | |
5350 | ac_clean_files=$ac_clean_files_save | |
5351 | ||
5352 | +test $ac_write_fail = 0 || | |
5353 | + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 | |
5354 | +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} | |
5355 | + { (exit 1); exit 1; }; } | |
5356 | + | |
5357 | ||
5358 | # configure is writing to config.log, and then calls config.status. | |
5359 | # config.status does its own redirection, appending to config.log. | |
5360 | @@ -6921,6 +7184,10 @@ if test "$no_create" != yes; then | |
5361 | # would make configure fail if this is the last instruction. | |
5362 | $ac_cs_success || { (exit 1); exit 1; } | |
5363 | fi | |
5364 | +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then | |
5365 | + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 | |
5366 | +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} | |
5367 | +fi | |
5368 | ||
5369 | ||
5370 | # | |
5371 | diff --git a/daemon/automount.c b/daemon/automount.c | |
5372 | index a664277..776c92c 100644 | |
5373 | --- a/daemon/automount.c | |
5374 | +++ b/daemon/automount.c | |
5375 | @@ -1730,6 +1730,16 @@ static void show_build_info(void) | |
5376 | #ifdef LIBXML2_WORKAROUND | |
5377 | printf("LIBXML2_WORKAROUND "); | |
5378 | count = count + 19; | |
5379 | + | |
5380 | + if (count > 60) { | |
5381 | + printf("\n "); | |
5382 | + count = 0; | |
5383 | + } | |
5384 | +#endif | |
5385 | + | |
5386 | +#ifdef WITH_LIBTIRPC | |
5387 | + printf("WITH_LIBTIRPC "); | |
5388 | + count = count + 14; | |
5389 | #endif | |
5390 | ||
5391 | printf("\n\n"); | |
5392 | @@ -2063,6 +2073,8 @@ int main(int argc, char *argv[]) | |
5393 | #endif | |
5394 | #ifdef TIRPC_WORKAROUND | |
5395 | void *dh_tirpc = dlopen("libitirpc.so", RTLD_NOW); | |
5396 | + if (!dh_tirpc) | |
5397 | + dh_tirpc = dlopen("libitirpc.so.1", RTLD_NOW); | |
5398 | #endif | |
5399 | ||
5400 | if (!master_read_master(master_list, age, 0)) { | |
5401 | diff --git a/include/config.h.in b/include/config.h.in | |
5402 | index 31b0d75..39cfa4b 100644 | |
5403 | --- a/include/config.h.in | |
5404 | +++ b/include/config.h.in | |
5405 | @@ -117,7 +117,7 @@ | |
5406 | /* Define to 1 if you have the ANSI C header files. */ | |
5407 | #undef STDC_HEADERS | |
5408 | ||
5409 | -/* Use libtirpc tsd usage workaround */ | |
5410 | +/* Define to 1 to use the libtirpc tsd usage workaround */ | |
5411 | #undef TIRPC_WORKAROUND | |
5412 | ||
5413 | /* Define if using the dmalloc debugging malloc package */ | |
5414 | @@ -129,5 +129,8 @@ | |
5415 | /* Define if using LDAP as a source of automount maps */ | |
5416 | #undef WITH_LDAP | |
5417 | ||
5418 | +/* Define to 1 if you have the libtirpc library installed */ | |
5419 | +#undef WITH_LIBTIRPC | |
5420 | + | |
5421 | /* Define if using SASL authentication with the LDAP module */ | |
5422 | #undef WITH_SASL |