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