Commit 356d9b782fbce68d240cbdbfeafad58d29d8789b - eog-plugins

prepare for release Emilio Pozuelo Monfort 14 years ago

4 changed file(s) with 2 addition(s) and 12208 deletion(s). Raw diff Collapse all Expand all

-1

debian/changelog less more

0		eog-plugins (2.28.0-1) UNRELEASED; urgency=low
	0	eog-plugins (2.28.0-1) unstable; urgency=low
1	1
2	2	[ Luca Bruno ]
3	3	* Initial release (Closes: #546995)

-1

debian/control less more

8	8	intltool (>= 0.40.0),
9	9	libglib2.0-dev (>= 2.12.0),
10	10	libgtk2.0-dev (>= 2.12.0),
	11	libgconf2-dev,
11	12	eog-dev (>= 2.19.0),
12	13	gconf2,
13	14	postr,

15	16	libchamplain-gtk-0.4-dev (>= 0.4),
16	17	libclutter-gtk-0.10-dev (>= 0.10),
17	18	libexif-dev (>= 0.6.16),
18		python-dev,
19	19	python-gobject-dev (>= 2.11.5),
20	20	python-gnome2-dev (>= 2.18.2),
21	21	python-gtk2-dev (>= 2.9.7),

-12176

~~debian/patches/70_relibtoolize.patch~~ less more

0		diff -urN -x config.guess -x config.sub eog-plugins-2.28.0.orig/aclocal.m4 eog-plugins-2.28.0/aclocal.m4
1		--- eog-plugins-2.28.0.orig/aclocal.m4 2009-09-21 17:48:06.000000000 +0200
2		+++ eog-plugins-2.28.0/aclocal.m4 2009-09-26 02:16:57.000000000 +0200
3		@@ -13,8 +13,8 @@
4
5		m4_ifndef([AC_AUTOCONF_VERSION],
6		[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
7		-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
8		-[m4_warning([this file was generated for autoconf 2.63.
9		+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
10		+[m4_warning([this file was generated for autoconf 2.64.
11		You have another version of autoconf. It may work, but is not guaranteed to.
12		If you have problems, you may need to regenerate the build system entirely.
13		To do so, use the procedure documented by the package, typically `autoreconf'.])])
14		@@ -2988,14 +2988,7 @@
15		*) objformat=elf ;;
16		esac
17		fi
18		- # Handle Gentoo/FreeBSD as it was Linux
19		- case $host_vendor in
20		- gentoo)
21		- version_type=linux ;;
22		- *)
23		- version_type=freebsd-$objformat ;;
24		- esac
25		-
26		+ version_type=freebsd-$objformat
27		case $version_type in
28		freebsd-elf*)
29		library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
30		@@ -3006,12 +2999,6 @@
31		library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
32		need_version=yes
33		;;
34		- linux)
35		- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
36		- soname_spec='${libname}${release}${shared_ext}$major'
37		- need_lib_prefix=no
38		- need_version=no
39		- ;;
40		esac
41		shlibpath_var=LD_LIBRARY_PATH
42		case $host_os in
43		@@ -3185,6 +3172,18 @@
44		dynamic_linker='GNU/Linux ld.so'
45		;;
46
47		+netbsdelf*-gnu)
48		+ version_type=linux
49		+ need_lib_prefix=no
50		+ need_version=no
51		+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
52		+ soname_spec='${libname}${release}${shared_ext}$major'
53		+ shlibpath_var=LD_LIBRARY_PATH
54		+ shlibpath_overrides_runpath=no
55		+ hardcode_into_libs=yes
56		+ dynamic_linker='NetBSD ld.elf_so'
57		+ ;;
58		+
59		netbsd*)
60		version_type=sunos
61		need_lib_prefix=no
62		@@ -3776,7 +3775,7 @@
63		lt_cv_deplibs_check_method=pass_all
64		;;
65
66		-netbsd*)
67		+netbsd* \| netbsdelf*-gnu)
68		if echo __ELF__ \| $CC -E - \| $GREP __ELF__ > /dev/null; then
69		lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+\|_pic\.a)$'
70		else
71		@@ -4457,7 +4456,7 @@
72		;;
73		esac
74		;;
75		- netbsd*)
76		+ netbsd* \| netbsdelf*-gnu)
77		;;
78		qnx \| nto)
79		# QNX uses GNU C++, but need to define -shared option too, otherwise
80		@@ -4882,6 +4881,9 @@
81		cygwin* \| mingw* \| cegcc*)
82		_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience \| $global_symbol_pipe \| $SED -e '\''/^[[BCDGRS]][[ ]]/s/.[[ ]]$[[^ ]]$/\1 DATA/;/^.[[ ]]__nm__/s/^.[[ ]]__nm__$[[^ ]]$[[ ]][[^ ]]/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' \| sort \| uniq > $export_symbols'
83		;;
84		+ linux* \| kbsd-gnu)
85		+ _LT_TAGVAR(link_all_deplibs, $1)=no
86		+ ;;
87		*)
88		_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience \| $global_symbol_pipe \| $SED '\''s/.* //'\'' \| sort \| uniq > $export_symbols'
89		;;
90		@@ -4946,6 +4948,9 @@
91		openbsd*)
92		with_gnu_ld=no
93		;;
94		+ linux* \| kbsd-gnu)
95		+ _LT_TAGVAR(link_all_deplibs, $1)=no
96		+ ;;
97		esac
98
99		_LT_TAGVAR(ld_shlibs, $1)=yes
100		@@ -5128,7 +5133,7 @@
101		fi
102		;;
103
104		- netbsd*)
105		+ netbsd* \| netbsdelf*-gnu)
106		if echo __ELF__ \| $CC -E - \| $GREP __ELF__ >/dev/null; then
107		_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
108		wlarc=
109		@@ -5303,6 +5308,7 @@
110		if test "$aix_use_runtimelinking" = yes; then
111		shared_flag="$shared_flag "'${wl}-G'
112		fi
113		+ _LT_TAGVAR(link_all_deplibs, $1)=no
114		else
115		# not using gcc
116		if test "$host_cpu" = ia64; then
117		@@ -5541,7 +5547,7 @@
118		_LT_TAGVAR(link_all_deplibs, $1)=yes
119		;;
120
121		- netbsd*)
122		+ netbsd* \| netbsdelf*-gnu)
123		if echo __ELF__ \| $CC -E - \| $GREP __ELF__ >/dev/null; then
124		_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
125		else
126		@@ -8750,14 +8756,16 @@
127		# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
128		# ---------------------------------------------
129		m4_define([_PKG_CONFIG],
130		-[if test -n "$$1"; then
131		- pkg_cv_[]$1="$$1"
132		- elif test -n "$PKG_CONFIG"; then
133		- PKG_CHECK_EXISTS([$3],
134		- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
135		- [pkg_failed=yes])
136		- else
137		- pkg_failed=untried
138		+[if test -n "$PKG_CONFIG"; then
139		+ if test -n "$$1"; then
140		+ pkg_cv_[]$1="$$1"
141		+ else
142		+ PKG_CHECK_EXISTS([$3],
143		+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
144		+ [pkg_failed=yes])
145		+ fi
146		+else
147		+ pkg_failed=untried
148		fi[]dnl
149		])# _PKG_CONFIG
150
151		@@ -8801,9 +8809,9 @@
152		if test $pkg_failed = yes; then
153		_PKG_SHORT_ERRORS_SUPPORTED
154		if test $_pkg_short_errors_supported = yes; then
155		- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
156		+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
157		else
158		- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
159		+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
160		fi
161		# Put the nasty error message in config.log where it belongs
162		echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
163		diff -urN -x config.guess -x config.sub eog-plugins-2.28.0.orig/configure eog-plugins-2.28.0/configure
164		--- eog-plugins-2.28.0.orig/configure 2009-09-21 17:48:07.000000000 +0200
165		+++ eog-plugins-2.28.0/configure 2009-09-26 02:17:24.000000000 +0200
166		@@ -1,20 +1,22 @@
167		#! /bin/sh
168		# Guess values for system-dependent variables and create Makefiles.
169		-# Generated by GNU Autoconf 2.63 for eog-plugins 2.28.0.
170		+# Generated by GNU Autoconf 2.64 for eog-plugins 2.28.0.
171		#
172		# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=eog&component=plugins>.
173		#
174		# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
175		-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
176		+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
177		+# Foundation, Inc.
178		+#
179		# This configure script is free software; the Free Software Foundation
180		# gives unlimited permission to copy, distribute and modify it.
181		-## --------------------- ##
182		-## M4sh Initialization. ##
183		-## --------------------- ##
184		+## -------------------- ##
185		+## M4sh Initialization. ##
186		+## -------------------- ##
187
188		# Be more Bourne compatible
189		DUALCASE=1; export DUALCASE # for MKS sh
190		-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
191		+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
192		emulate sh
193		NULLCMD=:
194		# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
195		@@ -22,23 +24,15 @@
196		alias -g '${1+"$@"}'='"$@"'
197		setopt NO_GLOB_SUBST
198		else
199		- case `(set -o) 2>/dev/null` in
200		- posix) set -o posix ;;
201		+ case `(set -o) 2>/dev/null` in #(
202		+ posix) :
203		+ set -o posix ;; #(
204		+ *) :
205		+ ;;
206		esac
207		-
208		fi
209
210
211		-
212		-
213		-# PATH needs CR
214		-# Avoid depending upon Character Ranges.
215		-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
216		-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
217		-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
218		-as_cr_digits='0123456789'
219		-as_cr_alnum=$as_cr_Letters$as_cr_digits
220		-
221		as_nl='
222		'
223		export as_nl
224		@@ -46,7 +40,13 @@
225		as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
226		as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
227		as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
228		-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
229		+# Prefer a ksh shell builtin over an external printf program on Solaris,
230		+# but without wasting forks for bash or zsh.
231		+if test -z "$BASH_VERSION$ZSH_VERSION" \
232		+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
233		+ as_echo='print -r --'
234		+ as_echo_n='print -rn --'
235		+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
236		as_echo='printf %s\n'
237		as_echo_n='printf %s'
238		else
239		@@ -57,7 +57,7 @@
240		as_echo_body='eval expr "X$1" : "X\$.*\$"'
241		as_echo_n_body='eval
242		arg=$1;
243		- case $arg in
244		+ case $arg in #(
245		"$as_nl")
246		expr "X$arg" : "X\$.*\$$as_nl";
247		arg=`expr "X$arg" : ".$as_nl\$.\$"`;;
248		@@ -80,13 +80,6 @@
249		}
250		fi
251
252		-# Support unset when possible.
253		-if ( (MAIL=60; unset MAIL) \|\| exit) >/dev/null 2>&1; then
254		- as_unset=unset
255		-else
256		- as_unset=false
257		-fi
258		-
259
260		# IFS
261		# We need space, tab and new line, in precisely that order. Quoting is
262		@@ -96,15 +89,15 @@
263		IFS=" "" $as_nl"
264
265		# Find who we are. Look in the path if we contain no directory separator.
266		-case $0 in
267		+case $0 in #((
268		[\\/] ) as_myself=$0 ;;
269		*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
270		for as_dir in $PATH
271		do
272		IFS=$as_save_IFS
273		test -z "$as_dir" && as_dir=.
274		- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
275		-done
276		+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
277		+ done
278		IFS=$as_save_IFS
279
280		;;
281		@@ -116,12 +109,16 @@
282		fi
283		if test ! -f "$as_myself"; then
284		$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
285		- { (exit 1); exit 1; }
286		+ exit 1
287		fi
288
289		-# Work around bugs in pre-3.0 UWIN ksh.
290		-for as_var in ENV MAIL MAILPATH
291		-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
292		+# Unset variables that we do not need and which cause bugs (e.g. in
293		+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "\|\| exit 1"
294		+# suppresses any "Segmentation fault" message there. '((' could
295		+# trigger a bug in pdksh 5.2.14.
296		+for as_var in BASH_ENV ENV MAIL MAILPATH
297		+do eval test x\${$as_var+set} = xset \
298		+ && ( (unset $as_var) \|\| exit 1) >/dev/null 2>&1 && unset $as_var \|\| :
299		done
300		PS1='$ '
301		PS2='> '
302		@@ -133,330 +130,301 @@
303		LANGUAGE=C
304		export LANGUAGE
305
306		-# Required to use basename.
307		-if expr a : '$a$' >/dev/null 2>&1 &&
308		- test "X`expr 00001 : '.*$...$'`" = X001; then
309		- as_expr=expr
310		-else
311		- as_expr=false
312		-fi
313		-
314		-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
315		- as_basename=basename
316		-else
317		- as_basename=false
318		-fi
319		-
320		-
321		-# Name of the executable.
322		-as_me=`$as_basename -- "$0" \|\|
323		-$as_expr X/"$0" : './$[^/][^/]$/*$' \\| \
324		- X"$0" : 'X$//$$' \\| \
325		- X"$0" : 'X$/$' \\| . 2>/dev/null \|\|
326		-$as_echo X/"$0" \|
327		- sed '/^.\/$[^/][^/]$\/*$/{
328		- s//\1/
329		- q
330		- }
331		- /^X\/$\/\/$$/{
332		- s//\1/
333		- q
334		- }
335		- /^X\/$\/$.*/{
336		- s//\1/
337		- q
338		- }
339		- s/.*/./; q'`
340		-
341		# CDPATH.
342		-$as_unset CDPATH
343		-
344		+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
345
346		if test "x$CONFIG_SHELL" = x; then
347		- if (eval ":") 2>/dev/null; then
348		- as_have_required=yes
349		+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
350		+ emulate sh
351		+ NULLCMD=:
352		+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
353		+ # is contrary to our usage. Disable this feature.
354		+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
355		+ setopt NO_GLOB_SUBST
356		else
357		- as_have_required=no
358		+ case \`(set -o) 2>/dev/null\` in #(
359		+ posix) :
360		+ set -o posix ;; #(
361		+ *) :
362		+ ;;
363		+esac
364		fi
365		-
366		- if test $as_have_required = yes && (eval ":
367		-(as_func_return () {
368		- (exit \$1)
369		-}
370		-as_func_success () {
371		- as_func_return 0
372		-}
373		-as_func_failure () {
374		- as_func_return 1
375		-}
376		-as_func_ret_success () {
377		- return 0
378		-}
379		-as_func_ret_failure () {
380		- return 1
381		-}
382		+"
383		+ as_required="as_fn_return () { (exit \$1); }
384		+as_fn_success () { as_fn_return 0; }
385		+as_fn_failure () { as_fn_return 1; }
386		+as_fn_ret_success () { return 0; }
387		+as_fn_ret_failure () { return 1; }
388
389		exitcode=0
390		-if as_func_success; then
391		- :
392		-else
393		- exitcode=1
394		- echo as_func_success failed.
395		-fi
396		-
397		-if as_func_failure; then
398		- exitcode=1
399		- echo as_func_failure succeeded.
400		-fi
401		-
402		-if as_func_ret_success; then
403		- :
404		-else
405		- exitcode=1
406		- echo as_func_ret_success failed.
407		-fi
408		-
409		-if as_func_ret_failure; then
410		- exitcode=1
411		- echo as_func_ret_failure succeeded.
412		-fi
413		-
414		-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
415		- :
416		+as_fn_success \|\| { exitcode=1; echo as_fn_success failed.; }
417		+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
418		+as_fn_ret_success \|\| { exitcode=1; echo as_fn_ret_success failed.; }
419		+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
420		+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
421		+
422		+else
423		+ exitcode=1; echo positional parameters were not saved.
424		+fi
425		+test x\$exitcode = x0 \|\| exit 1"
426		+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
427		+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
428		+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
429		+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' \|\| exit 1
430		+test \$(( 1 + 1 )) = 2 \|\| exit 1"
431		+ if (eval "$as_required") 2>/dev/null; then :
432		+ as_have_required=yes
433		else
434		- exitcode=1
435		- echo positional parameters were not saved.
436		+ as_have_required=no
437		fi
438		+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
439
440		-test \$exitcode = 0) \|\| { (exit 1); exit 1; }
441		-
442		-(
443		- as_lineno_1=\$LINENO
444		- as_lineno_2=\$LINENO
445		- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
446		- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") \|\| { (exit 1); exit 1; }
447		-") 2> /dev/null; then
448		- :
449		else
450		- as_candidate_shells=
451		- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
452		+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
453		+as_found=false
454		for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
455		do
456		IFS=$as_save_IFS
457		test -z "$as_dir" && as_dir=.
458		- case $as_dir in
459		+ as_found=:
460		+ case $as_dir in #(
461		/*)
462		for as_base in sh bash ksh sh5; do
463		- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
464		+ # Try only shells that exist, to save several forks.
465		+ as_shell=$as_dir/$as_base
466		+ if { test -f "$as_shell" \|\| test -f "$as_shell.exe"; } &&
467		+ { $as_echo "$as_bourne_compatible""$as_required" \| as_run=a "$as_shell"; } 2>/dev/null; then :
468		+ CONFIG_SHELL=$as_shell as_have_required=yes
469		+ if { $as_echo "$as_bourne_compatible""$as_suggested" \| as_run=a "$as_shell"; } 2>/dev/null; then :
470		+ break 2
471		+fi
472		+fi
473		done;;
474		esac
475		+ as_found=false
476		done
477		+$as_found \|\| { if { test -f "$SHELL" \|\| test -f "$SHELL.exe"; } &&
478		+ { $as_echo "$as_bourne_compatible""$as_required" \| as_run=a "$SHELL"; } 2>/dev/null; then :
479		+ CONFIG_SHELL=$SHELL as_have_required=yes
480		+fi; }
481		IFS=$as_save_IFS
482
483
484		- for as_shell in $as_candidate_shells $SHELL; do
485		- # Try only shells that exist, to save several forks.
486		- if { test -f "$as_shell" \|\| test -f "$as_shell.exe"; } &&
487		- { ("$as_shell") 2> /dev/null <<\_ASEOF
488		-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
489		- emulate sh
490		- NULLCMD=:
491		- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
492		- # is contrary to our usage. Disable this feature.
493		- alias -g '${1+"$@"}'='"$@"'
494		- setopt NO_GLOB_SUBST
495		-else
496		- case `(set -o) 2>/dev/null` in
497		- posix) set -o posix ;;
498		-esac
499		-
500		-fi
501		-
502		-
503		-:
504		-_ASEOF
505		-}; then
506		- CONFIG_SHELL=$as_shell
507		- as_have_required=yes
508		- if { "$as_shell" 2> /dev/null <<\_ASEOF
509		-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
510		- emulate sh
511		- NULLCMD=:
512		- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
513		- # is contrary to our usage. Disable this feature.
514		- alias -g '${1+"$@"}'='"$@"'
515		- setopt NO_GLOB_SUBST
516		-else
517		- case `(set -o) 2>/dev/null` in
518		- posix) set -o posix ;;
519		-esac
520		-
521		-fi
522		-
523		-
524		-:
525		-(as_func_return () {
526		- (exit $1)
527		-}
528		-as_func_success () {
529		- as_func_return 0
530		-}
531		-as_func_failure () {
532		- as_func_return 1
533		-}
534		-as_func_ret_success () {
535		- return 0
536		-}
537		-as_func_ret_failure () {
538		- return 1
539		-}
540		-
541		-exitcode=0
542		-if as_func_success; then
543		- :
544		-else
545		- exitcode=1
546		- echo as_func_success failed.
547		-fi
548		-
549		-if as_func_failure; then
550		- exitcode=1
551		- echo as_func_failure succeeded.
552		-fi
553		-
554		-if as_func_ret_success; then
555		- :
556		-else
557		- exitcode=1
558		- echo as_func_ret_success failed.
559		-fi
560		-
561		-if as_func_ret_failure; then
562		- exitcode=1
563		- echo as_func_ret_failure succeeded.
564		-fi
565		-
566		-if ( set x; as_func_ret_success y && test x = "$1" ); then
567		- :
568		-else
569		- exitcode=1
570		- echo positional parameters were not saved.
571		-fi
572		-
573		-test $exitcode = 0) \|\| { (exit 1); exit 1; }
574		-
575		-(
576		- as_lineno_1=$LINENO
577		- as_lineno_2=$LINENO
578		- test "x$as_lineno_1" != "x$as_lineno_2" &&
579		- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") \|\| { (exit 1); exit 1; }
580		-
581		-_ASEOF
582		-}; then
583		- break
584		-fi
585		-
586		-fi
587		-
588		- done
589		-
590		- if test "x$CONFIG_SHELL" != x; then
591		- for as_var in BASH_ENV ENV
592		- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
593		- done
594		+ if test "x$CONFIG_SHELL" != x; then :
595		+ # We cannot yet assume a decent shell, so we have to provide a
596		+ # neutralization value for shells without unset; and this also
597		+ # works around shells that cannot unset nonexistent variables.
598		+ BASH_ENV=/dev/null
599		+ ENV=/dev/null
600		+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
601		export CONFIG_SHELL
602		exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
603		fi
604
605		-
606		- if test $as_have_required = no; then
607		- echo This script requires a shell more modern than all the
608		- echo shells that I found on your system. Please install a
609		- echo modern shell, or manually run the script under such a
610		- echo shell if you do have one.
611		- { (exit 1); exit 1; }
612		+ if test x$as_have_required = xno; then :
613		+ $as_echo "$0: This script requires a shell more modern than all"
614		+ $as_echo "$0: the shells that I found on your system."
615		+ if test x${ZSH_VERSION+set} = xset ; then
616		+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
617		+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
618		+ else
619		+ $as_echo "$0: Please tell bug-autoconf@gnu.org and
620		+$0: http://bugzilla.gnome.org/enter_bug.cgi?product=eog&component=plugins
621		+$0: about your system, including any error possibly output
622		+$0: before this message. Then install a modern shell, or
623		+$0: manually run the script under such a shell if you do
624		+$0: have one."
625		+ fi
626		+ exit 1
627		fi
628		-
629		-
630		fi
631		-
632		fi
633		+SHELL=${CONFIG_SHELL-/bin/sh}
634		+export SHELL
635		+# Unset more variables known to interfere with behavior of common tools.
636		+CLICOLOR_FORCE= GREP_OPTIONS=
637		+unset CLICOLOR_FORCE GREP_OPTIONS
638		+
639		+## --------------------- ##
640		+## M4sh Shell Functions. ##
641		+## --------------------- ##
642		+# as_fn_unset VAR
643		+# ---------------
644		+# Portably unset VAR.
645		+as_fn_unset ()
646		+{
647		+ { eval $1=; unset $1;}
648		+}
649		+as_unset=as_fn_unset
650		+
651		+# as_fn_set_status STATUS
652		+# -----------------------
653		+# Set $? to STATUS, without forking.
654		+as_fn_set_status ()
655		+{
656		+ return $1
657		+} # as_fn_set_status
658		+
659		+# as_fn_exit STATUS
660		+# -----------------
661		+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
662		+as_fn_exit ()
663		+{
664		+ set +e
665		+ as_fn_set_status $1
666		+ exit $1
667		+} # as_fn_exit
668		+
669		+# as_fn_mkdir_p
670		+# -------------
671		+# Create "$as_dir" as a directory, including parents if necessary.
672		+as_fn_mkdir_p ()
673		+{
674
675		+ case $as_dir in #(
676		+ -*) as_dir=./$as_dir;;
677		+ esac
678		+ test -d "$as_dir" \|\| eval $as_mkdir_p \|\| {
679		+ as_dirs=
680		+ while :; do
681		+ case $as_dir in #(
682		+ \') as_qdir=`$as_echo "$as_dir" \| sed "s/'/'\\\\\\\\''/g"`;; #'(
683		+ *) as_qdir=$as_dir;;
684		+ esac
685		+ as_dirs="'$as_qdir' $as_dirs"
686		+ as_dir=`$as_dirname -- "$as_dir" \|\|
687		+$as_expr X"$as_dir" : 'X$.[^/]$//[^/][^/]/$' \\| \
688		+ X"$as_dir" : 'X$//$[^/]' \\| \
689		+ X"$as_dir" : 'X$//$$' \\| \
690		+ X"$as_dir" : 'X$/$' \\| . 2>/dev/null \|\|
691		+$as_echo X"$as_dir" \|
692		+ sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
693		+ s//\1/
694		+ q
695		+ }
696		+ /^X$\/\/$[^/].*/{
697		+ s//\1/
698		+ q
699		+ }
700		+ /^X$\/\/$$/{
701		+ s//\1/
702		+ q
703		+ }
704		+ /^X$\/$.*/{
705		+ s//\1/
706		+ q
707		+ }
708		+ s/.*/./; q'`
709		+ test -d "$as_dir" && break
710		+ done
711		+ test -z "$as_dirs" \|\| eval "mkdir $as_dirs"
712		+ } \|\| test -d "$as_dir" \|\| as_fn_error "cannot create directory $as_dir"
713
714
715		-(eval "as_func_return () {
716		- (exit \$1)
717		-}
718		-as_func_success () {
719		- as_func_return 0
720		-}
721		-as_func_failure () {
722		- as_func_return 1
723		-}
724		-as_func_ret_success () {
725		- return 0
726		-}
727		-as_func_ret_failure () {
728		- return 1
729		-}
730		+} # as_fn_mkdir_p
731		+# as_fn_append VAR VALUE
732		+# ----------------------
733		+# Append the text in VALUE to the end of the definition contained in VAR. Take
734		+# advantage of any shell optimizations that allow amortized linear growth over
735		+# repeated appends, instead of the typical quadratic growth present in naive
736		+# implementations.
737		+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
738		+ eval 'as_fn_append ()
739		+ {
740		+ eval $1+=\$2
741		+ }'
742		+else
743		+ as_fn_append ()
744		+ {
745		+ eval $1=\$$1\$2
746		+ }
747		+fi # as_fn_append
748
749		-exitcode=0
750		-if as_func_success; then
751		- :
752		+# as_fn_arith ARG...
753		+# ------------------
754		+# Perform arithmetic evaluation on the ARGs, and store the result in the
755		+# global $as_val. Take advantage of shells that can avoid forks. The arguments
756		+# must be portable across $(()) and expr.
757		+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
758		+ eval 'as_fn_arith ()
759		+ {
760		+ as_val=$(( $* ))
761		+ }'
762		else
763		- exitcode=1
764		- echo as_func_success failed.
765		-fi
766		+ as_fn_arith ()
767		+ {
768		+ as_val=`expr "$@" \|\| test $? -eq 1`
769		+ }
770		+fi # as_fn_arith
771
772		-if as_func_failure; then
773		- exitcode=1
774		- echo as_func_failure succeeded.
775		-fi
776
777		-if as_func_ret_success; then
778		- :
779		+# as_fn_error ERROR [LINENO LOG_FD]
780		+# ---------------------------------
781		+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
782		+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
783		+# script with status $?, using 1 if that was 0.
784		+as_fn_error ()
785		+{
786		+ as_status=$?; test $as_status -eq 0 && as_status=1
787		+ if test "$3"; then
788		+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
789		+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
790		+ fi
791		+ $as_echo "$as_me: error: $1" >&2
792		+ as_fn_exit $as_status
793		+} # as_fn_error
794		+
795		+if expr a : '$a$' >/dev/null 2>&1 &&
796		+ test "X`expr 00001 : '.*$...$'`" = X001; then
797		+ as_expr=expr
798		else
799		- exitcode=1
800		- echo as_func_ret_success failed.
801		+ as_expr=false
802		fi
803
804		-if as_func_ret_failure; then
805		- exitcode=1
806		- echo as_func_ret_failure succeeded.
807		+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
808		+ as_basename=basename
809		+else
810		+ as_basename=false
811		fi
812
813		-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
814		- :
815		+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
816		+ as_dirname=dirname
817		else
818		- exitcode=1
819		- echo positional parameters were not saved.
820		+ as_dirname=false
821		fi
822
823		-test \$exitcode = 0") \|\| {
824		- echo No shell found that supports shell functions.
825		- echo Please tell bug-autoconf@gnu.org about your system,
826		- echo including any error possibly output before this message.
827		- echo This can help us improve future autoconf versions.
828		- echo Configuration will now proceed without shell functions.
829		-}
830		+as_me=`$as_basename -- "$0" \|\|
831		+$as_expr X/"$0" : './$[^/][^/]$/*$' \\| \
832		+ X"$0" : 'X$//$$' \\| \
833		+ X"$0" : 'X$/$' \\| . 2>/dev/null \|\|
834		+$as_echo X/"$0" \|
835		+ sed '/^.\/$[^/][^/]$\/*$/{
836		+ s//\1/
837		+ q
838		+ }
839		+ /^X\/$\/\/$$/{
840		+ s//\1/
841		+ q
842		+ }
843		+ /^X\/$\/$.*/{
844		+ s//\1/
845		+ q
846		+ }
847		+ s/.*/./; q'`
848
849		+# Avoid depending upon Character Ranges.
850		+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
851		+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
852		+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
853		+as_cr_digits='0123456789'
854		+as_cr_alnum=$as_cr_Letters$as_cr_digits
855
856
857		- as_lineno_1=$LINENO
858		- as_lineno_2=$LINENO
859		- test "x$as_lineno_1" != "x$as_lineno_2" &&
860		- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" \|\| {
861		-
862		- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
863		- # uniformly replaced by the line number. The first 'sed' inserts a
864		- # line-number line after each line using $LINENO; the second 'sed'
865		- # does the real work. The second script uses 'N' to pair each
866		- # line-number line with the line containing $LINENO, and appends
867		- # trailing '-' during substitution so that $LINENO is not a special
868		- # case at line end.
869		- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
870		- # scripts with optimization help from Paolo Bonzini. Blame Lee
871		- # E. McMahon (1931-1989) for sed's syntax. :-)
872		+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
873		+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
874		+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
875		+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' \|\| {
876		+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
877		sed -n '
878		p
879		/[$]LINENO/=
880		@@ -473,8 +441,7 @@
881		s/-\n.*//
882		' >$as_me.lineno &&
883		chmod +x "$as_me.lineno" \|\|
884		- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
885		- { (exit 1); exit 1; }; }
886		+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
887
888		# Don't try to exec as it changes $[0], causing all sort of problems
889		# (the dirname of $[0] is not the place where we might find the
890		@@ -484,29 +451,18 @@
891		exit
892		}
893
894		-
895		-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
896		- as_dirname=dirname
897		-else
898		- as_dirname=false
899		-fi
900		-
901		ECHO_C= ECHO_N= ECHO_T=
902		-case `echo -n x` in
903		+case `echo -n x` in #(((((
904		-n*)
905		- case `echo 'x\c'` in
906		+ case `echo 'xy\c'` in
907		c) ECHO_T=' ';; # ECHO_T is single tab character.
908		- *) ECHO_C='\c';;
909		+ xy) ECHO_C='\c';;
910		+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
911		+ ECHO_T=' ';;
912		esac;;
913		*)
914		ECHO_N='-n';;
915		esac
916		-if expr a : '$a$' >/dev/null 2>&1 &&
917		- test "X`expr 00001 : '.*$...$'`" = X001; then
918		- as_expr=expr
919		-else
920		- as_expr=false
921		-fi
922
923		rm -f conf$$ conf$$.exe conf$$.file
924		if test -d conf$$.dir; then
925		@@ -536,7 +492,7 @@
926		rmdir conf$$.dir 2>/dev/null
927
928		if mkdir -p . 2>/dev/null; then
929		- as_mkdir_p=:
930		+ as_mkdir_p='mkdir -p "$as_dir"'
931		else
932		test -d ./-p && rmdir ./-p
933		as_mkdir_p=false
934		@@ -555,10 +511,10 @@
935		if test -d "$1"; then
936		test -d "$1/.";
937		else
938		- case $1 in
939		+ case $1 in #(
940		-*)set "./$1";;
941		esac;
942		- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
943		+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
944		???[sx]):;;)false;;esac;fi
945		'\'' sh
946		'
947		@@ -573,7 +529,6 @@
948
949
950
951		-
952		# Check that we are running under the correct shell.
953		SHELL=${CONFIG_SHELL-/bin/sh}
954
955		@@ -740,7 +695,6 @@
956		subdirs=
957		MFLAGS=
958		MAKEFLAGS=
959		-SHELL=${CONFIG_SHELL-/bin/sh}
960
961		# Identity of this package.
962		PACKAGE_NAME='eog-plugins'
963		@@ -748,6 +702,7 @@
964		PACKAGE_VERSION='2.28.0'
965		PACKAGE_STRING='eog-plugins 2.28.0'
966		PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=eog&component=plugins'
967		+PACKAGE_URL=''
968
969		ac_unique_file="plugins"
970		# Factoring default headers for most tests.
971		@@ -974,6 +929,7 @@
972		program_transform_name
973		prefix
974		exec_prefix
975		+PACKAGE_URL
976		PACKAGE_BUGREPORT
977		PACKAGE_STRING
978		PACKAGE_VERSION
979		@@ -1126,8 +1082,7 @@
980		ac_useropt=`expr "x$ac_option" : 'x-disable-$.$'`
981		# Reject names that are not valid shell variable names.
982		expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
983		- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
984		- { (exit 1); exit 1; }; }
985		+ as_fn_error "invalid feature name: $ac_useropt"
986		ac_useropt_orig=$ac_useropt
987		ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
988		case $ac_user_opts in
989		@@ -1153,8 +1108,7 @@
990		ac_useropt=`expr "x$ac_option" : 'x-enable-$[^=]$'`
991		# Reject names that are not valid shell variable names.
992		expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
993		- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
994		- { (exit 1); exit 1; }; }
995		+ as_fn_error "invalid feature name: $ac_useropt"
996		ac_useropt_orig=$ac_useropt
997		ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
998		case $ac_user_opts in
999		@@ -1358,8 +1312,7 @@
1000		ac_useropt=`expr "x$ac_option" : 'x-with-$[^=]$'`
1001		# Reject names that are not valid shell variable names.
1002		expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1003		- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
1004		- { (exit 1); exit 1; }; }
1005		+ as_fn_error "invalid package name: $ac_useropt"
1006		ac_useropt_orig=$ac_useropt
1007		ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
1008		case $ac_user_opts in
1009		@@ -1375,8 +1328,7 @@
1010		ac_useropt=`expr "x$ac_option" : 'x-without-$.$'`
1011		# Reject names that are not valid shell variable names.
1012		expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1013		- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
1014		- { (exit 1); exit 1; }; }
1015		+ as_fn_error "invalid package name: $ac_useropt"
1016		ac_useropt_orig=$ac_useropt
1017		ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
1018		case $ac_user_opts in
1019		@@ -1406,17 +1358,17 @@
1020		\| --x-librar=* \| --x-libra=* \| --x-libr=* \| --x-lib=* \| --x-li=* \| --x-l=*)
1021		x_libraries=$ac_optarg ;;
1022
1023		- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
1024		-Try \`$0 --help' for more information." >&2
1025		- { (exit 1); exit 1; }; }
1026		+ -*) as_fn_error "unrecognized option: \`$ac_option'
1027		+Try \`$0 --help' for more information."
1028		;;
1029
1030		=)
1031		ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='`
1032		# Reject names that are not valid shell variable names.
1033		- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
1034		- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
1035		- { (exit 1); exit 1; }; }
1036		+ case $ac_envvar in #(
1037		+ '' \| [0-9]* \| [!_$as_cr_alnum] )
1038		+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
1039		+ esac
1040		eval $ac_envvar=\$ac_optarg
1041		export $ac_envvar ;;
1042
1043		@@ -1433,15 +1385,13 @@
1044
1045		if test -n "$ac_prev"; then
1046		ac_option=--`echo $ac_prev \| sed 's/_/-/g'`
1047		- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
1048		- { (exit 1); exit 1; }; }
1049		+ as_fn_error "missing argument to $ac_option"
1050		fi
1051
1052		if test -n "$ac_unrecognized_opts"; then
1053		case $enable_option_checking in
1054		no) ;;
1055		- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
1056		- { (exit 1); exit 1; }; } ;;
1057		+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
1058		*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1059		esac
1060		fi
1061		@@ -1464,8 +1414,7 @@
1062		[\\/$]* \| ?:[\\/]* ) continue;;
1063		NONE \| '' ) case $ac_var in *prefix ) continue;; esac;;
1064		esac
1065		- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1066		- { (exit 1); exit 1; }; }
1067		+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
1068		done
1069
1070		# There might be people who depend on the old broken behavior: `$host'
1071		@@ -1495,11 +1444,9 @@
1072		ac_pwd=`pwd` && test -n "$ac_pwd" &&
1073		ac_ls_di=`ls -di .` &&
1074		ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` \|\|
1075		- { $as_echo "$as_me: error: working directory cannot be determined" >&2
1076		- { (exit 1); exit 1; }; }
1077		+ as_fn_error "working directory cannot be determined"
1078		test "X$ac_ls_di" = "X$ac_pwd_ls_di" \|\|
1079		- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
1080		- { (exit 1); exit 1; }; }
1081		+ as_fn_error "pwd does not report name of working directory"
1082
1083
1084		# Find the source files, if location was not specified.
1085		@@ -1538,13 +1485,11 @@
1086		fi
1087		if test ! -r "$srcdir/$ac_unique_file"; then
1088		test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1089		- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1090		- { (exit 1); exit 1; }; }
1091		+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
1092		fi
1093		ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1094		ac_abs_confdir=`(
1095		- cd "$srcdir" && test -r "./$ac_unique_file" \|\| { $as_echo "$as_me: error: $ac_msg" >&2
1096		- { (exit 1); exit 1; }; }
1097		+ cd "$srcdir" && test -r "./$ac_unique_file" \|\| as_fn_error "$ac_msg"
1098		pwd)`
1099		# When building in place, set srcdir=.
1100		if test "$ac_abs_confdir" = "$ac_pwd"; then
1101		@@ -1771,21 +1716,378 @@
1102		if $ac_init_version; then
1103		cat <<\_ACEOF
1104		eog-plugins configure 2.28.0
1105		-generated by GNU Autoconf 2.63
1106		+generated by GNU Autoconf 2.64
1107
1108		-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1109		-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1110		+Copyright (C) 2009 Free Software Foundation, Inc.
1111		This configure script is free software; the Free Software Foundation
1112		gives unlimited permission to copy, distribute and modify it.
1113		_ACEOF
1114		exit
1115		fi
1116		+
1117		+## ------------------------ ##
1118		+## Autoconf initialization. ##
1119		+## ------------------------ ##
1120		+
1121		+# ac_fn_c_try_compile LINENO
1122		+# --------------------------
1123		+# Try to compile conftest.$ac_ext, and return whether this succeeded.
1124		+ac_fn_c_try_compile ()
1125		+{
1126		+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1127		+ rm -f conftest.$ac_objext
1128		+ if { { ac_try="$ac_compile"
1129		+case "(($ac_try" in
1130		+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
1131		+ *) ac_try_echo=$ac_try;;
1132		+esac
1133		+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1134		+$as_echo "$ac_try_echo"; } >&5
1135		+ (eval "$ac_compile") 2>conftest.err
1136		+ ac_status=$?
1137		+ if test -s conftest.err; then
1138		+ grep -v '^ *+' conftest.err >conftest.er1
1139		+ cat conftest.er1 >&5
1140		+ mv -f conftest.er1 conftest.err
1141		+ fi
1142		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1143		+ test $ac_status = 0; } && {
1144		+ test -z "$ac_c_werror_flag" \|\|
1145		+ test ! -s conftest.err
1146		+ } && test -s conftest.$ac_objext; then :
1147		+ ac_retval=0
1148		+else
1149		+ $as_echo "$as_me: failed program was:" >&5
1150		+sed 's/^/\| /' conftest.$ac_ext >&5
1151		+
1152		+ ac_retval=1
1153		+fi
1154		+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1155		+ return $ac_retval
1156		+
1157		+} # ac_fn_c_try_compile
1158		+
1159		+# ac_fn_c_try_link LINENO
1160		+# -----------------------
1161		+# Try to link conftest.$ac_ext, and return whether this succeeded.
1162		+ac_fn_c_try_link ()
1163		+{
1164		+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1165		+ rm -f conftest.$ac_objext conftest$ac_exeext
1166		+ if { { ac_try="$ac_link"
1167		+case "(($ac_try" in
1168		+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
1169		+ *) ac_try_echo=$ac_try;;
1170		+esac
1171		+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1172		+$as_echo "$ac_try_echo"; } >&5
1173		+ (eval "$ac_link") 2>conftest.err
1174		+ ac_status=$?
1175		+ if test -s conftest.err; then
1176		+ grep -v '^ *+' conftest.err >conftest.er1
1177		+ cat conftest.er1 >&5
1178		+ mv -f conftest.er1 conftest.err
1179		+ fi
1180		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1181		+ test $ac_status = 0; } && {
1182		+ test -z "$ac_c_werror_flag" \|\|
1183		+ test ! -s conftest.err
1184		+ } && test -s conftest$ac_exeext && {
1185		+ test "$cross_compiling" = yes \|\|
1186		+ $as_test_x conftest$ac_exeext
1187		+ }; then :
1188		+ ac_retval=0
1189		+else
1190		+ $as_echo "$as_me: failed program was:" >&5
1191		+sed 's/^/\| /' conftest.$ac_ext >&5
1192		+
1193		+ ac_retval=1
1194		+fi
1195		+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
1196		+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
1197		+ # interfere with the next link command; also delete a directory that is
1198		+ # left behind by Apple's compiler. We do this before executing the actions.
1199		+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1200		+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1201		+ return $ac_retval
1202		+
1203		+} # ac_fn_c_try_link
1204		+
1205		+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
1206		+# -------------------------------------------------------
1207		+# Tests whether HEADER exists and can be compiled using the include files in
1208		+# INCLUDES, setting the cache variable VAR accordingly.
1209		+ac_fn_c_check_header_compile ()
1210		+{
1211		+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1212		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1213		+$as_echo_n "checking for $2... " >&6; }
1214		+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1215		+ $as_echo_n "(cached) " >&6
1216		+else
1217		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1218		+/* end confdefs.h. */
1219		+$4
1220		+#include <$2>
1221		+_ACEOF
1222		+if ac_fn_c_try_compile "$LINENO"; then :
1223		+ eval "$3=yes"
1224		+else
1225		+ eval "$3=no"
1226		+fi
1227		+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1228		+fi
1229		+eval ac_res=\$$3
1230		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1231		+$as_echo "$ac_res" >&6; }
1232		+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1233		+
1234		+} # ac_fn_c_check_header_compile
1235		+
1236		+# ac_fn_c_try_cpp LINENO
1237		+# ----------------------
1238		+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
1239		+ac_fn_c_try_cpp ()
1240		+{
1241		+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1242		+ if { { ac_try="$ac_cpp conftest.$ac_ext"
1243		+case "(($ac_try" in
1244		+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
1245		+ *) ac_try_echo=$ac_try;;
1246		+esac
1247		+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1248		+$as_echo "$ac_try_echo"; } >&5
1249		+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
1250		+ ac_status=$?
1251		+ if test -s conftest.err; then
1252		+ grep -v '^ *+' conftest.err >conftest.er1
1253		+ cat conftest.er1 >&5
1254		+ mv -f conftest.er1 conftest.err
1255		+ fi
1256		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1257		+ test $ac_status = 0; } >/dev/null && {
1258		+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
1259		+ test ! -s conftest.err
1260		+ }; then :
1261		+ ac_retval=0
1262		+else
1263		+ $as_echo "$as_me: failed program was:" >&5
1264		+sed 's/^/\| /' conftest.$ac_ext >&5
1265		+
1266		+ ac_retval=1
1267		+fi
1268		+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1269		+ return $ac_retval
1270		+
1271		+} # ac_fn_c_try_cpp
1272		+
1273		+# ac_fn_c_try_run LINENO
1274		+# ----------------------
1275		+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
1276		+# that executables can be run.
1277		+ac_fn_c_try_run ()
1278		+{
1279		+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1280		+ if { { ac_try="$ac_link"
1281		+case "(($ac_try" in
1282		+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
1283		+ *) ac_try_echo=$ac_try;;
1284		+esac
1285		+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1286		+$as_echo "$ac_try_echo"; } >&5
1287		+ (eval "$ac_link") 2>&5
1288		+ ac_status=$?
1289		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1290		+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
1291		+ { { case "(($ac_try" in
1292		+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
1293		+ *) ac_try_echo=$ac_try;;
1294		+esac
1295		+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1296		+$as_echo "$ac_try_echo"; } >&5
1297		+ (eval "$ac_try") 2>&5
1298		+ ac_status=$?
1299		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1300		+ test $ac_status = 0; }; }; then :
1301		+ ac_retval=0
1302		+else
1303		+ $as_echo "$as_me: program exited with status $ac_status" >&5
1304		+ $as_echo "$as_me: failed program was:" >&5
1305		+sed 's/^/\| /' conftest.$ac_ext >&5
1306		+
1307		+ ac_retval=$ac_status
1308		+fi
1309		+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1310		+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1311		+ return $ac_retval
1312		+
1313		+} # ac_fn_c_try_run
1314		+
1315		+# ac_fn_c_check_func LINENO FUNC VAR
1316		+# ----------------------------------
1317		+# Tests whether FUNC exists, setting the cache variable VAR accordingly
1318		+ac_fn_c_check_func ()
1319		+{
1320		+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1321		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1322		+$as_echo_n "checking for $2... " >&6; }
1323		+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1324		+ $as_echo_n "(cached) " >&6
1325		+else
1326		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1327		+/* end confdefs.h. */
1328		+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
1329		+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
1330		+#define $2 innocuous_$2
1331		+
1332		+/* System header to define __stub macros and hopefully few prototypes,
1333		+ which can conflict with char $2 (); below.
1334		+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1335		+ <limits.h> exists even on freestanding compilers. */
1336		+
1337		+#ifdef __STDC__
1338		+# include <limits.h>
1339		+#else
1340		+# include <assert.h>
1341		+#endif
1342		+
1343		+#undef $2
1344		+
1345		+/* Override any GCC internal prototype to avoid an error.
1346		+ Use char because int might match the return type of a GCC
1347		+ builtin and then its argument prototype would still apply. */
1348		+#ifdef __cplusplus
1349		+extern "C"
1350		+#endif
1351		+char $2 ();
1352		+/* The GNU C library defines this for functions which it implements
1353		+ to always fail with ENOSYS. Some functions are actually named
1354		+ something starting with __ and the normal name is an alias. */
1355		+#if defined __stub_$2 \|\| defined __stub___$2
1356		+choke me
1357		+#endif
1358		+
1359		+int
1360		+main ()
1361		+{
1362		+return $2 ();
1363		+ ;
1364		+ return 0;
1365		+}
1366		+_ACEOF
1367		+if ac_fn_c_try_link "$LINENO"; then :
1368		+ eval "$3=yes"
1369		+else
1370		+ eval "$3=no"
1371		+fi
1372		+rm -f core conftest.err conftest.$ac_objext \
1373		+ conftest$ac_exeext conftest.$ac_ext
1374		+fi
1375		+eval ac_res=\$$3
1376		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1377		+$as_echo "$ac_res" >&6; }
1378		+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1379		+
1380		+} # ac_fn_c_check_func
1381		+
1382		+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
1383		+# -------------------------------------------------------
1384		+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
1385		+# the include files in INCLUDES and setting the cache variable VAR
1386		+# accordingly.
1387		+ac_fn_c_check_header_mongrel ()
1388		+{
1389		+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1390		+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1391		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1392		+$as_echo_n "checking for $2... " >&6; }
1393		+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1394		+ $as_echo_n "(cached) " >&6
1395		+fi
1396		+eval ac_res=\$$3
1397		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1398		+$as_echo "$ac_res" >&6; }
1399		+else
1400		+ # Is the header compilable?
1401		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
1402		+$as_echo_n "checking $2 usability... " >&6; }
1403		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1404		+/* end confdefs.h. */
1405		+$4
1406		+#include <$2>
1407		+_ACEOF
1408		+if ac_fn_c_try_compile "$LINENO"; then :
1409		+ ac_header_compiler=yes
1410		+else
1411		+ ac_header_compiler=no
1412		+fi
1413		+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1414		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
1415		+$as_echo "$ac_header_compiler" >&6; }
1416		+
1417		+# Is the header present?
1418		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
1419		+$as_echo_n "checking $2 presence... " >&6; }
1420		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1421		+/* end confdefs.h. */
1422		+#include <$2>
1423		+_ACEOF
1424		+if ac_fn_c_try_cpp "$LINENO"; then :
1425		+ ac_header_preproc=yes
1426		+else
1427		+ ac_header_preproc=no
1428		+fi
1429		+rm -f conftest.err conftest.$ac_ext
1430		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
1431		+$as_echo "$ac_header_preproc" >&6; }
1432		+
1433		+# So? What about this header?
1434		+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
1435		+ yes:no: )
1436		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
1437		+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
1438		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1439		+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1440		+ ;;
1441		+ no:yes:* )
1442		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
1443		+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
1444		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
1445		+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
1446		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
1447		+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
1448		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
1449		+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
1450		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1451		+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1452		+( cat <<\_ASBOX
1453		+## ------------------------------------------------------------------------------------ ##
1454		+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=eog&component=plugins ##
1455		+## ------------------------------------------------------------------------------------ ##
1456		+_ASBOX
1457		+ ) \| sed "s/^/$as_me: WARNING: /" >&2
1458		+ ;;
1459		+esac
1460		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1461		+$as_echo_n "checking for $2... " >&6; }
1462		+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1463		+ $as_echo_n "(cached) " >&6
1464		+else
1465		+ eval "$3=\$ac_header_compiler"
1466		+fi
1467		+eval ac_res=\$$3
1468		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1469		+$as_echo "$ac_res" >&6; }
1470		+fi
1471		+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1472		+
1473		+} # ac_fn_c_check_header_mongrel
1474		cat >config.log <<_ACEOF
1475		This file contains any messages produced by compilers while
1476		running configure, to aid debugging if configure makes a mistake.
1477
1478		It was created by eog-plugins $as_me 2.28.0, which was
1479		-generated by GNU Autoconf 2.63. Invocation command line was
1480		+generated by GNU Autoconf 2.64. Invocation command line was
1481
1482		$ $0 $@
1483
1484		@@ -1821,8 +2123,8 @@
1485		do
1486		IFS=$as_save_IFS
1487		test -z "$as_dir" && as_dir=.
1488		- $as_echo "PATH: $as_dir"
1489		-done
1490		+ $as_echo "PATH: $as_dir"
1491		+ done
1492		IFS=$as_save_IFS
1493
1494		} >&5
1495		@@ -1859,9 +2161,9 @@
1496		ac_arg=`$as_echo "$ac_arg" \| sed "s/'/'\\\\\\\\''/g"` ;;
1497		esac
1498		case $ac_pass in
1499		- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
1500		+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
1501		2)
1502		- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
1503		+ as_fn_append ac_configure_args1 " '$ac_arg'"
1504		if test $ac_must_keep_next = true; then
1505		ac_must_keep_next=false # Got value, back to normal.
1506		else
1507		@@ -1877,13 +2179,13 @@
1508		-* ) ac_must_keep_next=true ;;
1509		esac
1510		fi
1511		- ac_configure_args="$ac_configure_args '$ac_arg'"
1512		+ as_fn_append ac_configure_args " '$ac_arg'"
1513		;;
1514		esac
1515		done
1516		done
1517		-$as_unset ac_configure_args0 \|\| test "${ac_configure_args0+set}" != set \|\| { ac_configure_args0=; export ac_configure_args0; }
1518		-$as_unset ac_configure_args1 \|\| test "${ac_configure_args1+set}" != set \|\| { ac_configure_args1=; export ac_configure_args1; }
1519		+{ ac_configure_args0=; unset ac_configure_args0;}
1520		+{ ac_configure_args1=; unset ac_configure_args1;}
1521
1522		# When interrupted or exit'd, cleanup temporary files, and complete
1523		# config.log. We remove comments because anyway the quotes in there
1524		@@ -1908,13 +2210,13 @@
1525		case $ac_val in #(
1526		${as_nl})
1527		case $ac_var in #(
1528		- _cv_) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
1529		+ _cv_) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
1530		$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
1531		esac
1532		case $ac_var in #(
1533		_ \| IFS \| as_nl) ;; #(
1534		BASH_ARGV \| BASH_SOURCE) eval $ac_var= ;; #(
1535		- *) $as_unset $ac_var ;;
1536		+ *) { eval $ac_var=; unset $ac_var;} ;;
1537		esac ;;
1538		esac
1539		done
1540		@@ -1986,39 +2288,41 @@
1541		exit $exit_status
1542		' 0
1543		for ac_signal in 1 2 13 15; do
1544		- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
1545		+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
1546		done
1547		ac_signal=0
1548
1549		# confdefs.h avoids OS command line length limits that DEFS can exceed.
1550		rm -f -r conftest* confdefs.h
1551
1552		+$as_echo "/* confdefs.h */" > confdefs.h
1553		+
1554		# Predefined preprocessor variables.
1555
1556		cat >>confdefs.h <<_ACEOF
1557		#define PACKAGE_NAME "$PACKAGE_NAME"
1558		_ACEOF
1559
1560		-
1561		cat >>confdefs.h <<_ACEOF
1562		#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
1563		_ACEOF
1564
1565		-
1566		cat >>confdefs.h <<_ACEOF
1567		#define PACKAGE_VERSION "$PACKAGE_VERSION"
1568		_ACEOF
1569
1570		-
1571		cat >>confdefs.h <<_ACEOF
1572		#define PACKAGE_STRING "$PACKAGE_STRING"
1573		_ACEOF
1574
1575		-
1576		cat >>confdefs.h <<_ACEOF
1577		#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
1578		_ACEOF
1579
1580		+cat >>confdefs.h <<_ACEOF
1581		+#define PACKAGE_URL "$PACKAGE_URL"
1582		+_ACEOF
1583		+
1584
1585		# Let the site file select an alternate cache file if it wants to.
1586		# Prefer an explicitly selected file to automatically selected ones.
1587		@@ -2037,7 +2341,7 @@
1588		do
1589		test "x$ac_site_file" = xNONE && continue
1590		if test -r "$ac_site_file"; then
1591		- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
1592		+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
1593		$as_echo "$as_me: loading site script $ac_site_file" >&6;}
1594		sed 's/^/\| /' "$ac_site_file" >&5
1595		. "$ac_site_file"
1596		@@ -2048,7 +2352,7 @@
1597		# Some versions of bash will fail to source /dev/null (special
1598		# files actually), so we avoid doing that.
1599		if test -f "$cache_file"; then
1600		- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
1601		+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
1602		$as_echo "$as_me: loading cache $cache_file" >&6;}
1603		case $cache_file in
1604		[\\/]* \| ?:[\\/]* ) . "$cache_file";;
1605		@@ -2056,7 +2360,7 @@
1606		esac
1607		fi
1608		else
1609		- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
1610		+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
1611		$as_echo "$as_me: creating cache $cache_file" >&6;}
1612		>$cache_file
1613		fi
1614		@@ -2071,11 +2375,11 @@
1615		eval ac_new_val=\$ac_env_${ac_var}_value
1616		case $ac_old_set,$ac_new_set in
1617		set,)
1618		- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1619		+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1620		$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
1621		ac_cache_corrupted=: ;;
1622		,set)
1623		- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
1624		+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
1625		$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
1626		ac_cache_corrupted=: ;;
1627		,);;
1628		@@ -2085,17 +2389,17 @@
1629		ac_old_val_w=`echo x $ac_old_val`
1630		ac_new_val_w=`echo x $ac_new_val`
1631		if test "$ac_old_val_w" != "$ac_new_val_w"; then
1632		- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1633		+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
1634		$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1635		ac_cache_corrupted=:
1636		else
1637		- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
1638		+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
1639		$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
1640		eval $ac_var=\$ac_old_val
1641		fi
1642		- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
1643		+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
1644		$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
1645		- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
1646		+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
1647		$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
1648		fi;;
1649		esac
1650		@@ -2107,43 +2411,20 @@
1651		esac
1652		case " $ac_configure_args " in
1653		" '$ac_arg' ") ;; # Avoid dups. Use of quotes ensures accuracy.
1654		- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
1655		+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
1656		esac
1657		fi
1658		done
1659		if $ac_cache_corrupted; then
1660		- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1661		+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1662		$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1663		- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
1664		+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
1665		$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1666		- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1667		-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1668		- { (exit 1); exit 1; }; }
1669		+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
1670		fi
1671		-
1672		-
1673		-
1674		-
1675		-
1676		-
1677		-
1678		-
1679		-
1680		-
1681		-
1682		-
1683		-
1684		-
1685		-
1686		-
1687		-
1688		-
1689		-
1690		-
1691		-
1692		-
1693		-
1694		-
1695		+## -------------------- ##
1696		+## Main body of script. ##
1697		+## -------------------- ##
1698
1699		ac_ext=c
1700		ac_cpp='$CPP $CPPFLAGS'
1701		@@ -2158,9 +2439,9 @@
1702		$as_echo_n "checking for prefix by " >&6
1703		# Extract the first word of "eog", so it can be a program name with args.
1704		set dummy eog; ac_word=$2
1705		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1706		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1707		$as_echo_n "checking for $ac_word... " >&6; }
1708		-if test "${ac_cv_path_ac_prefix_program+set}" = set; then
1709		+if test "${ac_cv_path_ac_prefix_program+set}" = set; then :
1710		$as_echo_n "(cached) " >&6
1711		else
1712		case $ac_prefix_program in
1713		@@ -2173,14 +2454,14 @@
1714		do
1715		IFS=$as_save_IFS
1716		test -z "$as_dir" && as_dir=.
1717		- for ac_exec_ext in '' $ac_executable_extensions; do
1718		+ for ac_exec_ext in '' $ac_executable_extensions; do
1719		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1720		ac_cv_path_ac_prefix_program="$as_dir/$ac_word$ac_exec_ext"
1721		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1722		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1723		break 2
1724		fi
1725		done
1726		-done
1727		+ done
1728		IFS=$as_save_IFS
1729
1730		;;
1731		@@ -2188,10 +2469,10 @@
1732		fi
1733		ac_prefix_program=$ac_cv_path_ac_prefix_program
1734		if test -n "$ac_prefix_program"; then
1735		- { $as_echo "$as_me:$LINENO: result: $ac_prefix_program" >&5
1736		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prefix_program" >&5
1737		$as_echo "$ac_prefix_program" >&6; }
1738		else
1739		- { $as_echo "$as_me:$LINENO: result: no" >&5
1740		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1741		$as_echo "no" >&6; }
1742		fi
1743
1744		@@ -2255,24 +2536,16 @@
1745
1746		ac_aux_dir=
1747		for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
1748		- if test -f "$ac_dir/install-sh"; then
1749		- ac_aux_dir=$ac_dir
1750		- ac_install_sh="$ac_aux_dir/install-sh -c"
1751		- break
1752		- elif test -f "$ac_dir/install.sh"; then
1753		- ac_aux_dir=$ac_dir
1754		- ac_install_sh="$ac_aux_dir/install.sh -c"
1755		- break
1756		- elif test -f "$ac_dir/shtool"; then
1757		- ac_aux_dir=$ac_dir
1758		- ac_install_sh="$ac_aux_dir/shtool install -c"
1759		- break
1760		- fi
1761		+ for ac_t in install-sh install.sh shtool; do
1762		+ if test -f "$ac_dir/$ac_t"; then
1763		+ ac_aux_dir=$ac_dir
1764		+ ac_install_sh="$ac_aux_dir/$ac_t -c"
1765		+ break 2
1766		+ fi
1767		+ done
1768		done
1769		if test -z "$ac_aux_dir"; then
1770		- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
1771		-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
1772		- { (exit 1); exit 1; }; }
1773		+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
1774		fi
1775
1776		# These three variables are undocumented and unsupported,
1777		@@ -2298,10 +2571,10 @@
1778		# OS/2's system install, which has a completely different semantic
1779		# ./install, which can be erroneously created by make from ./install.sh.
1780		# Reject install programs that cannot install multiple files.
1781		-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
1782		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
1783		$as_echo_n "checking for a BSD-compatible install... " >&6; }
1784		if test -z "$INSTALL"; then
1785		-if test "${ac_cv_path_install+set}" = set; then
1786		+if test "${ac_cv_path_install+set}" = set; then :
1787		$as_echo_n "(cached) " >&6
1788		else
1789		as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1790		@@ -2309,11 +2582,11 @@
1791		do
1792		IFS=$as_save_IFS
1793		test -z "$as_dir" && as_dir=.
1794		- # Account for people who put trailing slashes in PATH elements.
1795		-case $as_dir/ in
1796		- ./ \| .// \| /cC/* \| \
1797		+ # Account for people who put trailing slashes in PATH elements.
1798		+case $as_dir/ in #((
1799		+ ./ \| .// \| /[cC]/* \| \
1800		/etc/* \| /usr/sbin/* \| /usr/etc/* \| /sbin/* \| /usr/afsws/bin/* \| \
1801		- ?:\\/os2\\/install\\/* \| ?:\\/OS2\\/INSTALL\\/* \| \
1802		+ ?:[\\/]os2[\\/]install[\\/]* \| ?:[\\/]OS2[\\/]INSTALL[\\/]* \| \
1803		/usr/ucb/* ) ;;
1804		*)
1805		# OSF1 and SCO ODT 3.0 have their own names for install.
1806		@@ -2350,7 +2623,7 @@
1807		;;
1808		esac
1809
1810		-done
1811		+ done
1812		IFS=$as_save_IFS
1813
1814		rm -rf conftest.one conftest.two conftest.dir
1815		@@ -2366,7 +2639,7 @@
1816		INSTALL=$ac_install_sh
1817		fi
1818		fi
1819		-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
1820		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
1821		$as_echo "$INSTALL" >&6; }
1822
1823		# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
1824		@@ -2377,7 +2650,7 @@
1825
1826		test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1827
1828		-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
1829		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
1830		$as_echo_n "checking whether build environment is sane... " >&6; }
1831		# Just in case
1832		sleep 1
1833		@@ -2388,15 +2661,11 @@
1834		'
1835		case `pwd` in
1836		[\\\"\#\$\&\'\`$am_lf])
1837		- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
1838		-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
1839		- { (exit 1); exit 1; }; };;
1840		+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
1841		esac
1842		case $srcdir in
1843		[\\\"\#\$\&\'\`$am_lf\ \ ])
1844		- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
1845		-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
1846		- { (exit 1); exit 1; }; };;
1847		+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
1848		esac
1849
1850		# Do `set' in a subshell so we don't clobber the current shell's
1851		@@ -2418,11 +2687,8 @@
1852		# if, for instance, CONFIG_SHELL is bash and it inherits a
1853		# broken ls alias from the environment. This has actually
1854		# happened. Such a system could not be considered "sane".
1855		- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
1856		-alias in your environment" >&5
1857		-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
1858		-alias in your environment" >&2;}
1859		- { (exit 1); exit 1; }; }
1860		+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
1861		+alias in your environment" "$LINENO" 5
1862		fi
1863
1864		test "$2" = conftest.file
1865		@@ -2431,13 +2697,10 @@
1866		# Ok.
1867		:
1868		else
1869		- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
1870		-Check your system clock" >&5
1871		-$as_echo "$as_me: error: newly created file is older than distributed files!
1872		-Check your system clock" >&2;}
1873		- { (exit 1); exit 1; }; }
1874		+ as_fn_error "newly created file is older than distributed files!
1875		+Check your system clock" "$LINENO" 5
1876		fi
1877		-{ $as_echo "$as_me:$LINENO: result: yes" >&5
1878		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1879		$as_echo "yes" >&6; }
1880		test "$program_prefix" != NONE &&
1881		program_transform_name="s&^&$program_prefix&;$program_transform_name"
1882		@@ -2465,7 +2728,7 @@
1883		am_missing_run="$MISSING --run "
1884		else
1885		am_missing_run=
1886		- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
1887		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
1888		$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
1889		fi
1890
1891		@@ -2486,9 +2749,9 @@
1892		if test -n "$ac_tool_prefix"; then
1893		# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
1894		set dummy ${ac_tool_prefix}strip; ac_word=$2
1895		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1896		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1897		$as_echo_n "checking for $ac_word... " >&6; }
1898		-if test "${ac_cv_prog_STRIP+set}" = set; then
1899		+if test "${ac_cv_prog_STRIP+set}" = set; then :
1900		$as_echo_n "(cached) " >&6
1901		else
1902		if test -n "$STRIP"; then
1903		@@ -2499,24 +2762,24 @@
1904		do
1905		IFS=$as_save_IFS
1906		test -z "$as_dir" && as_dir=.
1907		- for ac_exec_ext in '' $ac_executable_extensions; do
1908		+ for ac_exec_ext in '' $ac_executable_extensions; do
1909		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1910		ac_cv_prog_STRIP="${ac_tool_prefix}strip"
1911		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1912		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1913		break 2
1914		fi
1915		done
1916		-done
1917		+ done
1918		IFS=$as_save_IFS
1919
1920		fi
1921		fi
1922		STRIP=$ac_cv_prog_STRIP
1923		if test -n "$STRIP"; then
1924		- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
1925		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1926		$as_echo "$STRIP" >&6; }
1927		else
1928		- { $as_echo "$as_me:$LINENO: result: no" >&5
1929		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1930		$as_echo "no" >&6; }
1931		fi
1932
1933		@@ -2526,9 +2789,9 @@
1934		ac_ct_STRIP=$STRIP
1935		# Extract the first word of "strip", so it can be a program name with args.
1936		set dummy strip; ac_word=$2
1937		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1938		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1939		$as_echo_n "checking for $ac_word... " >&6; }
1940		-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
1941		+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
1942		$as_echo_n "(cached) " >&6
1943		else
1944		if test -n "$ac_ct_STRIP"; then
1945		@@ -2539,24 +2802,24 @@
1946		do
1947		IFS=$as_save_IFS
1948		test -z "$as_dir" && as_dir=.
1949		- for ac_exec_ext in '' $ac_executable_extensions; do
1950		+ for ac_exec_ext in '' $ac_executable_extensions; do
1951		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1952		ac_cv_prog_ac_ct_STRIP="strip"
1953		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1954		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1955		break 2
1956		fi
1957		done
1958		-done
1959		+ done
1960		IFS=$as_save_IFS
1961
1962		fi
1963		fi
1964		ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
1965		if test -n "$ac_ct_STRIP"; then
1966		- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
1967		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
1968		$as_echo "$ac_ct_STRIP" >&6; }
1969		else
1970		- { $as_echo "$as_me:$LINENO: result: no" >&5
1971		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1972		$as_echo "no" >&6; }
1973		fi
1974
1975		@@ -2565,7 +2828,7 @@
1976		else
1977		case $cross_compiling:$ac_tool_warned in
1978		yes:)
1979		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
1980		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1981		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1982		ac_tool_warned=yes ;;
1983		esac
1984		@@ -2578,10 +2841,10 @@
1985		fi
1986		INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1987
1988		-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
1989		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
1990		$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
1991		if test -z "$MKDIR_P"; then
1992		- if test "${ac_cv_path_mkdir+set}" = set; then
1993		+ if test "${ac_cv_path_mkdir+set}" = set; then :
1994		$as_echo_n "(cached) " >&6
1995		else
1996		as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1997		@@ -2589,7 +2852,7 @@
1998		do
1999		IFS=$as_save_IFS
2000		test -z "$as_dir" && as_dir=.
2001		- for ac_prog in mkdir gmkdir; do
2002		+ for ac_prog in mkdir gmkdir; do
2003		for ac_exec_ext in '' $ac_executable_extensions; do
2004		{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } \|\| continue
2005		case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
2006		@@ -2601,7 +2864,7 @@
2007		esac
2008		done
2009		done
2010		-done
2011		+ done
2012		IFS=$as_save_IFS
2013
2014		fi
2015		@@ -2617,7 +2880,7 @@
2016		MKDIR_P="$ac_install_sh -d"
2017		fi
2018		fi
2019		-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
2020		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
2021		$as_echo "$MKDIR_P" >&6; }
2022
2023		mkdir_p="$MKDIR_P"
2024		@@ -2630,9 +2893,9 @@
2025		do
2026		# Extract the first word of "$ac_prog", so it can be a program name with args.
2027		set dummy $ac_prog; ac_word=$2
2028		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2029		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2030		$as_echo_n "checking for $ac_word... " >&6; }
2031		-if test "${ac_cv_prog_AWK+set}" = set; then
2032		+if test "${ac_cv_prog_AWK+set}" = set; then :
2033		$as_echo_n "(cached) " >&6
2034		else
2035		if test -n "$AWK"; then
2036		@@ -2643,24 +2906,24 @@
2037		do
2038		IFS=$as_save_IFS
2039		test -z "$as_dir" && as_dir=.
2040		- for ac_exec_ext in '' $ac_executable_extensions; do
2041		+ for ac_exec_ext in '' $ac_executable_extensions; do
2042		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2043		ac_cv_prog_AWK="$ac_prog"
2044		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2045		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2046		break 2
2047		fi
2048		done
2049		-done
2050		+ done
2051		IFS=$as_save_IFS
2052
2053		fi
2054		fi
2055		AWK=$ac_cv_prog_AWK
2056		if test -n "$AWK"; then
2057		- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
2058		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
2059		$as_echo "$AWK" >&6; }
2060		else
2061		- { $as_echo "$as_me:$LINENO: result: no" >&5
2062		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2063		$as_echo "no" >&6; }
2064		fi
2065
2066		@@ -2668,11 +2931,11 @@
2067		test -n "$AWK" && break
2068		done
2069
2070		-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2071		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2072		$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
2073		set x ${MAKE-make}
2074		ac_make=`$as_echo "$2" \| sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2075		-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
2076		+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
2077		$as_echo_n "(cached) " >&6
2078		else
2079		cat >conftest.make <<\_ACEOF
2080		@@ -2690,11 +2953,11 @@
2081		rm -f conftest.make
2082		fi
2083		if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
2084		- { $as_echo "$as_me:$LINENO: result: yes" >&5
2085		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2086		$as_echo "yes" >&6; }
2087		SET_MAKE=
2088		else
2089		- { $as_echo "$as_me:$LINENO: result: no" >&5
2090		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2091		$as_echo "no" >&6; }
2092		SET_MAKE="MAKE=${MAKE-make}"
2093		fi
2094		@@ -2714,9 +2977,7 @@
2095		am__isrc=' -I$(srcdir)'
2096		# test to see if srcdir already configured
2097		if test -f $srcdir/config.status; then
2098		- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
2099		-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
2100		- { (exit 1); exit 1; }; }
2101		+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
2102		fi
2103		fi
2104
2105		@@ -2774,7 +3035,7 @@
2106
2107		# Support silencing the build output if supported (automake-1.11+)
2108		# Check whether --enable-silent-rules was given.
2109		-if test "${enable_silent_rules+set}" = set; then
2110		+if test "${enable_silent_rules+set}" = set; then :
2111		enableval=$enable_silent_rules;
2112		fi
2113
2114		@@ -2787,16 +3048,16 @@
2115
2116
2117
2118		-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
2119		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
2120		$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
2121		# Check whether --enable-maintainer-mode was given.
2122		-if test "${enable_maintainer_mode+set}" = set; then
2123		+if test "${enable_maintainer_mode+set}" = set; then :
2124		enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
2125		else
2126		USE_MAINTAINER_MODE=no
2127		fi
2128
2129		- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
2130		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
2131		$as_echo "$USE_MAINTAINER_MODE" >&6; }
2132		if test $USE_MAINTAINER_MODE = yes; then
2133		MAINTAINER_MODE_TRUE=
2134		@@ -2812,7 +3073,7 @@
2135		ac_config_headers="$ac_config_headers config.h"
2136
2137		# Check whether --enable-static was given.
2138		-if test "${enable_static+set}" = set; then
2139		+if test "${enable_static+set}" = set; then :
2140		enableval=$enable_static; p=${PACKAGE-default}
2141		case $enableval in
2142		yes) enable_static=yes ;;
2143		@@ -2845,7 +3106,7 @@
2144
2145		case `pwd` in
2146		\ \| \ )
2147		- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
2148		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
2149		$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
2150		esac
2151
2152		@@ -2870,35 +3131,27 @@
2153
2154		# Make sure we can run config.sub.
2155		$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 \|\|
2156		- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
2157		-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
2158		- { (exit 1); exit 1; }; }
2159		+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
2160
2161		-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
2162		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
2163		$as_echo_n "checking build system type... " >&6; }
2164		-if test "${ac_cv_build+set}" = set; then
2165		+if test "${ac_cv_build+set}" = set; then :
2166		$as_echo_n "(cached) " >&6
2167		else
2168		ac_build_alias=$build_alias
2169		test "x$ac_build_alias" = x &&
2170		ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
2171		test "x$ac_build_alias" = x &&
2172		- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
2173		-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
2174		- { (exit 1); exit 1; }; }
2175		+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
2176		ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` \|\|
2177		- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
2178		-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
2179		- { (exit 1); exit 1; }; }
2180		+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
2181
2182		fi
2183		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
2184		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
2185		$as_echo "$ac_cv_build" >&6; }
2186		case $ac_cv_build in
2187		--*) ;;
2188		-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
2189		-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
2190		- { (exit 1); exit 1; }; };;
2191		+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
2192		esac
2193		build=$ac_cv_build
2194		ac_save_IFS=$IFS; IFS='-'
2195		@@ -2914,28 +3167,24 @@
2196		case $build_os in \ ) build_os=`echo "$build_os" \| sed 's/ /-/g'`;; esac
2197
2198
2199		-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
2200		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
2201		$as_echo_n "checking host system type... " >&6; }
2202		-if test "${ac_cv_host+set}" = set; then
2203		+if test "${ac_cv_host+set}" = set; then :
2204		$as_echo_n "(cached) " >&6
2205		else
2206		if test "x$host_alias" = x; then
2207		ac_cv_host=$ac_cv_build
2208		else
2209		ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` \|\|
2210		- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
2211		-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
2212		- { (exit 1); exit 1; }; }
2213		+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
2214		fi
2215
2216		fi
2217		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
2218		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
2219		$as_echo "$ac_cv_host" >&6; }
2220		case $ac_cv_host in
2221		--*) ;;
2222		-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
2223		-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
2224		- { (exit 1); exit 1; }; };;
2225		+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
2226		esac
2227		host=$ac_cv_host
2228		ac_save_IFS=$IFS; IFS='-'
2229		@@ -2963,7 +3212,7 @@
2230		.PHONY: am__doit
2231		END
2232		# If we don't find an include directive, just comment out the code.
2233		-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
2234		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
2235		$as_echo_n "checking for style of include used by $am_make... " >&6; }
2236		am__include="#"
2237		am__quote=
2238		@@ -2991,12 +3240,12 @@
2239		fi
2240
2241
2242		-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
2243		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
2244		$as_echo "$_am_result" >&6; }
2245		rm -f confinc confmf
2246
2247		# Check whether --enable-dependency-tracking was given.
2248		-if test "${enable_dependency_tracking+set}" = set; then
2249		+if test "${enable_dependency_tracking+set}" = set; then :
2250		enableval=$enable_dependency_tracking;
2251		fi
2252
2253		@@ -3021,9 +3270,9 @@
2254		if test -n "$ac_tool_prefix"; then
2255		# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
2256		set dummy ${ac_tool_prefix}gcc; ac_word=$2
2257		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2258		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2259		$as_echo_n "checking for $ac_word... " >&6; }
2260		-if test "${ac_cv_prog_CC+set}" = set; then
2261		+if test "${ac_cv_prog_CC+set}" = set; then :
2262		$as_echo_n "(cached) " >&6
2263		else
2264		if test -n "$CC"; then
2265		@@ -3034,24 +3283,24 @@
2266		do
2267		IFS=$as_save_IFS
2268		test -z "$as_dir" && as_dir=.
2269		- for ac_exec_ext in '' $ac_executable_extensions; do
2270		+ for ac_exec_ext in '' $ac_executable_extensions; do
2271		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2272		ac_cv_prog_CC="${ac_tool_prefix}gcc"
2273		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2274		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2275		break 2
2276		fi
2277		done
2278		-done
2279		+ done
2280		IFS=$as_save_IFS
2281
2282		fi
2283		fi
2284		CC=$ac_cv_prog_CC
2285		if test -n "$CC"; then
2286		- { $as_echo "$as_me:$LINENO: result: $CC" >&5
2287		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
2288		$as_echo "$CC" >&6; }
2289		else
2290		- { $as_echo "$as_me:$LINENO: result: no" >&5
2291		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2292		$as_echo "no" >&6; }
2293		fi
2294
2295		@@ -3061,9 +3310,9 @@
2296		ac_ct_CC=$CC
2297		# Extract the first word of "gcc", so it can be a program name with args.
2298		set dummy gcc; ac_word=$2
2299		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2300		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2301		$as_echo_n "checking for $ac_word... " >&6; }
2302		-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2303		+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
2304		$as_echo_n "(cached) " >&6
2305		else
2306		if test -n "$ac_ct_CC"; then
2307		@@ -3074,24 +3323,24 @@
2308		do
2309		IFS=$as_save_IFS
2310		test -z "$as_dir" && as_dir=.
2311		- for ac_exec_ext in '' $ac_executable_extensions; do
2312		+ for ac_exec_ext in '' $ac_executable_extensions; do
2313		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2314		ac_cv_prog_ac_ct_CC="gcc"
2315		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2316		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2317		break 2
2318		fi
2319		done
2320		-done
2321		+ done
2322		IFS=$as_save_IFS
2323
2324		fi
2325		fi
2326		ac_ct_CC=$ac_cv_prog_ac_ct_CC
2327		if test -n "$ac_ct_CC"; then
2328		- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2329		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
2330		$as_echo "$ac_ct_CC" >&6; }
2331		else
2332		- { $as_echo "$as_me:$LINENO: result: no" >&5
2333		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2334		$as_echo "no" >&6; }
2335		fi
2336
2337		@@ -3100,7 +3349,7 @@
2338		else
2339		case $cross_compiling:$ac_tool_warned in
2340		yes:)
2341		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
2342		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2343		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2344		ac_tool_warned=yes ;;
2345		esac
2346		@@ -3114,9 +3363,9 @@
2347		if test -n "$ac_tool_prefix"; then
2348		# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
2349		set dummy ${ac_tool_prefix}cc; ac_word=$2
2350		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2351		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2352		$as_echo_n "checking for $ac_word... " >&6; }
2353		-if test "${ac_cv_prog_CC+set}" = set; then
2354		+if test "${ac_cv_prog_CC+set}" = set; then :
2355		$as_echo_n "(cached) " >&6
2356		else
2357		if test -n "$CC"; then
2358		@@ -3127,24 +3376,24 @@
2359		do
2360		IFS=$as_save_IFS
2361		test -z "$as_dir" && as_dir=.
2362		- for ac_exec_ext in '' $ac_executable_extensions; do
2363		+ for ac_exec_ext in '' $ac_executable_extensions; do
2364		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2365		ac_cv_prog_CC="${ac_tool_prefix}cc"
2366		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2367		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2368		break 2
2369		fi
2370		done
2371		-done
2372		+ done
2373		IFS=$as_save_IFS
2374
2375		fi
2376		fi
2377		CC=$ac_cv_prog_CC
2378		if test -n "$CC"; then
2379		- { $as_echo "$as_me:$LINENO: result: $CC" >&5
2380		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
2381		$as_echo "$CC" >&6; }
2382		else
2383		- { $as_echo "$as_me:$LINENO: result: no" >&5
2384		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2385		$as_echo "no" >&6; }
2386		fi
2387
2388		@@ -3154,9 +3403,9 @@
2389		if test -z "$CC"; then
2390		# Extract the first word of "cc", so it can be a program name with args.
2391		set dummy cc; ac_word=$2
2392		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2393		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2394		$as_echo_n "checking for $ac_word... " >&6; }
2395		-if test "${ac_cv_prog_CC+set}" = set; then
2396		+if test "${ac_cv_prog_CC+set}" = set; then :
2397		$as_echo_n "(cached) " >&6
2398		else
2399		if test -n "$CC"; then
2400		@@ -3168,18 +3417,18 @@
2401		do
2402		IFS=$as_save_IFS
2403		test -z "$as_dir" && as_dir=.
2404		- for ac_exec_ext in '' $ac_executable_extensions; do
2405		+ for ac_exec_ext in '' $ac_executable_extensions; do
2406		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2407		if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
2408		ac_prog_rejected=yes
2409		continue
2410		fi
2411		ac_cv_prog_CC="cc"
2412		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2413		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2414		break 2
2415		fi
2416		done
2417		-done
2418		+ done
2419		IFS=$as_save_IFS
2420
2421		if test $ac_prog_rejected = yes; then
2422		@@ -3198,10 +3447,10 @@
2423		fi
2424		CC=$ac_cv_prog_CC
2425		if test -n "$CC"; then
2426		- { $as_echo "$as_me:$LINENO: result: $CC" >&5
2427		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
2428		$as_echo "$CC" >&6; }
2429		else
2430		- { $as_echo "$as_me:$LINENO: result: no" >&5
2431		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2432		$as_echo "no" >&6; }
2433		fi
2434
2435		@@ -3213,9 +3462,9 @@
2436		do
2437		# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2438		set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2439		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2440		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2441		$as_echo_n "checking for $ac_word... " >&6; }
2442		-if test "${ac_cv_prog_CC+set}" = set; then
2443		+if test "${ac_cv_prog_CC+set}" = set; then :
2444		$as_echo_n "(cached) " >&6
2445		else
2446		if test -n "$CC"; then
2447		@@ -3226,24 +3475,24 @@
2448		do
2449		IFS=$as_save_IFS
2450		test -z "$as_dir" && as_dir=.
2451		- for ac_exec_ext in '' $ac_executable_extensions; do
2452		+ for ac_exec_ext in '' $ac_executable_extensions; do
2453		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2454		ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
2455		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2456		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2457		break 2
2458		fi
2459		done
2460		-done
2461		+ done
2462		IFS=$as_save_IFS
2463
2464		fi
2465		fi
2466		CC=$ac_cv_prog_CC
2467		if test -n "$CC"; then
2468		- { $as_echo "$as_me:$LINENO: result: $CC" >&5
2469		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
2470		$as_echo "$CC" >&6; }
2471		else
2472		- { $as_echo "$as_me:$LINENO: result: no" >&5
2473		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2474		$as_echo "no" >&6; }
2475		fi
2476
2477		@@ -3257,9 +3506,9 @@
2478		do
2479		# Extract the first word of "$ac_prog", so it can be a program name with args.
2480		set dummy $ac_prog; ac_word=$2
2481		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2482		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2483		$as_echo_n "checking for $ac_word... " >&6; }
2484		-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2485		+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
2486		$as_echo_n "(cached) " >&6
2487		else
2488		if test -n "$ac_ct_CC"; then
2489		@@ -3270,24 +3519,24 @@
2490		do
2491		IFS=$as_save_IFS
2492		test -z "$as_dir" && as_dir=.
2493		- for ac_exec_ext in '' $ac_executable_extensions; do
2494		+ for ac_exec_ext in '' $ac_executable_extensions; do
2495		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2496		ac_cv_prog_ac_ct_CC="$ac_prog"
2497		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2498		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2499		break 2
2500		fi
2501		done
2502		-done
2503		+ done
2504		IFS=$as_save_IFS
2505
2506		fi
2507		fi
2508		ac_ct_CC=$ac_cv_prog_ac_ct_CC
2509		if test -n "$ac_ct_CC"; then
2510		- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2511		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
2512		$as_echo "$ac_ct_CC" >&6; }
2513		else
2514		- { $as_echo "$as_me:$LINENO: result: no" >&5
2515		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2516		$as_echo "no" >&6; }
2517		fi
2518
2519		@@ -3300,7 +3549,7 @@
2520		else
2521		case $cross_compiling:$ac_tool_warned in
2522		yes:)
2523		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
2524		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2525		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2526		ac_tool_warned=yes ;;
2527		esac
2528		@@ -3311,73 +3560,55 @@
2529		fi
2530
2531
2532		-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2533		+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2534		$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2535		-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
2536		-See \`config.log' for more details." >&5
2537		-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
2538		-See \`config.log' for more details." >&2;}
2539		- { (exit 1); exit 1; }; }; }
2540		+as_fn_error "no acceptable C compiler found in \$PATH
2541		+See \`config.log' for more details." "$LINENO" 5; }
2542
2543		# Provide some information about the compiler.
2544		-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
2545		+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
2546		set X $ac_compile
2547		ac_compiler=$2
2548		-{ (ac_try="$ac_compiler --version >&5"
2549		+for ac_option in --version -v -V -qversion; do
2550		+ { { ac_try="$ac_compiler $ac_option >&5"
2551		case "(($ac_try" in
2552		\" \| \` \| \\) ac_try_echo=\$ac_try;;
2553		*) ac_try_echo=$ac_try;;
2554		esac
2555		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2556		-$as_echo "$ac_try_echo") >&5
2557		- (eval "$ac_compiler --version >&5") 2>&5
2558		+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2559		+$as_echo "$ac_try_echo"; } >&5
2560		+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
2561		ac_status=$?
2562		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2563		- (exit $ac_status); }
2564		-{ (ac_try="$ac_compiler -v >&5"
2565		-case "(($ac_try" in
2566		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
2567		- *) ac_try_echo=$ac_try;;
2568		-esac
2569		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2570		-$as_echo "$ac_try_echo") >&5
2571		- (eval "$ac_compiler -v >&5") 2>&5
2572		- ac_status=$?
2573		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2574		- (exit $ac_status); }
2575		-{ (ac_try="$ac_compiler -V >&5"
2576		-case "(($ac_try" in
2577		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
2578		- *) ac_try_echo=$ac_try;;
2579		-esac
2580		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2581		-$as_echo "$ac_try_echo") >&5
2582		- (eval "$ac_compiler -V >&5") 2>&5
2583		- ac_status=$?
2584		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2585		- (exit $ac_status); }
2586		+ if test -s conftest.err; then
2587		+ sed '10a\
2588		+... rest of stderr output deleted ...
2589		+ 10q' conftest.err >conftest.er1
2590		+ cat conftest.er1 >&5
2591		+ rm -f conftest.er1 conftest.err
2592		+ fi
2593		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2594		+ test $ac_status = 0; }
2595		+done
2596
2597		-cat >conftest.$ac_ext <<_ACEOF
2598		-/* confdefs.h. */
2599		-_ACEOF
2600		-cat confdefs.h >>conftest.$ac_ext
2601		-cat >>conftest.$ac_ext <<_ACEOF
2602		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2603		/* end confdefs.h. */
2604		-
2605		+#include <stdio.h>
2606		int
2607		main ()
2608		{
2609		+FILE *f = fopen ("conftest.out", "w");
2610		+ return ferror (f) \|\| fclose (f) != 0;
2611
2612		;
2613		return 0;
2614		}
2615		_ACEOF
2616		ac_clean_files_save=$ac_clean_files
2617		-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
2618		+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
2619		# Try to create an executable without -o first, disregard a.out.
2620		# It will help us diagnose broken compilers, and finding out an intuition
2621		# of exeext.
2622		-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
2623		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
2624		$as_echo_n "checking for C compiler default output file name... " >&6; }
2625		ac_link_default=`$as_echo "$ac_link" \| sed 's/ -o conftest[^ ]//'`
2626
2627		@@ -3394,17 +3625,17 @@
2628		done
2629		rm -f $ac_rmfiles
2630
2631		-if { (ac_try="$ac_link_default"
2632		+if { { ac_try="$ac_link_default"
2633		case "(($ac_try" in
2634		\" \| \` \| \\) ac_try_echo=\$ac_try;;
2635		*) ac_try_echo=$ac_try;;
2636		esac
2637		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2638		-$as_echo "$ac_try_echo") >&5
2639		+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2640		+$as_echo "$ac_try_echo"; } >&5
2641		(eval "$ac_link_default") 2>&5
2642		ac_status=$?
2643		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2644		- (exit $ac_status); }; then
2645		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2646		+ test $ac_status = 0; }; then :
2647		# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
2648		# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
2649		# in a Makefile. We should not override ac_cv_exeext if it was cached,
2650		@@ -3421,7 +3652,7 @@
2651		# certainly right.
2652		break;;
2653		. )
2654		- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
2655		+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
2656		then :; else
2657		ac_cv_exeext=`expr "$ac_file" : '[^.]$\..$'`
2658		fi
2659		@@ -3440,84 +3671,75 @@
2660		else
2661		ac_file=''
2662		fi
2663		-
2664		-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
2665		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
2666		$as_echo "$ac_file" >&6; }
2667		-if test -z "$ac_file"; then
2668		+if test -z "$ac_file"; then :
2669		$as_echo "$as_me: failed program was:" >&5
2670		sed 's/^/\| /' conftest.$ac_ext >&5
2671
2672		-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2673		+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2674		$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2675		-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
2676		-See \`config.log' for more details." >&5
2677		-$as_echo "$as_me: error: C compiler cannot create executables
2678		-See \`config.log' for more details." >&2;}
2679		- { (exit 77); exit 77; }; }; }
2680		+{ as_fn_set_status 77
2681		+as_fn_error "C compiler cannot create executables
2682		+See \`config.log' for more details." "$LINENO" 5; }; }
2683		fi
2684		-
2685		ac_exeext=$ac_cv_exeext
2686
2687		# Check that the compiler produces executables we can run. If not, either
2688		# the compiler is broken, or we cross compile.
2689		-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
2690		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
2691		$as_echo_n "checking whether the C compiler works... " >&6; }
2692		-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
2693		# If not cross compiling, check that we can run a simple program.
2694		if test "$cross_compiling" != yes; then
2695		if { ac_try='./$ac_file'
2696		- { (case "(($ac_try" in
2697		+ { { case "(($ac_try" in
2698		\" \| \` \| \\) ac_try_echo=\$ac_try;;
2699		*) ac_try_echo=$ac_try;;
2700		esac
2701		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2702		-$as_echo "$ac_try_echo") >&5
2703		+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2704		+$as_echo "$ac_try_echo"; } >&5
2705		(eval "$ac_try") 2>&5
2706		ac_status=$?
2707		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2708		- (exit $ac_status); }; }; then
2709		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2710		+ test $ac_status = 0; }; }; then
2711		cross_compiling=no
2712		else
2713		if test "$cross_compiling" = maybe; then
2714		cross_compiling=yes
2715		else
2716		- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2717		+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2718		$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2719		-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
2720		+as_fn_error "cannot run C compiled programs.
2721		If you meant to cross compile, use \`--host'.
2722		-See \`config.log' for more details." >&5
2723		-$as_echo "$as_me: error: cannot run C compiled programs.
2724		-If you meant to cross compile, use \`--host'.
2725		-See \`config.log' for more details." >&2;}
2726		- { (exit 1); exit 1; }; }; }
2727		+See \`config.log' for more details." "$LINENO" 5; }
2728		fi
2729		fi
2730		fi
2731		-{ $as_echo "$as_me:$LINENO: result: yes" >&5
2732		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2733		$as_echo "yes" >&6; }
2734
2735		-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
2736		+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
2737		ac_clean_files=$ac_clean_files_save
2738		# Check that the compiler produces executables we can run. If not, either
2739		# the compiler is broken, or we cross compile.
2740		-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
2741		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
2742		$as_echo_n "checking whether we are cross compiling... " >&6; }
2743		-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
2744		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
2745		$as_echo "$cross_compiling" >&6; }
2746
2747		-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
2748		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
2749		$as_echo_n "checking for suffix of executables... " >&6; }
2750		-if { (ac_try="$ac_link"
2751		+if { { ac_try="$ac_link"
2752		case "(($ac_try" in
2753		\" \| \` \| \\) ac_try_echo=\$ac_try;;
2754		*) ac_try_echo=$ac_try;;
2755		esac
2756		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2757		-$as_echo "$ac_try_echo") >&5
2758		+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2759		+$as_echo "$ac_try_echo"; } >&5
2760		(eval "$ac_link") 2>&5
2761		ac_status=$?
2762		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2763		- (exit $ac_status); }; then
2764		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2765		+ test $ac_status = 0; }; then :
2766		# If both `conftest.exe' and `conftest' are `present' (well, observable)
2767		# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
2768		# work properly (i.e., refer to `conftest.exe'), while it won't with
2769		@@ -3532,32 +3754,24 @@
2770		esac
2771		done
2772		else
2773		- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2774		+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2775		$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2776		-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
2777		-See \`config.log' for more details." >&5
2778		-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
2779		-See \`config.log' for more details." >&2;}
2780		- { (exit 1); exit 1; }; }; }
2781		+as_fn_error "cannot compute suffix of executables: cannot compile and link
2782		+See \`config.log' for more details." "$LINENO" 5; }
2783		fi
2784		-
2785		rm -f conftest$ac_cv_exeext
2786		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
2787		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
2788		$as_echo "$ac_cv_exeext" >&6; }
2789
2790		rm -f conftest.$ac_ext
2791		EXEEXT=$ac_cv_exeext
2792		ac_exeext=$EXEEXT
2793		-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
2794		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
2795		$as_echo_n "checking for suffix of object files... " >&6; }
2796		-if test "${ac_cv_objext+set}" = set; then
2797		+if test "${ac_cv_objext+set}" = set; then :
2798		$as_echo_n "(cached) " >&6
2799		else
2800		- cat >conftest.$ac_ext <<_ACEOF
2801		-/* confdefs.h. */
2802		-_ACEOF
2803		-cat confdefs.h >>conftest.$ac_ext
2804		-cat >>conftest.$ac_ext <<_ACEOF
2805		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2806		/* end confdefs.h. */
2807
2808		int
2809		@@ -3569,17 +3783,17 @@
2810		}
2811		_ACEOF
2812		rm -f conftest.o conftest.obj
2813		-if { (ac_try="$ac_compile"
2814		+if { { ac_try="$ac_compile"
2815		case "(($ac_try" in
2816		\" \| \` \| \\) ac_try_echo=\$ac_try;;
2817		*) ac_try_echo=$ac_try;;
2818		esac
2819		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2820		-$as_echo "$ac_try_echo") >&5
2821		+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2822		+$as_echo "$ac_try_echo"; } >&5
2823		(eval "$ac_compile") 2>&5
2824		ac_status=$?
2825		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2826		- (exit $ac_status); }; then
2827		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2828		+ test $ac_status = 0; }; then :
2829		for ac_file in conftest.o conftest.obj conftest.*; do
2830		test -f "$ac_file" \|\| continue;
2831		case $ac_file in
2832		@@ -3592,31 +3806,23 @@
2833		$as_echo "$as_me: failed program was:" >&5
2834		sed 's/^/\| /' conftest.$ac_ext >&5
2835
2836		-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2837		+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2838		$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2839		-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
2840		-See \`config.log' for more details." >&5
2841		-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
2842		-See \`config.log' for more details." >&2;}
2843		- { (exit 1); exit 1; }; }; }
2844		+as_fn_error "cannot compute suffix of object files: cannot compile
2845		+See \`config.log' for more details." "$LINENO" 5; }
2846		fi
2847		-
2848		rm -f conftest.$ac_cv_objext conftest.$ac_ext
2849		fi
2850		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
2851		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
2852		$as_echo "$ac_cv_objext" >&6; }
2853		OBJEXT=$ac_cv_objext
2854		ac_objext=$OBJEXT
2855		-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
2856		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
2857		$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
2858		-if test "${ac_cv_c_compiler_gnu+set}" = set; then
2859		+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
2860		$as_echo_n "(cached) " >&6
2861		else
2862		- cat >conftest.$ac_ext <<_ACEOF
2863		-/* confdefs.h. */
2864		-_ACEOF
2865		-cat confdefs.h >>conftest.$ac_ext
2866		-cat >>conftest.$ac_ext <<_ACEOF
2867		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2868		/* end confdefs.h. */
2869
2870		int
2871		@@ -3630,37 +3836,16 @@
2872		return 0;
2873		}
2874		_ACEOF
2875		-rm -f conftest.$ac_objext
2876		-if { (ac_try="$ac_compile"
2877		-case "(($ac_try" in
2878		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
2879		- *) ac_try_echo=$ac_try;;
2880		-esac
2881		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2882		-$as_echo "$ac_try_echo") >&5
2883		- (eval "$ac_compile") 2>conftest.er1
2884		- ac_status=$?
2885		- grep -v '^ *+' conftest.er1 >conftest.err
2886		- rm -f conftest.er1
2887		- cat conftest.err >&5
2888		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2889		- (exit $ac_status); } && {
2890		- test -z "$ac_c_werror_flag" \|\|
2891		- test ! -s conftest.err
2892		- } && test -s conftest.$ac_objext; then
2893		+if ac_fn_c_try_compile "$LINENO"; then :
2894		ac_compiler_gnu=yes
2895		else
2896		- $as_echo "$as_me: failed program was:" >&5
2897		-sed 's/^/\| /' conftest.$ac_ext >&5
2898		-
2899		- ac_compiler_gnu=no
2900		+ ac_compiler_gnu=no
2901		fi
2902		-
2903		rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2904		ac_cv_c_compiler_gnu=$ac_compiler_gnu
2905
2906		fi
2907		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
2908		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
2909		$as_echo "$ac_cv_c_compiler_gnu" >&6; }
2910		if test $ac_compiler_gnu = yes; then
2911		GCC=yes
2912		@@ -3669,20 +3854,16 @@
2913		fi
2914		ac_test_CFLAGS=${CFLAGS+set}
2915		ac_save_CFLAGS=$CFLAGS
2916		-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
2917		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
2918		$as_echo_n "checking whether $CC accepts -g... " >&6; }
2919		-if test "${ac_cv_prog_cc_g+set}" = set; then
2920		+if test "${ac_cv_prog_cc_g+set}" = set; then :
2921		$as_echo_n "(cached) " >&6
2922		else
2923		ac_save_c_werror_flag=$ac_c_werror_flag
2924		ac_c_werror_flag=yes
2925		ac_cv_prog_cc_g=no
2926		CFLAGS="-g"
2927		- cat >conftest.$ac_ext <<_ACEOF
2928		-/* confdefs.h. */
2929		-_ACEOF
2930		-cat confdefs.h >>conftest.$ac_ext
2931		-cat >>conftest.$ac_ext <<_ACEOF
2932		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2933		/* end confdefs.h. */
2934
2935		int
2936		@@ -3693,35 +3874,11 @@
2937		return 0;
2938		}
2939		_ACEOF
2940		-rm -f conftest.$ac_objext
2941		-if { (ac_try="$ac_compile"
2942		-case "(($ac_try" in
2943		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
2944		- *) ac_try_echo=$ac_try;;
2945		-esac
2946		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2947		-$as_echo "$ac_try_echo") >&5
2948		- (eval "$ac_compile") 2>conftest.er1
2949		- ac_status=$?
2950		- grep -v '^ *+' conftest.er1 >conftest.err
2951		- rm -f conftest.er1
2952		- cat conftest.err >&5
2953		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2954		- (exit $ac_status); } && {
2955		- test -z "$ac_c_werror_flag" \|\|
2956		- test ! -s conftest.err
2957		- } && test -s conftest.$ac_objext; then
2958		+if ac_fn_c_try_compile "$LINENO"; then :
2959		ac_cv_prog_cc_g=yes
2960		else
2961		- $as_echo "$as_me: failed program was:" >&5
2962		-sed 's/^/\| /' conftest.$ac_ext >&5
2963		-
2964		- CFLAGS=""
2965		- cat >conftest.$ac_ext <<_ACEOF
2966		-/* confdefs.h. */
2967		-_ACEOF
2968		-cat confdefs.h >>conftest.$ac_ext
2969		-cat >>conftest.$ac_ext <<_ACEOF
2970		+ CFLAGS=""
2971		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2972		/* end confdefs.h. */
2973
2974		int
2975		@@ -3732,36 +3889,12 @@
2976		return 0;
2977		}
2978		_ACEOF
2979		-rm -f conftest.$ac_objext
2980		-if { (ac_try="$ac_compile"
2981		-case "(($ac_try" in
2982		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
2983		- *) ac_try_echo=$ac_try;;
2984		-esac
2985		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2986		-$as_echo "$ac_try_echo") >&5
2987		- (eval "$ac_compile") 2>conftest.er1
2988		- ac_status=$?
2989		- grep -v '^ *+' conftest.er1 >conftest.err
2990		- rm -f conftest.er1
2991		- cat conftest.err >&5
2992		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2993		- (exit $ac_status); } && {
2994		- test -z "$ac_c_werror_flag" \|\|
2995		- test ! -s conftest.err
2996		- } && test -s conftest.$ac_objext; then
2997		- :
2998		-else
2999		- $as_echo "$as_me: failed program was:" >&5
3000		-sed 's/^/\| /' conftest.$ac_ext >&5
3001		+if ac_fn_c_try_compile "$LINENO"; then :
3002
3003		- ac_c_werror_flag=$ac_save_c_werror_flag
3004		+else
3005		+ ac_c_werror_flag=$ac_save_c_werror_flag
3006		CFLAGS="-g"
3007		- cat >conftest.$ac_ext <<_ACEOF
3008		-/* confdefs.h. */
3009		-_ACEOF
3010		-cat confdefs.h >>conftest.$ac_ext
3011		-cat >>conftest.$ac_ext <<_ACEOF
3012		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3013		/* end confdefs.h. */
3014
3015		int
3016		@@ -3772,42 +3905,17 @@
3017		return 0;
3018		}
3019		_ACEOF
3020		-rm -f conftest.$ac_objext
3021		-if { (ac_try="$ac_compile"
3022		-case "(($ac_try" in
3023		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
3024		- *) ac_try_echo=$ac_try;;
3025		-esac
3026		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3027		-$as_echo "$ac_try_echo") >&5
3028		- (eval "$ac_compile") 2>conftest.er1
3029		- ac_status=$?
3030		- grep -v '^ *+' conftest.er1 >conftest.err
3031		- rm -f conftest.er1
3032		- cat conftest.err >&5
3033		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3034		- (exit $ac_status); } && {
3035		- test -z "$ac_c_werror_flag" \|\|
3036		- test ! -s conftest.err
3037		- } && test -s conftest.$ac_objext; then
3038		+if ac_fn_c_try_compile "$LINENO"; then :
3039		ac_cv_prog_cc_g=yes
3040		-else
3041		- $as_echo "$as_me: failed program was:" >&5
3042		-sed 's/^/\| /' conftest.$ac_ext >&5
3043		-
3044		-
3045		fi
3046		-
3047		rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3048		fi
3049		-
3050		rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3051		fi
3052		-
3053		rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3054		ac_c_werror_flag=$ac_save_c_werror_flag
3055		fi
3056		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
3057		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
3058		$as_echo "$ac_cv_prog_cc_g" >&6; }
3059		if test "$ac_test_CFLAGS" = set; then
3060		CFLAGS=$ac_save_CFLAGS
3061		@@ -3824,18 +3932,14 @@
3062		CFLAGS=
3063		fi
3064		fi
3065		-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
3066		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
3067		$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
3068		-if test "${ac_cv_prog_cc_c89+set}" = set; then
3069		+if test "${ac_cv_prog_cc_c89+set}" = set; then :
3070		$as_echo_n "(cached) " >&6
3071		else
3072		ac_cv_prog_cc_c89=no
3073		ac_save_CC=$CC
3074		-cat >conftest.$ac_ext <<_ACEOF
3075		-/* confdefs.h. */
3076		-_ACEOF
3077		-cat confdefs.h >>conftest.$ac_ext
3078		-cat >>conftest.$ac_ext <<_ACEOF
3079		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3080		/* end confdefs.h. */
3081		#include <stdarg.h>
3082		#include <stdio.h>
3083		@@ -3892,32 +3996,9 @@
3084		-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
3085		do
3086		CC="$ac_save_CC $ac_arg"
3087		- rm -f conftest.$ac_objext
3088		-if { (ac_try="$ac_compile"
3089		-case "(($ac_try" in
3090		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
3091		- *) ac_try_echo=$ac_try;;
3092		-esac
3093		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3094		-$as_echo "$ac_try_echo") >&5
3095		- (eval "$ac_compile") 2>conftest.er1
3096		- ac_status=$?
3097		- grep -v '^ *+' conftest.er1 >conftest.err
3098		- rm -f conftest.er1
3099		- cat conftest.err >&5
3100		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3101		- (exit $ac_status); } && {
3102		- test -z "$ac_c_werror_flag" \|\|
3103		- test ! -s conftest.err
3104		- } && test -s conftest.$ac_objext; then
3105		+ if ac_fn_c_try_compile "$LINENO"; then :
3106		ac_cv_prog_cc_c89=$ac_arg
3107		-else
3108		- $as_echo "$as_me: failed program was:" >&5
3109		-sed 's/^/\| /' conftest.$ac_ext >&5
3110		-
3111		-
3112		fi
3113		-
3114		rm -f core conftest.err conftest.$ac_objext
3115		test "x$ac_cv_prog_cc_c89" != "xno" && break
3116		done
3117		@@ -3928,17 +4009,19 @@
3118		# AC_CACHE_VAL
3119		case "x$ac_cv_prog_cc_c89" in
3120		x)
3121		- { $as_echo "$as_me:$LINENO: result: none needed" >&5
3122		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
3123		$as_echo "none needed" >&6; } ;;
3124		xno)
3125		- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
3126		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
3127		$as_echo "unsupported" >&6; } ;;
3128		*)
3129		CC="$CC $ac_cv_prog_cc_c89"
3130		- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
3131		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
3132		$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
3133		esac
3134		+if test "x$ac_cv_prog_cc_c89" != xno; then :
3135
3136		+fi
3137
3138		ac_ext=c
3139		ac_cpp='$CPP $CPPFLAGS'
3140		@@ -3948,9 +4031,9 @@
3141
3142		depcc="$CC" am_compiler_list=
3143
3144		-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
3145		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
3146		$as_echo_n "checking dependency style of $depcc... " >&6; }
3147		-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
3148		+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
3149		$as_echo_n "(cached) " >&6
3150		else
3151		if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
3152		@@ -4058,7 +4141,7 @@
3153		fi
3154
3155		fi
3156		-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
3157		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
3158		$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
3159		CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
3160
3161		@@ -4073,9 +4156,9 @@
3162		fi
3163
3164
3165		-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
3166		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
3167		$as_echo_n "checking for a sed that does not truncate output... " >&6; }
3168		-if test "${ac_cv_path_SED+set}" = set; then
3169		+if test "${ac_cv_path_SED+set}" = set; then :
3170		$as_echo_n "(cached) " >&6
3171		else
3172		ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
3173		@@ -4083,7 +4166,7 @@
3174		ac_script="$ac_script$as_nl$ac_script"
3175		done
3176		echo "$ac_script" 2>/dev/null \| sed 99q >conftest.sed
3177		- $as_unset ac_script \|\| ac_script=
3178		+ { ac_script=; unset ac_script;}
3179		if test -z "$SED"; then
3180		ac_path_SED_found=false
3181		# Loop through the user's path and test for each of PROGNAME-LIST
3182		@@ -4092,7 +4175,7 @@
3183		do
3184		IFS=$as_save_IFS
3185		test -z "$as_dir" && as_dir=.
3186		- for ac_prog in sed gsed; do
3187		+ for ac_prog in sed gsed; do
3188		for ac_exec_ext in '' $ac_executable_extensions; do
3189		ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
3190		{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } \|\| continue
3191		@@ -4112,7 +4195,7 @@
3192		$as_echo '' >> "conftest.nl"
3193		"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null \|\| break
3194		diff "conftest.out" "conftest.nl" >/dev/null 2>&1 \|\| break
3195		- ac_count=`expr $ac_count + 1`
3196		+ as_fn_arith $ac_count + 1 && ac_count=$as_val
3197		if test $ac_count -gt ${ac_path_SED_max-0}; then
3198		# Best one so far, save it but keep looking for a better one
3199		ac_cv_path_SED="$ac_path_SED"
3200		@@ -4127,19 +4210,17 @@
3201		$ac_path_SED_found && break 3
3202		done
3203		done
3204		-done
3205		+ done
3206		IFS=$as_save_IFS
3207		if test -z "$ac_cv_path_SED"; then
3208		- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
3209		-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
3210		- { (exit 1); exit 1; }; }
3211		+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
3212		fi
3213		else
3214		ac_cv_path_SED=$SED
3215		fi
3216
3217		fi
3218		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
3219		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
3220		$as_echo "$ac_cv_path_SED" >&6; }
3221		SED="$ac_cv_path_SED"
3222		rm -f conftest.sed
3223		@@ -4157,9 +4238,9 @@
3224
3225
3226
3227		-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
3228		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
3229		$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
3230		-if test "${ac_cv_path_GREP+set}" = set; then
3231		+if test "${ac_cv_path_GREP+set}" = set; then :
3232		$as_echo_n "(cached) " >&6
3233		else
3234		if test -z "$GREP"; then
3235		@@ -4170,7 +4251,7 @@
3236		do
3237		IFS=$as_save_IFS
3238		test -z "$as_dir" && as_dir=.
3239		- for ac_prog in grep ggrep; do
3240		+ for ac_prog in grep ggrep; do
3241		for ac_exec_ext in '' $ac_executable_extensions; do
3242		ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
3243		{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } \|\| continue
3244		@@ -4190,7 +4271,7 @@
3245		$as_echo 'GREP' >> "conftest.nl"
3246		"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null \|\| break
3247		diff "conftest.out" "conftest.nl" >/dev/null 2>&1 \|\| break
3248		- ac_count=`expr $ac_count + 1`
3249		+ as_fn_arith $ac_count + 1 && ac_count=$as_val
3250		if test $ac_count -gt ${ac_path_GREP_max-0}; then
3251		# Best one so far, save it but keep looking for a better one
3252		ac_cv_path_GREP="$ac_path_GREP"
3253		@@ -4205,26 +4286,24 @@
3254		$ac_path_GREP_found && break 3
3255		done
3256		done
3257		-done
3258		+ done
3259		IFS=$as_save_IFS
3260		if test -z "$ac_cv_path_GREP"; then
3261		- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
3262		-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
3263		- { (exit 1); exit 1; }; }
3264		+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
3265		fi
3266		else
3267		ac_cv_path_GREP=$GREP
3268		fi
3269
3270		fi
3271		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
3272		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
3273		$as_echo "$ac_cv_path_GREP" >&6; }
3274		GREP="$ac_cv_path_GREP"
3275
3276
3277		-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
3278		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
3279		$as_echo_n "checking for egrep... " >&6; }
3280		-if test "${ac_cv_path_EGREP+set}" = set; then
3281		+if test "${ac_cv_path_EGREP+set}" = set; then :
3282		$as_echo_n "(cached) " >&6
3283		else
3284		if echo a \| $GREP -E '(a\|b)' >/dev/null 2>&1
3285		@@ -4238,7 +4317,7 @@
3286		do
3287		IFS=$as_save_IFS
3288		test -z "$as_dir" && as_dir=.
3289		- for ac_prog in egrep; do
3290		+ for ac_prog in egrep; do
3291		for ac_exec_ext in '' $ac_executable_extensions; do
3292		ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
3293		{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } \|\| continue
3294		@@ -4258,7 +4337,7 @@
3295		$as_echo 'EGREP' >> "conftest.nl"
3296		"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null \|\| break
3297		diff "conftest.out" "conftest.nl" >/dev/null 2>&1 \|\| break
3298		- ac_count=`expr $ac_count + 1`
3299		+ as_fn_arith $ac_count + 1 && ac_count=$as_val
3300		if test $ac_count -gt ${ac_path_EGREP_max-0}; then
3301		# Best one so far, save it but keep looking for a better one
3302		ac_cv_path_EGREP="$ac_path_EGREP"
3303		@@ -4273,12 +4352,10 @@
3304		$ac_path_EGREP_found && break 3
3305		done
3306		done
3307		-done
3308		+ done
3309		IFS=$as_save_IFS
3310		if test -z "$ac_cv_path_EGREP"; then
3311		- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
3312		-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
3313		- { (exit 1); exit 1; }; }
3314		+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
3315		fi
3316		else
3317		ac_cv_path_EGREP=$EGREP
3318		@@ -4286,14 +4363,14 @@
3319
3320		fi
3321		fi
3322		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
3323		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
3324		$as_echo "$ac_cv_path_EGREP" >&6; }
3325		EGREP="$ac_cv_path_EGREP"
3326
3327
3328		-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
3329		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
3330		$as_echo_n "checking for fgrep... " >&6; }
3331		-if test "${ac_cv_path_FGREP+set}" = set; then
3332		+if test "${ac_cv_path_FGREP+set}" = set; then :
3333		$as_echo_n "(cached) " >&6
3334		else
3335		if echo 'abc' \| $GREP -F 'abc' >/dev/null 2>&1
3336		@@ -4307,7 +4384,7 @@
3337		do
3338		IFS=$as_save_IFS
3339		test -z "$as_dir" && as_dir=.
3340		- for ac_prog in fgrep; do
3341		+ for ac_prog in fgrep; do
3342		for ac_exec_ext in '' $ac_executable_extensions; do
3343		ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
3344		{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } \|\| continue
3345		@@ -4327,7 +4404,7 @@
3346		$as_echo 'FGREP' >> "conftest.nl"
3347		"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null \|\| break
3348		diff "conftest.out" "conftest.nl" >/dev/null 2>&1 \|\| break
3349		- ac_count=`expr $ac_count + 1`
3350		+ as_fn_arith $ac_count + 1 && ac_count=$as_val
3351		if test $ac_count -gt ${ac_path_FGREP_max-0}; then
3352		# Best one so far, save it but keep looking for a better one
3353		ac_cv_path_FGREP="$ac_path_FGREP"
3354		@@ -4342,12 +4419,10 @@
3355		$ac_path_FGREP_found && break 3
3356		done
3357		done
3358		-done
3359		+ done
3360		IFS=$as_save_IFS
3361		if test -z "$ac_cv_path_FGREP"; then
3362		- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
3363		-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
3364		- { (exit 1); exit 1; }; }
3365		+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
3366		fi
3367		else
3368		ac_cv_path_FGREP=$FGREP
3369		@@ -4355,7 +4430,7 @@
3370
3371		fi
3372		fi
3373		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
3374		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
3375		$as_echo "$ac_cv_path_FGREP" >&6; }
3376		FGREP="$ac_cv_path_FGREP"
3377
3378		@@ -4381,7 +4456,7 @@
3379
3380
3381		# Check whether --with-gnu-ld was given.
3382		-if test "${with_gnu_ld+set}" = set; then
3383		+if test "${with_gnu_ld+set}" = set; then :
3384		withval=$with_gnu_ld; test "$withval" = no \|\| with_gnu_ld=yes
3385		else
3386		with_gnu_ld=no
3387		@@ -4390,7 +4465,7 @@
3388		ac_prog=ld
3389		if test "$GCC" = yes; then
3390		# Check if gcc -print-prog-name=ld gives a path.
3391		- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
3392		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
3393		$as_echo_n "checking for ld used by $CC... " >&6; }
3394		case $host in
3395		--mingw*)
3396		@@ -4420,13 +4495,13 @@
3397		;;
3398		esac
3399		elif test "$with_gnu_ld" = yes; then
3400		- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
3401		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
3402		$as_echo_n "checking for GNU ld... " >&6; }
3403		else
3404		- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
3405		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
3406		$as_echo_n "checking for non-GNU ld... " >&6; }
3407		fi
3408		-if test "${lt_cv_path_LD+set}" = set; then
3409		+if test "${lt_cv_path_LD+set}" = set; then :
3410		$as_echo_n "(cached) " >&6
3411		else
3412		if test -z "$LD"; then
3413		@@ -4457,18 +4532,16 @@
3414
3415		LD="$lt_cv_path_LD"
3416		if test -n "$LD"; then
3417		- { $as_echo "$as_me:$LINENO: result: $LD" >&5
3418		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
3419		$as_echo "$LD" >&6; }
3420		else
3421		- { $as_echo "$as_me:$LINENO: result: no" >&5
3422		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3423		$as_echo "no" >&6; }
3424		fi
3425		-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
3426		-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
3427		- { (exit 1); exit 1; }; }
3428		-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
3429		+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
3430		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
3431		$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
3432		-if test "${lt_cv_prog_gnu_ld+set}" = set; then
3433		+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
3434		$as_echo_n "(cached) " >&6
3435		else
3436		# I'd rather use --version here, but apparently some GNU lds only accept -v.
3437		@@ -4481,7 +4554,7 @@
3438		;;
3439		esac
3440		fi
3441		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
3442		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
3443		$as_echo "$lt_cv_prog_gnu_ld" >&6; }
3444		with_gnu_ld=$lt_cv_prog_gnu_ld
3445
3446		@@ -4493,9 +4566,9 @@
3447
3448
3449
3450		-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
3451		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
3452		$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
3453		-if test "${lt_cv_path_NM+set}" = set; then
3454		+if test "${lt_cv_path_NM+set}" = set; then :
3455		$as_echo_n "(cached) " >&6
3456		else
3457		if test -n "$NM"; then
3458		@@ -4542,7 +4615,7 @@
3459		: ${lt_cv_path_NM=no}
3460		fi
3461		fi
3462		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
3463		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
3464		$as_echo "$lt_cv_path_NM" >&6; }
3465		if test "$lt_cv_path_NM" != "no"; then
3466		NM="$lt_cv_path_NM"
3467		@@ -4553,9 +4626,9 @@
3468		do
3469		# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3470		set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3471		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3472		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3473		$as_echo_n "checking for $ac_word... " >&6; }
3474		-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
3475		+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
3476		$as_echo_n "(cached) " >&6
3477		else
3478		if test -n "$DUMPBIN"; then
3479		@@ -4566,24 +4639,24 @@
3480		do
3481		IFS=$as_save_IFS
3482		test -z "$as_dir" && as_dir=.
3483		- for ac_exec_ext in '' $ac_executable_extensions; do
3484		+ for ac_exec_ext in '' $ac_executable_extensions; do
3485		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3486		ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
3487		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3488		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3489		break 2
3490		fi
3491		done
3492		-done
3493		+ done
3494		IFS=$as_save_IFS
3495
3496		fi
3497		fi
3498		DUMPBIN=$ac_cv_prog_DUMPBIN
3499		if test -n "$DUMPBIN"; then
3500		- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
3501		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
3502		$as_echo "$DUMPBIN" >&6; }
3503		else
3504		- { $as_echo "$as_me:$LINENO: result: no" >&5
3505		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3506		$as_echo "no" >&6; }
3507		fi
3508
3509		@@ -4597,9 +4670,9 @@
3510		do
3511		# Extract the first word of "$ac_prog", so it can be a program name with args.
3512		set dummy $ac_prog; ac_word=$2
3513		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3514		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3515		$as_echo_n "checking for $ac_word... " >&6; }
3516		-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
3517		+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
3518		$as_echo_n "(cached) " >&6
3519		else
3520		if test -n "$ac_ct_DUMPBIN"; then
3521		@@ -4610,24 +4683,24 @@
3522		do
3523		IFS=$as_save_IFS
3524		test -z "$as_dir" && as_dir=.
3525		- for ac_exec_ext in '' $ac_executable_extensions; do
3526		+ for ac_exec_ext in '' $ac_executable_extensions; do
3527		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3528		ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
3529		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3530		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3531		break 2
3532		fi
3533		done
3534		-done
3535		+ done
3536		IFS=$as_save_IFS
3537
3538		fi
3539		fi
3540		ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
3541		if test -n "$ac_ct_DUMPBIN"; then
3542		- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
3543		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
3544		$as_echo "$ac_ct_DUMPBIN" >&6; }
3545		else
3546		- { $as_echo "$as_me:$LINENO: result: no" >&5
3547		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3548		$as_echo "no" >&6; }
3549		fi
3550
3551		@@ -4640,7 +4713,7 @@
3552		else
3553		case $cross_compiling:$ac_tool_warned in
3554		yes:)
3555		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3556		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3557		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3558		ac_tool_warned=yes ;;
3559		esac
3560		@@ -4660,44 +4733,44 @@
3561
3562
3563
3564		-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
3565		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
3566		$as_echo_n "checking the name lister ($NM) interface... " >&6; }
3567		-if test "${lt_cv_nm_interface+set}" = set; then
3568		+if test "${lt_cv_nm_interface+set}" = set; then :
3569		$as_echo_n "(cached) " >&6
3570		else
3571		lt_cv_nm_interface="BSD nm"
3572		echo "int some_variable = 0;" > conftest.$ac_ext
3573		- (eval echo "\"\$as_me:4670: $ac_compile\"" >&5)
3574		+ (eval echo "\"\$as_me:4743: $ac_compile\"" >&5)
3575		(eval "$ac_compile" 2>conftest.err)
3576		cat conftest.err >&5
3577		- (eval echo "\"\$as_me:4673: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
3578		+ (eval echo "\"\$as_me:4746: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
3579		(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
3580		cat conftest.err >&5
3581		- (eval echo "\"\$as_me:4676: output\"" >&5)
3582		+ (eval echo "\"\$as_me:4749: output\"" >&5)
3583		cat conftest.out >&5
3584		if $GREP 'External.*some_variable' conftest.out > /dev/null; then
3585		lt_cv_nm_interface="MS dumpbin"
3586		fi
3587		rm -f conftest*
3588		fi
3589		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
3590		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
3591		$as_echo "$lt_cv_nm_interface" >&6; }
3592
3593		-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
3594		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
3595		$as_echo_n "checking whether ln -s works... " >&6; }
3596		LN_S=$as_ln_s
3597		if test "$LN_S" = "ln -s"; then
3598		- { $as_echo "$as_me:$LINENO: result: yes" >&5
3599		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3600		$as_echo "yes" >&6; }
3601		else
3602		- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
3603		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
3604		$as_echo "no, using $LN_S" >&6; }
3605		fi
3606
3607		# find the maximum length of command line arguments
3608		-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
3609		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
3610		$as_echo_n "checking the maximum length of command line arguments... " >&6; }
3611		-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
3612		+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
3613		$as_echo_n "(cached) " >&6
3614		else
3615		i=0
3616		@@ -4815,10 +4888,10 @@
3617		fi
3618
3619		if test -n $lt_cv_sys_max_cmd_len ; then
3620		- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
3621		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
3622		$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
3623		else
3624		- { $as_echo "$as_me:$LINENO: result: none" >&5
3625		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
3626		$as_echo "none" >&6; }
3627		fi
3628		max_cmd_len=$lt_cv_sys_max_cmd_len
3629		@@ -4832,7 +4905,7 @@
3630		: ${MV="mv -f"}
3631		: ${RM="rm -f"}
3632
3633		-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
3634		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
3635		$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
3636		# Try some XSI features
3637		xsi_shell=no
3638		@@ -4842,17 +4915,17 @@
3639		&& eval 'test $(( 1 + 1 )) -eq 2 \
3640		&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3641		&& xsi_shell=yes
3642		-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
3643		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
3644		$as_echo "$xsi_shell" >&6; }
3645
3646
3647		-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
3648		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
3649		$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
3650		lt_shell_append=no
3651		( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
3652		>/dev/null 2>&1 \
3653		&& lt_shell_append=yes
3654		-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
3655		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
3656		$as_echo "$lt_shell_append" >&6; }
3657
3658
3659		@@ -4887,14 +4960,14 @@
3660
3661
3662
3663		-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
3664		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
3665		$as_echo_n "checking for $LD option to reload object files... " >&6; }
3666		-if test "${lt_cv_ld_reload_flag+set}" = set; then
3667		+if test "${lt_cv_ld_reload_flag+set}" = set; then :
3668		$as_echo_n "(cached) " >&6
3669		else
3670		lt_cv_ld_reload_flag='-r'
3671		fi
3672		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
3673		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
3674		$as_echo "$lt_cv_ld_reload_flag" >&6; }
3675		reload_flag=$lt_cv_ld_reload_flag
3676		case $reload_flag in
3677		@@ -4923,9 +4996,9 @@
3678		if test -n "$ac_tool_prefix"; then
3679		# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
3680		set dummy ${ac_tool_prefix}objdump; ac_word=$2
3681		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3682		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3683		$as_echo_n "checking for $ac_word... " >&6; }
3684		-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
3685		+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
3686		$as_echo_n "(cached) " >&6
3687		else
3688		if test -n "$OBJDUMP"; then
3689		@@ -4936,24 +5009,24 @@
3690		do
3691		IFS=$as_save_IFS
3692		test -z "$as_dir" && as_dir=.
3693		- for ac_exec_ext in '' $ac_executable_extensions; do
3694		+ for ac_exec_ext in '' $ac_executable_extensions; do
3695		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3696		ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
3697		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3698		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3699		break 2
3700		fi
3701		done
3702		-done
3703		+ done
3704		IFS=$as_save_IFS
3705
3706		fi
3707		fi
3708		OBJDUMP=$ac_cv_prog_OBJDUMP
3709		if test -n "$OBJDUMP"; then
3710		- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
3711		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
3712		$as_echo "$OBJDUMP" >&6; }
3713		else
3714		- { $as_echo "$as_me:$LINENO: result: no" >&5
3715		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3716		$as_echo "no" >&6; }
3717		fi
3718
3719		@@ -4963,9 +5036,9 @@
3720		ac_ct_OBJDUMP=$OBJDUMP
3721		# Extract the first word of "objdump", so it can be a program name with args.
3722		set dummy objdump; ac_word=$2
3723		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3724		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3725		$as_echo_n "checking for $ac_word... " >&6; }
3726		-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
3727		+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
3728		$as_echo_n "(cached) " >&6
3729		else
3730		if test -n "$ac_ct_OBJDUMP"; then
3731		@@ -4976,24 +5049,24 @@
3732		do
3733		IFS=$as_save_IFS
3734		test -z "$as_dir" && as_dir=.
3735		- for ac_exec_ext in '' $ac_executable_extensions; do
3736		+ for ac_exec_ext in '' $ac_executable_extensions; do
3737		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3738		ac_cv_prog_ac_ct_OBJDUMP="objdump"
3739		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3740		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3741		break 2
3742		fi
3743		done
3744		-done
3745		+ done
3746		IFS=$as_save_IFS
3747
3748		fi
3749		fi
3750		ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
3751		if test -n "$ac_ct_OBJDUMP"; then
3752		- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
3753		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
3754		$as_echo "$ac_ct_OBJDUMP" >&6; }
3755		else
3756		- { $as_echo "$as_me:$LINENO: result: no" >&5
3757		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3758		$as_echo "no" >&6; }
3759		fi
3760
3761		@@ -5002,7 +5075,7 @@
3762		else
3763		case $cross_compiling:$ac_tool_warned in
3764		yes:)
3765		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3766		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3767		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3768		ac_tool_warned=yes ;;
3769		esac
3770		@@ -5022,9 +5095,9 @@
3771
3772
3773
3774		-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
3775		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
3776		$as_echo_n "checking how to recognize dependent libraries... " >&6; }
3777		-if test "${lt_cv_deplibs_check_method+set}" = set; then
3778		+if test "${lt_cv_deplibs_check_method+set}" = set; then :
3779		$as_echo_n "(cached) " >&6
3780		else
3781		lt_cv_file_magic_cmd='$MAGIC_CMD'
3782		@@ -5143,7 +5216,7 @@
3783		lt_cv_deplibs_check_method=pass_all
3784		;;
3785
3786		-netbsd*)
3787		+netbsd* \| netbsdelf*-gnu)
3788		if echo __ELF__ \| $CC -E - \| $GREP __ELF__ > /dev/null; then
3789		lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+\|_pic\.a)$'
3790		else
3791		@@ -5218,7 +5291,7 @@
3792		esac
3793
3794		fi
3795		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
3796		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
3797		$as_echo "$lt_cv_deplibs_check_method" >&6; }
3798		file_magic_cmd=$lt_cv_file_magic_cmd
3799		deplibs_check_method=$lt_cv_deplibs_check_method
3800		@@ -5238,9 +5311,9 @@
3801		if test -n "$ac_tool_prefix"; then
3802		# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
3803		set dummy ${ac_tool_prefix}ar; ac_word=$2
3804		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3805		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3806		$as_echo_n "checking for $ac_word... " >&6; }
3807		-if test "${ac_cv_prog_AR+set}" = set; then
3808		+if test "${ac_cv_prog_AR+set}" = set; then :
3809		$as_echo_n "(cached) " >&6
3810		else
3811		if test -n "$AR"; then
3812		@@ -5251,24 +5324,24 @@
3813		do
3814		IFS=$as_save_IFS
3815		test -z "$as_dir" && as_dir=.
3816		- for ac_exec_ext in '' $ac_executable_extensions; do
3817		+ for ac_exec_ext in '' $ac_executable_extensions; do
3818		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3819		ac_cv_prog_AR="${ac_tool_prefix}ar"
3820		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3821		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3822		break 2
3823		fi
3824		done
3825		-done
3826		+ done
3827		IFS=$as_save_IFS
3828
3829		fi
3830		fi
3831		AR=$ac_cv_prog_AR
3832		if test -n "$AR"; then
3833		- { $as_echo "$as_me:$LINENO: result: $AR" >&5
3834		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
3835		$as_echo "$AR" >&6; }
3836		else
3837		- { $as_echo "$as_me:$LINENO: result: no" >&5
3838		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3839		$as_echo "no" >&6; }
3840		fi
3841
3842		@@ -5278,9 +5351,9 @@
3843		ac_ct_AR=$AR
3844		# Extract the first word of "ar", so it can be a program name with args.
3845		set dummy ar; ac_word=$2
3846		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3847		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3848		$as_echo_n "checking for $ac_word... " >&6; }
3849		-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
3850		+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
3851		$as_echo_n "(cached) " >&6
3852		else
3853		if test -n "$ac_ct_AR"; then
3854		@@ -5291,24 +5364,24 @@
3855		do
3856		IFS=$as_save_IFS
3857		test -z "$as_dir" && as_dir=.
3858		- for ac_exec_ext in '' $ac_executable_extensions; do
3859		+ for ac_exec_ext in '' $ac_executable_extensions; do
3860		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3861		ac_cv_prog_ac_ct_AR="ar"
3862		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3863		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3864		break 2
3865		fi
3866		done
3867		-done
3868		+ done
3869		IFS=$as_save_IFS
3870
3871		fi
3872		fi
3873		ac_ct_AR=$ac_cv_prog_ac_ct_AR
3874		if test -n "$ac_ct_AR"; then
3875		- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
3876		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
3877		$as_echo "$ac_ct_AR" >&6; }
3878		else
3879		- { $as_echo "$as_me:$LINENO: result: no" >&5
3880		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3881		$as_echo "no" >&6; }
3882		fi
3883
3884		@@ -5317,7 +5390,7 @@
3885		else
3886		case $cross_compiling:$ac_tool_warned in
3887		yes:)
3888		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3889		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3890		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3891		ac_tool_warned=yes ;;
3892		esac
3893		@@ -5343,9 +5416,9 @@
3894		if test -n "$ac_tool_prefix"; then
3895		# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
3896		set dummy ${ac_tool_prefix}strip; ac_word=$2
3897		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3898		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3899		$as_echo_n "checking for $ac_word... " >&6; }
3900		-if test "${ac_cv_prog_STRIP+set}" = set; then
3901		+if test "${ac_cv_prog_STRIP+set}" = set; then :
3902		$as_echo_n "(cached) " >&6
3903		else
3904		if test -n "$STRIP"; then
3905		@@ -5356,24 +5429,24 @@
3906		do
3907		IFS=$as_save_IFS
3908		test -z "$as_dir" && as_dir=.
3909		- for ac_exec_ext in '' $ac_executable_extensions; do
3910		+ for ac_exec_ext in '' $ac_executable_extensions; do
3911		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3912		ac_cv_prog_STRIP="${ac_tool_prefix}strip"
3913		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3914		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3915		break 2
3916		fi
3917		done
3918		-done
3919		+ done
3920		IFS=$as_save_IFS
3921
3922		fi
3923		fi
3924		STRIP=$ac_cv_prog_STRIP
3925		if test -n "$STRIP"; then
3926		- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
3927		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
3928		$as_echo "$STRIP" >&6; }
3929		else
3930		- { $as_echo "$as_me:$LINENO: result: no" >&5
3931		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3932		$as_echo "no" >&6; }
3933		fi
3934
3935		@@ -5383,9 +5456,9 @@
3936		ac_ct_STRIP=$STRIP
3937		# Extract the first word of "strip", so it can be a program name with args.
3938		set dummy strip; ac_word=$2
3939		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3940		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3941		$as_echo_n "checking for $ac_word... " >&6; }
3942		-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
3943		+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
3944		$as_echo_n "(cached) " >&6
3945		else
3946		if test -n "$ac_ct_STRIP"; then
3947		@@ -5396,24 +5469,24 @@
3948		do
3949		IFS=$as_save_IFS
3950		test -z "$as_dir" && as_dir=.
3951		- for ac_exec_ext in '' $ac_executable_extensions; do
3952		+ for ac_exec_ext in '' $ac_executable_extensions; do
3953		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3954		ac_cv_prog_ac_ct_STRIP="strip"
3955		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3956		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3957		break 2
3958		fi
3959		done
3960		-done
3961		+ done
3962		IFS=$as_save_IFS
3963
3964		fi
3965		fi
3966		ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
3967		if test -n "$ac_ct_STRIP"; then
3968		- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
3969		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
3970		$as_echo "$ac_ct_STRIP" >&6; }
3971		else
3972		- { $as_echo "$as_me:$LINENO: result: no" >&5
3973		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3974		$as_echo "no" >&6; }
3975		fi
3976
3977		@@ -5422,7 +5495,7 @@
3978		else
3979		case $cross_compiling:$ac_tool_warned in
3980		yes:)
3981		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3982		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3983		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3984		ac_tool_warned=yes ;;
3985		esac
3986		@@ -5442,9 +5515,9 @@
3987		if test -n "$ac_tool_prefix"; then
3988		# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
3989		set dummy ${ac_tool_prefix}ranlib; ac_word=$2
3990		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3991		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3992		$as_echo_n "checking for $ac_word... " >&6; }
3993		-if test "${ac_cv_prog_RANLIB+set}" = set; then
3994		+if test "${ac_cv_prog_RANLIB+set}" = set; then :
3995		$as_echo_n "(cached) " >&6
3996		else
3997		if test -n "$RANLIB"; then
3998		@@ -5455,24 +5528,24 @@
3999		do
4000		IFS=$as_save_IFS
4001		test -z "$as_dir" && as_dir=.
4002		- for ac_exec_ext in '' $ac_executable_extensions; do
4003		+ for ac_exec_ext in '' $ac_executable_extensions; do
4004		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4005		ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
4006		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4007		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4008		break 2
4009		fi
4010		done
4011		-done
4012		+ done
4013		IFS=$as_save_IFS
4014
4015		fi
4016		fi
4017		RANLIB=$ac_cv_prog_RANLIB
4018		if test -n "$RANLIB"; then
4019		- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
4020		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
4021		$as_echo "$RANLIB" >&6; }
4022		else
4023		- { $as_echo "$as_me:$LINENO: result: no" >&5
4024		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4025		$as_echo "no" >&6; }
4026		fi
4027
4028		@@ -5482,9 +5555,9 @@
4029		ac_ct_RANLIB=$RANLIB
4030		# Extract the first word of "ranlib", so it can be a program name with args.
4031		set dummy ranlib; ac_word=$2
4032		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4033		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4034		$as_echo_n "checking for $ac_word... " >&6; }
4035		-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
4036		+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
4037		$as_echo_n "(cached) " >&6
4038		else
4039		if test -n "$ac_ct_RANLIB"; then
4040		@@ -5495,24 +5568,24 @@
4041		do
4042		IFS=$as_save_IFS
4043		test -z "$as_dir" && as_dir=.
4044		- for ac_exec_ext in '' $ac_executable_extensions; do
4045		+ for ac_exec_ext in '' $ac_executable_extensions; do
4046		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4047		ac_cv_prog_ac_ct_RANLIB="ranlib"
4048		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4049		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4050		break 2
4051		fi
4052		done
4053		-done
4054		+ done
4055		IFS=$as_save_IFS
4056
4057		fi
4058		fi
4059		ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
4060		if test -n "$ac_ct_RANLIB"; then
4061		- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
4062		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
4063		$as_echo "$ac_ct_RANLIB" >&6; }
4064		else
4065		- { $as_echo "$as_me:$LINENO: result: no" >&5
4066		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4067		$as_echo "no" >&6; }
4068		fi
4069
4070		@@ -5521,7 +5594,7 @@
4071		else
4072		case $cross_compiling:$ac_tool_warned in
4073		yes:)
4074		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4075		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4076		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4077		ac_tool_warned=yes ;;
4078		esac
4079		@@ -5599,9 +5672,9 @@
4080
4081
4082		# Check for command to grab the raw symbol name followed by C symbol from nm.
4083		-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
4084		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
4085		$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
4086		-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
4087		+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
4088		$as_echo_n "(cached) " >&6
4089		else
4090
4091		@@ -5717,18 +5790,18 @@
4092		int main(){nm_test_var='a';nm_test_func();return(0);}
4093		_LT_EOF
4094
4095		- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4096		+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4097		(eval $ac_compile) 2>&5
4098		ac_status=$?
4099		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4100		- (exit $ac_status); }; then
4101		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4102		+ test $ac_status = 0; }; then
4103		# Now try to grab the symbols.
4104		nlist=conftest.nm
4105		- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \\| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
4106		+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \\| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
4107		(eval $NM conftest.$ac_objext \\| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
4108		ac_status=$?
4109		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4110		- (exit $ac_status); } && test -s "$nlist"; then
4111		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4112		+ test $ac_status = 0; } && test -s "$nlist"; then
4113		# Try sorting and uniquifying the output.
4114		if sort "$nlist" \| uniq > "$nlist"T; then
4115		mv -f "$nlist"T "$nlist"
4116		@@ -5781,11 +5854,11 @@
4117		lt_save_CFLAGS="$CFLAGS"
4118		LIBS="conftstm.$ac_objext"
4119		CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4120		- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4121		+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4122		(eval $ac_link) 2>&5
4123		ac_status=$?
4124		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4125		- (exit $ac_status); } && test -s conftest${ac_exeext}; then
4126		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4127		+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4128		pipe_works=yes
4129		fi
4130		LIBS="$lt_save_LIBS"
4131		@@ -5819,10 +5892,10 @@
4132		lt_cv_sys_global_symbol_to_cdecl=
4133		fi
4134		if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
4135		- { $as_echo "$as_me:$LINENO: result: failed" >&5
4136		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
4137		$as_echo "failed" >&6; }
4138		else
4139		- { $as_echo "$as_me:$LINENO: result: ok" >&5
4140		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
4141		$as_echo "ok" >&6; }
4142		fi
4143
4144		@@ -5849,7 +5922,7 @@
4145
4146
4147		# Check whether --enable-libtool-lock was given.
4148		-if test "${enable_libtool_lock+set}" = set; then
4149		+if test "${enable_libtool_lock+set}" = set; then :
4150		enableval=$enable_libtool_lock;
4151		fi
4152
4153		@@ -5861,11 +5934,11 @@
4154		ia64--hpux)
4155		# Find out which ABI we are using.
4156		echo 'int i;' > conftest.$ac_ext
4157		- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4158		+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4159		(eval $ac_compile) 2>&5
4160		ac_status=$?
4161		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4162		- (exit $ac_status); }; then
4163		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4164		+ test $ac_status = 0; }; then
4165		case `/usr/bin/file conftest.$ac_objext` in
4166		ELF-32)
4167		HPUX_IA64_MODE="32"
4168		@@ -5879,12 +5952,12 @@
4169		;;
4170		--irix6*)
4171		# Find out which ABI we are using.
4172		- echo '#line 5882 "configure"' > conftest.$ac_ext
4173		- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4174		+ echo '#line 5955 "configure"' > conftest.$ac_ext
4175		+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4176		(eval $ac_compile) 2>&5
4177		ac_status=$?
4178		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4179		- (exit $ac_status); }; then
4180		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4181		+ test $ac_status = 0; }; then
4182		if test "$lt_cv_prog_gnu_ld" = yes; then
4183		case `/usr/bin/file conftest.$ac_objext` in
4184		32-bit)
4185		@@ -5918,11 +5991,11 @@
4186		s390-linux\|s390-tpf\|sparc-linux*)
4187		# Find out which ABI we are using.
4188		echo 'int i;' > conftest.$ac_ext
4189		- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4190		+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4191		(eval $ac_compile) 2>&5
4192		ac_status=$?
4193		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4194		- (exit $ac_status); }; then
4195		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4196		+ test $ac_status = 0; }; then
4197		case `/usr/bin/file conftest.o` in
4198		32-bit)
4199		case $host in
4200		@@ -5971,9 +6044,9 @@
4201		# On SCO OpenServer 5, we need -belf to get full-featured binaries.
4202		SAVE_CFLAGS="$CFLAGS"
4203		CFLAGS="$CFLAGS -belf"
4204		- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
4205		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
4206		$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
4207		-if test "${lt_cv_cc_needs_belf+set}" = set; then
4208		+if test "${lt_cv_cc_needs_belf+set}" = set; then :
4209		$as_echo_n "(cached) " >&6
4210		else
4211		ac_ext=c
4212		@@ -5982,11 +6055,7 @@
4213		ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4214		ac_compiler_gnu=$ac_cv_c_compiler_gnu
4215
4216		- cat >conftest.$ac_ext <<_ACEOF
4217		-/* confdefs.h. */
4218		-_ACEOF
4219		-cat confdefs.h >>conftest.$ac_ext
4220		-cat >>conftest.$ac_ext <<_ACEOF
4221		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4222		/* end confdefs.h. */
4223
4224		int
4225		@@ -5997,38 +6066,13 @@
4226		return 0;
4227		}
4228		_ACEOF
4229		-rm -f conftest.$ac_objext conftest$ac_exeext
4230		-if { (ac_try="$ac_link"
4231		-case "(($ac_try" in
4232		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
4233		- *) ac_try_echo=$ac_try;;
4234		-esac
4235		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4236		-$as_echo "$ac_try_echo") >&5
4237		- (eval "$ac_link") 2>conftest.er1
4238		- ac_status=$?
4239		- grep -v '^ *+' conftest.er1 >conftest.err
4240		- rm -f conftest.er1
4241		- cat conftest.err >&5
4242		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4243		- (exit $ac_status); } && {
4244		- test -z "$ac_c_werror_flag" \|\|
4245		- test ! -s conftest.err
4246		- } && test -s conftest$ac_exeext && {
4247		- test "$cross_compiling" = yes \|\|
4248		- $as_test_x conftest$ac_exeext
4249		- }; then
4250		+if ac_fn_c_try_link "$LINENO"; then :
4251		lt_cv_cc_needs_belf=yes
4252		else
4253		- $as_echo "$as_me: failed program was:" >&5
4254		-sed 's/^/\| /' conftest.$ac_ext >&5
4255		-
4256		- lt_cv_cc_needs_belf=no
4257		+ lt_cv_cc_needs_belf=no
4258		fi
4259		-
4260		-rm -rf conftest.dSYM
4261		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4262		- conftest$ac_exeext conftest.$ac_ext
4263		+rm -f core conftest.err conftest.$ac_objext \
4264		+ conftest$ac_exeext conftest.$ac_ext
4265		ac_ext=c
4266		ac_cpp='$CPP $CPPFLAGS'
4267		ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4268		@@ -6036,7 +6080,7 @@
4269		ac_compiler_gnu=$ac_cv_c_compiler_gnu
4270
4271		fi
4272		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
4273		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
4274		$as_echo "$lt_cv_cc_needs_belf" >&6; }
4275		if test x"$lt_cv_cc_needs_belf" != x"yes"; then
4276		# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
4277		@@ -6046,11 +6090,11 @@
4278		sparc-solaris*)
4279		# Find out which ABI we are using.
4280		echo 'int i;' > conftest.$ac_ext
4281		- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4282		+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4283		(eval $ac_compile) 2>&5
4284		ac_status=$?
4285		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4286		- (exit $ac_status); }; then
4287		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4288		+ test $ac_status = 0; }; then
4289		case `/usr/bin/file conftest.o` in
4290		64-bit)
4291		case $lt_cv_prog_gnu_ld in
4292		@@ -6076,9 +6120,9 @@
4293		if test -n "$ac_tool_prefix"; then
4294		# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
4295		set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
4296		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4297		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4298		$as_echo_n "checking for $ac_word... " >&6; }
4299		-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
4300		+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
4301		$as_echo_n "(cached) " >&6
4302		else
4303		if test -n "$DSYMUTIL"; then
4304		@@ -6089,24 +6133,24 @@
4305		do
4306		IFS=$as_save_IFS
4307		test -z "$as_dir" && as_dir=.
4308		- for ac_exec_ext in '' $ac_executable_extensions; do
4309		+ for ac_exec_ext in '' $ac_executable_extensions; do
4310		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4311		ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
4312		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4313		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4314		break 2
4315		fi
4316		done
4317		-done
4318		+ done
4319		IFS=$as_save_IFS
4320
4321		fi
4322		fi
4323		DSYMUTIL=$ac_cv_prog_DSYMUTIL
4324		if test -n "$DSYMUTIL"; then
4325		- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
4326		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
4327		$as_echo "$DSYMUTIL" >&6; }
4328		else
4329		- { $as_echo "$as_me:$LINENO: result: no" >&5
4330		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4331		$as_echo "no" >&6; }
4332		fi
4333
4334		@@ -6116,9 +6160,9 @@
4335		ac_ct_DSYMUTIL=$DSYMUTIL
4336		# Extract the first word of "dsymutil", so it can be a program name with args.
4337		set dummy dsymutil; ac_word=$2
4338		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4339		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4340		$as_echo_n "checking for $ac_word... " >&6; }
4341		-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
4342		+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
4343		$as_echo_n "(cached) " >&6
4344		else
4345		if test -n "$ac_ct_DSYMUTIL"; then
4346		@@ -6129,24 +6173,24 @@
4347		do
4348		IFS=$as_save_IFS
4349		test -z "$as_dir" && as_dir=.
4350		- for ac_exec_ext in '' $ac_executable_extensions; do
4351		+ for ac_exec_ext in '' $ac_executable_extensions; do
4352		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4353		ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
4354		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4355		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4356		break 2
4357		fi
4358		done
4359		-done
4360		+ done
4361		IFS=$as_save_IFS
4362
4363		fi
4364		fi
4365		ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
4366		if test -n "$ac_ct_DSYMUTIL"; then
4367		- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
4368		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
4369		$as_echo "$ac_ct_DSYMUTIL" >&6; }
4370		else
4371		- { $as_echo "$as_me:$LINENO: result: no" >&5
4372		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4373		$as_echo "no" >&6; }
4374		fi
4375
4376		@@ -6155,7 +6199,7 @@
4377		else
4378		case $cross_compiling:$ac_tool_warned in
4379		yes:)
4380		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4381		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4382		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4383		ac_tool_warned=yes ;;
4384		esac
4385		@@ -6168,9 +6212,9 @@
4386		if test -n "$ac_tool_prefix"; then
4387		# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
4388		set dummy ${ac_tool_prefix}nmedit; ac_word=$2
4389		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4390		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4391		$as_echo_n "checking for $ac_word... " >&6; }
4392		-if test "${ac_cv_prog_NMEDIT+set}" = set; then
4393		+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
4394		$as_echo_n "(cached) " >&6
4395		else
4396		if test -n "$NMEDIT"; then
4397		@@ -6181,24 +6225,24 @@
4398		do
4399		IFS=$as_save_IFS
4400		test -z "$as_dir" && as_dir=.
4401		- for ac_exec_ext in '' $ac_executable_extensions; do
4402		+ for ac_exec_ext in '' $ac_executable_extensions; do
4403		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4404		ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
4405		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4406		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4407		break 2
4408		fi
4409		done
4410		-done
4411		+ done
4412		IFS=$as_save_IFS
4413
4414		fi
4415		fi
4416		NMEDIT=$ac_cv_prog_NMEDIT
4417		if test -n "$NMEDIT"; then
4418		- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
4419		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
4420		$as_echo "$NMEDIT" >&6; }
4421		else
4422		- { $as_echo "$as_me:$LINENO: result: no" >&5
4423		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4424		$as_echo "no" >&6; }
4425		fi
4426
4427		@@ -6208,9 +6252,9 @@
4428		ac_ct_NMEDIT=$NMEDIT
4429		# Extract the first word of "nmedit", so it can be a program name with args.
4430		set dummy nmedit; ac_word=$2
4431		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4432		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4433		$as_echo_n "checking for $ac_word... " >&6; }
4434		-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
4435		+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
4436		$as_echo_n "(cached) " >&6
4437		else
4438		if test -n "$ac_ct_NMEDIT"; then
4439		@@ -6221,24 +6265,24 @@
4440		do
4441		IFS=$as_save_IFS
4442		test -z "$as_dir" && as_dir=.
4443		- for ac_exec_ext in '' $ac_executable_extensions; do
4444		+ for ac_exec_ext in '' $ac_executable_extensions; do
4445		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4446		ac_cv_prog_ac_ct_NMEDIT="nmedit"
4447		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4448		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4449		break 2
4450		fi
4451		done
4452		-done
4453		+ done
4454		IFS=$as_save_IFS
4455
4456		fi
4457		fi
4458		ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
4459		if test -n "$ac_ct_NMEDIT"; then
4460		- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
4461		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
4462		$as_echo "$ac_ct_NMEDIT" >&6; }
4463		else
4464		- { $as_echo "$as_me:$LINENO: result: no" >&5
4465		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4466		$as_echo "no" >&6; }
4467		fi
4468
4469		@@ -6247,7 +6291,7 @@
4470		else
4471		case $cross_compiling:$ac_tool_warned in
4472		yes:)
4473		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4474		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4475		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4476		ac_tool_warned=yes ;;
4477		esac
4478		@@ -6260,9 +6304,9 @@
4479		if test -n "$ac_tool_prefix"; then
4480		# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
4481		set dummy ${ac_tool_prefix}lipo; ac_word=$2
4482		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4483		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4484		$as_echo_n "checking for $ac_word... " >&6; }
4485		-if test "${ac_cv_prog_LIPO+set}" = set; then
4486		+if test "${ac_cv_prog_LIPO+set}" = set; then :
4487		$as_echo_n "(cached) " >&6
4488		else
4489		if test -n "$LIPO"; then
4490		@@ -6273,24 +6317,24 @@
4491		do
4492		IFS=$as_save_IFS
4493		test -z "$as_dir" && as_dir=.
4494		- for ac_exec_ext in '' $ac_executable_extensions; do
4495		+ for ac_exec_ext in '' $ac_executable_extensions; do
4496		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4497		ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
4498		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4499		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4500		break 2
4501		fi
4502		done
4503		-done
4504		+ done
4505		IFS=$as_save_IFS
4506
4507		fi
4508		fi
4509		LIPO=$ac_cv_prog_LIPO
4510		if test -n "$LIPO"; then
4511		- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
4512		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
4513		$as_echo "$LIPO" >&6; }
4514		else
4515		- { $as_echo "$as_me:$LINENO: result: no" >&5
4516		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4517		$as_echo "no" >&6; }
4518		fi
4519
4520		@@ -6300,9 +6344,9 @@
4521		ac_ct_LIPO=$LIPO
4522		# Extract the first word of "lipo", so it can be a program name with args.
4523		set dummy lipo; ac_word=$2
4524		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4525		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4526		$as_echo_n "checking for $ac_word... " >&6; }
4527		-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
4528		+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
4529		$as_echo_n "(cached) " >&6
4530		else
4531		if test -n "$ac_ct_LIPO"; then
4532		@@ -6313,24 +6357,24 @@
4533		do
4534		IFS=$as_save_IFS
4535		test -z "$as_dir" && as_dir=.
4536		- for ac_exec_ext in '' $ac_executable_extensions; do
4537		+ for ac_exec_ext in '' $ac_executable_extensions; do
4538		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4539		ac_cv_prog_ac_ct_LIPO="lipo"
4540		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4541		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4542		break 2
4543		fi
4544		done
4545		-done
4546		+ done
4547		IFS=$as_save_IFS
4548
4549		fi
4550		fi
4551		ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
4552		if test -n "$ac_ct_LIPO"; then
4553		- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
4554		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
4555		$as_echo "$ac_ct_LIPO" >&6; }
4556		else
4557		- { $as_echo "$as_me:$LINENO: result: no" >&5
4558		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4559		$as_echo "no" >&6; }
4560		fi
4561
4562		@@ -6339,7 +6383,7 @@
4563		else
4564		case $cross_compiling:$ac_tool_warned in
4565		yes:)
4566		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4567		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4568		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4569		ac_tool_warned=yes ;;
4570		esac
4571		@@ -6352,9 +6396,9 @@
4572		if test -n "$ac_tool_prefix"; then
4573		# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
4574		set dummy ${ac_tool_prefix}otool; ac_word=$2
4575		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4576		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4577		$as_echo_n "checking for $ac_word... " >&6; }
4578		-if test "${ac_cv_prog_OTOOL+set}" = set; then
4579		+if test "${ac_cv_prog_OTOOL+set}" = set; then :
4580		$as_echo_n "(cached) " >&6
4581		else
4582		if test -n "$OTOOL"; then
4583		@@ -6365,24 +6409,24 @@
4584		do
4585		IFS=$as_save_IFS
4586		test -z "$as_dir" && as_dir=.
4587		- for ac_exec_ext in '' $ac_executable_extensions; do
4588		+ for ac_exec_ext in '' $ac_executable_extensions; do
4589		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4590		ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
4591		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4592		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4593		break 2
4594		fi
4595		done
4596		-done
4597		+ done
4598		IFS=$as_save_IFS
4599
4600		fi
4601		fi
4602		OTOOL=$ac_cv_prog_OTOOL
4603		if test -n "$OTOOL"; then
4604		- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
4605		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
4606		$as_echo "$OTOOL" >&6; }
4607		else
4608		- { $as_echo "$as_me:$LINENO: result: no" >&5
4609		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4610		$as_echo "no" >&6; }
4611		fi
4612
4613		@@ -6392,9 +6436,9 @@
4614		ac_ct_OTOOL=$OTOOL
4615		# Extract the first word of "otool", so it can be a program name with args.
4616		set dummy otool; ac_word=$2
4617		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4618		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4619		$as_echo_n "checking for $ac_word... " >&6; }
4620		-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
4621		+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
4622		$as_echo_n "(cached) " >&6
4623		else
4624		if test -n "$ac_ct_OTOOL"; then
4625		@@ -6405,24 +6449,24 @@
4626		do
4627		IFS=$as_save_IFS
4628		test -z "$as_dir" && as_dir=.
4629		- for ac_exec_ext in '' $ac_executable_extensions; do
4630		+ for ac_exec_ext in '' $ac_executable_extensions; do
4631		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4632		ac_cv_prog_ac_ct_OTOOL="otool"
4633		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4634		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4635		break 2
4636		fi
4637		done
4638		-done
4639		+ done
4640		IFS=$as_save_IFS
4641
4642		fi
4643		fi
4644		ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
4645		if test -n "$ac_ct_OTOOL"; then
4646		- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
4647		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
4648		$as_echo "$ac_ct_OTOOL" >&6; }
4649		else
4650		- { $as_echo "$as_me:$LINENO: result: no" >&5
4651		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4652		$as_echo "no" >&6; }
4653		fi
4654
4655		@@ -6431,7 +6475,7 @@
4656		else
4657		case $cross_compiling:$ac_tool_warned in
4658		yes:)
4659		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4660		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4661		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4662		ac_tool_warned=yes ;;
4663		esac
4664		@@ -6444,9 +6488,9 @@
4665		if test -n "$ac_tool_prefix"; then
4666		# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
4667		set dummy ${ac_tool_prefix}otool64; ac_word=$2
4668		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4669		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4670		$as_echo_n "checking for $ac_word... " >&6; }
4671		-if test "${ac_cv_prog_OTOOL64+set}" = set; then
4672		+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
4673		$as_echo_n "(cached) " >&6
4674		else
4675		if test -n "$OTOOL64"; then
4676		@@ -6457,24 +6501,24 @@
4677		do
4678		IFS=$as_save_IFS
4679		test -z "$as_dir" && as_dir=.
4680		- for ac_exec_ext in '' $ac_executable_extensions; do
4681		+ for ac_exec_ext in '' $ac_executable_extensions; do
4682		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4683		ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
4684		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4685		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4686		break 2
4687		fi
4688		done
4689		-done
4690		+ done
4691		IFS=$as_save_IFS
4692
4693		fi
4694		fi
4695		OTOOL64=$ac_cv_prog_OTOOL64
4696		if test -n "$OTOOL64"; then
4697		- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
4698		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
4699		$as_echo "$OTOOL64" >&6; }
4700		else
4701		- { $as_echo "$as_me:$LINENO: result: no" >&5
4702		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4703		$as_echo "no" >&6; }
4704		fi
4705
4706		@@ -6484,9 +6528,9 @@
4707		ac_ct_OTOOL64=$OTOOL64
4708		# Extract the first word of "otool64", so it can be a program name with args.
4709		set dummy otool64; ac_word=$2
4710		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4711		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4712		$as_echo_n "checking for $ac_word... " >&6; }
4713		-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
4714		+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
4715		$as_echo_n "(cached) " >&6
4716		else
4717		if test -n "$ac_ct_OTOOL64"; then
4718		@@ -6497,24 +6541,24 @@
4719		do
4720		IFS=$as_save_IFS
4721		test -z "$as_dir" && as_dir=.
4722		- for ac_exec_ext in '' $ac_executable_extensions; do
4723		+ for ac_exec_ext in '' $ac_executable_extensions; do
4724		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4725		ac_cv_prog_ac_ct_OTOOL64="otool64"
4726		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4727		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4728		break 2
4729		fi
4730		done
4731		-done
4732		+ done
4733		IFS=$as_save_IFS
4734
4735		fi
4736		fi
4737		ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
4738		if test -n "$ac_ct_OTOOL64"; then
4739		- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
4740		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
4741		$as_echo "$ac_ct_OTOOL64" >&6; }
4742		else
4743		- { $as_echo "$as_me:$LINENO: result: no" >&5
4744		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4745		$as_echo "no" >&6; }
4746		fi
4747
4748		@@ -6523,7 +6567,7 @@
4749		else
4750		case $cross_compiling:$ac_tool_warned in
4751		yes:)
4752		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4753		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4754		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4755		ac_tool_warned=yes ;;
4756		esac
4757		@@ -6559,9 +6603,9 @@
4758
4759
4760
4761		- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
4762		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
4763		$as_echo_n "checking for -single_module linker flag... " >&6; }
4764		-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
4765		+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
4766		$as_echo_n "(cached) " >&6
4767		else
4768		lt_cv_apple_cc_single_mod=no
4769		@@ -6586,22 +6630,18 @@
4770		rm -f conftest.*
4771		fi
4772		fi
4773		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
4774		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
4775		$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
4776		- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
4777		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
4778		$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
4779		-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
4780		+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
4781		$as_echo_n "(cached) " >&6
4782		else
4783		lt_cv_ld_exported_symbols_list=no
4784		save_LDFLAGS=$LDFLAGS
4785		echo "_main" > conftest.sym
4786		LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
4787		- cat >conftest.$ac_ext <<_ACEOF
4788		-/* confdefs.h. */
4789		-_ACEOF
4790		-cat confdefs.h >>conftest.$ac_ext
4791		-cat >>conftest.$ac_ext <<_ACEOF
4792		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4793		/* end confdefs.h. */
4794
4795		int
4796		@@ -6612,42 +6652,17 @@
4797		return 0;
4798		}
4799		_ACEOF
4800		-rm -f conftest.$ac_objext conftest$ac_exeext
4801		-if { (ac_try="$ac_link"
4802		-case "(($ac_try" in
4803		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
4804		- *) ac_try_echo=$ac_try;;
4805		-esac
4806		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4807		-$as_echo "$ac_try_echo") >&5
4808		- (eval "$ac_link") 2>conftest.er1
4809		- ac_status=$?
4810		- grep -v '^ *+' conftest.er1 >conftest.err
4811		- rm -f conftest.er1
4812		- cat conftest.err >&5
4813		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4814		- (exit $ac_status); } && {
4815		- test -z "$ac_c_werror_flag" \|\|
4816		- test ! -s conftest.err
4817		- } && test -s conftest$ac_exeext && {
4818		- test "$cross_compiling" = yes \|\|
4819		- $as_test_x conftest$ac_exeext
4820		- }; then
4821		+if ac_fn_c_try_link "$LINENO"; then :
4822		lt_cv_ld_exported_symbols_list=yes
4823		else
4824		- $as_echo "$as_me: failed program was:" >&5
4825		-sed 's/^/\| /' conftest.$ac_ext >&5
4826		-
4827		- lt_cv_ld_exported_symbols_list=no
4828		+ lt_cv_ld_exported_symbols_list=no
4829		fi
4830		-
4831		-rm -rf conftest.dSYM
4832		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4833		- conftest$ac_exeext conftest.$ac_ext
4834		+rm -f core conftest.err conftest.$ac_objext \
4835		+ conftest$ac_exeext conftest.$ac_ext
4836		LDFLAGS="$save_LDFLAGS"
4837
4838		fi
4839		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
4840		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
4841		$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
4842		case $host_os in
4843		rhapsody* \| darwin1.[012])
4844		@@ -6689,14 +6704,14 @@
4845		ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4846		ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4847		ac_compiler_gnu=$ac_cv_c_compiler_gnu
4848		-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
4849		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
4850		$as_echo_n "checking how to run the C preprocessor... " >&6; }
4851		# On Suns, sometimes $CPP names a directory.
4852		if test -n "$CPP" && test -d "$CPP"; then
4853		CPP=
4854		fi
4855		if test -z "$CPP"; then
4856		- if test "${ac_cv_prog_CPP+set}" = set; then
4857		+ if test "${ac_cv_prog_CPP+set}" = set; then :
4858		$as_echo_n "(cached) " >&6
4859		else
4860		# Double quotes because CPP needs to be expanded
4861		@@ -6711,11 +6726,7 @@
4862		# <limits.h> exists even on freestanding compilers.
4863		# On the NeXT, cc -E runs the code through the compiler's parser,
4864		# not just through cpp. "Syntax error" is here to catch this case.
4865		- cat >conftest.$ac_ext <<_ACEOF
4866		-/* confdefs.h. */
4867		-_ACEOF
4868		-cat confdefs.h >>conftest.$ac_ext
4869		-cat >>conftest.$ac_ext <<_ACEOF
4870		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4871		/* end confdefs.h. */
4872		#ifdef __STDC__
4873		# include <limits.h>
4874		@@ -6724,78 +6735,34 @@
4875		#endif
4876		Syntax error
4877		_ACEOF
4878		-if { (ac_try="$ac_cpp conftest.$ac_ext"
4879		-case "(($ac_try" in
4880		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
4881		- *) ac_try_echo=$ac_try;;
4882		-esac
4883		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4884		-$as_echo "$ac_try_echo") >&5
4885		- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4886		- ac_status=$?
4887		- grep -v '^ *+' conftest.er1 >conftest.err
4888		- rm -f conftest.er1
4889		- cat conftest.err >&5
4890		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4891		- (exit $ac_status); } >/dev/null && {
4892		- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
4893		- test ! -s conftest.err
4894		- }; then
4895		- :
4896		-else
4897		- $as_echo "$as_me: failed program was:" >&5
4898		-sed 's/^/\| /' conftest.$ac_ext >&5
4899		+if ac_fn_c_try_cpp "$LINENO"; then :
4900
4901		+else
4902		# Broken: fails on valid input.
4903		continue
4904		fi
4905		-
4906		rm -f conftest.err conftest.$ac_ext
4907
4908		# OK, works on sane cases. Now check whether nonexistent headers
4909		# can be detected and how.
4910		- cat >conftest.$ac_ext <<_ACEOF
4911		-/* confdefs.h. */
4912		-_ACEOF
4913		-cat confdefs.h >>conftest.$ac_ext
4914		-cat >>conftest.$ac_ext <<_ACEOF
4915		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4916		/* end confdefs.h. */
4917		#include <ac_nonexistent.h>
4918		_ACEOF
4919		-if { (ac_try="$ac_cpp conftest.$ac_ext"
4920		-case "(($ac_try" in
4921		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
4922		- *) ac_try_echo=$ac_try;;
4923		-esac
4924		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4925		-$as_echo "$ac_try_echo") >&5
4926		- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4927		- ac_status=$?
4928		- grep -v '^ *+' conftest.er1 >conftest.err
4929		- rm -f conftest.er1
4930		- cat conftest.err >&5
4931		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4932		- (exit $ac_status); } >/dev/null && {
4933		- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
4934		- test ! -s conftest.err
4935		- }; then
4936		+if ac_fn_c_try_cpp "$LINENO"; then :
4937		# Broken: success on invalid input.
4938		continue
4939		else
4940		- $as_echo "$as_me: failed program was:" >&5
4941		-sed 's/^/\| /' conftest.$ac_ext >&5
4942		-
4943		# Passes both tests.
4944		ac_preproc_ok=:
4945		break
4946		fi
4947		-
4948		rm -f conftest.err conftest.$ac_ext
4949
4950		done
4951		# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
4952		rm -f conftest.err conftest.$ac_ext
4953		-if $ac_preproc_ok; then
4954		+if $ac_preproc_ok; then :
4955		break
4956		fi
4957
4958		@@ -6807,7 +6774,7 @@
4959		else
4960		ac_cv_prog_CPP=$CPP
4961		fi
4962		-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
4963		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
4964		$as_echo "$CPP" >&6; }
4965		ac_preproc_ok=false
4966		for ac_c_preproc_warn_flag in '' yes
4967		@@ -6818,11 +6785,7 @@
4968		# <limits.h> exists even on freestanding compilers.
4969		# On the NeXT, cc -E runs the code through the compiler's parser,
4970		# not just through cpp. "Syntax error" is here to catch this case.
4971		- cat >conftest.$ac_ext <<_ACEOF
4972		-/* confdefs.h. */
4973		-_ACEOF
4974		-cat confdefs.h >>conftest.$ac_ext
4975		-cat >>conftest.$ac_ext <<_ACEOF
4976		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4977		/* end confdefs.h. */
4978		#ifdef __STDC__
4979		# include <limits.h>
4980		@@ -6831,87 +6794,40 @@
4981		#endif
4982		Syntax error
4983		_ACEOF
4984		-if { (ac_try="$ac_cpp conftest.$ac_ext"
4985		-case "(($ac_try" in
4986		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
4987		- *) ac_try_echo=$ac_try;;
4988		-esac
4989		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4990		-$as_echo "$ac_try_echo") >&5
4991		- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4992		- ac_status=$?
4993		- grep -v '^ *+' conftest.er1 >conftest.err
4994		- rm -f conftest.er1
4995		- cat conftest.err >&5
4996		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4997		- (exit $ac_status); } >/dev/null && {
4998		- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
4999		- test ! -s conftest.err
5000		- }; then
5001		- :
5002		-else
5003		- $as_echo "$as_me: failed program was:" >&5
5004		-sed 's/^/\| /' conftest.$ac_ext >&5
5005		+if ac_fn_c_try_cpp "$LINENO"; then :
5006
5007		+else
5008		# Broken: fails on valid input.
5009		continue
5010		fi
5011		-
5012		rm -f conftest.err conftest.$ac_ext
5013
5014		# OK, works on sane cases. Now check whether nonexistent headers
5015		# can be detected and how.
5016		- cat >conftest.$ac_ext <<_ACEOF
5017		-/* confdefs.h. */
5018		-_ACEOF
5019		-cat confdefs.h >>conftest.$ac_ext
5020		-cat >>conftest.$ac_ext <<_ACEOF
5021		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5022		/* end confdefs.h. */
5023		#include <ac_nonexistent.h>
5024		_ACEOF
5025		-if { (ac_try="$ac_cpp conftest.$ac_ext"
5026		-case "(($ac_try" in
5027		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
5028		- *) ac_try_echo=$ac_try;;
5029		-esac
5030		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5031		-$as_echo "$ac_try_echo") >&5
5032		- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5033		- ac_status=$?
5034		- grep -v '^ *+' conftest.er1 >conftest.err
5035		- rm -f conftest.er1
5036		- cat conftest.err >&5
5037		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5038		- (exit $ac_status); } >/dev/null && {
5039		- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
5040		- test ! -s conftest.err
5041		- }; then
5042		+if ac_fn_c_try_cpp "$LINENO"; then :
5043		# Broken: success on invalid input.
5044		continue
5045		else
5046		- $as_echo "$as_me: failed program was:" >&5
5047		-sed 's/^/\| /' conftest.$ac_ext >&5
5048		-
5049		# Passes both tests.
5050		ac_preproc_ok=:
5051		break
5052		fi
5053		-
5054		rm -f conftest.err conftest.$ac_ext
5055
5056		done
5057		# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
5058		rm -f conftest.err conftest.$ac_ext
5059		-if $ac_preproc_ok; then
5060		- :
5061		+if $ac_preproc_ok; then :
5062		+
5063		else
5064		- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
5065		+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5066		$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5067		-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
5068		-See \`config.log' for more details." >&5
5069		-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
5070		-See \`config.log' for more details." >&2;}
5071		- { (exit 1); exit 1; }; }; }
5072		+as_fn_error "C preprocessor \"$CPP\" fails sanity check
5073		+See \`config.log' for more details." "$LINENO" 5; }
5074		fi
5075
5076		ac_ext=c
5077		@@ -6921,16 +6837,12 @@
5078		ac_compiler_gnu=$ac_cv_c_compiler_gnu
5079
5080
5081		-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
5082		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
5083		$as_echo_n "checking for ANSI C header files... " >&6; }
5084		-if test "${ac_cv_header_stdc+set}" = set; then
5085		+if test "${ac_cv_header_stdc+set}" = set; then :
5086		$as_echo_n "(cached) " >&6
5087		else
5088		- cat >conftest.$ac_ext <<_ACEOF
5089		-/* confdefs.h. */
5090		-_ACEOF
5091		-cat confdefs.h >>conftest.$ac_ext
5092		-cat >>conftest.$ac_ext <<_ACEOF
5093		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5094		/* end confdefs.h. */
5095		#include <stdlib.h>
5096		#include <stdarg.h>
5097		@@ -6945,48 +6857,23 @@
5098		return 0;
5099		}
5100		_ACEOF
5101		-rm -f conftest.$ac_objext
5102		-if { (ac_try="$ac_compile"
5103		-case "(($ac_try" in
5104		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
5105		- *) ac_try_echo=$ac_try;;
5106		-esac
5107		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5108		-$as_echo "$ac_try_echo") >&5
5109		- (eval "$ac_compile") 2>conftest.er1
5110		- ac_status=$?
5111		- grep -v '^ *+' conftest.er1 >conftest.err
5112		- rm -f conftest.er1
5113		- cat conftest.err >&5
5114		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5115		- (exit $ac_status); } && {
5116		- test -z "$ac_c_werror_flag" \|\|
5117		- test ! -s conftest.err
5118		- } && test -s conftest.$ac_objext; then
5119		+if ac_fn_c_try_compile "$LINENO"; then :
5120		ac_cv_header_stdc=yes
5121		else
5122		- $as_echo "$as_me: failed program was:" >&5
5123		-sed 's/^/\| /' conftest.$ac_ext >&5
5124		-
5125		- ac_cv_header_stdc=no
5126		+ ac_cv_header_stdc=no
5127		fi
5128		-
5129		rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5130
5131		if test $ac_cv_header_stdc = yes; then
5132		# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
5133		- cat >conftest.$ac_ext <<_ACEOF
5134		-/* confdefs.h. */
5135		-_ACEOF
5136		-cat confdefs.h >>conftest.$ac_ext
5137		-cat >>conftest.$ac_ext <<_ACEOF
5138		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5139		/* end confdefs.h. */
5140		#include <string.h>
5141
5142		_ACEOF
5143		if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
5144		- $EGREP "memchr" >/dev/null 2>&1; then
5145		- :
5146		+ $EGREP "memchr" >/dev/null 2>&1; then :
5147		+
5148		else
5149		ac_cv_header_stdc=no
5150		fi
5151		@@ -6996,18 +6883,14 @@
5152
5153		if test $ac_cv_header_stdc = yes; then
5154		# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
5155		- cat >conftest.$ac_ext <<_ACEOF
5156		-/* confdefs.h. */
5157		-_ACEOF
5158		-cat confdefs.h >>conftest.$ac_ext
5159		-cat >>conftest.$ac_ext <<_ACEOF
5160		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5161		/* end confdefs.h. */
5162		#include <stdlib.h>
5163
5164		_ACEOF
5165		if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
5166		- $EGREP "free" >/dev/null 2>&1; then
5167		- :
5168		+ $EGREP "free" >/dev/null 2>&1; then :
5169		+
5170		else
5171		ac_cv_header_stdc=no
5172		fi
5173		@@ -7017,14 +6900,10 @@
5174
5175		if test $ac_cv_header_stdc = yes; then
5176		# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
5177		- if test "$cross_compiling" = yes; then
5178		+ if test "$cross_compiling" = yes; then :
5179		:
5180		else
5181		- cat >conftest.$ac_ext <<_ACEOF
5182		-/* confdefs.h. */
5183		-_ACEOF
5184		-cat confdefs.h >>conftest.$ac_ext
5185		-cat >>conftest.$ac_ext <<_ACEOF
5186		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5187		/* end confdefs.h. */
5188		#include <ctype.h>
5189		#include <stdlib.h>
5190		@@ -7051,118 +6930,34 @@
5191		return 0;
5192		}
5193		_ACEOF
5194		-rm -f conftest$ac_exeext
5195		-if { (ac_try="$ac_link"
5196		-case "(($ac_try" in
5197		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
5198		- *) ac_try_echo=$ac_try;;
5199		-esac
5200		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5201		-$as_echo "$ac_try_echo") >&5
5202		- (eval "$ac_link") 2>&5
5203		- ac_status=$?
5204		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5205		- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5206		- { (case "(($ac_try" in
5207		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
5208		- *) ac_try_echo=$ac_try;;
5209		-esac
5210		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5211		-$as_echo "$ac_try_echo") >&5
5212		- (eval "$ac_try") 2>&5
5213		- ac_status=$?
5214		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5215		- (exit $ac_status); }; }; then
5216		- :
5217		-else
5218		- $as_echo "$as_me: program exited with status $ac_status" >&5
5219		-$as_echo "$as_me: failed program was:" >&5
5220		-sed 's/^/\| /' conftest.$ac_ext >&5
5221		+if ac_fn_c_try_run "$LINENO"; then :
5222
5223		-( exit $ac_status )
5224		-ac_cv_header_stdc=no
5225		+else
5226		+ ac_cv_header_stdc=no
5227		fi
5228		-rm -rf conftest.dSYM
5229		-rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
5230		+rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \
5231		+ conftest.$ac_objext conftest.beam conftest.$ac_ext
5232		fi
5233
5234		-
5235		fi
5236		fi
5237		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
5238		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
5239		$as_echo "$ac_cv_header_stdc" >&6; }
5240		if test $ac_cv_header_stdc = yes; then
5241
5242		-cat >>confdefs.h <<\_ACEOF
5243		-#define STDC_HEADERS 1
5244		-_ACEOF
5245		+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
5246
5247		fi
5248
5249		# On IRIX 5.3, sys/types and inttypes.h are conflicting.
5250		-
5251		-
5252		-
5253		-
5254		-
5255		-
5256		-
5257		-
5258		-
5259		for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
5260		inttypes.h stdint.h unistd.h
5261		-do
5262		-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
5263		-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
5264		-$as_echo_n "checking for $ac_header... " >&6; }
5265		-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
5266		- $as_echo_n "(cached) " >&6
5267		-else
5268		- cat >conftest.$ac_ext <<_ACEOF
5269		-/* confdefs.h. */
5270		-_ACEOF
5271		-cat confdefs.h >>conftest.$ac_ext
5272		-cat >>conftest.$ac_ext <<_ACEOF
5273		-/* end confdefs.h. */
5274		-$ac_includes_default
5275		-
5276		-#include <$ac_header>
5277		-_ACEOF
5278		-rm -f conftest.$ac_objext
5279		-if { (ac_try="$ac_compile"
5280		-case "(($ac_try" in
5281		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
5282		- *) ac_try_echo=$ac_try;;
5283		-esac
5284		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5285		-$as_echo "$ac_try_echo") >&5
5286		- (eval "$ac_compile") 2>conftest.er1
5287		- ac_status=$?
5288		- grep -v '^ *+' conftest.er1 >conftest.err
5289		- rm -f conftest.er1
5290		- cat conftest.err >&5
5291		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5292		- (exit $ac_status); } && {
5293		- test -z "$ac_c_werror_flag" \|\|
5294		- test ! -s conftest.err
5295		- } && test -s conftest.$ac_objext; then
5296		- eval "$as_ac_Header=yes"
5297		-else
5298		- $as_echo "$as_me: failed program was:" >&5
5299		-sed 's/^/\| /' conftest.$ac_ext >&5
5300		-
5301		- eval "$as_ac_Header=no"
5302		-fi
5303		-
5304		-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5305		-fi
5306		-ac_res=`eval 'as_val=${'$as_ac_Header'}
5307		- $as_echo "$as_val"'`
5308		- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
5309		-$as_echo "$ac_res" >&6; }
5310		-as_val=`eval 'as_val=${'$as_ac_Header'}
5311		- $as_echo "$as_val"'`
5312		- if test "x$as_val" = x""yes; then
5313		+do :
5314		+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
5315		+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
5316		+"
5317		+eval as_val=\$$as_ac_Header
5318		+ if test "x$as_val" = x""yes; then :
5319		cat >>confdefs.h <<_ACEOF
5320		#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1
5321		_ACEOF
5322		@@ -7172,62 +6967,13 @@
5323		done
5324
5325
5326		-
5327		for ac_header in dlfcn.h
5328		-do
5329		-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
5330		-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
5331		-$as_echo_n "checking for $ac_header... " >&6; }
5332		-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
5333		- $as_echo_n "(cached) " >&6
5334		-else
5335		- cat >conftest.$ac_ext <<_ACEOF
5336		-/* confdefs.h. */
5337		-_ACEOF
5338		-cat confdefs.h >>conftest.$ac_ext
5339		-cat >>conftest.$ac_ext <<_ACEOF
5340		-/* end confdefs.h. */
5341		-$ac_includes_default
5342		-
5343		-#include <$ac_header>
5344		-_ACEOF
5345		-rm -f conftest.$ac_objext
5346		-if { (ac_try="$ac_compile"
5347		-case "(($ac_try" in
5348		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
5349		- *) ac_try_echo=$ac_try;;
5350		-esac
5351		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5352		-$as_echo "$ac_try_echo") >&5
5353		- (eval "$ac_compile") 2>conftest.er1
5354		- ac_status=$?
5355		- grep -v '^ *+' conftest.er1 >conftest.err
5356		- rm -f conftest.er1
5357		- cat conftest.err >&5
5358		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5359		- (exit $ac_status); } && {
5360		- test -z "$ac_c_werror_flag" \|\|
5361		- test ! -s conftest.err
5362		- } && test -s conftest.$ac_objext; then
5363		- eval "$as_ac_Header=yes"
5364		-else
5365		- $as_echo "$as_me: failed program was:" >&5
5366		-sed 's/^/\| /' conftest.$ac_ext >&5
5367		-
5368		- eval "$as_ac_Header=no"
5369		-fi
5370		-
5371		-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5372		-fi
5373		-ac_res=`eval 'as_val=${'$as_ac_Header'}
5374		- $as_echo "$as_val"'`
5375		- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
5376		-$as_echo "$ac_res" >&6; }
5377		-as_val=`eval 'as_val=${'$as_ac_Header'}
5378		- $as_echo "$as_val"'`
5379		- if test "x$as_val" = x""yes; then
5380		+do :
5381		+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
5382		+"
5383		+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
5384		cat >>confdefs.h <<_ACEOF
5385		-#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1
5386		+#define HAVE_DLFCN_H 1
5387		_ACEOF
5388
5389		fi
5390		@@ -7247,7 +6993,7 @@
5391
5392
5393		# Check whether --enable-shared was given.
5394		-if test "${enable_shared+set}" = set; then
5395		+if test "${enable_shared+set}" = set; then :
5396		enableval=$enable_shared; p=${PACKAGE-default}
5397		case $enableval in
5398		yes) enable_shared=yes ;;
5399		@@ -7280,7 +7026,7 @@
5400
5401
5402		# Check whether --with-pic was given.
5403		-if test "${with_pic+set}" = set; then
5404		+if test "${with_pic+set}" = set; then :
5405		withval=$with_pic; pic_mode="$withval"
5406		else
5407		pic_mode=default
5408		@@ -7296,7 +7042,7 @@
5409
5410
5411		# Check whether --enable-fast-install was given.
5412		-if test "${enable_fast_install+set}" = set; then
5413		+if test "${enable_fast_install+set}" = set; then :
5414		enableval=$enable_fast_install; p=${PACKAGE-default}
5415		case $enableval in
5416		yes) enable_fast_install=yes ;;
5417		@@ -7377,9 +7123,9 @@
5418		setopt NO_GLOB_SUBST
5419		fi
5420
5421		-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
5422		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
5423		$as_echo_n "checking for objdir... " >&6; }
5424		-if test "${lt_cv_objdir+set}" = set; then
5425		+if test "${lt_cv_objdir+set}" = set; then :
5426		$as_echo_n "(cached) " >&6
5427		else
5428		rm -f .libs 2>/dev/null
5429		@@ -7392,7 +7138,7 @@
5430		fi
5431		rmdir .libs 2>/dev/null
5432		fi
5433		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
5434		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
5435		$as_echo "$lt_cv_objdir" >&6; }
5436		objdir=$lt_cv_objdir
5437
5438		@@ -7485,9 +7231,9 @@
5439		case $deplibs_check_method in
5440		file_magic*)
5441		if test "$file_magic_cmd" = '$MAGIC_CMD'; then
5442		- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
5443		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
5444		$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
5445		-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
5446		+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
5447		$as_echo_n "(cached) " >&6
5448		else
5449		case $MAGIC_CMD in
5450		@@ -7538,10 +7284,10 @@
5451
5452		MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
5453		if test -n "$MAGIC_CMD"; then
5454		- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
5455		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
5456		$as_echo "$MAGIC_CMD" >&6; }
5457		else
5458		- { $as_echo "$as_me:$LINENO: result: no" >&5
5459		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5460		$as_echo "no" >&6; }
5461		fi
5462
5463		@@ -7551,9 +7297,9 @@
5464
5465		if test -z "$lt_cv_path_MAGIC_CMD"; then
5466		if test -n "$ac_tool_prefix"; then
5467		- { $as_echo "$as_me:$LINENO: checking for file" >&5
5468		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
5469		$as_echo_n "checking for file... " >&6; }
5470		-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
5471		+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
5472		$as_echo_n "(cached) " >&6
5473		else
5474		case $MAGIC_CMD in
5475		@@ -7604,10 +7350,10 @@
5476
5477		MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
5478		if test -n "$MAGIC_CMD"; then
5479		- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
5480		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
5481		$as_echo "$MAGIC_CMD" >&6; }
5482		else
5483		- { $as_echo "$as_me:$LINENO: result: no" >&5
5484		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5485		$as_echo "no" >&6; }
5486		fi
5487
5488		@@ -7684,9 +7430,9 @@
5489		if test "$GCC" = yes; then
5490		lt_prog_compiler_no_builtin_flag=' -fno-builtin'
5491
5492		- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
5493		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
5494		$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
5495		-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
5496		+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
5497		$as_echo_n "(cached) " >&6
5498		else
5499		lt_cv_prog_compiler_rtti_exceptions=no
5500		@@ -7702,11 +7448,11 @@
5501		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
5502		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
5503		-e 's:$: $lt_compiler_flag:'`
5504		- (eval echo "\"\$as_me:7705: $lt_compile\"" >&5)
5505		+ (eval echo "\"\$as_me:7451: $lt_compile\"" >&5)
5506		(eval "$lt_compile" 2>conftest.err)
5507		ac_status=$?
5508		cat conftest.err >&5
5509		- echo "$as_me:7709: \$? = $ac_status" >&5
5510		+ echo "$as_me:7455: \$? = $ac_status" >&5
5511		if (exit $ac_status) && test -s "$ac_outfile"; then
5512		# The compiler can only warn and ignore the option if not recognized
5513		# So say no if there are warnings other than the usual output.
5514		@@ -7719,7 +7465,7 @@
5515		$RM conftest*
5516
5517		fi
5518		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
5519		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
5520		$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
5521
5522		if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
5523		@@ -7739,7 +7485,7 @@
5524		lt_prog_compiler_pic=
5525		lt_prog_compiler_static=
5526
5527		-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
5528		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
5529		$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
5530
5531		if test "$GCC" = yes; then
5532		@@ -8011,7 +7757,7 @@
5533		lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
5534		;;
5535		esac
5536		-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
5537		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
5538		$as_echo "$lt_prog_compiler_pic" >&6; }
5539
5540
5541		@@ -8023,9 +7769,9 @@
5542		# Check to make sure the PIC flag actually works.
5543		#
5544		if test -n "$lt_prog_compiler_pic"; then
5545		- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
5546		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
5547		$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
5548		-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
5549		+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
5550		$as_echo_n "(cached) " >&6
5551		else
5552		lt_cv_prog_compiler_pic_works=no
5553		@@ -8041,11 +7787,11 @@
5554		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
5555		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
5556		-e 's:$: $lt_compiler_flag:'`
5557		- (eval echo "\"\$as_me:8044: $lt_compile\"" >&5)
5558		+ (eval echo "\"\$as_me:7790: $lt_compile\"" >&5)
5559		(eval "$lt_compile" 2>conftest.err)
5560		ac_status=$?
5561		cat conftest.err >&5
5562		- echo "$as_me:8048: \$? = $ac_status" >&5
5563		+ echo "$as_me:7794: \$? = $ac_status" >&5
5564		if (exit $ac_status) && test -s "$ac_outfile"; then
5565		# The compiler can only warn and ignore the option if not recognized
5566		# So say no if there are warnings other than the usual output.
5567		@@ -8058,7 +7804,7 @@
5568		$RM conftest*
5569
5570		fi
5571		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
5572		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
5573		$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
5574
5575		if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
5576		@@ -8082,9 +7828,9 @@
5577		# Check to make sure the static flag actually works.
5578		#
5579		wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
5580		-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
5581		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
5582		$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
5583		-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
5584		+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
5585		$as_echo_n "(cached) " >&6
5586		else
5587		lt_cv_prog_compiler_static_works=no
5588		@@ -8110,7 +7856,7 @@
5589		LDFLAGS="$save_LDFLAGS"
5590
5591		fi
5592		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
5593		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
5594		$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
5595
5596		if test x"$lt_cv_prog_compiler_static_works" = xyes; then
5597		@@ -8125,9 +7871,9 @@
5598
5599
5600
5601		- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
5602		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
5603		$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
5604		-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
5605		+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
5606		$as_echo_n "(cached) " >&6
5607		else
5608		lt_cv_prog_compiler_c_o=no
5609		@@ -8146,11 +7892,11 @@
5610		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
5611		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
5612		-e 's:$: $lt_compiler_flag:'`
5613		- (eval echo "\"\$as_me:8149: $lt_compile\"" >&5)
5614		+ (eval echo "\"\$as_me:7895: $lt_compile\"" >&5)
5615		(eval "$lt_compile" 2>out/conftest.err)
5616		ac_status=$?
5617		cat out/conftest.err >&5
5618		- echo "$as_me:8153: \$? = $ac_status" >&5
5619		+ echo "$as_me:7899: \$? = $ac_status" >&5
5620		if (exit $ac_status) && test -s out/conftest2.$ac_objext
5621		then
5622		# The compiler can only warn and ignore the option if not recognized
5623		@@ -8172,7 +7918,7 @@
5624		$RM conftest*
5625
5626		fi
5627		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
5628		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
5629		$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
5630
5631
5632		@@ -8180,9 +7926,9 @@
5633
5634
5635
5636		- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
5637		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
5638		$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
5639		-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
5640		+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
5641		$as_echo_n "(cached) " >&6
5642		else
5643		lt_cv_prog_compiler_c_o=no
5644		@@ -8201,11 +7947,11 @@
5645		-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
5646		-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
5647		-e 's:$: $lt_compiler_flag:'`
5648		- (eval echo "\"\$as_me:8204: $lt_compile\"" >&5)
5649		+ (eval echo "\"\$as_me:7950: $lt_compile\"" >&5)
5650		(eval "$lt_compile" 2>out/conftest.err)
5651		ac_status=$?
5652		cat out/conftest.err >&5
5653		- echo "$as_me:8208: \$? = $ac_status" >&5
5654		+ echo "$as_me:7954: \$? = $ac_status" >&5
5655		if (exit $ac_status) && test -s out/conftest2.$ac_objext
5656		then
5657		# The compiler can only warn and ignore the option if not recognized
5658		@@ -8227,7 +7973,7 @@
5659		$RM conftest*
5660
5661		fi
5662		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
5663		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
5664		$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
5665
5666
5667		@@ -8236,7 +7982,7 @@
5668		hard_links="nottested"
5669		if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
5670		# do not overwrite the value of need_locks provided by the user
5671		- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
5672		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
5673		$as_echo_n "checking if we can lock with hard links... " >&6; }
5674		hard_links=yes
5675		$RM conftest*
5676		@@ -8244,10 +7990,10 @@
5677		touch conftest.a
5678		ln conftest.a conftest.b 2>&5 \|\| hard_links=no
5679		ln conftest.a conftest.b 2>/dev/null && hard_links=no
5680		- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
5681		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
5682		$as_echo "$hard_links" >&6; }
5683		if test "$hard_links" = no; then
5684		- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
5685		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
5686		$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
5687		need_locks=warn
5688		fi
5689		@@ -8260,7 +8006,7 @@
5690
5691
5692
5693		- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
5694		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
5695		$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
5696
5697		runpath_var=
5698		@@ -8320,6 +8066,9 @@
5699		openbsd*)
5700		with_gnu_ld=no
5701		;;
5702		+ linux* \| kbsd-gnu)
5703		+ link_all_deplibs=no
5704		+ ;;
5705		esac
5706
5707		ld_shlibs=yes
5708		@@ -8502,7 +8251,7 @@
5709		fi
5710		;;
5711
5712		- netbsd*)
5713		+ netbsd* \| netbsdelf*-gnu)
5714		if echo __ELF__ \| $CC -E - \| $GREP __ELF__ >/dev/null; then
5715		archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
5716		wlarc=
5717		@@ -8677,6 +8426,7 @@
5718		if test "$aix_use_runtimelinking" = yes; then
5719		shared_flag="$shared_flag "'${wl}-G'
5720		fi
5721		+ link_all_deplibs=no
5722		else
5723		# not using gcc
5724		if test "$host_cpu" = ia64; then
5725		@@ -8702,11 +8452,7 @@
5726		allow_undefined_flag='-berok'
5727		# Determine the default libpath from the value encoded in an
5728		# empty executable.
5729		- cat >conftest.$ac_ext <<_ACEOF
5730		-/* confdefs.h. */
5731		-_ACEOF
5732		-cat confdefs.h >>conftest.$ac_ext
5733		-cat >>conftest.$ac_ext <<_ACEOF
5734		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5735		/* end confdefs.h. */
5736
5737		int
5738		@@ -8717,27 +8463,7 @@
5739		return 0;
5740		}
5741		_ACEOF
5742		-rm -f conftest.$ac_objext conftest$ac_exeext
5743		-if { (ac_try="$ac_link"
5744		-case "(($ac_try" in
5745		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
5746		- *) ac_try_echo=$ac_try;;
5747		-esac
5748		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5749		-$as_echo "$ac_try_echo") >&5
5750		- (eval "$ac_link") 2>conftest.er1
5751		- ac_status=$?
5752		- grep -v '^ *+' conftest.er1 >conftest.err
5753		- rm -f conftest.er1
5754		- cat conftest.err >&5
5755		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5756		- (exit $ac_status); } && {
5757		- test -z "$ac_c_werror_flag" \|\|
5758		- test ! -s conftest.err
5759		- } && test -s conftest$ac_exeext && {
5760		- test "$cross_compiling" = yes \|\|
5761		- $as_test_x conftest$ac_exeext
5762		- }; then
5763		+if ac_fn_c_try_link "$LINENO"; then :
5764
5765		lt_aix_libpath_sed='
5766		/Import File Strings/,/^$/ {
5767		@@ -8751,16 +8477,9 @@
5768		if test -z "$aix_libpath"; then
5769		aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null \| $SED -n -e "$lt_aix_libpath_sed"`
5770		fi
5771		-else
5772		- $as_echo "$as_me: failed program was:" >&5
5773		-sed 's/^/\| /' conftest.$ac_ext >&5
5774		-
5775		-
5776		fi
5777		-
5778		-rm -rf conftest.dSYM
5779		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5780		- conftest$ac_exeext conftest.$ac_ext
5781		+rm -f core conftest.err conftest.$ac_objext \
5782		+ conftest$ac_exeext conftest.$ac_ext
5783		if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5784
5785		hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
5786		@@ -8773,11 +8492,7 @@
5787		else
5788		# Determine the default libpath from the value encoded in an
5789		# empty executable.
5790		- cat >conftest.$ac_ext <<_ACEOF
5791		-/* confdefs.h. */
5792		-_ACEOF
5793		-cat confdefs.h >>conftest.$ac_ext
5794		-cat >>conftest.$ac_ext <<_ACEOF
5795		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5796		/* end confdefs.h. */
5797
5798		int
5799		@@ -8788,27 +8503,7 @@
5800		return 0;
5801		}
5802		_ACEOF
5803		-rm -f conftest.$ac_objext conftest$ac_exeext
5804		-if { (ac_try="$ac_link"
5805		-case "(($ac_try" in
5806		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
5807		- *) ac_try_echo=$ac_try;;
5808		-esac
5809		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5810		-$as_echo "$ac_try_echo") >&5
5811		- (eval "$ac_link") 2>conftest.er1
5812		- ac_status=$?
5813		- grep -v '^ *+' conftest.er1 >conftest.err
5814		- rm -f conftest.er1
5815		- cat conftest.err >&5
5816		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5817		- (exit $ac_status); } && {
5818		- test -z "$ac_c_werror_flag" \|\|
5819		- test ! -s conftest.err
5820		- } && test -s conftest$ac_exeext && {
5821		- test "$cross_compiling" = yes \|\|
5822		- $as_test_x conftest$ac_exeext
5823		- }; then
5824		+if ac_fn_c_try_link "$LINENO"; then :
5825
5826		lt_aix_libpath_sed='
5827		/Import File Strings/,/^$/ {
5828		@@ -8822,16 +8517,9 @@
5829		if test -z "$aix_libpath"; then
5830		aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null \| $SED -n -e "$lt_aix_libpath_sed"`
5831		fi
5832		-else
5833		- $as_echo "$as_me: failed program was:" >&5
5834		-sed 's/^/\| /' conftest.$ac_ext >&5
5835		-
5836		-
5837		fi
5838		-
5839		-rm -rf conftest.dSYM
5840		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5841		- conftest$ac_exeext conftest.$ac_ext
5842		+rm -f core conftest.err conftest.$ac_objext \
5843		+ conftest$ac_exeext conftest.$ac_ext
5844		if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5845
5846		hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
5847		@@ -9043,42 +8731,16 @@
5848		# implicitly export all symbols.
5849		save_LDFLAGS="$LDFLAGS"
5850		LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5851		- cat >conftest.$ac_ext <<_ACEOF
5852		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5853		+/* end confdefs.h. */
5854		int foo(void) {}
5855		_ACEOF
5856		-rm -f conftest.$ac_objext conftest$ac_exeext
5857		-if { (ac_try="$ac_link"
5858		-case "(($ac_try" in
5859		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
5860		- *) ac_try_echo=$ac_try;;
5861		-esac
5862		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5863		-$as_echo "$ac_try_echo") >&5
5864		- (eval "$ac_link") 2>conftest.er1
5865		- ac_status=$?
5866		- grep -v '^ *+' conftest.er1 >conftest.err
5867		- rm -f conftest.er1
5868		- cat conftest.err >&5
5869		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5870		- (exit $ac_status); } && {
5871		- test -z "$ac_c_werror_flag" \|\|
5872		- test ! -s conftest.err
5873		- } && test -s conftest$ac_exeext && {
5874		- test "$cross_compiling" = yes \|\|
5875		- $as_test_x conftest$ac_exeext
5876		- }; then
5877		+if ac_fn_c_try_link "$LINENO"; then :
5878		archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" \| $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
5879
5880		-else
5881		- $as_echo "$as_me: failed program was:" >&5
5882		-sed 's/^/\| /' conftest.$ac_ext >&5
5883		-
5884		-
5885		fi
5886		-
5887		-rm -rf conftest.dSYM
5888		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5889		- conftest$ac_exeext conftest.$ac_ext
5890		+rm -f core conftest.err conftest.$ac_objext \
5891		+ conftest$ac_exeext conftest.$ac_ext
5892		LDFLAGS="$save_LDFLAGS"
5893		else
5894		archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" \| $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
5895		@@ -9091,7 +8753,7 @@
5896		link_all_deplibs=yes
5897		;;
5898
5899		- netbsd*)
5900		+ netbsd* \| netbsdelf*-gnu)
5901		if echo __ELF__ \| $CC -E - \| $GREP __ELF__ >/dev/null; then
5902		archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
5903		else
5904		@@ -9334,7 +8996,7 @@
5905		fi
5906		fi
5907
5908		-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
5909		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
5910		$as_echo "$ld_shlibs" >&6; }
5911		test "$ld_shlibs" = no && can_build_shared=no
5912
5913		@@ -9371,16 +9033,16 @@
5914		# Test whether the compiler implicitly links with -lc since on some
5915		# systems, -lgcc has to come before -lc. If gcc already passes -lc
5916		# to ld, don't add -lc before -lgcc.
5917		- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
5918		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
5919		$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
5920		$RM conftest*
5921		echo "$lt_simple_compile_test_code" > conftest.$ac_ext
5922
5923		- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5924		+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
5925		(eval $ac_compile) 2>&5
5926		ac_status=$?
5927		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5928		- (exit $ac_status); } 2>conftest.err; then
5929		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5930		+ test $ac_status = 0; } 2>conftest.err; then
5931		soname=conftest
5932		lib=conftest
5933		libobjs=conftest.$ac_objext
5934		@@ -9394,11 +9056,11 @@
5935		libname=conftest
5936		lt_save_allow_undefined_flag=$allow_undefined_flag
5937		allow_undefined_flag=
5938		- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \\| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
5939		+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \\| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
5940		(eval $archive_cmds 2\>\&1 \\| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
5941		ac_status=$?
5942		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5943		- (exit $ac_status); }
5944		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5945		+ test $ac_status = 0; }
5946		then
5947		archive_cmds_need_lc=no
5948		else
5949		@@ -9409,7 +9071,7 @@
5950		cat conftest.err 1>&5
5951		fi
5952		$RM conftest*
5953		- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
5954		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
5955		$as_echo "$archive_cmds_need_lc" >&6; }
5956		;;
5957		esac
5958		@@ -9573,7 +9235,7 @@
5959
5960
5961
5962		- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
5963		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
5964		$as_echo_n "checking dynamic linker characteristics... " >&6; }
5965
5966		if test "$GCC" = yes; then
5967		@@ -9837,14 +9499,7 @@
5968		*) objformat=elf ;;
5969		esac
5970		fi
5971		- # Handle Gentoo/FreeBSD as it was Linux
5972		- case $host_vendor in
5973		- gentoo)
5974		- version_type=linux ;;
5975		- *)
5976		- version_type=freebsd-$objformat ;;
5977		- esac
5978		-
5979		+ version_type=freebsd-$objformat
5980		case $version_type in
5981		freebsd-elf*)
5982		library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
5983		@@ -9855,12 +9510,6 @@
5984		library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
5985		need_version=yes
5986		;;
5987		- linux)
5988		- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
5989		- soname_spec='${libname}${release}${shared_ext}$major'
5990		- need_lib_prefix=no
5991		- need_version=no
5992		- ;;
5993		esac
5994		shlibpath_var=LD_LIBRARY_PATH
5995		case $host_os in
5996		@@ -10008,11 +9657,7 @@
5997		save_libdir=$libdir
5998		eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
5999		LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
6000		- cat >conftest.$ac_ext <<_ACEOF
6001		-/* confdefs.h. */
6002		-_ACEOF
6003		-cat confdefs.h >>conftest.$ac_ext
6004		-cat >>conftest.$ac_ext <<_ACEOF
6005		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6006		/* end confdefs.h. */
6007
6008		int
6009		@@ -10023,41 +9668,13 @@
6010		return 0;
6011		}
6012		_ACEOF
6013		-rm -f conftest.$ac_objext conftest$ac_exeext
6014		-if { (ac_try="$ac_link"
6015		-case "(($ac_try" in
6016		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
6017		- *) ac_try_echo=$ac_try;;
6018		-esac
6019		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6020		-$as_echo "$ac_try_echo") >&5
6021		- (eval "$ac_link") 2>conftest.er1
6022		- ac_status=$?
6023		- grep -v '^ *+' conftest.er1 >conftest.err
6024		- rm -f conftest.er1
6025		- cat conftest.err >&5
6026		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6027		- (exit $ac_status); } && {
6028		- test -z "$ac_c_werror_flag" \|\|
6029		- test ! -s conftest.err
6030		- } && test -s conftest$ac_exeext && {
6031		- test "$cross_compiling" = yes \|\|
6032		- $as_test_x conftest$ac_exeext
6033		- }; then
6034		- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null \| grep "RUNPATH.*$libdir" >/dev/null; then
6035		+if ac_fn_c_try_link "$LINENO"; then :
6036		+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null \| grep "RUNPATH.*$libdir" >/dev/null; then :
6037		shlibpath_overrides_runpath=yes
6038		fi
6039		-
6040		-else
6041		- $as_echo "$as_me: failed program was:" >&5
6042		-sed 's/^/\| /' conftest.$ac_ext >&5
6043		-
6044		-
6045		fi
6046		-
6047		-rm -rf conftest.dSYM
6048		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6049		- conftest$ac_exeext conftest.$ac_ext
6050		+rm -f core conftest.err conftest.$ac_objext \
6051		+ conftest$ac_exeext conftest.$ac_ext
6052		LDFLAGS=$save_LDFLAGS
6053		libdir=$save_libdir
6054
6055		@@ -10081,6 +9698,18 @@
6056		dynamic_linker='GNU/Linux ld.so'
6057		;;
6058
6059		+netbsdelf*-gnu)
6060		+ version_type=linux
6061		+ need_lib_prefix=no
6062		+ need_version=no
6063		+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
6064		+ soname_spec='${libname}${release}${shared_ext}$major'
6065		+ shlibpath_var=LD_LIBRARY_PATH
6066		+ shlibpath_overrides_runpath=no
6067		+ hardcode_into_libs=yes
6068		+ dynamic_linker='NetBSD ld.elf_so'
6069		+ ;;
6070		+
6071		netbsd*)
6072		version_type=sunos
6073		need_lib_prefix=no
6074		@@ -10269,7 +9898,7 @@
6075		dynamic_linker=no
6076		;;
6077		esac
6078		-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
6079		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
6080		$as_echo "$dynamic_linker" >&6; }
6081		test "$dynamic_linker" = no && can_build_shared=no
6082
6083		@@ -10371,7 +10000,7 @@
6084
6085
6086
6087		- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
6088		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
6089		$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
6090		hardcode_action=
6091		if test -n "$hardcode_libdir_flag_spec" \|\|
6092		@@ -10396,7 +10025,7 @@
6093		# directories.
6094		hardcode_action=unsupported
6095		fi
6096		-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
6097		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
6098		$as_echo "$hardcode_action" >&6; }
6099
6100		if test "$hardcode_action" = relink \|\|
6101		@@ -10441,18 +10070,14 @@
6102
6103		darwin*)
6104		# if libdl is installed we need to link against it
6105		- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
6106		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
6107		$as_echo_n "checking for dlopen in -ldl... " >&6; }
6108		-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
6109		+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
6110		$as_echo_n "(cached) " >&6
6111		else
6112		ac_check_lib_save_LIBS=$LIBS
6113		LIBS="-ldl $LIBS"
6114		-cat >conftest.$ac_ext <<_ACEOF
6115		-/* confdefs.h. */
6116		-_ACEOF
6117		-cat confdefs.h >>conftest.$ac_ext
6118		-cat >>conftest.$ac_ext <<_ACEOF
6119		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6120		/* end confdefs.h. */
6121
6122		/* Override any GCC internal prototype to avoid an error.
6123		@@ -10470,43 +10095,18 @@
6124		return 0;
6125		}
6126		_ACEOF
6127		-rm -f conftest.$ac_objext conftest$ac_exeext
6128		-if { (ac_try="$ac_link"
6129		-case "(($ac_try" in
6130		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
6131		- *) ac_try_echo=$ac_try;;
6132		-esac
6133		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6134		-$as_echo "$ac_try_echo") >&5
6135		- (eval "$ac_link") 2>conftest.er1
6136		- ac_status=$?
6137		- grep -v '^ *+' conftest.er1 >conftest.err
6138		- rm -f conftest.er1
6139		- cat conftest.err >&5
6140		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6141		- (exit $ac_status); } && {
6142		- test -z "$ac_c_werror_flag" \|\|
6143		- test ! -s conftest.err
6144		- } && test -s conftest$ac_exeext && {
6145		- test "$cross_compiling" = yes \|\|
6146		- $as_test_x conftest$ac_exeext
6147		- }; then
6148		+if ac_fn_c_try_link "$LINENO"; then :
6149		ac_cv_lib_dl_dlopen=yes
6150		else
6151		- $as_echo "$as_me: failed program was:" >&5
6152		-sed 's/^/\| /' conftest.$ac_ext >&5
6153		-
6154		- ac_cv_lib_dl_dlopen=no
6155		+ ac_cv_lib_dl_dlopen=no
6156		fi
6157		-
6158		-rm -rf conftest.dSYM
6159		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6160		- conftest$ac_exeext conftest.$ac_ext
6161		+rm -f core conftest.err conftest.$ac_objext \
6162		+ conftest$ac_exeext conftest.$ac_ext
6163		LIBS=$ac_check_lib_save_LIBS
6164		fi
6165		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
6166		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
6167		$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
6168		-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
6169		+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
6170		lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
6171		else
6172
6173		@@ -10519,33 +10119,19 @@
6174		;;
6175
6176		*)
6177		- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
6178		-$as_echo_n "checking for shl_load... " >&6; }
6179		-if test "${ac_cv_func_shl_load+set}" = set; then
6180		+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
6181		+if test "x$ac_cv_func_shl_load" = x""yes; then :
6182		+ lt_cv_dlopen="shl_load"
6183		+else
6184		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
6185		+$as_echo_n "checking for shl_load in -ldld... " >&6; }
6186		+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
6187		$as_echo_n "(cached) " >&6
6188		else
6189		- cat >conftest.$ac_ext <<_ACEOF
6190		-/* confdefs.h. */
6191		-_ACEOF
6192		-cat confdefs.h >>conftest.$ac_ext
6193		-cat >>conftest.$ac_ext <<_ACEOF
6194		+ ac_check_lib_save_LIBS=$LIBS
6195		+LIBS="-ldld $LIBS"
6196		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6197		/* end confdefs.h. */
6198		-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
6199		- For example, HP-UX 11i <limits.h> declares gettimeofday. */
6200		-#define shl_load innocuous_shl_load
6201		-
6202		-/* System header to define __stub macros and hopefully few prototypes,
6203		- which can conflict with char shl_load (); below.
6204		- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
6205		- <limits.h> exists even on freestanding compilers. */
6206		-
6207		-#ifdef __STDC__
6208		-# include <limits.h>
6209		-#else
6210		-# include <assert.h>
6211		-#endif
6212		-
6213		-#undef shl_load
6214
6215		/* Override any GCC internal prototype to avoid an error.
6216		Use char because int might match the return type of a GCC
6217		@@ -10554,13 +10140,6 @@
6218		extern "C"
6219		#endif
6220		char shl_load ();
6221		-/* The GNU C library defines this for functions which it implements
6222		- to always fail with ENOSYS. Some functions are actually named
6223		- something starting with __ and the normal name is an alias. */
6224		-#if defined __stub_shl_load \|\| defined __stub___shl_load
6225		-choke me
6226		-#endif
6227		-
6228		int
6229		main ()
6230		{
6231		@@ -10569,212 +10148,32 @@
6232		return 0;
6233		}
6234		_ACEOF
6235		-rm -f conftest.$ac_objext conftest$ac_exeext
6236		-if { (ac_try="$ac_link"
6237		-case "(($ac_try" in
6238		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
6239		- *) ac_try_echo=$ac_try;;
6240		-esac
6241		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6242		-$as_echo "$ac_try_echo") >&5
6243		- (eval "$ac_link") 2>conftest.er1
6244		- ac_status=$?
6245		- grep -v '^ *+' conftest.er1 >conftest.err
6246		- rm -f conftest.er1
6247		- cat conftest.err >&5
6248		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6249		- (exit $ac_status); } && {
6250		- test -z "$ac_c_werror_flag" \|\|
6251		- test ! -s conftest.err
6252		- } && test -s conftest$ac_exeext && {
6253		- test "$cross_compiling" = yes \|\|
6254		- $as_test_x conftest$ac_exeext
6255		- }; then
6256		- ac_cv_func_shl_load=yes
6257		+if ac_fn_c_try_link "$LINENO"; then :
6258		+ ac_cv_lib_dld_shl_load=yes
6259		else
6260		- $as_echo "$as_me: failed program was:" >&5
6261		-sed 's/^/\| /' conftest.$ac_ext >&5
6262		-
6263		- ac_cv_func_shl_load=no
6264		+ ac_cv_lib_dld_shl_load=no
6265		fi
6266		-
6267		-rm -rf conftest.dSYM
6268		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6269		- conftest$ac_exeext conftest.$ac_ext
6270		+rm -f core conftest.err conftest.$ac_objext \
6271		+ conftest$ac_exeext conftest.$ac_ext
6272		+LIBS=$ac_check_lib_save_LIBS
6273		fi
6274		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
6275		-$as_echo "$ac_cv_func_shl_load" >&6; }
6276		-if test "x$ac_cv_func_shl_load" = x""yes; then
6277		- lt_cv_dlopen="shl_load"
6278		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
6279		+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
6280		+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
6281		+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
6282		else
6283		- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
6284		-$as_echo_n "checking for shl_load in -ldld... " >&6; }
6285		-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
6286		- $as_echo_n "(cached) " >&6
6287		-else
6288		- ac_check_lib_save_LIBS=$LIBS
6289		-LIBS="-ldld $LIBS"
6290		-cat >conftest.$ac_ext <<_ACEOF
6291		-/* confdefs.h. */
6292		-_ACEOF
6293		-cat confdefs.h >>conftest.$ac_ext
6294		-cat >>conftest.$ac_ext <<_ACEOF
6295		-/* end confdefs.h. */
6296		-
6297		-/* Override any GCC internal prototype to avoid an error.
6298		- Use char because int might match the return type of a GCC
6299		- builtin and then its argument prototype would still apply. */
6300		-#ifdef __cplusplus
6301		-extern "C"
6302		-#endif
6303		-char shl_load ();
6304		-int
6305		-main ()
6306		-{
6307		-return shl_load ();
6308		- ;
6309		- return 0;
6310		-}
6311		-_ACEOF
6312		-rm -f conftest.$ac_objext conftest$ac_exeext
6313		-if { (ac_try="$ac_link"
6314		-case "(($ac_try" in
6315		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
6316		- *) ac_try_echo=$ac_try;;
6317		-esac
6318		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6319		-$as_echo "$ac_try_echo") >&5
6320		- (eval "$ac_link") 2>conftest.er1
6321		- ac_status=$?
6322		- grep -v '^ *+' conftest.er1 >conftest.err
6323		- rm -f conftest.er1
6324		- cat conftest.err >&5
6325		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6326		- (exit $ac_status); } && {
6327		- test -z "$ac_c_werror_flag" \|\|
6328		- test ! -s conftest.err
6329		- } && test -s conftest$ac_exeext && {
6330		- test "$cross_compiling" = yes \|\|
6331		- $as_test_x conftest$ac_exeext
6332		- }; then
6333		- ac_cv_lib_dld_shl_load=yes
6334		-else
6335		- $as_echo "$as_me: failed program was:" >&5
6336		-sed 's/^/\| /' conftest.$ac_ext >&5
6337		-
6338		- ac_cv_lib_dld_shl_load=no
6339		-fi
6340		-
6341		-rm -rf conftest.dSYM
6342		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6343		- conftest$ac_exeext conftest.$ac_ext
6344		-LIBS=$ac_check_lib_save_LIBS
6345		-fi
6346		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
6347		-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
6348		-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
6349		- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
6350		-else
6351		- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
6352		-$as_echo_n "checking for dlopen... " >&6; }
6353		-if test "${ac_cv_func_dlopen+set}" = set; then
6354		- $as_echo_n "(cached) " >&6
6355		-else
6356		- cat >conftest.$ac_ext <<_ACEOF
6357		-/* confdefs.h. */
6358		-_ACEOF
6359		-cat confdefs.h >>conftest.$ac_ext
6360		-cat >>conftest.$ac_ext <<_ACEOF
6361		-/* end confdefs.h. */
6362		-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
6363		- For example, HP-UX 11i <limits.h> declares gettimeofday. */
6364		-#define dlopen innocuous_dlopen
6365		-
6366		-/* System header to define __stub macros and hopefully few prototypes,
6367		- which can conflict with char dlopen (); below.
6368		- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
6369		- <limits.h> exists even on freestanding compilers. */
6370		-
6371		-#ifdef __STDC__
6372		-# include <limits.h>
6373		-#else
6374		-# include <assert.h>
6375		-#endif
6376		-
6377		-#undef dlopen
6378		-
6379		-/* Override any GCC internal prototype to avoid an error.
6380		- Use char because int might match the return type of a GCC
6381		- builtin and then its argument prototype would still apply. */
6382		-#ifdef __cplusplus
6383		-extern "C"
6384		-#endif
6385		-char dlopen ();
6386		-/* The GNU C library defines this for functions which it implements
6387		- to always fail with ENOSYS. Some functions are actually named
6388		- something starting with __ and the normal name is an alias. */
6389		-#if defined __stub_dlopen \|\| defined __stub___dlopen
6390		-choke me
6391		-#endif
6392		-
6393		-int
6394		-main ()
6395		-{
6396		-return dlopen ();
6397		- ;
6398		- return 0;
6399		-}
6400		-_ACEOF
6401		-rm -f conftest.$ac_objext conftest$ac_exeext
6402		-if { (ac_try="$ac_link"
6403		-case "(($ac_try" in
6404		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
6405		- *) ac_try_echo=$ac_try;;
6406		-esac
6407		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6408		-$as_echo "$ac_try_echo") >&5
6409		- (eval "$ac_link") 2>conftest.er1
6410		- ac_status=$?
6411		- grep -v '^ *+' conftest.er1 >conftest.err
6412		- rm -f conftest.er1
6413		- cat conftest.err >&5
6414		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6415		- (exit $ac_status); } && {
6416		- test -z "$ac_c_werror_flag" \|\|
6417		- test ! -s conftest.err
6418		- } && test -s conftest$ac_exeext && {
6419		- test "$cross_compiling" = yes \|\|
6420		- $as_test_x conftest$ac_exeext
6421		- }; then
6422		- ac_cv_func_dlopen=yes
6423		-else
6424		- $as_echo "$as_me: failed program was:" >&5
6425		-sed 's/^/\| /' conftest.$ac_ext >&5
6426		-
6427		- ac_cv_func_dlopen=no
6428		-fi
6429		-
6430		-rm -rf conftest.dSYM
6431		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6432		- conftest$ac_exeext conftest.$ac_ext
6433		-fi
6434		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
6435		-$as_echo "$ac_cv_func_dlopen" >&6; }
6436		-if test "x$ac_cv_func_dlopen" = x""yes; then
6437		- lt_cv_dlopen="dlopen"
6438		-else
6439		- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
6440		-$as_echo_n "checking for dlopen in -ldl... " >&6; }
6441		-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
6442		+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
6443		+if test "x$ac_cv_func_dlopen" = x""yes; then :
6444		+ lt_cv_dlopen="dlopen"
6445		+else
6446		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
6447		+$as_echo_n "checking for dlopen in -ldl... " >&6; }
6448		+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
6449		$as_echo_n "(cached) " >&6
6450		else
6451		ac_check_lib_save_LIBS=$LIBS
6452		LIBS="-ldl $LIBS"
6453		-cat >conftest.$ac_ext <<_ACEOF
6454		-/* confdefs.h. */
6455		-_ACEOF
6456		-cat confdefs.h >>conftest.$ac_ext
6457		-cat >>conftest.$ac_ext <<_ACEOF
6458		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6459		/* end confdefs.h. */
6460
6461		/* Override any GCC internal prototype to avoid an error.
6462		@@ -10792,57 +10191,28 @@
6463		return 0;
6464		}
6465		_ACEOF
6466		-rm -f conftest.$ac_objext conftest$ac_exeext
6467		-if { (ac_try="$ac_link"
6468		-case "(($ac_try" in
6469		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
6470		- *) ac_try_echo=$ac_try;;
6471		-esac
6472		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6473		-$as_echo "$ac_try_echo") >&5
6474		- (eval "$ac_link") 2>conftest.er1
6475		- ac_status=$?
6476		- grep -v '^ *+' conftest.er1 >conftest.err
6477		- rm -f conftest.er1
6478		- cat conftest.err >&5
6479		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6480		- (exit $ac_status); } && {
6481		- test -z "$ac_c_werror_flag" \|\|
6482		- test ! -s conftest.err
6483		- } && test -s conftest$ac_exeext && {
6484		- test "$cross_compiling" = yes \|\|
6485		- $as_test_x conftest$ac_exeext
6486		- }; then
6487		+if ac_fn_c_try_link "$LINENO"; then :
6488		ac_cv_lib_dl_dlopen=yes
6489		else
6490		- $as_echo "$as_me: failed program was:" >&5
6491		-sed 's/^/\| /' conftest.$ac_ext >&5
6492		-
6493		- ac_cv_lib_dl_dlopen=no
6494		+ ac_cv_lib_dl_dlopen=no
6495		fi
6496		-
6497		-rm -rf conftest.dSYM
6498		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6499		- conftest$ac_exeext conftest.$ac_ext
6500		+rm -f core conftest.err conftest.$ac_objext \
6501		+ conftest$ac_exeext conftest.$ac_ext
6502		LIBS=$ac_check_lib_save_LIBS
6503		fi
6504		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
6505		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
6506		$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
6507		-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
6508		+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
6509		lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
6510		else
6511		- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
6512		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
6513		$as_echo_n "checking for dlopen in -lsvld... " >&6; }
6514		-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
6515		+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
6516		$as_echo_n "(cached) " >&6
6517		else
6518		ac_check_lib_save_LIBS=$LIBS
6519		LIBS="-lsvld $LIBS"
6520		-cat >conftest.$ac_ext <<_ACEOF
6521		-/* confdefs.h. */
6522		-_ACEOF
6523		-cat confdefs.h >>conftest.$ac_ext
6524		-cat >>conftest.$ac_ext <<_ACEOF
6525		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6526		/* end confdefs.h. */
6527
6528		/* Override any GCC internal prototype to avoid an error.
6529		@@ -10860,57 +10230,28 @@
6530		return 0;
6531		}
6532		_ACEOF
6533		-rm -f conftest.$ac_objext conftest$ac_exeext
6534		-if { (ac_try="$ac_link"
6535		-case "(($ac_try" in
6536		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
6537		- *) ac_try_echo=$ac_try;;
6538		-esac
6539		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6540		-$as_echo "$ac_try_echo") >&5
6541		- (eval "$ac_link") 2>conftest.er1
6542		- ac_status=$?
6543		- grep -v '^ *+' conftest.er1 >conftest.err
6544		- rm -f conftest.er1
6545		- cat conftest.err >&5
6546		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6547		- (exit $ac_status); } && {
6548		- test -z "$ac_c_werror_flag" \|\|
6549		- test ! -s conftest.err
6550		- } && test -s conftest$ac_exeext && {
6551		- test "$cross_compiling" = yes \|\|
6552		- $as_test_x conftest$ac_exeext
6553		- }; then
6554		+if ac_fn_c_try_link "$LINENO"; then :
6555		ac_cv_lib_svld_dlopen=yes
6556		else
6557		- $as_echo "$as_me: failed program was:" >&5
6558		-sed 's/^/\| /' conftest.$ac_ext >&5
6559		-
6560		- ac_cv_lib_svld_dlopen=no
6561		+ ac_cv_lib_svld_dlopen=no
6562		fi
6563		-
6564		-rm -rf conftest.dSYM
6565		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6566		- conftest$ac_exeext conftest.$ac_ext
6567		+rm -f core conftest.err conftest.$ac_objext \
6568		+ conftest$ac_exeext conftest.$ac_ext
6569		LIBS=$ac_check_lib_save_LIBS
6570		fi
6571		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
6572		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
6573		$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
6574		-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
6575		+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
6576		lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
6577		else
6578		- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
6579		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
6580		$as_echo_n "checking for dld_link in -ldld... " >&6; }
6581		-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
6582		+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
6583		$as_echo_n "(cached) " >&6
6584		else
6585		ac_check_lib_save_LIBS=$LIBS
6586		LIBS="-ldld $LIBS"
6587		-cat >conftest.$ac_ext <<_ACEOF
6588		-/* confdefs.h. */
6589		-_ACEOF
6590		-cat confdefs.h >>conftest.$ac_ext
6591		-cat >>conftest.$ac_ext <<_ACEOF
6592		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6593		/* end confdefs.h. */
6594
6595		/* Override any GCC internal prototype to avoid an error.
6596		@@ -10928,43 +10269,18 @@
6597		return 0;
6598		}
6599		_ACEOF
6600		-rm -f conftest.$ac_objext conftest$ac_exeext
6601		-if { (ac_try="$ac_link"
6602		-case "(($ac_try" in
6603		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
6604		- *) ac_try_echo=$ac_try;;
6605		-esac
6606		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6607		-$as_echo "$ac_try_echo") >&5
6608		- (eval "$ac_link") 2>conftest.er1
6609		- ac_status=$?
6610		- grep -v '^ *+' conftest.er1 >conftest.err
6611		- rm -f conftest.er1
6612		- cat conftest.err >&5
6613		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6614		- (exit $ac_status); } && {
6615		- test -z "$ac_c_werror_flag" \|\|
6616		- test ! -s conftest.err
6617		- } && test -s conftest$ac_exeext && {
6618		- test "$cross_compiling" = yes \|\|
6619		- $as_test_x conftest$ac_exeext
6620		- }; then
6621		+if ac_fn_c_try_link "$LINENO"; then :
6622		ac_cv_lib_dld_dld_link=yes
6623		else
6624		- $as_echo "$as_me: failed program was:" >&5
6625		-sed 's/^/\| /' conftest.$ac_ext >&5
6626		-
6627		- ac_cv_lib_dld_dld_link=no
6628		+ ac_cv_lib_dld_dld_link=no
6629		fi
6630		-
6631		-rm -rf conftest.dSYM
6632		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6633		- conftest$ac_exeext conftest.$ac_ext
6634		+rm -f core conftest.err conftest.$ac_objext \
6635		+ conftest$ac_exeext conftest.$ac_ext
6636		LIBS=$ac_check_lib_save_LIBS
6637		fi
6638		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
6639		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
6640		$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
6641		-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
6642		+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
6643		lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
6644		fi
6645
6646		@@ -11003,9 +10319,9 @@
6647		save_LIBS="$LIBS"
6648		LIBS="$lt_cv_dlopen_libs $LIBS"
6649
6650		- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
6651		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
6652		$as_echo_n "checking whether a program can dlopen itself... " >&6; }
6653		-if test "${lt_cv_dlopen_self+set}" = set; then
6654		+if test "${lt_cv_dlopen_self+set}" = set; then :
6655		$as_echo_n "(cached) " >&6
6656		else
6657		if test "$cross_compiling" = yes; then :
6658		@@ -11014,7 +10330,7 @@
6659		lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
6660		lt_status=$lt_dlunknown
6661		cat > conftest.$ac_ext <<_LT_EOF
6662		-#line 11017 "configure"
6663		+#line 10333 "configure"
6664		#include "confdefs.h"
6665
6666		#if HAVE_DLFCN_H
6667		@@ -11073,11 +10389,11 @@
6668		return status;
6669		}
6670		_LT_EOF
6671		- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6672		+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6673		(eval $ac_link) 2>&5
6674		ac_status=$?
6675		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6676		- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
6677		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6678		+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
6679		(./conftest; exit; ) >&5 2>/dev/null
6680		lt_status=$?
6681		case x$lt_status in
6682		@@ -11094,14 +10410,14 @@
6683
6684
6685		fi
6686		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
6687		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
6688		$as_echo "$lt_cv_dlopen_self" >&6; }
6689
6690		if test "x$lt_cv_dlopen_self" = xyes; then
6691		wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
6692		- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
6693		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
6694		$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
6695		-if test "${lt_cv_dlopen_self_static+set}" = set; then
6696		+if test "${lt_cv_dlopen_self_static+set}" = set; then :
6697		$as_echo_n "(cached) " >&6
6698		else
6699		if test "$cross_compiling" = yes; then :
6700		@@ -11110,7 +10426,7 @@
6701		lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
6702		lt_status=$lt_dlunknown
6703		cat > conftest.$ac_ext <<_LT_EOF
6704		-#line 11113 "configure"
6705		+#line 10429 "configure"
6706		#include "confdefs.h"
6707
6708		#if HAVE_DLFCN_H
6709		@@ -11169,11 +10485,11 @@
6710		return status;
6711		}
6712		_LT_EOF
6713		- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6714		+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6715		(eval $ac_link) 2>&5
6716		ac_status=$?
6717		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6718		- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
6719		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6720		+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
6721		(./conftest; exit; ) >&5 2>/dev/null
6722		lt_status=$?
6723		case x$lt_status in
6724		@@ -11190,7 +10506,7 @@
6725
6726
6727		fi
6728		-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
6729		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
6730		$as_echo "$lt_cv_dlopen_self_static" >&6; }
6731		fi
6732
6733		@@ -11229,12 +10545,12 @@
6734
6735		striplib=
6736		old_striplib=
6737		-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
6738		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
6739		$as_echo_n "checking whether stripping libraries is possible... " >&6; }
6740		if test -n "$STRIP" && $STRIP -V 2>&1 \| $GREP "GNU strip" >/dev/null; then
6741		test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
6742		test -z "$striplib" && striplib="$STRIP --strip-unneeded"
6743		- { $as_echo "$as_me:$LINENO: result: yes" >&5
6744		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6745		$as_echo "yes" >&6; }
6746		else
6747		# FIXME - insert some real tests, host_os isn't really good enough
6748		@@ -11243,15 +10559,15 @@
6749		if test -n "$STRIP" ; then
6750		striplib="$STRIP -x"
6751		old_striplib="$STRIP -S"
6752		- { $as_echo "$as_me:$LINENO: result: yes" >&5
6753		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6754		$as_echo "yes" >&6; }
6755		else
6756		- { $as_echo "$as_me:$LINENO: result: no" >&5
6757		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6758		$as_echo "no" >&6; }
6759		fi
6760		;;
6761		*)
6762		- { $as_echo "$as_me:$LINENO: result: no" >&5
6763		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6764		$as_echo "no" >&6; }
6765		;;
6766		esac
6767		@@ -11269,12 +10585,12 @@
6768
6769
6770		# Report which library types will actually be built
6771		- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
6772		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
6773		$as_echo_n "checking if libtool supports shared libraries... " >&6; }
6774		- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
6775		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
6776		$as_echo "$can_build_shared" >&6; }
6777
6778		- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
6779		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
6780		$as_echo_n "checking whether to build shared libraries... " >&6; }
6781		test "$can_build_shared" = "no" && enable_shared=no
6782
6783		@@ -11295,14 +10611,14 @@
6784		fi
6785		;;
6786		esac
6787		- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
6788		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
6789		$as_echo "$enable_shared" >&6; }
6790
6791		- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
6792		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
6793		$as_echo_n "checking whether to build static libraries... " >&6; }
6794		# Make sure either enable_shared or enable_static is yes.
6795		test "$enable_shared" = yes \|\| enable_static=yes
6796		- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
6797		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
6798		$as_echo "$enable_static" >&6; }
6799
6800
6801		@@ -11338,17 +10654,13 @@
6802
6803
6804
6805		-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
6806		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
6807		$as_echo_n "checking for library containing strerror... " >&6; }
6808		-if test "${ac_cv_search_strerror+set}" = set; then
6809		+if test "${ac_cv_search_strerror+set}" = set; then :
6810		$as_echo_n "(cached) " >&6
6811		else
6812		ac_func_search_save_LIBS=$LIBS
6813		-cat >conftest.$ac_ext <<_ACEOF
6814		-/* confdefs.h. */
6815		-_ACEOF
6816		-cat confdefs.h >>conftest.$ac_ext
6817		-cat >>conftest.$ac_ext <<_ACEOF
6818		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6819		/* end confdefs.h. */
6820
6821		/* Override any GCC internal prototype to avoid an error.
6822		@@ -11373,54 +10685,27 @@
6823		ac_res=-l$ac_lib
6824		LIBS="-l$ac_lib $ac_func_search_save_LIBS"
6825		fi
6826		- rm -f conftest.$ac_objext conftest$ac_exeext
6827		-if { (ac_try="$ac_link"
6828		-case "(($ac_try" in
6829		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
6830		- *) ac_try_echo=$ac_try;;
6831		-esac
6832		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6833		-$as_echo "$ac_try_echo") >&5
6834		- (eval "$ac_link") 2>conftest.er1
6835		- ac_status=$?
6836		- grep -v '^ *+' conftest.er1 >conftest.err
6837		- rm -f conftest.er1
6838		- cat conftest.err >&5
6839		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6840		- (exit $ac_status); } && {
6841		- test -z "$ac_c_werror_flag" \|\|
6842		- test ! -s conftest.err
6843		- } && test -s conftest$ac_exeext && {
6844		- test "$cross_compiling" = yes \|\|
6845		- $as_test_x conftest$ac_exeext
6846		- }; then
6847		+ if ac_fn_c_try_link "$LINENO"; then :
6848		ac_cv_search_strerror=$ac_res
6849		-else
6850		- $as_echo "$as_me: failed program was:" >&5
6851		-sed 's/^/\| /' conftest.$ac_ext >&5
6852		-
6853		-
6854		fi
6855		-
6856		-rm -rf conftest.dSYM
6857		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6858		- conftest$ac_exeext
6859		- if test "${ac_cv_search_strerror+set}" = set; then
6860		+rm -f core conftest.err conftest.$ac_objext \
6861		+ conftest$ac_exeext
6862		+ if test "${ac_cv_search_strerror+set}" = set; then :
6863		break
6864		fi
6865		done
6866		-if test "${ac_cv_search_strerror+set}" = set; then
6867		- :
6868		+if test "${ac_cv_search_strerror+set}" = set; then :
6869		+
6870		else
6871		ac_cv_search_strerror=no
6872		fi
6873		rm conftest.$ac_ext
6874		LIBS=$ac_func_search_save_LIBS
6875		fi
6876		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
6877		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
6878		$as_echo "$ac_cv_search_strerror" >&6; }
6879		ac_res=$ac_cv_search_strerror
6880		-if test "$ac_res" != no; then
6881		+if test "$ac_res" != no; then :
6882		test "$ac_res" = "none required" \|\| LIBS="$ac_res $LIBS"
6883
6884		fi
6885		@@ -11433,9 +10718,9 @@
6886		if test -n "$ac_tool_prefix"; then
6887		# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
6888		set dummy ${ac_tool_prefix}gcc; ac_word=$2
6889		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6890		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6891		$as_echo_n "checking for $ac_word... " >&6; }
6892		-if test "${ac_cv_prog_CC+set}" = set; then
6893		+if test "${ac_cv_prog_CC+set}" = set; then :
6894		$as_echo_n "(cached) " >&6
6895		else
6896		if test -n "$CC"; then
6897		@@ -11446,24 +10731,24 @@
6898		do
6899		IFS=$as_save_IFS
6900		test -z "$as_dir" && as_dir=.
6901		- for ac_exec_ext in '' $ac_executable_extensions; do
6902		+ for ac_exec_ext in '' $ac_executable_extensions; do
6903		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6904		ac_cv_prog_CC="${ac_tool_prefix}gcc"
6905		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6906		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6907		break 2
6908		fi
6909		done
6910		-done
6911		+ done
6912		IFS=$as_save_IFS
6913
6914		fi
6915		fi
6916		CC=$ac_cv_prog_CC
6917		if test -n "$CC"; then
6918		- { $as_echo "$as_me:$LINENO: result: $CC" >&5
6919		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
6920		$as_echo "$CC" >&6; }
6921		else
6922		- { $as_echo "$as_me:$LINENO: result: no" >&5
6923		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6924		$as_echo "no" >&6; }
6925		fi
6926
6927		@@ -11473,9 +10758,9 @@
6928		ac_ct_CC=$CC
6929		# Extract the first word of "gcc", so it can be a program name with args.
6930		set dummy gcc; ac_word=$2
6931		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6932		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6933		$as_echo_n "checking for $ac_word... " >&6; }
6934		-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
6935		+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
6936		$as_echo_n "(cached) " >&6
6937		else
6938		if test -n "$ac_ct_CC"; then
6939		@@ -11486,24 +10771,24 @@
6940		do
6941		IFS=$as_save_IFS
6942		test -z "$as_dir" && as_dir=.
6943		- for ac_exec_ext in '' $ac_executable_extensions; do
6944		+ for ac_exec_ext in '' $ac_executable_extensions; do
6945		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6946		ac_cv_prog_ac_ct_CC="gcc"
6947		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6948		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6949		break 2
6950		fi
6951		done
6952		-done
6953		+ done
6954		IFS=$as_save_IFS
6955
6956		fi
6957		fi
6958		ac_ct_CC=$ac_cv_prog_ac_ct_CC
6959		if test -n "$ac_ct_CC"; then
6960		- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
6961		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
6962		$as_echo "$ac_ct_CC" >&6; }
6963		else
6964		- { $as_echo "$as_me:$LINENO: result: no" >&5
6965		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6966		$as_echo "no" >&6; }
6967		fi
6968
6969		@@ -11512,7 +10797,7 @@
6970		else
6971		case $cross_compiling:$ac_tool_warned in
6972		yes:)
6973		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
6974		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6975		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6976		ac_tool_warned=yes ;;
6977		esac
6978		@@ -11526,9 +10811,9 @@
6979		if test -n "$ac_tool_prefix"; then
6980		# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
6981		set dummy ${ac_tool_prefix}cc; ac_word=$2
6982		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6983		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6984		$as_echo_n "checking for $ac_word... " >&6; }
6985		-if test "${ac_cv_prog_CC+set}" = set; then
6986		+if test "${ac_cv_prog_CC+set}" = set; then :
6987		$as_echo_n "(cached) " >&6
6988		else
6989		if test -n "$CC"; then
6990		@@ -11539,24 +10824,24 @@
6991		do
6992		IFS=$as_save_IFS
6993		test -z "$as_dir" && as_dir=.
6994		- for ac_exec_ext in '' $ac_executable_extensions; do
6995		+ for ac_exec_ext in '' $ac_executable_extensions; do
6996		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6997		ac_cv_prog_CC="${ac_tool_prefix}cc"
6998		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6999		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7000		break 2
7001		fi
7002		done
7003		-done
7004		+ done
7005		IFS=$as_save_IFS
7006
7007		fi
7008		fi
7009		CC=$ac_cv_prog_CC
7010		if test -n "$CC"; then
7011		- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7012		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7013		$as_echo "$CC" >&6; }
7014		else
7015		- { $as_echo "$as_me:$LINENO: result: no" >&5
7016		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7017		$as_echo "no" >&6; }
7018		fi
7019
7020		@@ -11566,9 +10851,9 @@
7021		if test -z "$CC"; then
7022		# Extract the first word of "cc", so it can be a program name with args.
7023		set dummy cc; ac_word=$2
7024		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7025		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7026		$as_echo_n "checking for $ac_word... " >&6; }
7027		-if test "${ac_cv_prog_CC+set}" = set; then
7028		+if test "${ac_cv_prog_CC+set}" = set; then :
7029		$as_echo_n "(cached) " >&6
7030		else
7031		if test -n "$CC"; then
7032		@@ -11580,18 +10865,18 @@
7033		do
7034		IFS=$as_save_IFS
7035		test -z "$as_dir" && as_dir=.
7036		- for ac_exec_ext in '' $ac_executable_extensions; do
7037		+ for ac_exec_ext in '' $ac_executable_extensions; do
7038		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7039		if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
7040		ac_prog_rejected=yes
7041		continue
7042		fi
7043		ac_cv_prog_CC="cc"
7044		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7045		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7046		break 2
7047		fi
7048		done
7049		-done
7050		+ done
7051		IFS=$as_save_IFS
7052
7053		if test $ac_prog_rejected = yes; then
7054		@@ -11610,10 +10895,10 @@
7055		fi
7056		CC=$ac_cv_prog_CC
7057		if test -n "$CC"; then
7058		- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7059		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7060		$as_echo "$CC" >&6; }
7061		else
7062		- { $as_echo "$as_me:$LINENO: result: no" >&5
7063		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7064		$as_echo "no" >&6; }
7065		fi
7066
7067		@@ -11625,9 +10910,9 @@
7068		do
7069		# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
7070		set dummy $ac_tool_prefix$ac_prog; ac_word=$2
7071		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7072		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7073		$as_echo_n "checking for $ac_word... " >&6; }
7074		-if test "${ac_cv_prog_CC+set}" = set; then
7075		+if test "${ac_cv_prog_CC+set}" = set; then :
7076		$as_echo_n "(cached) " >&6
7077		else
7078		if test -n "$CC"; then
7079		@@ -11638,24 +10923,24 @@
7080		do
7081		IFS=$as_save_IFS
7082		test -z "$as_dir" && as_dir=.
7083		- for ac_exec_ext in '' $ac_executable_extensions; do
7084		+ for ac_exec_ext in '' $ac_executable_extensions; do
7085		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7086		ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
7087		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7088		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7089		break 2
7090		fi
7091		done
7092		-done
7093		+ done
7094		IFS=$as_save_IFS
7095
7096		fi
7097		fi
7098		CC=$ac_cv_prog_CC
7099		if test -n "$CC"; then
7100		- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7101		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7102		$as_echo "$CC" >&6; }
7103		else
7104		- { $as_echo "$as_me:$LINENO: result: no" >&5
7105		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7106		$as_echo "no" >&6; }
7107		fi
7108
7109		@@ -11669,9 +10954,9 @@
7110		do
7111		# Extract the first word of "$ac_prog", so it can be a program name with args.
7112		set dummy $ac_prog; ac_word=$2
7113		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7114		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7115		$as_echo_n "checking for $ac_word... " >&6; }
7116		-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
7117		+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
7118		$as_echo_n "(cached) " >&6
7119		else
7120		if test -n "$ac_ct_CC"; then
7121		@@ -11682,24 +10967,24 @@
7122		do
7123		IFS=$as_save_IFS
7124		test -z "$as_dir" && as_dir=.
7125		- for ac_exec_ext in '' $ac_executable_extensions; do
7126		+ for ac_exec_ext in '' $ac_executable_extensions; do
7127		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7128		ac_cv_prog_ac_ct_CC="$ac_prog"
7129		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7130		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7131		break 2
7132		fi
7133		done
7134		-done
7135		+ done
7136		IFS=$as_save_IFS
7137
7138		fi
7139		fi
7140		ac_ct_CC=$ac_cv_prog_ac_ct_CC
7141		if test -n "$ac_ct_CC"; then
7142		- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
7143		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
7144		$as_echo "$ac_ct_CC" >&6; }
7145		else
7146		- { $as_echo "$as_me:$LINENO: result: no" >&5
7147		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7148		$as_echo "no" >&6; }
7149		fi
7150
7151		@@ -11712,7 +10997,7 @@
7152		else
7153		case $cross_compiling:$ac_tool_warned in
7154		yes:)
7155		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
7156		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7157		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7158		ac_tool_warned=yes ;;
7159		esac
7160		@@ -11723,62 +11008,42 @@
7161		fi
7162
7163
7164		-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
7165		+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7166		$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7167		-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
7168		-See \`config.log' for more details." >&5
7169		-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
7170		-See \`config.log' for more details." >&2;}
7171		- { (exit 1); exit 1; }; }; }
7172		+as_fn_error "no acceptable C compiler found in \$PATH
7173		+See \`config.log' for more details." "$LINENO" 5; }
7174
7175		# Provide some information about the compiler.
7176		-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
7177		+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
7178		set X $ac_compile
7179		ac_compiler=$2
7180		-{ (ac_try="$ac_compiler --version >&5"
7181		-case "(($ac_try" in
7182		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
7183		- *) ac_try_echo=$ac_try;;
7184		-esac
7185		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7186		-$as_echo "$ac_try_echo") >&5
7187		- (eval "$ac_compiler --version >&5") 2>&5
7188		- ac_status=$?
7189		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7190		- (exit $ac_status); }
7191		-{ (ac_try="$ac_compiler -v >&5"
7192		-case "(($ac_try" in
7193		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
7194		- *) ac_try_echo=$ac_try;;
7195		-esac
7196		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7197		-$as_echo "$ac_try_echo") >&5
7198		- (eval "$ac_compiler -v >&5") 2>&5
7199		- ac_status=$?
7200		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7201		- (exit $ac_status); }
7202		-{ (ac_try="$ac_compiler -V >&5"
7203		+for ac_option in --version -v -V -qversion; do
7204		+ { { ac_try="$ac_compiler $ac_option >&5"
7205		case "(($ac_try" in
7206		\" \| \` \| \\) ac_try_echo=\$ac_try;;
7207		*) ac_try_echo=$ac_try;;
7208		esac
7209		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7210		-$as_echo "$ac_try_echo") >&5
7211		- (eval "$ac_compiler -V >&5") 2>&5
7212		+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
7213		+$as_echo "$ac_try_echo"; } >&5
7214		+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
7215		ac_status=$?
7216		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7217		- (exit $ac_status); }
7218		+ if test -s conftest.err; then
7219		+ sed '10a\
7220		+... rest of stderr output deleted ...
7221		+ 10q' conftest.err >conftest.er1
7222		+ cat conftest.er1 >&5
7223		+ rm -f conftest.er1 conftest.err
7224		+ fi
7225		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7226		+ test $ac_status = 0; }
7227		+done
7228
7229		-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
7230		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
7231		$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
7232		-if test "${ac_cv_c_compiler_gnu+set}" = set; then
7233		+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
7234		$as_echo_n "(cached) " >&6
7235		else
7236		- cat >conftest.$ac_ext <<_ACEOF
7237		-/* confdefs.h. */
7238		-_ACEOF
7239		-cat confdefs.h >>conftest.$ac_ext
7240		-cat >>conftest.$ac_ext <<_ACEOF
7241		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7242		/* end confdefs.h. */
7243
7244		int
7245		@@ -11792,37 +11057,16 @@
7246		return 0;
7247		}
7248		_ACEOF
7249		-rm -f conftest.$ac_objext
7250		-if { (ac_try="$ac_compile"
7251		-case "(($ac_try" in
7252		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
7253		- *) ac_try_echo=$ac_try;;
7254		-esac
7255		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7256		-$as_echo "$ac_try_echo") >&5
7257		- (eval "$ac_compile") 2>conftest.er1
7258		- ac_status=$?
7259		- grep -v '^ *+' conftest.er1 >conftest.err
7260		- rm -f conftest.er1
7261		- cat conftest.err >&5
7262		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7263		- (exit $ac_status); } && {
7264		- test -z "$ac_c_werror_flag" \|\|
7265		- test ! -s conftest.err
7266		- } && test -s conftest.$ac_objext; then
7267		+if ac_fn_c_try_compile "$LINENO"; then :
7268		ac_compiler_gnu=yes
7269		else
7270		- $as_echo "$as_me: failed program was:" >&5
7271		-sed 's/^/\| /' conftest.$ac_ext >&5
7272		-
7273		- ac_compiler_gnu=no
7274		+ ac_compiler_gnu=no
7275		fi
7276		-
7277		rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7278		ac_cv_c_compiler_gnu=$ac_compiler_gnu
7279
7280		fi
7281		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
7282		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
7283		$as_echo "$ac_cv_c_compiler_gnu" >&6; }
7284		if test $ac_compiler_gnu = yes; then
7285		GCC=yes
7286		@@ -11831,20 +11075,16 @@
7287		fi
7288		ac_test_CFLAGS=${CFLAGS+set}
7289		ac_save_CFLAGS=$CFLAGS
7290		-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
7291		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
7292		$as_echo_n "checking whether $CC accepts -g... " >&6; }
7293		-if test "${ac_cv_prog_cc_g+set}" = set; then
7294		+if test "${ac_cv_prog_cc_g+set}" = set; then :
7295		$as_echo_n "(cached) " >&6
7296		else
7297		ac_save_c_werror_flag=$ac_c_werror_flag
7298		ac_c_werror_flag=yes
7299		ac_cv_prog_cc_g=no
7300		CFLAGS="-g"
7301		- cat >conftest.$ac_ext <<_ACEOF
7302		-/* confdefs.h. */
7303		-_ACEOF
7304		-cat confdefs.h >>conftest.$ac_ext
7305		-cat >>conftest.$ac_ext <<_ACEOF
7306		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7307		/* end confdefs.h. */
7308
7309		int
7310		@@ -11855,35 +11095,11 @@
7311		return 0;
7312		}
7313		_ACEOF
7314		-rm -f conftest.$ac_objext
7315		-if { (ac_try="$ac_compile"
7316		-case "(($ac_try" in
7317		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
7318		- *) ac_try_echo=$ac_try;;
7319		-esac
7320		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7321		-$as_echo "$ac_try_echo") >&5
7322		- (eval "$ac_compile") 2>conftest.er1
7323		- ac_status=$?
7324		- grep -v '^ *+' conftest.er1 >conftest.err
7325		- rm -f conftest.er1
7326		- cat conftest.err >&5
7327		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7328		- (exit $ac_status); } && {
7329		- test -z "$ac_c_werror_flag" \|\|
7330		- test ! -s conftest.err
7331		- } && test -s conftest.$ac_objext; then
7332		+if ac_fn_c_try_compile "$LINENO"; then :
7333		ac_cv_prog_cc_g=yes
7334		else
7335		- $as_echo "$as_me: failed program was:" >&5
7336		-sed 's/^/\| /' conftest.$ac_ext >&5
7337		-
7338		- CFLAGS=""
7339		- cat >conftest.$ac_ext <<_ACEOF
7340		-/* confdefs.h. */
7341		-_ACEOF
7342		-cat confdefs.h >>conftest.$ac_ext
7343		-cat >>conftest.$ac_ext <<_ACEOF
7344		+ CFLAGS=""
7345		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7346		/* end confdefs.h. */
7347
7348		int
7349		@@ -11894,36 +11110,12 @@
7350		return 0;
7351		}
7352		_ACEOF
7353		-rm -f conftest.$ac_objext
7354		-if { (ac_try="$ac_compile"
7355		-case "(($ac_try" in
7356		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
7357		- *) ac_try_echo=$ac_try;;
7358		-esac
7359		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7360		-$as_echo "$ac_try_echo") >&5
7361		- (eval "$ac_compile") 2>conftest.er1
7362		- ac_status=$?
7363		- grep -v '^ *+' conftest.er1 >conftest.err
7364		- rm -f conftest.er1
7365		- cat conftest.err >&5
7366		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7367		- (exit $ac_status); } && {
7368		- test -z "$ac_c_werror_flag" \|\|
7369		- test ! -s conftest.err
7370		- } && test -s conftest.$ac_objext; then
7371		- :
7372		-else
7373		- $as_echo "$as_me: failed program was:" >&5
7374		-sed 's/^/\| /' conftest.$ac_ext >&5
7375		+if ac_fn_c_try_compile "$LINENO"; then :
7376
7377		- ac_c_werror_flag=$ac_save_c_werror_flag
7378		+else
7379		+ ac_c_werror_flag=$ac_save_c_werror_flag
7380		CFLAGS="-g"
7381		- cat >conftest.$ac_ext <<_ACEOF
7382		-/* confdefs.h. */
7383		-_ACEOF
7384		-cat confdefs.h >>conftest.$ac_ext
7385		-cat >>conftest.$ac_ext <<_ACEOF
7386		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7387		/* end confdefs.h. */
7388
7389		int
7390		@@ -11934,42 +11126,17 @@
7391		return 0;
7392		}
7393		_ACEOF
7394		-rm -f conftest.$ac_objext
7395		-if { (ac_try="$ac_compile"
7396		-case "(($ac_try" in
7397		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
7398		- *) ac_try_echo=$ac_try;;
7399		-esac
7400		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7401		-$as_echo "$ac_try_echo") >&5
7402		- (eval "$ac_compile") 2>conftest.er1
7403		- ac_status=$?
7404		- grep -v '^ *+' conftest.er1 >conftest.err
7405		- rm -f conftest.er1
7406		- cat conftest.err >&5
7407		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7408		- (exit $ac_status); } && {
7409		- test -z "$ac_c_werror_flag" \|\|
7410		- test ! -s conftest.err
7411		- } && test -s conftest.$ac_objext; then
7412		+if ac_fn_c_try_compile "$LINENO"; then :
7413		ac_cv_prog_cc_g=yes
7414		-else
7415		- $as_echo "$as_me: failed program was:" >&5
7416		-sed 's/^/\| /' conftest.$ac_ext >&5
7417		-
7418		-
7419		fi
7420		-
7421		rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7422		fi
7423		-
7424		rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7425		fi
7426		-
7427		rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7428		ac_c_werror_flag=$ac_save_c_werror_flag
7429		fi
7430		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
7431		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
7432		$as_echo "$ac_cv_prog_cc_g" >&6; }
7433		if test "$ac_test_CFLAGS" = set; then
7434		CFLAGS=$ac_save_CFLAGS
7435		@@ -11986,18 +11153,14 @@
7436		CFLAGS=
7437		fi
7438		fi
7439		-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
7440		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
7441		$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
7442		-if test "${ac_cv_prog_cc_c89+set}" = set; then
7443		+if test "${ac_cv_prog_cc_c89+set}" = set; then :
7444		$as_echo_n "(cached) " >&6
7445		else
7446		ac_cv_prog_cc_c89=no
7447		ac_save_CC=$CC
7448		-cat >conftest.$ac_ext <<_ACEOF
7449		-/* confdefs.h. */
7450		-_ACEOF
7451		-cat confdefs.h >>conftest.$ac_ext
7452		-cat >>conftest.$ac_ext <<_ACEOF
7453		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7454		/* end confdefs.h. */
7455		#include <stdarg.h>
7456		#include <stdio.h>
7457		@@ -12054,32 +11217,9 @@
7458		-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
7459		do
7460		CC="$ac_save_CC $ac_arg"
7461		- rm -f conftest.$ac_objext
7462		-if { (ac_try="$ac_compile"
7463		-case "(($ac_try" in
7464		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
7465		- *) ac_try_echo=$ac_try;;
7466		-esac
7467		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7468		-$as_echo "$ac_try_echo") >&5
7469		- (eval "$ac_compile") 2>conftest.er1
7470		- ac_status=$?
7471		- grep -v '^ *+' conftest.er1 >conftest.err
7472		- rm -f conftest.er1
7473		- cat conftest.err >&5
7474		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7475		- (exit $ac_status); } && {
7476		- test -z "$ac_c_werror_flag" \|\|
7477		- test ! -s conftest.err
7478		- } && test -s conftest.$ac_objext; then
7479		+ if ac_fn_c_try_compile "$LINENO"; then :
7480		ac_cv_prog_cc_c89=$ac_arg
7481		-else
7482		- $as_echo "$as_me: failed program was:" >&5
7483		-sed 's/^/\| /' conftest.$ac_ext >&5
7484		-
7485		-
7486		fi
7487		-
7488		rm -f core conftest.err conftest.$ac_objext
7489		test "x$ac_cv_prog_cc_c89" != "xno" && break
7490		done
7491		@@ -12090,17 +11230,19 @@
7492		# AC_CACHE_VAL
7493		case "x$ac_cv_prog_cc_c89" in
7494		x)
7495		- { $as_echo "$as_me:$LINENO: result: none needed" >&5
7496		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
7497		$as_echo "none needed" >&6; } ;;
7498		xno)
7499		- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
7500		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
7501		$as_echo "unsupported" >&6; } ;;
7502		*)
7503		CC="$CC $ac_cv_prog_cc_c89"
7504		- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
7505		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
7506		$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
7507		esac
7508		+if test "x$ac_cv_prog_cc_c89" != xno; then :
7509
7510		+fi
7511
7512		ac_ext=c
7513		ac_cpp='$CPP $CPPFLAGS'
7514		@@ -12110,9 +11252,9 @@
7515
7516		depcc="$CC" am_compiler_list=
7517
7518		-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
7519		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
7520		$as_echo_n "checking dependency style of $depcc... " >&6; }
7521		-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
7522		+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
7523		$as_echo_n "(cached) " >&6
7524		else
7525		if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
7526		@@ -12220,7 +11362,7 @@
7527		fi
7528
7529		fi
7530		-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
7531		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
7532		$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
7533		CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
7534
7535		@@ -12235,104 +11377,12 @@
7536		fi
7537
7538
7539		-# Find a good install program. We prefer a C program (faster),
7540		-# so one script is as good as another. But avoid the broken or
7541		-# incompatible versions:
7542		-# SysV /etc/install, /usr/sbin/install
7543		-# SunOS /usr/etc/install
7544		-# IRIX /sbin/install
7545		-# AIX /bin/install
7546		-# AmigaOS /C/install, which installs bootblocks on floppy discs
7547		-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
7548		-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
7549		-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
7550		-# OS/2's system install, which has a completely different semantic
7551		-# ./install, which can be erroneously created by make from ./install.sh.
7552		-# Reject install programs that cannot install multiple files.
7553		-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
7554		-$as_echo_n "checking for a BSD-compatible install... " >&6; }
7555		-if test -z "$INSTALL"; then
7556		-if test "${ac_cv_path_install+set}" = set; then
7557		- $as_echo_n "(cached) " >&6
7558		-else
7559		- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7560		-for as_dir in $PATH
7561		-do
7562		- IFS=$as_save_IFS
7563		- test -z "$as_dir" && as_dir=.
7564		- # Account for people who put trailing slashes in PATH elements.
7565		-case $as_dir/ in
7566		- ./ \| .// \| /cC/* \| \
7567		- /etc/* \| /usr/sbin/* \| /usr/etc/* \| /sbin/* \| /usr/afsws/bin/* \| \
7568		- ?:\\/os2\\/install\\/* \| ?:\\/OS2\\/INSTALL\\/* \| \
7569		- /usr/ucb/* ) ;;
7570		- *)
7571		- # OSF1 and SCO ODT 3.0 have their own names for install.
7572		- # Don't use installbsd from OSF since it installs stuff as root
7573		- # by default.
7574		- for ac_prog in ginstall scoinst install; do
7575		- for ac_exec_ext in '' $ac_executable_extensions; do
7576		- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
7577		- if test $ac_prog = install &&
7578		- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
7579		- # AIX install. It has an incompatible calling convention.
7580		- :
7581		- elif test $ac_prog = install &&
7582		- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
7583		- # program-specific install script used by HP pwplus--don't use.
7584		- :
7585		- else
7586		- rm -rf conftest.one conftest.two conftest.dir
7587		- echo one > conftest.one
7588		- echo two > conftest.two
7589		- mkdir conftest.dir
7590		- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
7591		- test -s conftest.one && test -s conftest.two &&
7592		- test -s conftest.dir/conftest.one &&
7593		- test -s conftest.dir/conftest.two
7594		- then
7595		- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
7596		- break 3
7597		- fi
7598		- fi
7599		- fi
7600		- done
7601		- done
7602		- ;;
7603		-esac
7604		-
7605		-done
7606		-IFS=$as_save_IFS
7607
7608		-rm -rf conftest.one conftest.two conftest.dir
7609		-
7610		-fi
7611		- if test "${ac_cv_path_install+set}" = set; then
7612		- INSTALL=$ac_cv_path_install
7613		- else
7614		- # As a last resort, use the slow shell script. Don't cache a
7615		- # value for INSTALL within a source directory, because that will
7616		- # break other packages using the cache if that directory is
7617		- # removed, or if the value is a relative name.
7618		- INSTALL=$ac_install_sh
7619		- fi
7620		-fi
7621		-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
7622		-$as_echo "$INSTALL" >&6; }
7623		-
7624		-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
7625		-# It thinks the first close brace ends the variable substitution.
7626		-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
7627		-
7628		-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
7629		-
7630		-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
7631		-
7632		-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
7633		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
7634		$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
7635		set x ${MAKE-make}
7636		ac_make=`$as_echo "$2" \| sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
7637		-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
7638		+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
7639		$as_echo_n "(cached) " >&6
7640		else
7641		cat >conftest.make <<\_ACEOF
7642		@@ -12350,11 +11400,11 @@
7643		rm -f conftest.make
7644		fi
7645		if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
7646		- { $as_echo "$as_me:$LINENO: result: yes" >&5
7647		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7648		$as_echo "yes" >&6; }
7649		SET_MAKE=
7650		else
7651		- { $as_echo "$as_me:$LINENO: result: no" >&5
7652		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7653		$as_echo "no" >&6; }
7654		SET_MAKE="MAKE=${MAKE-make}"
7655		fi
7656		@@ -12365,151 +11415,12 @@
7657		# ***********
7658
7659
7660		-
7661		-for ac_header in locale.h
7662		-do
7663		-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
7664		-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
7665		- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
7666		-$as_echo_n "checking for $ac_header... " >&6; }
7667		-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
7668		- $as_echo_n "(cached) " >&6
7669		-fi
7670		-ac_res=`eval 'as_val=${'$as_ac_Header'}
7671		- $as_echo "$as_val"'`
7672		- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
7673		-$as_echo "$ac_res" >&6; }
7674		-else
7675		- # Is the header compilable?
7676		-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
7677		-$as_echo_n "checking $ac_header usability... " >&6; }
7678		-cat >conftest.$ac_ext <<_ACEOF
7679		-/* confdefs.h. */
7680		-_ACEOF
7681		-cat confdefs.h >>conftest.$ac_ext
7682		-cat >>conftest.$ac_ext <<_ACEOF
7683		-/* end confdefs.h. */
7684		-$ac_includes_default
7685		-#include <$ac_header>
7686		-_ACEOF
7687		-rm -f conftest.$ac_objext
7688		-if { (ac_try="$ac_compile"
7689		-case "(($ac_try" in
7690		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
7691		- *) ac_try_echo=$ac_try;;
7692		-esac
7693		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7694		-$as_echo "$ac_try_echo") >&5
7695		- (eval "$ac_compile") 2>conftest.er1
7696		- ac_status=$?
7697		- grep -v '^ *+' conftest.er1 >conftest.err
7698		- rm -f conftest.er1
7699		- cat conftest.err >&5
7700		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7701		- (exit $ac_status); } && {
7702		- test -z "$ac_c_werror_flag" \|\|
7703		- test ! -s conftest.err
7704		- } && test -s conftest.$ac_objext; then
7705		- ac_header_compiler=yes
7706		-else
7707		- $as_echo "$as_me: failed program was:" >&5
7708		-sed 's/^/\| /' conftest.$ac_ext >&5
7709		-
7710		- ac_header_compiler=no
7711		-fi
7712		-
7713		-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7714		-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
7715		-$as_echo "$ac_header_compiler" >&6; }
7716		-
7717		-# Is the header present?
7718		-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
7719		-$as_echo_n "checking $ac_header presence... " >&6; }
7720		-cat >conftest.$ac_ext <<_ACEOF
7721		-/* confdefs.h. */
7722		-_ACEOF
7723		-cat confdefs.h >>conftest.$ac_ext
7724		-cat >>conftest.$ac_ext <<_ACEOF
7725		-/* end confdefs.h. */
7726		-#include <$ac_header>
7727		-_ACEOF
7728		-if { (ac_try="$ac_cpp conftest.$ac_ext"
7729		-case "(($ac_try" in
7730		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
7731		- *) ac_try_echo=$ac_try;;
7732		-esac
7733		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7734		-$as_echo "$ac_try_echo") >&5
7735		- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
7736		- ac_status=$?
7737		- grep -v '^ *+' conftest.er1 >conftest.err
7738		- rm -f conftest.er1
7739		- cat conftest.err >&5
7740		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7741		- (exit $ac_status); } >/dev/null && {
7742		- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
7743		- test ! -s conftest.err
7744		- }; then
7745		- ac_header_preproc=yes
7746		-else
7747		- $as_echo "$as_me: failed program was:" >&5
7748		-sed 's/^/\| /' conftest.$ac_ext >&5
7749		-
7750		- ac_header_preproc=no
7751		-fi
7752		-
7753		-rm -f conftest.err conftest.$ac_ext
7754		-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
7755		-$as_echo "$ac_header_preproc" >&6; }
7756		-
7757		-# So? What about this header?
7758		-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
7759		- yes:no: )
7760		- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
7761		-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
7762		- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
7763		-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
7764		- ac_header_preproc=yes
7765		- ;;
7766		- no:yes:* )
7767		- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
7768		-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
7769		- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
7770		-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
7771		- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
7772		-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
7773		- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
7774		-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
7775		- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
7776		-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
7777		- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
7778		-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
7779		- ( cat <<\_ASBOX
7780		-## ------------------------------------------------------------------------------------ ##
7781		-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=eog&component=plugins ##
7782		-## ------------------------------------------------------------------------------------ ##
7783		-_ASBOX
7784		- ) \| sed "s/^/$as_me: WARNING: /" >&2
7785		- ;;
7786		-esac
7787		-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
7788		-$as_echo_n "checking for $ac_header... " >&6; }
7789		-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
7790		- $as_echo_n "(cached) " >&6
7791		-else
7792		- eval "$as_ac_Header=\$ac_header_preproc"
7793		-fi
7794		-ac_res=`eval 'as_val=${'$as_ac_Header'}
7795		- $as_echo "$as_val"'`
7796		- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
7797		-$as_echo "$ac_res" >&6; }
7798		-
7799		-fi
7800		-as_val=`eval 'as_val=${'$as_ac_Header'}
7801		- $as_echo "$as_val"'`
7802		- if test "x$as_val" = x""yes; then
7803		+ for ac_header in locale.h
7804		+do :
7805		+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
7806		+if test "x$ac_cv_header_locale_h" = x""yes; then :
7807		cat >>confdefs.h <<_ACEOF
7808		-#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1
7809		+#define HAVE_LOCALE_H 1
7810		_ACEOF
7811
7812		fi
7813		@@ -12517,16 +11428,12 @@
7814		done
7815
7816		if test $ac_cv_header_locale_h = yes; then
7817		- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
7818		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
7819		$as_echo_n "checking for LC_MESSAGES... " >&6; }
7820		-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
7821		+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
7822		$as_echo_n "(cached) " >&6
7823		else
7824		- cat >conftest.$ac_ext <<_ACEOF
7825		-/* confdefs.h. */
7826		-_ACEOF
7827		-cat confdefs.h >>conftest.$ac_ext
7828		-cat >>conftest.$ac_ext <<_ACEOF
7829		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7830		/* end confdefs.h. */
7831		#include <locale.h>
7832		int
7833		@@ -12537,46 +11444,19 @@
7834		return 0;
7835		}
7836		_ACEOF
7837		-rm -f conftest.$ac_objext conftest$ac_exeext
7838		-if { (ac_try="$ac_link"
7839		-case "(($ac_try" in
7840		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
7841		- *) ac_try_echo=$ac_try;;
7842		-esac
7843		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7844		-$as_echo "$ac_try_echo") >&5
7845		- (eval "$ac_link") 2>conftest.er1
7846		- ac_status=$?
7847		- grep -v '^ *+' conftest.er1 >conftest.err
7848		- rm -f conftest.er1
7849		- cat conftest.err >&5
7850		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7851		- (exit $ac_status); } && {
7852		- test -z "$ac_c_werror_flag" \|\|
7853		- test ! -s conftest.err
7854		- } && test -s conftest$ac_exeext && {
7855		- test "$cross_compiling" = yes \|\|
7856		- $as_test_x conftest$ac_exeext
7857		- }; then
7858		+if ac_fn_c_try_link "$LINENO"; then :
7859		am_cv_val_LC_MESSAGES=yes
7860		else
7861		- $as_echo "$as_me: failed program was:" >&5
7862		-sed 's/^/\| /' conftest.$ac_ext >&5
7863		-
7864		- am_cv_val_LC_MESSAGES=no
7865		+ am_cv_val_LC_MESSAGES=no
7866		fi
7867		-
7868		-rm -rf conftest.dSYM
7869		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7870		- conftest$ac_exeext conftest.$ac_ext
7871		+rm -f core conftest.err conftest.$ac_objext \
7872		+ conftest$ac_exeext conftest.$ac_ext
7873		fi
7874		-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
7875		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
7876		$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
7877		if test $am_cv_val_LC_MESSAGES = yes; then
7878
7879		-cat >>confdefs.h <<\_ACEOF
7880		-#define HAVE_LC_MESSAGES 1
7881		-_ACEOF
7882		+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
7883
7884		fi
7885		fi
7886		@@ -12589,155 +11469,20 @@
7887		XGETTEXT=:
7888		INTLLIBS=
7889
7890		- if test "${ac_cv_header_libintl_h+set}" = set; then
7891		- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
7892		-$as_echo_n "checking for libintl.h... " >&6; }
7893		-if test "${ac_cv_header_libintl_h+set}" = set; then
7894		- $as_echo_n "(cached) " >&6
7895		-fi
7896		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
7897		-$as_echo "$ac_cv_header_libintl_h" >&6; }
7898		-else
7899		- # Is the header compilable?
7900		-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
7901		-$as_echo_n "checking libintl.h usability... " >&6; }
7902		-cat >conftest.$ac_ext <<_ACEOF
7903		-/* confdefs.h. */
7904		-_ACEOF
7905		-cat confdefs.h >>conftest.$ac_ext
7906		-cat >>conftest.$ac_ext <<_ACEOF
7907		-/* end confdefs.h. */
7908		-$ac_includes_default
7909		-#include <libintl.h>
7910		-_ACEOF
7911		-rm -f conftest.$ac_objext
7912		-if { (ac_try="$ac_compile"
7913		-case "(($ac_try" in
7914		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
7915		- *) ac_try_echo=$ac_try;;
7916		-esac
7917		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7918		-$as_echo "$ac_try_echo") >&5
7919		- (eval "$ac_compile") 2>conftest.er1
7920		- ac_status=$?
7921		- grep -v '^ *+' conftest.er1 >conftest.err
7922		- rm -f conftest.er1
7923		- cat conftest.err >&5
7924		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7925		- (exit $ac_status); } && {
7926		- test -z "$ac_c_werror_flag" \|\|
7927		- test ! -s conftest.err
7928		- } && test -s conftest.$ac_objext; then
7929		- ac_header_compiler=yes
7930		-else
7931		- $as_echo "$as_me: failed program was:" >&5
7932		-sed 's/^/\| /' conftest.$ac_ext >&5
7933		-
7934		- ac_header_compiler=no
7935		-fi
7936		-
7937		-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7938		-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
7939		-$as_echo "$ac_header_compiler" >&6; }
7940		-
7941		-# Is the header present?
7942		-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
7943		-$as_echo_n "checking libintl.h presence... " >&6; }
7944		-cat >conftest.$ac_ext <<_ACEOF
7945		-/* confdefs.h. */
7946		-_ACEOF
7947		-cat confdefs.h >>conftest.$ac_ext
7948		-cat >>conftest.$ac_ext <<_ACEOF
7949		-/* end confdefs.h. */
7950		-#include <libintl.h>
7951		-_ACEOF
7952		-if { (ac_try="$ac_cpp conftest.$ac_ext"
7953		-case "(($ac_try" in
7954		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
7955		- *) ac_try_echo=$ac_try;;
7956		-esac
7957		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7958		-$as_echo "$ac_try_echo") >&5
7959		- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
7960		- ac_status=$?
7961		- grep -v '^ *+' conftest.er1 >conftest.err
7962		- rm -f conftest.er1
7963		- cat conftest.err >&5
7964		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7965		- (exit $ac_status); } >/dev/null && {
7966		- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
7967		- test ! -s conftest.err
7968		- }; then
7969		- ac_header_preproc=yes
7970		-else
7971		- $as_echo "$as_me: failed program was:" >&5
7972		-sed 's/^/\| /' conftest.$ac_ext >&5
7973		-
7974		- ac_header_preproc=no
7975		-fi
7976		-
7977		-rm -f conftest.err conftest.$ac_ext
7978		-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
7979		-$as_echo "$ac_header_preproc" >&6; }
7980		-
7981		-# So? What about this header?
7982		-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
7983		- yes:no: )
7984		- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
7985		-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
7986		- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
7987		-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
7988		- ac_header_preproc=yes
7989		- ;;
7990		- no:yes:* )
7991		- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
7992		-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
7993		- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
7994		-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
7995		- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
7996		-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
7997		- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
7998		-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
7999		- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
8000		-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
8001		- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
8002		-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
8003		- ( cat <<\_ASBOX
8004		-## ------------------------------------------------------------------------------------ ##
8005		-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=eog&component=plugins ##
8006		-## ------------------------------------------------------------------------------------ ##
8007		-_ASBOX
8008		- ) \| sed "s/^/$as_me: WARNING: /" >&2
8009		- ;;
8010		-esac
8011		-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
8012		-$as_echo_n "checking for libintl.h... " >&6; }
8013		-if test "${ac_cv_header_libintl_h+set}" = set; then
8014		- $as_echo_n "(cached) " >&6
8015		-else
8016		- ac_cv_header_libintl_h=$ac_header_preproc
8017		-fi
8018		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
8019		-$as_echo "$ac_cv_header_libintl_h" >&6; }
8020		-
8021		-fi
8022		-if test "x$ac_cv_header_libintl_h" = x""yes; then
8023		+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
8024		+if test "x$ac_cv_header_libintl_h" = x""yes; then :
8025		gt_cv_func_dgettext_libintl="no"
8026		libintl_extra_libs=""
8027
8028		#
8029		# First check in libc
8030		#
8031		- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
8032		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
8033		$as_echo_n "checking for ngettext in libc... " >&6; }
8034		-if test "${gt_cv_func_ngettext_libc+set}" = set; then
8035		+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
8036		$as_echo_n "(cached) " >&6
8037		else
8038		- cat >conftest.$ac_ext <<_ACEOF
8039		-/* confdefs.h. */
8040		-_ACEOF
8041		-cat confdefs.h >>conftest.$ac_ext
8042		-cat >>conftest.$ac_ext <<_ACEOF
8043		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8044		/* end confdefs.h. */
8045
8046		#include <libintl.h>
8047		@@ -12750,201 +11495,57 @@
8048		return 0;
8049		}
8050		_ACEOF
8051		-rm -f conftest.$ac_objext conftest$ac_exeext
8052		-if { (ac_try="$ac_link"
8053		-case "(($ac_try" in
8054		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
8055		- *) ac_try_echo=$ac_try;;
8056		-esac
8057		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8058		-$as_echo "$ac_try_echo") >&5
8059		- (eval "$ac_link") 2>conftest.er1
8060		- ac_status=$?
8061		- grep -v '^ *+' conftest.er1 >conftest.err
8062		- rm -f conftest.er1
8063		- cat conftest.err >&5
8064		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8065		- (exit $ac_status); } && {
8066		- test -z "$ac_c_werror_flag" \|\|
8067		- test ! -s conftest.err
8068		- } && test -s conftest$ac_exeext && {
8069		- test "$cross_compiling" = yes \|\|
8070		- $as_test_x conftest$ac_exeext
8071		- }; then
8072		+if ac_fn_c_try_link "$LINENO"; then :
8073		gt_cv_func_ngettext_libc=yes
8074		else
8075		- $as_echo "$as_me: failed program was:" >&5
8076		-sed 's/^/\| /' conftest.$ac_ext >&5
8077		-
8078		- gt_cv_func_ngettext_libc=no
8079		+ gt_cv_func_ngettext_libc=no
8080		fi
8081		-
8082		-rm -rf conftest.dSYM
8083		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8084		- conftest$ac_exeext conftest.$ac_ext
8085		+rm -f core conftest.err conftest.$ac_objext \
8086		+ conftest$ac_exeext conftest.$ac_ext
8087
8088		fi
8089		-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
8090		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
8091		$as_echo "$gt_cv_func_ngettext_libc" >&6; }
8092
8093		if test "$gt_cv_func_ngettext_libc" = "yes" ; then
8094		- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
8095		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
8096		$as_echo_n "checking for dgettext in libc... " >&6; }
8097		-if test "${gt_cv_func_dgettext_libc+set}" = set; then
8098		- $as_echo_n "(cached) " >&6
8099		-else
8100		- cat >conftest.$ac_ext <<_ACEOF
8101		-/* confdefs.h. */
8102		-_ACEOF
8103		-cat confdefs.h >>conftest.$ac_ext
8104		-cat >>conftest.$ac_ext <<_ACEOF
8105		-/* end confdefs.h. */
8106		-
8107		-#include <libintl.h>
8108		-
8109		-int
8110		-main ()
8111		-{
8112		-return !dgettext ("","")
8113		- ;
8114		- return 0;
8115		-}
8116		-_ACEOF
8117		-rm -f conftest.$ac_objext conftest$ac_exeext
8118		-if { (ac_try="$ac_link"
8119		-case "(($ac_try" in
8120		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
8121		- *) ac_try_echo=$ac_try;;
8122		-esac
8123		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8124		-$as_echo "$ac_try_echo") >&5
8125		- (eval "$ac_link") 2>conftest.er1
8126		- ac_status=$?
8127		- grep -v '^ *+' conftest.er1 >conftest.err
8128		- rm -f conftest.er1
8129		- cat conftest.err >&5
8130		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8131		- (exit $ac_status); } && {
8132		- test -z "$ac_c_werror_flag" \|\|
8133		- test ! -s conftest.err
8134		- } && test -s conftest$ac_exeext && {
8135		- test "$cross_compiling" = yes \|\|
8136		- $as_test_x conftest$ac_exeext
8137		- }; then
8138		- gt_cv_func_dgettext_libc=yes
8139		-else
8140		- $as_echo "$as_me: failed program was:" >&5
8141		-sed 's/^/\| /' conftest.$ac_ext >&5
8142		-
8143		- gt_cv_func_dgettext_libc=no
8144		-fi
8145		-
8146		-rm -rf conftest.dSYM
8147		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8148		- conftest$ac_exeext conftest.$ac_ext
8149		-
8150		-fi
8151		-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
8152		-$as_echo "$gt_cv_func_dgettext_libc" >&6; }
8153		- fi
8154		-
8155		- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
8156		-
8157		-for ac_func in bind_textdomain_codeset
8158		-do
8159		-as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh`
8160		-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
8161		-$as_echo_n "checking for $ac_func... " >&6; }
8162		-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
8163		+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
8164		$as_echo_n "(cached) " >&6
8165		else
8166		- cat >conftest.$ac_ext <<_ACEOF
8167		-/* confdefs.h. */
8168		-_ACEOF
8169		-cat confdefs.h >>conftest.$ac_ext
8170		-cat >>conftest.$ac_ext <<_ACEOF
8171		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8172		/* end confdefs.h. */
8173		-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
8174		- For example, HP-UX 11i <limits.h> declares gettimeofday. */
8175		-#define $ac_func innocuous_$ac_func
8176		-
8177		-/* System header to define __stub macros and hopefully few prototypes,
8178		- which can conflict with char $ac_func (); below.
8179		- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8180		- <limits.h> exists even on freestanding compilers. */
8181		-
8182		-#ifdef __STDC__
8183		-# include <limits.h>
8184		-#else
8185		-# include <assert.h>
8186		-#endif
8187		-
8188		-#undef $ac_func
8189		-
8190		-/* Override any GCC internal prototype to avoid an error.
8191		- Use char because int might match the return type of a GCC
8192		- builtin and then its argument prototype would still apply. */
8193		-#ifdef __cplusplus
8194		-extern "C"
8195		-#endif
8196		-char $ac_func ();
8197		-/* The GNU C library defines this for functions which it implements
8198		- to always fail with ENOSYS. Some functions are actually named
8199		- something starting with __ and the normal name is an alias. */
8200		-#if defined __stub_$ac_func \|\| defined __stub___$ac_func
8201		-choke me
8202		-#endif
8203		+
8204		+#include <libintl.h>
8205
8206		int
8207		main ()
8208		{
8209		-return $ac_func ();
8210		+return !dgettext ("","")
8211		;
8212		return 0;
8213		}
8214		_ACEOF
8215		-rm -f conftest.$ac_objext conftest$ac_exeext
8216		-if { (ac_try="$ac_link"
8217		-case "(($ac_try" in
8218		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
8219		- *) ac_try_echo=$ac_try;;
8220		-esac
8221		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8222		-$as_echo "$ac_try_echo") >&5
8223		- (eval "$ac_link") 2>conftest.er1
8224		- ac_status=$?
8225		- grep -v '^ *+' conftest.er1 >conftest.err
8226		- rm -f conftest.er1
8227		- cat conftest.err >&5
8228		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8229		- (exit $ac_status); } && {
8230		- test -z "$ac_c_werror_flag" \|\|
8231		- test ! -s conftest.err
8232		- } && test -s conftest$ac_exeext && {
8233		- test "$cross_compiling" = yes \|\|
8234		- $as_test_x conftest$ac_exeext
8235		- }; then
8236		- eval "$as_ac_var=yes"
8237		+if ac_fn_c_try_link "$LINENO"; then :
8238		+ gt_cv_func_dgettext_libc=yes
8239		else
8240		- $as_echo "$as_me: failed program was:" >&5
8241		-sed 's/^/\| /' conftest.$ac_ext >&5
8242		-
8243		- eval "$as_ac_var=no"
8244		+ gt_cv_func_dgettext_libc=no
8245		fi
8246		+rm -f core conftest.err conftest.$ac_objext \
8247		+ conftest$ac_exeext conftest.$ac_ext
8248
8249		-rm -rf conftest.dSYM
8250		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8251		- conftest$ac_exeext conftest.$ac_ext
8252		fi
8253		-ac_res=`eval 'as_val=${'$as_ac_var'}
8254		- $as_echo "$as_val"'`
8255		- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
8256		-$as_echo "$ac_res" >&6; }
8257		-as_val=`eval 'as_val=${'$as_ac_var'}
8258		- $as_echo "$as_val"'`
8259		- if test "x$as_val" = x""yes; then
8260		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
8261		+$as_echo "$gt_cv_func_dgettext_libc" >&6; }
8262		+ fi
8263		+
8264		+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
8265		+ for ac_func in bind_textdomain_codeset
8266		+do :
8267		+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
8268		+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
8269		cat >>confdefs.h <<_ACEOF
8270		-#define `$as_echo "HAVE_$ac_func" \| $as_tr_cpp` 1
8271		+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
8272		_ACEOF
8273
8274		fi
8275		@@ -12959,18 +11560,14 @@
8276		\|\| test "$gt_cv_func_ngettext_libc" != "yes" \
8277		\|\| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
8278
8279		- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
8280		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
8281		$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
8282		-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
8283		+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
8284		$as_echo_n "(cached) " >&6
8285		else
8286		ac_check_lib_save_LIBS=$LIBS
8287		LIBS="-lintl $LIBS"
8288		-cat >conftest.$ac_ext <<_ACEOF
8289		-/* confdefs.h. */
8290		-_ACEOF
8291		-cat confdefs.h >>conftest.$ac_ext
8292		-cat >>conftest.$ac_ext <<_ACEOF
8293		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8294		/* end confdefs.h. */
8295
8296		/* Override any GCC internal prototype to avoid an error.
8297		@@ -12988,55 +11585,26 @@
8298		return 0;
8299		}
8300		_ACEOF
8301		-rm -f conftest.$ac_objext conftest$ac_exeext
8302		-if { (ac_try="$ac_link"
8303		-case "(($ac_try" in
8304		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
8305		- *) ac_try_echo=$ac_try;;
8306		-esac
8307		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8308		-$as_echo "$ac_try_echo") >&5
8309		- (eval "$ac_link") 2>conftest.er1
8310		- ac_status=$?
8311		- grep -v '^ *+' conftest.er1 >conftest.err
8312		- rm -f conftest.er1
8313		- cat conftest.err >&5
8314		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8315		- (exit $ac_status); } && {
8316		- test -z "$ac_c_werror_flag" \|\|
8317		- test ! -s conftest.err
8318		- } && test -s conftest$ac_exeext && {
8319		- test "$cross_compiling" = yes \|\|
8320		- $as_test_x conftest$ac_exeext
8321		- }; then
8322		+if ac_fn_c_try_link "$LINENO"; then :
8323		ac_cv_lib_intl_bindtextdomain=yes
8324		else
8325		- $as_echo "$as_me: failed program was:" >&5
8326		-sed 's/^/\| /' conftest.$ac_ext >&5
8327		-
8328		- ac_cv_lib_intl_bindtextdomain=no
8329		+ ac_cv_lib_intl_bindtextdomain=no
8330		fi
8331		-
8332		-rm -rf conftest.dSYM
8333		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8334		- conftest$ac_exeext conftest.$ac_ext
8335		+rm -f core conftest.err conftest.$ac_objext \
8336		+ conftest$ac_exeext conftest.$ac_ext
8337		LIBS=$ac_check_lib_save_LIBS
8338		fi
8339		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
8340		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
8341		$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
8342		-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
8343		- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
8344		+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
8345		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
8346		$as_echo_n "checking for ngettext in -lintl... " >&6; }
8347		-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
8348		+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
8349		$as_echo_n "(cached) " >&6
8350		else
8351		ac_check_lib_save_LIBS=$LIBS
8352		LIBS="-lintl $LIBS"
8353		-cat >conftest.$ac_ext <<_ACEOF
8354		-/* confdefs.h. */
8355		-_ACEOF
8356		-cat confdefs.h >>conftest.$ac_ext
8357		-cat >>conftest.$ac_ext <<_ACEOF
8358		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8359		/* end confdefs.h. */
8360
8361		/* Override any GCC internal prototype to avoid an error.
8362		@@ -13054,55 +11622,26 @@
8363		return 0;
8364		}
8365		_ACEOF
8366		-rm -f conftest.$ac_objext conftest$ac_exeext
8367		-if { (ac_try="$ac_link"
8368		-case "(($ac_try" in
8369		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
8370		- *) ac_try_echo=$ac_try;;
8371		-esac
8372		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8373		-$as_echo "$ac_try_echo") >&5
8374		- (eval "$ac_link") 2>conftest.er1
8375		- ac_status=$?
8376		- grep -v '^ *+' conftest.er1 >conftest.err
8377		- rm -f conftest.er1
8378		- cat conftest.err >&5
8379		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8380		- (exit $ac_status); } && {
8381		- test -z "$ac_c_werror_flag" \|\|
8382		- test ! -s conftest.err
8383		- } && test -s conftest$ac_exeext && {
8384		- test "$cross_compiling" = yes \|\|
8385		- $as_test_x conftest$ac_exeext
8386		- }; then
8387		+if ac_fn_c_try_link "$LINENO"; then :
8388		ac_cv_lib_intl_ngettext=yes
8389		else
8390		- $as_echo "$as_me: failed program was:" >&5
8391		-sed 's/^/\| /' conftest.$ac_ext >&5
8392		-
8393		- ac_cv_lib_intl_ngettext=no
8394		+ ac_cv_lib_intl_ngettext=no
8395		fi
8396		-
8397		-rm -rf conftest.dSYM
8398		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8399		- conftest$ac_exeext conftest.$ac_ext
8400		+rm -f core conftest.err conftest.$ac_objext \
8401		+ conftest$ac_exeext conftest.$ac_ext
8402		LIBS=$ac_check_lib_save_LIBS
8403		fi
8404		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
8405		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
8406		$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
8407		-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
8408		- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
8409		+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
8410		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
8411		$as_echo_n "checking for dgettext in -lintl... " >&6; }
8412		-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
8413		+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
8414		$as_echo_n "(cached) " >&6
8415		else
8416		ac_check_lib_save_LIBS=$LIBS
8417		LIBS="-lintl $LIBS"
8418		-cat >conftest.$ac_ext <<_ACEOF
8419		-/* confdefs.h. */
8420		-_ACEOF
8421		-cat confdefs.h >>conftest.$ac_ext
8422		-cat >>conftest.$ac_ext <<_ACEOF
8423		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8424		/* end confdefs.h. */
8425
8426		/* Override any GCC internal prototype to avoid an error.
8427		@@ -13120,43 +11659,18 @@
8428		return 0;
8429		}
8430		_ACEOF
8431		-rm -f conftest.$ac_objext conftest$ac_exeext
8432		-if { (ac_try="$ac_link"
8433		-case "(($ac_try" in
8434		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
8435		- *) ac_try_echo=$ac_try;;
8436		-esac
8437		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8438		-$as_echo "$ac_try_echo") >&5
8439		- (eval "$ac_link") 2>conftest.er1
8440		- ac_status=$?
8441		- grep -v '^ *+' conftest.er1 >conftest.err
8442		- rm -f conftest.er1
8443		- cat conftest.err >&5
8444		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8445		- (exit $ac_status); } && {
8446		- test -z "$ac_c_werror_flag" \|\|
8447		- test ! -s conftest.err
8448		- } && test -s conftest$ac_exeext && {
8449		- test "$cross_compiling" = yes \|\|
8450		- $as_test_x conftest$ac_exeext
8451		- }; then
8452		+if ac_fn_c_try_link "$LINENO"; then :
8453		ac_cv_lib_intl_dgettext=yes
8454		else
8455		- $as_echo "$as_me: failed program was:" >&5
8456		-sed 's/^/\| /' conftest.$ac_ext >&5
8457		-
8458		- ac_cv_lib_intl_dgettext=no
8459		+ ac_cv_lib_intl_dgettext=no
8460		fi
8461		-
8462		-rm -rf conftest.dSYM
8463		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8464		- conftest$ac_exeext conftest.$ac_ext
8465		+rm -f core conftest.err conftest.$ac_objext \
8466		+ conftest$ac_exeext conftest.$ac_ext
8467		LIBS=$ac_check_lib_save_LIBS
8468		fi
8469		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
8470		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
8471		$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
8472		-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
8473		+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
8474		gt_cv_func_dgettext_libintl=yes
8475		fi
8476
8477		@@ -13166,22 +11680,18 @@
8478
8479
8480		if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
8481		- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
8482		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
8483		$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
8484		- { $as_echo "$as_me:$LINENO: result: " >&5
8485		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
8486		$as_echo "" >&6; }
8487		- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
8488		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
8489		$as_echo_n "checking for ngettext in -lintl... " >&6; }
8490		-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
8491		+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
8492		$as_echo_n "(cached) " >&6
8493		else
8494		ac_check_lib_save_LIBS=$LIBS
8495		LIBS="-lintl -liconv $LIBS"
8496		-cat >conftest.$ac_ext <<_ACEOF
8497		-/* confdefs.h. */
8498		-_ACEOF
8499		-cat confdefs.h >>conftest.$ac_ext
8500		-cat >>conftest.$ac_ext <<_ACEOF
8501		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8502		/* end confdefs.h. */
8503
8504		/* Override any GCC internal prototype to avoid an error.
8505		@@ -13199,55 +11709,26 @@
8506		return 0;
8507		}
8508		_ACEOF
8509		-rm -f conftest.$ac_objext conftest$ac_exeext
8510		-if { (ac_try="$ac_link"
8511		-case "(($ac_try" in
8512		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
8513		- *) ac_try_echo=$ac_try;;
8514		-esac
8515		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8516		-$as_echo "$ac_try_echo") >&5
8517		- (eval "$ac_link") 2>conftest.er1
8518		- ac_status=$?
8519		- grep -v '^ *+' conftest.er1 >conftest.err
8520		- rm -f conftest.er1
8521		- cat conftest.err >&5
8522		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8523		- (exit $ac_status); } && {
8524		- test -z "$ac_c_werror_flag" \|\|
8525		- test ! -s conftest.err
8526		- } && test -s conftest$ac_exeext && {
8527		- test "$cross_compiling" = yes \|\|
8528		- $as_test_x conftest$ac_exeext
8529		- }; then
8530		+if ac_fn_c_try_link "$LINENO"; then :
8531		ac_cv_lib_intl_ngettext=yes
8532		else
8533		- $as_echo "$as_me: failed program was:" >&5
8534		-sed 's/^/\| /' conftest.$ac_ext >&5
8535		-
8536		- ac_cv_lib_intl_ngettext=no
8537		+ ac_cv_lib_intl_ngettext=no
8538		fi
8539		-
8540		-rm -rf conftest.dSYM
8541		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8542		- conftest$ac_exeext conftest.$ac_ext
8543		+rm -f core conftest.err conftest.$ac_objext \
8544		+ conftest$ac_exeext conftest.$ac_ext
8545		LIBS=$ac_check_lib_save_LIBS
8546		fi
8547		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
8548		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
8549		$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
8550		-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
8551		- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
8552		+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
8553		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
8554		$as_echo_n "checking for dcgettext in -lintl... " >&6; }
8555		-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
8556		+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
8557		$as_echo_n "(cached) " >&6
8558		else
8559		ac_check_lib_save_LIBS=$LIBS
8560		LIBS="-lintl -liconv $LIBS"
8561		-cat >conftest.$ac_ext <<_ACEOF
8562		-/* confdefs.h. */
8563		-_ACEOF
8564		-cat confdefs.h >>conftest.$ac_ext
8565		-cat >>conftest.$ac_ext <<_ACEOF
8566		+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8567		/* end confdefs.h. */
8568
8569		/* Override any GCC internal prototype to avoid an error.
8570		@@ -13265,43 +11746,18 @@
8571		return 0;
8572		}
8573		_ACEOF
8574		-rm -f conftest.$ac_objext conftest$ac_exeext
8575		-if { (ac_try="$ac_link"
8576		-case "(($ac_try" in
8577		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
8578		- *) ac_try_echo=$ac_try;;
8579		-esac
8580		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8581		-$as_echo "$ac_try_echo") >&5
8582		- (eval "$ac_link") 2>conftest.er1
8583		- ac_status=$?
8584		- grep -v '^ *+' conftest.er1 >conftest.err
8585		- rm -f conftest.er1
8586		- cat conftest.err >&5
8587		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8588		- (exit $ac_status); } && {
8589		- test -z "$ac_c_werror_flag" \|\|
8590		- test ! -s conftest.err
8591		- } && test -s conftest$ac_exeext && {
8592		- test "$cross_compiling" = yes \|\|
8593		- $as_test_x conftest$ac_exeext
8594		- }; then
8595		+if ac_fn_c_try_link "$LINENO"; then :
8596		ac_cv_lib_intl_dcgettext=yes
8597		else
8598		- $as_echo "$as_me: failed program was:" >&5
8599		-sed 's/^/\| /' conftest.$ac_ext >&5
8600		-
8601		- ac_cv_lib_intl_dcgettext=no
8602		+ ac_cv_lib_intl_dcgettext=no
8603		fi
8604		-
8605		-rm -rf conftest.dSYM
8606		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8607		- conftest$ac_exeext conftest.$ac_ext
8608		+rm -f core conftest.err conftest.$ac_objext \
8609		+ conftest$ac_exeext conftest.$ac_ext
8610		LIBS=$ac_check_lib_save_LIBS
8611		fi
8612		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
8613		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
8614		$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
8615		-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
8616		+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
8617		gt_cv_func_dgettext_libintl=yes
8618		libintl_extra_libs=-liconv
8619		else
8620		@@ -13323,102 +11779,12 @@
8621		glib_save_LIBS="$LIBS"
8622		LIBS="$LIBS -lintl $libintl_extra_libs"
8623		unset ac_cv_func_bind_textdomain_codeset
8624		-
8625		-for ac_func in bind_textdomain_codeset
8626		-do
8627		-as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh`
8628		-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
8629		-$as_echo_n "checking for $ac_func... " >&6; }
8630		-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
8631		- $as_echo_n "(cached) " >&6
8632		-else
8633		- cat >conftest.$ac_ext <<_ACEOF
8634		-/* confdefs.h. */
8635		-_ACEOF
8636		-cat confdefs.h >>conftest.$ac_ext
8637		-cat >>conftest.$ac_ext <<_ACEOF
8638		-/* end confdefs.h. */
8639		-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
8640		- For example, HP-UX 11i <limits.h> declares gettimeofday. */
8641		-#define $ac_func innocuous_$ac_func
8642		-
8643		-/* System header to define __stub macros and hopefully few prototypes,
8644		- which can conflict with char $ac_func (); below.
8645		- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8646		- <limits.h> exists even on freestanding compilers. */
8647		-
8648		-#ifdef __STDC__
8649		-# include <limits.h>
8650		-#else
8651		-# include <assert.h>
8652		-#endif
8653		-
8654		-#undef $ac_func
8655		-
8656		-/* Override any GCC internal prototype to avoid an error.
8657		- Use char because int might match the return type of a GCC
8658		- builtin and then its argument prototype would still apply. */
8659		-#ifdef __cplusplus
8660		-extern "C"
8661		-#endif
8662		-char $ac_func ();
8663		-/* The GNU C library defines this for functions which it implements
8664		- to always fail with ENOSYS. Some functions are actually named
8665		- something starting with __ and the normal name is an alias. */
8666		-#if defined __stub_$ac_func \|\| defined __stub___$ac_func
8667		-choke me
8668		-#endif
8669		-
8670		-int
8671		-main ()
8672		-{
8673		-return $ac_func ();
8674		- ;
8675		- return 0;
8676		-}
8677		-_ACEOF
8678		-rm -f conftest.$ac_objext conftest$ac_exeext
8679		-if { (ac_try="$ac_link"
8680		-case "(($ac_try" in
8681		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
8682		- *) ac_try_echo=$ac_try;;
8683		-esac
8684		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8685		-$as_echo "$ac_try_echo") >&5
8686		- (eval "$ac_link") 2>conftest.er1
8687		- ac_status=$?
8688		- grep -v '^ *+' conftest.er1 >conftest.err
8689		- rm -f conftest.er1
8690		- cat conftest.err >&5
8691		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8692		- (exit $ac_status); } && {
8693		- test -z "$ac_c_werror_flag" \|\|
8694		- test ! -s conftest.err
8695		- } && test -s conftest$ac_exeext && {
8696		- test "$cross_compiling" = yes \|\|
8697		- $as_test_x conftest$ac_exeext
8698		- }; then
8699		- eval "$as_ac_var=yes"
8700		-else
8701		- $as_echo "$as_me: failed program was:" >&5
8702		-sed 's/^/\| /' conftest.$ac_ext >&5
8703		-
8704		- eval "$as_ac_var=no"
8705		-fi
8706		-
8707		-rm -rf conftest.dSYM
8708		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8709		- conftest$ac_exeext conftest.$ac_ext
8710		-fi
8711		-ac_res=`eval 'as_val=${'$as_ac_var'}
8712		- $as_echo "$as_val"'`
8713		- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
8714		-$as_echo "$ac_res" >&6; }
8715		-as_val=`eval 'as_val=${'$as_ac_var'}
8716		- $as_echo "$as_val"'`
8717		- if test "x$as_val" = x""yes; then
8718		+ for ac_func in bind_textdomain_codeset
8719		+do :
8720		+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
8721		+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
8722		cat >>confdefs.h <<_ACEOF
8723		-#define `$as_echo "HAVE_$ac_func" \| $as_tr_cpp` 1
8724		+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
8725		_ACEOF
8726
8727		fi
8728		@@ -13440,159 +11806,67 @@
8729		if test "$gt_cv_func_dgettext_libc" = "yes" \
8730		\|\| test "$gt_cv_func_dgettext_libintl" = "yes"; then
8731		gt_cv_have_gettext=yes
8732		- fi
8733		-
8734		- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
8735		- INTLLIBS="-lintl $libintl_extra_libs"
8736		- fi
8737		-
8738		- if test "$gt_cv_have_gettext" = "yes"; then
8739		-
8740		-cat >>confdefs.h <<\_ACEOF
8741		-#define HAVE_GETTEXT 1
8742		-_ACEOF
8743		-
8744		- # Extract the first word of "msgfmt", so it can be a program name with args.
8745		-set dummy msgfmt; ac_word=$2
8746		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8747		-$as_echo_n "checking for $ac_word... " >&6; }
8748		-if test "${ac_cv_path_MSGFMT+set}" = set; then
8749		- $as_echo_n "(cached) " >&6
8750		-else
8751		- case "$MSGFMT" in
8752		- /*)
8753		- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
8754		- ;;
8755		- *)
8756		- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
8757		- for ac_dir in $PATH; do
8758		- test -z "$ac_dir" && ac_dir=.
8759		- if test -f $ac_dir/$ac_word; then
8760		- if test -z "`$ac_dir/$ac_word -h 2>&1 \| grep 'dv '`"; then
8761		- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
8762		- break
8763		- fi
8764		- fi
8765		- done
8766		- IFS="$ac_save_ifs"
8767		- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
8768		- ;;
8769		-esac
8770		-fi
8771		-MSGFMT="$ac_cv_path_MSGFMT"
8772		-if test "$MSGFMT" != "no"; then
8773		- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
8774		-$as_echo "$MSGFMT" >&6; }
8775		-else
8776		- { $as_echo "$as_me:$LINENO: result: no" >&5
8777		-$as_echo "no" >&6; }
8778		-fi
8779		- if test "$MSGFMT" != "no"; then
8780		- glib_save_LIBS="$LIBS"
8781		- LIBS="$LIBS $INTLLIBS"
8782		-
8783		-for ac_func in dcgettext
8784		-do
8785		-as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh`
8786		-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
8787		-$as_echo_n "checking for $ac_func... " >&6; }
8788		-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
8789		- $as_echo_n "(cached) " >&6
8790		-else
8791		- cat >conftest.$ac_ext <<_ACEOF
8792		-/* confdefs.h. */
8793		-_ACEOF
8794		-cat confdefs.h >>conftest.$ac_ext
8795		-cat >>conftest.$ac_ext <<_ACEOF
8796		-/* end confdefs.h. */
8797		-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
8798		- For example, HP-UX 11i <limits.h> declares gettimeofday. */
8799		-#define $ac_func innocuous_$ac_func
8800		-
8801		-/* System header to define __stub macros and hopefully few prototypes,
8802		- which can conflict with char $ac_func (); below.
8803		- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8804		- <limits.h> exists even on freestanding compilers. */
8805		-
8806		-#ifdef __STDC__
8807		-# include <limits.h>
8808		-#else
8809		-# include <assert.h>
8810		-#endif
8811		-
8812		-#undef $ac_func
8813		-
8814		-/* Override any GCC internal prototype to avoid an error.
8815		- Use char because int might match the return type of a GCC
8816		- builtin and then its argument prototype would still apply. */
8817		-#ifdef __cplusplus
8818		-extern "C"
8819		-#endif
8820		-char $ac_func ();
8821		-/* The GNU C library defines this for functions which it implements
8822		- to always fail with ENOSYS. Some functions are actually named
8823		- something starting with __ and the normal name is an alias. */
8824		-#if defined __stub_$ac_func \|\| defined __stub___$ac_func
8825		-choke me
8826		-#endif
8827		-
8828		-int
8829		-main ()
8830		-{
8831		-return $ac_func ();
8832		- ;
8833		- return 0;
8834		-}
8835		-_ACEOF
8836		-rm -f conftest.$ac_objext conftest$ac_exeext
8837		-if { (ac_try="$ac_link"
8838		-case "(($ac_try" in
8839		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
8840		- *) ac_try_echo=$ac_try;;
8841		-esac
8842		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8843		-$as_echo "$ac_try_echo") >&5
8844		- (eval "$ac_link") 2>conftest.er1
8845		- ac_status=$?
8846		- grep -v '^ *+' conftest.er1 >conftest.err
8847		- rm -f conftest.er1
8848		- cat conftest.err >&5
8849		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8850		- (exit $ac_status); } && {
8851		- test -z "$ac_c_werror_flag" \|\|
8852		- test ! -s conftest.err
8853		- } && test -s conftest$ac_exeext && {
8854		- test "$cross_compiling" = yes \|\|
8855		- $as_test_x conftest$ac_exeext
8856		- }; then
8857		- eval "$as_ac_var=yes"
8858		-else
8859		- $as_echo "$as_me: failed program was:" >&5
8860		-sed 's/^/\| /' conftest.$ac_ext >&5
8861		+ fi
8862
8863		- eval "$as_ac_var=no"
8864		-fi
8865		+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
8866		+ INTLLIBS="-lintl $libintl_extra_libs"
8867		+ fi
8868		+
8869		+ if test "$gt_cv_have_gettext" = "yes"; then
8870		+
8871		+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
8872
8873		-rm -rf conftest.dSYM
8874		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8875		- conftest$ac_exeext conftest.$ac_ext
8876		+ # Extract the first word of "msgfmt", so it can be a program name with args.
8877		+set dummy msgfmt; ac_word=$2
8878		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8879		+$as_echo_n "checking for $ac_word... " >&6; }
8880		+if test "${ac_cv_path_MSGFMT+set}" = set; then :
8881		+ $as_echo_n "(cached) " >&6
8882		+else
8883		+ case "$MSGFMT" in
8884		+ /*)
8885		+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
8886		+ ;;
8887		+ *)
8888		+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
8889		+ for ac_dir in $PATH; do
8890		+ test -z "$ac_dir" && ac_dir=.
8891		+ if test -f $ac_dir/$ac_word; then
8892		+ if test -z "`$ac_dir/$ac_word -h 2>&1 \| grep 'dv '`"; then
8893		+ ac_cv_path_MSGFMT="$ac_dir/$ac_word"
8894		+ break
8895		+ fi
8896		+ fi
8897		+ done
8898		+ IFS="$ac_save_ifs"
8899		+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
8900		+ ;;
8901		+esac
8902		fi
8903		-ac_res=`eval 'as_val=${'$as_ac_var'}
8904		- $as_echo "$as_val"'`
8905		- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
8906		-$as_echo "$ac_res" >&6; }
8907		-as_val=`eval 'as_val=${'$as_ac_var'}
8908		- $as_echo "$as_val"'`
8909		- if test "x$as_val" = x""yes; then
8910		+MSGFMT="$ac_cv_path_MSGFMT"
8911		+if test "$MSGFMT" != "no"; then
8912		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
8913		+$as_echo "$MSGFMT" >&6; }
8914		+else
8915		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8916		+$as_echo "no" >&6; }
8917		+fi
8918		+ if test "$MSGFMT" != "no"; then
8919		+ glib_save_LIBS="$LIBS"
8920		+ LIBS="$LIBS $INTLLIBS"
8921		+ for ac_func in dcgettext
8922		+do :
8923		+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
8924		+if test "x$ac_cv_func_dcgettext" = x""yes; then :
8925		cat >>confdefs.h <<_ACEOF
8926		-#define `$as_echo "HAVE_$ac_func" \| $as_tr_cpp` 1
8927		+#define HAVE_DCGETTEXT 1
8928		_ACEOF
8929
8930		fi
8931		done
8932
8933		MSGFMT_OPTS=
8934		- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
8935		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
8936		$as_echo_n "checking if msgfmt accepts -c... " >&6; }
8937		cat >conftest.foo <<_ACEOF
8938
8939		@@ -13607,14 +11881,14 @@
8940		"Content-Transfer-Encoding: 8bit\n"
8941
8942		_ACEOF
8943		-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
8944		+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
8945		($MSGFMT -c -o /dev/null conftest.foo) 2>&5
8946		ac_status=$?
8947		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8948		- (exit $ac_status); }; then
8949		- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
8950		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8951		+ test $ac_status = 0; }; then
8952		+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
8953		$as_echo "yes" >&6; }
8954		-else { $as_echo "$as_me:$LINENO: result: no" >&5
8955		+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8956		$as_echo "no" >&6; }
8957		echo "$as_me: failed input was:" >&5
8958		sed 's/^/\| /' conftest.foo >&5
8959		@@ -13622,9 +11896,9 @@
8960
8961		# Extract the first word of "gmsgfmt", so it can be a program name with args.
8962		set dummy gmsgfmt; ac_word=$2
8963		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8964		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8965		$as_echo_n "checking for $ac_word... " >&6; }
8966		-if test "${ac_cv_path_GMSGFMT+set}" = set; then
8967		+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
8968		$as_echo_n "(cached) " >&6
8969		else
8970		case $GMSGFMT in
8971		@@ -13637,14 +11911,14 @@
8972		do
8973		IFS=$as_save_IFS
8974		test -z "$as_dir" && as_dir=.
8975		- for ac_exec_ext in '' $ac_executable_extensions; do
8976		+ for ac_exec_ext in '' $ac_executable_extensions; do
8977		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8978		ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
8979		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8980		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8981		break 2
8982		fi
8983		done
8984		-done
8985		+ done
8986		IFS=$as_save_IFS
8987
8988		test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
8989		@@ -13653,19 +11927,19 @@
8990		fi
8991		GMSGFMT=$ac_cv_path_GMSGFMT
8992		if test -n "$GMSGFMT"; then
8993		- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
8994		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
8995		$as_echo "$GMSGFMT" >&6; }
8996		else
8997		- { $as_echo "$as_me:$LINENO: result: no" >&5
8998		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8999		$as_echo "no" >&6; }
9000		fi
9001
9002
9003		# Extract the first word of "xgettext", so it can be a program name with args.
9004		set dummy xgettext; ac_word=$2
9005		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9006		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9007		$as_echo_n "checking for $ac_word... " >&6; }
9008		-if test "${ac_cv_path_XGETTEXT+set}" = set; then
9009		+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
9010		$as_echo_n "(cached) " >&6
9011		else
9012		case "$XGETTEXT" in
9013		@@ -13690,18 +11964,14 @@
9014		fi
9015		XGETTEXT="$ac_cv_path_XGETTEXT"
9016		if test "$XGETTEXT" != ":"; then
9017		- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
9018		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
9019		$as_echo "$XGETTEXT" >&6; }
9020		else
9021		- { $as_echo "$as_me:$LINENO: result: no" >&5
9022		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9023		$as_echo "no" >&6; }
9024		fi
9025
9026		- cat >conftest.$ac_ext <<_ACEOF
9027		-/* confdefs.h. */
9028		-_ACEOF
9029		-cat confdefs.h >>conftest.$ac_ext
9030		-cat >>conftest.$ac_ext <<_ACEOF
9031		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9032		/* end confdefs.h. */
9033
9034		int
9035		@@ -13713,121 +11983,14 @@
9036		return 0;
9037		}
9038		_ACEOF
9039		-rm -f conftest.$ac_objext conftest$ac_exeext
9040		-if { (ac_try="$ac_link"
9041		-case "(($ac_try" in
9042		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
9043		- *) ac_try_echo=$ac_try;;
9044		-esac
9045		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9046		-$as_echo "$ac_try_echo") >&5
9047		- (eval "$ac_link") 2>conftest.er1
9048		- ac_status=$?
9049		- grep -v '^ *+' conftest.er1 >conftest.err
9050		- rm -f conftest.er1
9051		- cat conftest.err >&5
9052		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9053		- (exit $ac_status); } && {
9054		- test -z "$ac_c_werror_flag" \|\|
9055		- test ! -s conftest.err
9056		- } && test -s conftest$ac_exeext && {
9057		- test "$cross_compiling" = yes \|\|
9058		- $as_test_x conftest$ac_exeext
9059		- }; then
9060		+if ac_fn_c_try_link "$LINENO"; then :
9061		CATOBJEXT=.gmo
9062		DATADIRNAME=share
9063		else
9064		- $as_echo "$as_me: failed program was:" >&5
9065		-sed 's/^/\| /' conftest.$ac_ext >&5
9066		-
9067		- case $host in
9068		+ case $host in
9069		--solaris*)
9070		- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
9071		-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
9072		-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
9073		- $as_echo_n "(cached) " >&6
9074		-else
9075		- cat >conftest.$ac_ext <<_ACEOF
9076		-/* confdefs.h. */
9077		-_ACEOF
9078		-cat confdefs.h >>conftest.$ac_ext
9079		-cat >>conftest.$ac_ext <<_ACEOF
9080		-/* end confdefs.h. */
9081		-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
9082		- For example, HP-UX 11i <limits.h> declares gettimeofday. */
9083		-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
9084		-
9085		-/* System header to define __stub macros and hopefully few prototypes,
9086		- which can conflict with char bind_textdomain_codeset (); below.
9087		- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9088		- <limits.h> exists even on freestanding compilers. */
9089		-
9090		-#ifdef __STDC__
9091		-# include <limits.h>
9092		-#else
9093		-# include <assert.h>
9094		-#endif
9095		-
9096		-#undef bind_textdomain_codeset
9097		-
9098		-/* Override any GCC internal prototype to avoid an error.
9099		- Use char because int might match the return type of a GCC
9100		- builtin and then its argument prototype would still apply. */
9101		-#ifdef __cplusplus
9102		-extern "C"
9103		-#endif
9104		-char bind_textdomain_codeset ();
9105		-/* The GNU C library defines this for functions which it implements
9106		- to always fail with ENOSYS. Some functions are actually named
9107		- something starting with __ and the normal name is an alias. */
9108		-#if defined __stub_bind_textdomain_codeset \|\| defined __stub___bind_textdomain_codeset
9109		-choke me
9110		-#endif
9111		-
9112		-int
9113		-main ()
9114		-{
9115		-return bind_textdomain_codeset ();
9116		- ;
9117		- return 0;
9118		-}
9119		-_ACEOF
9120		-rm -f conftest.$ac_objext conftest$ac_exeext
9121		-if { (ac_try="$ac_link"
9122		-case "(($ac_try" in
9123		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
9124		- *) ac_try_echo=$ac_try;;
9125		-esac
9126		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9127		-$as_echo "$ac_try_echo") >&5
9128		- (eval "$ac_link") 2>conftest.er1
9129		- ac_status=$?
9130		- grep -v '^ *+' conftest.er1 >conftest.err
9131		- rm -f conftest.er1
9132		- cat conftest.err >&5
9133		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9134		- (exit $ac_status); } && {
9135		- test -z "$ac_c_werror_flag" \|\|
9136		- test ! -s conftest.err
9137		- } && test -s conftest$ac_exeext && {
9138		- test "$cross_compiling" = yes \|\|
9139		- $as_test_x conftest$ac_exeext
9140		- }; then
9141		- ac_cv_func_bind_textdomain_codeset=yes
9142		-else
9143		- $as_echo "$as_me: failed program was:" >&5
9144		-sed 's/^/\| /' conftest.$ac_ext >&5
9145		-
9146		- ac_cv_func_bind_textdomain_codeset=no
9147		-fi
9148		-
9149		-rm -rf conftest.dSYM
9150		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9151		- conftest$ac_exeext conftest.$ac_ext
9152		-fi
9153		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
9154		-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
9155		-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
9156		+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
9157		+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
9158		CATOBJEXT=.gmo
9159		DATADIRNAME=share
9160		else
9161		@@ -13842,10 +12005,8 @@
9162		;;
9163		esac
9164		fi
9165		-
9166		-rm -rf conftest.dSYM
9167		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9168		- conftest$ac_exeext conftest.$ac_ext
9169		+rm -f core conftest.err conftest.$ac_objext \
9170		+ conftest$ac_exeext conftest.$ac_ext
9171		LIBS="$glib_save_LIBS"
9172		INSTOBJEXT=.mo
9173		else
9174		@@ -13859,9 +12020,7 @@
9175
9176		if test "$gt_cv_have_gettext" = "yes" ; then
9177
9178		-cat >>confdefs.h <<\_ACEOF
9179		-#define ENABLE_NLS 1
9180		-_ACEOF
9181		+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
9182
9183		fi
9184
9185		@@ -13869,7 +12028,7 @@
9186		if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
9187		: ;
9188		else
9189		- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
9190		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
9191		$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
9192		XGETTEXT=":"
9193		fi
9194		@@ -13902,7 +12061,7 @@
9195		if test "x$ALL_LINGUAS" = "x"; then
9196		LINGUAS=
9197		else
9198		- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
9199		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
9200		$as_echo_n "checking for catalogs to be installed... " >&6; }
9201		NEW_LINGUAS=
9202		for presentlang in $ALL_LINGUAS; do
9203		@@ -13927,7 +12086,7 @@
9204		fi
9205		done
9206		LINGUAS=$NEW_LINGUAS
9207		- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
9208		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
9209		$as_echo "$LINGUAS" >&6; }
9210		fi
9211
9212		@@ -13960,16 +12119,16 @@
9213		< $srcdir/po/POTFILES.in > po/POTFILES
9214
9215
9216		- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
9217		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
9218		$as_echo_n "checking whether NLS is requested... " >&6; }
9219		# Check whether --enable-nls was given.
9220		-if test "${enable_nls+set}" = set; then
9221		+if test "${enable_nls+set}" = set; then :
9222		enableval=$enable_nls; USE_NLS=$enableval
9223		else
9224		USE_NLS=yes
9225		fi
9226
9227		- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
9228		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
9229		$as_echo "$USE_NLS" >&6; }
9230
9231
9232		@@ -13977,35 +12136,31 @@
9233
9234		case "$am__api_version" in
9235		1.01234)
9236		- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
9237		-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
9238		- { (exit 1); exit 1; }; }
9239		+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
9240		;;
9241		*)
9242		;;
9243		esac
9244
9245		if test -n "0.40.0"; then
9246		- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5
9247		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5
9248		$as_echo_n "checking for intltool >= 0.40.0... " >&6; }
9249
9250		INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 \| awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
9251		INTLTOOL_APPLIED_VERSION=`intltool-update --version \| head -1 \| cut -d" " -f3`
9252		INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION \| awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
9253
9254		- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
9255		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
9256		$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
9257		test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" \|\|
9258		- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5
9259		-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;}
9260		- { (exit 1); exit 1; }; }
9261		+ as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5
9262		fi
9263
9264		# Extract the first word of "intltool-update", so it can be a program name with args.
9265		set dummy intltool-update; ac_word=$2
9266		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9267		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9268		$as_echo_n "checking for $ac_word... " >&6; }
9269		-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
9270		+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
9271		$as_echo_n "(cached) " >&6
9272		else
9273		case $INTLTOOL_UPDATE in
9274		@@ -14018,14 +12173,14 @@
9275		do
9276		IFS=$as_save_IFS
9277		test -z "$as_dir" && as_dir=.
9278		- for ac_exec_ext in '' $ac_executable_extensions; do
9279		+ for ac_exec_ext in '' $ac_executable_extensions; do
9280		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9281		ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
9282		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9283		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9284		break 2
9285		fi
9286		done
9287		-done
9288		+ done
9289		IFS=$as_save_IFS
9290
9291		;;
9292		@@ -14033,19 +12188,19 @@
9293		fi
9294		INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
9295		if test -n "$INTLTOOL_UPDATE"; then
9296		- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
9297		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
9298		$as_echo "$INTLTOOL_UPDATE" >&6; }
9299		else
9300		- { $as_echo "$as_me:$LINENO: result: no" >&5
9301		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9302		$as_echo "no" >&6; }
9303		fi
9304
9305
9306		# Extract the first word of "intltool-merge", so it can be a program name with args.
9307		set dummy intltool-merge; ac_word=$2
9308		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9309		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9310		$as_echo_n "checking for $ac_word... " >&6; }
9311		-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
9312		+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
9313		$as_echo_n "(cached) " >&6
9314		else
9315		case $INTLTOOL_MERGE in
9316		@@ -14058,14 +12213,14 @@
9317		do
9318		IFS=$as_save_IFS
9319		test -z "$as_dir" && as_dir=.
9320		- for ac_exec_ext in '' $ac_executable_extensions; do
9321		+ for ac_exec_ext in '' $ac_executable_extensions; do
9322		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9323		ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
9324		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9325		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9326		break 2
9327		fi
9328		done
9329		-done
9330		+ done
9331		IFS=$as_save_IFS
9332
9333		;;
9334		@@ -14073,19 +12228,19 @@
9335		fi
9336		INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
9337		if test -n "$INTLTOOL_MERGE"; then
9338		- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
9339		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
9340		$as_echo "$INTLTOOL_MERGE" >&6; }
9341		else
9342		- { $as_echo "$as_me:$LINENO: result: no" >&5
9343		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9344		$as_echo "no" >&6; }
9345		fi
9346
9347
9348		# Extract the first word of "intltool-extract", so it can be a program name with args.
9349		set dummy intltool-extract; ac_word=$2
9350		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9351		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9352		$as_echo_n "checking for $ac_word... " >&6; }
9353		-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
9354		+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
9355		$as_echo_n "(cached) " >&6
9356		else
9357		case $INTLTOOL_EXTRACT in
9358		@@ -14098,14 +12253,14 @@
9359		do
9360		IFS=$as_save_IFS
9361		test -z "$as_dir" && as_dir=.
9362		- for ac_exec_ext in '' $ac_executable_extensions; do
9363		+ for ac_exec_ext in '' $ac_executable_extensions; do
9364		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9365		ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
9366		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9367		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9368		break 2
9369		fi
9370		done
9371		-done
9372		+ done
9373		IFS=$as_save_IFS
9374
9375		;;
9376		@@ -14113,18 +12268,16 @@
9377		fi
9378		INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
9379		if test -n "$INTLTOOL_EXTRACT"; then
9380		- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
9381		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
9382		$as_echo "$INTLTOOL_EXTRACT" >&6; }
9383		else
9384		- { $as_echo "$as_me:$LINENO: result: no" >&5
9385		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9386		$as_echo "no" >&6; }
9387		fi
9388
9389
9390		if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
9391		- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
9392		-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
9393		- { (exit 1); exit 1; }; }
9394		+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
9395		fi
9396
9397		INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
9398		@@ -14246,9 +12399,9 @@
9399		# Check the gettext tools to make sure they are GNU
9400		# Extract the first word of "xgettext", so it can be a program name with args.
9401		set dummy xgettext; ac_word=$2
9402		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9403		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9404		$as_echo_n "checking for $ac_word... " >&6; }
9405		-if test "${ac_cv_path_XGETTEXT+set}" = set; then
9406		+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
9407		$as_echo_n "(cached) " >&6
9408		else
9409		case $XGETTEXT in
9410		@@ -14261,14 +12414,14 @@
9411		do
9412		IFS=$as_save_IFS
9413		test -z "$as_dir" && as_dir=.
9414		- for ac_exec_ext in '' $ac_executable_extensions; do
9415		+ for ac_exec_ext in '' $ac_executable_extensions; do
9416		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9417		ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
9418		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9419		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9420		break 2
9421		fi
9422		done
9423		-done
9424		+ done
9425		IFS=$as_save_IFS
9426
9427		;;
9428		@@ -14276,19 +12429,19 @@
9429		fi
9430		XGETTEXT=$ac_cv_path_XGETTEXT
9431		if test -n "$XGETTEXT"; then
9432		- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
9433		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
9434		$as_echo "$XGETTEXT" >&6; }
9435		else
9436		- { $as_echo "$as_me:$LINENO: result: no" >&5
9437		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9438		$as_echo "no" >&6; }
9439		fi
9440
9441
9442		# Extract the first word of "msgmerge", so it can be a program name with args.
9443		set dummy msgmerge; ac_word=$2
9444		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9445		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9446		$as_echo_n "checking for $ac_word... " >&6; }
9447		-if test "${ac_cv_path_MSGMERGE+set}" = set; then
9448		+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
9449		$as_echo_n "(cached) " >&6
9450		else
9451		case $MSGMERGE in
9452		@@ -14301,14 +12454,14 @@
9453		do
9454		IFS=$as_save_IFS
9455		test -z "$as_dir" && as_dir=.
9456		- for ac_exec_ext in '' $ac_executable_extensions; do
9457		+ for ac_exec_ext in '' $ac_executable_extensions; do
9458		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9459		ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
9460		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9461		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9462		break 2
9463		fi
9464		done
9465		-done
9466		+ done
9467		IFS=$as_save_IFS
9468
9469		;;
9470		@@ -14316,19 +12469,19 @@
9471		fi
9472		MSGMERGE=$ac_cv_path_MSGMERGE
9473		if test -n "$MSGMERGE"; then
9474		- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
9475		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
9476		$as_echo "$MSGMERGE" >&6; }
9477		else
9478		- { $as_echo "$as_me:$LINENO: result: no" >&5
9479		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9480		$as_echo "no" >&6; }
9481		fi
9482
9483
9484		# Extract the first word of "msgfmt", so it can be a program name with args.
9485		set dummy msgfmt; ac_word=$2
9486		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9487		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9488		$as_echo_n "checking for $ac_word... " >&6; }
9489		-if test "${ac_cv_path_MSGFMT+set}" = set; then
9490		+if test "${ac_cv_path_MSGFMT+set}" = set; then :
9491		$as_echo_n "(cached) " >&6
9492		else
9493		case $MSGFMT in
9494		@@ -14341,14 +12494,14 @@
9495		do
9496		IFS=$as_save_IFS
9497		test -z "$as_dir" && as_dir=.
9498		- for ac_exec_ext in '' $ac_executable_extensions; do
9499		+ for ac_exec_ext in '' $ac_executable_extensions; do
9500		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9501		ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
9502		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9503		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9504		break 2
9505		fi
9506		done
9507		-done
9508		+ done
9509		IFS=$as_save_IFS
9510
9511		;;
9512		@@ -14356,19 +12509,19 @@
9513		fi
9514		MSGFMT=$ac_cv_path_MSGFMT
9515		if test -n "$MSGFMT"; then
9516		- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
9517		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
9518		$as_echo "$MSGFMT" >&6; }
9519		else
9520		- { $as_echo "$as_me:$LINENO: result: no" >&5
9521		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9522		$as_echo "no" >&6; }
9523		fi
9524
9525
9526		# Extract the first word of "gmsgfmt", so it can be a program name with args.
9527		set dummy gmsgfmt; ac_word=$2
9528		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9529		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9530		$as_echo_n "checking for $ac_word... " >&6; }
9531		-if test "${ac_cv_path_GMSGFMT+set}" = set; then
9532		+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
9533		$as_echo_n "(cached) " >&6
9534		else
9535		case $GMSGFMT in
9536		@@ -14381,14 +12534,14 @@
9537		do
9538		IFS=$as_save_IFS
9539		test -z "$as_dir" && as_dir=.
9540		- for ac_exec_ext in '' $ac_executable_extensions; do
9541		+ for ac_exec_ext in '' $ac_executable_extensions; do
9542		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9543		ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
9544		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9545		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9546		break 2
9547		fi
9548		done
9549		-done
9550		+ done
9551		IFS=$as_save_IFS
9552
9553		test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
9554		@@ -14397,33 +12550,29 @@
9555		fi
9556		GMSGFMT=$ac_cv_path_GMSGFMT
9557		if test -n "$GMSGFMT"; then
9558		- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
9559		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
9560		$as_echo "$GMSGFMT" >&6; }
9561		else
9562		- { $as_echo "$as_me:$LINENO: result: no" >&5
9563		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9564		$as_echo "no" >&6; }
9565		fi
9566
9567
9568		if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
9569		- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
9570		-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
9571		- { (exit 1); exit 1; }; }
9572		+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
9573		fi
9574		xgversion="`$XGETTEXT --version\|grep '(GNU ' 2> /dev/null`"
9575		mmversion="`$MSGMERGE --version\|grep '(GNU ' 2> /dev/null`"
9576		mfversion="`$MSGFMT --version\|grep '(GNU ' 2> /dev/null`"
9577		if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
9578		- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
9579		-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
9580		- { (exit 1); exit 1; }; }
9581		+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
9582		fi
9583
9584		# Extract the first word of "perl", so it can be a program name with args.
9585		set dummy perl; ac_word=$2
9586		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9587		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9588		$as_echo_n "checking for $ac_word... " >&6; }
9589		-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
9590		+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
9591		$as_echo_n "(cached) " >&6
9592		else
9593		case $INTLTOOL_PERL in
9594		@@ -14436,14 +12585,14 @@
9595		do
9596		IFS=$as_save_IFS
9597		test -z "$as_dir" && as_dir=.
9598		- for ac_exec_ext in '' $ac_executable_extensions; do
9599		+ for ac_exec_ext in '' $ac_executable_extensions; do
9600		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9601		ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
9602		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9603		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9604		break 2
9605		fi
9606		done
9607		-done
9608		+ done
9609		IFS=$as_save_IFS
9610
9611		;;
9612		@@ -14451,41 +12600,35 @@
9613		fi
9614		INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
9615		if test -n "$INTLTOOL_PERL"; then
9616		- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
9617		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
9618		$as_echo "$INTLTOOL_PERL" >&6; }
9619		else
9620		- { $as_echo "$as_me:$LINENO: result: no" >&5
9621		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9622		$as_echo "no" >&6; }
9623		fi
9624
9625
9626		if test -z "$INTLTOOL_PERL"; then
9627		- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
9628		-$as_echo "$as_me: error: perl not found" >&2;}
9629		- { (exit 1); exit 1; }; }
9630		+ as_fn_error "perl not found" "$LINENO" 5
9631		fi
9632		-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
9633		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
9634		$as_echo_n "checking for perl >= 5.8.1... " >&6; }
9635		$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
9636		if test $? -ne 0; then
9637		- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
9638		-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
9639		- { (exit 1); exit 1; }; }
9640		+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
9641		else
9642		IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
9643		- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
9644		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
9645		$as_echo "$IT_PERL_VERSION" >&6; }
9646		fi
9647		if test "x" != "xno-xml"; then
9648		- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
9649		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
9650		$as_echo_n "checking for XML::Parser... " >&6; }
9651		if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
9652		- { $as_echo "$as_me:$LINENO: result: ok" >&5
9653		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
9654		$as_echo "ok" >&6; }
9655		else
9656		- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
9657		-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
9658		- { (exit 1); exit 1; }; }
9659		+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
9660		fi
9661		fi
9662
9663		@@ -14495,11 +12638,7 @@
9664		# Set DATADIRNAME correctly if it is not set yet
9665		# (copied from glib-gettext.m4)
9666		if test -z "$DATADIRNAME"; then
9667		- cat >conftest.$ac_ext <<_ACEOF
9668		-/* confdefs.h. */
9669		-_ACEOF
9670		-cat confdefs.h >>conftest.$ac_ext
9671		-cat >>conftest.$ac_ext <<_ACEOF
9672		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9673		/* end confdefs.h. */
9674
9675		int
9676		@@ -14511,120 +12650,13 @@
9677		return 0;
9678		}
9679		_ACEOF
9680		-rm -f conftest.$ac_objext conftest$ac_exeext
9681		-if { (ac_try="$ac_link"
9682		-case "(($ac_try" in
9683		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
9684		- *) ac_try_echo=$ac_try;;
9685		-esac
9686		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9687		-$as_echo "$ac_try_echo") >&5
9688		- (eval "$ac_link") 2>conftest.er1
9689		- ac_status=$?
9690		- grep -v '^ *+' conftest.er1 >conftest.err
9691		- rm -f conftest.er1
9692		- cat conftest.err >&5
9693		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9694		- (exit $ac_status); } && {
9695		- test -z "$ac_c_werror_flag" \|\|
9696		- test ! -s conftest.err
9697		- } && test -s conftest$ac_exeext && {
9698		- test "$cross_compiling" = yes \|\|
9699		- $as_test_x conftest$ac_exeext
9700		- }; then
9701		+if ac_fn_c_try_link "$LINENO"; then :
9702		DATADIRNAME=share
9703		else
9704		- $as_echo "$as_me: failed program was:" >&5
9705		-sed 's/^/\| /' conftest.$ac_ext >&5
9706		-
9707		- case $host in
9708		+ case $host in
9709		--solaris*)
9710		- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
9711		-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
9712		-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
9713		- $as_echo_n "(cached) " >&6
9714		-else
9715		- cat >conftest.$ac_ext <<_ACEOF
9716		-/* confdefs.h. */
9717		-_ACEOF
9718		-cat confdefs.h >>conftest.$ac_ext
9719		-cat >>conftest.$ac_ext <<_ACEOF
9720		-/* end confdefs.h. */
9721		-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
9722		- For example, HP-UX 11i <limits.h> declares gettimeofday. */
9723		-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
9724		-
9725		-/* System header to define __stub macros and hopefully few prototypes,
9726		- which can conflict with char bind_textdomain_codeset (); below.
9727		- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9728		- <limits.h> exists even on freestanding compilers. */
9729		-
9730		-#ifdef __STDC__
9731		-# include <limits.h>
9732		-#else
9733		-# include <assert.h>
9734		-#endif
9735		-
9736		-#undef bind_textdomain_codeset
9737		-
9738		-/* Override any GCC internal prototype to avoid an error.
9739		- Use char because int might match the return type of a GCC
9740		- builtin and then its argument prototype would still apply. */
9741		-#ifdef __cplusplus
9742		-extern "C"
9743		-#endif
9744		-char bind_textdomain_codeset ();
9745		-/* The GNU C library defines this for functions which it implements
9746		- to always fail with ENOSYS. Some functions are actually named
9747		- something starting with __ and the normal name is an alias. */
9748		-#if defined __stub_bind_textdomain_codeset \|\| defined __stub___bind_textdomain_codeset
9749		-choke me
9750		-#endif
9751		-
9752		-int
9753		-main ()
9754		-{
9755		-return bind_textdomain_codeset ();
9756		- ;
9757		- return 0;
9758		-}
9759		-_ACEOF
9760		-rm -f conftest.$ac_objext conftest$ac_exeext
9761		-if { (ac_try="$ac_link"
9762		-case "(($ac_try" in
9763		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
9764		- *) ac_try_echo=$ac_try;;
9765		-esac
9766		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9767		-$as_echo "$ac_try_echo") >&5
9768		- (eval "$ac_link") 2>conftest.er1
9769		- ac_status=$?
9770		- grep -v '^ *+' conftest.er1 >conftest.err
9771		- rm -f conftest.er1
9772		- cat conftest.err >&5
9773		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9774		- (exit $ac_status); } && {
9775		- test -z "$ac_c_werror_flag" \|\|
9776		- test ! -s conftest.err
9777		- } && test -s conftest$ac_exeext && {
9778		- test "$cross_compiling" = yes \|\|
9779		- $as_test_x conftest$ac_exeext
9780		- }; then
9781		- ac_cv_func_bind_textdomain_codeset=yes
9782		-else
9783		- $as_echo "$as_me: failed program was:" >&5
9784		-sed 's/^/\| /' conftest.$ac_ext >&5
9785		-
9786		- ac_cv_func_bind_textdomain_codeset=no
9787		-fi
9788		-
9789		-rm -rf conftest.dSYM
9790		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9791		- conftest$ac_exeext conftest.$ac_ext
9792		-fi
9793		-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
9794		-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
9795		-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
9796		+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
9797		+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
9798		DATADIRNAME=share
9799		else
9800		DATADIRNAME=lib
9801		@@ -14636,10 +12668,8 @@
9802		;;
9803		esac
9804		fi
9805		-
9806		-rm -rf conftest.dSYM
9807		-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9808		- conftest$ac_exeext conftest.$ac_ext
9809		+rm -f core conftest.err conftest.$ac_objext \
9810		+ conftest$ac_exeext conftest.$ac_ext
9811		fi
9812
9813
9814		@@ -14665,9 +12695,9 @@
9815		if test -n "$ac_tool_prefix"; then
9816		# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
9817		set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
9818		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9819		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9820		$as_echo_n "checking for $ac_word... " >&6; }
9821		-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
9822		+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
9823		$as_echo_n "(cached) " >&6
9824		else
9825		case $PKG_CONFIG in
9826		@@ -14680,14 +12710,14 @@
9827		do
9828		IFS=$as_save_IFS
9829		test -z "$as_dir" && as_dir=.
9830		- for ac_exec_ext in '' $ac_executable_extensions; do
9831		+ for ac_exec_ext in '' $ac_executable_extensions; do
9832		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9833		ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
9834		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9835		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9836		break 2
9837		fi
9838		done
9839		-done
9840		+ done
9841		IFS=$as_save_IFS
9842
9843		;;
9844		@@ -14695,10 +12725,10 @@
9845		fi
9846		PKG_CONFIG=$ac_cv_path_PKG_CONFIG
9847		if test -n "$PKG_CONFIG"; then
9848		- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
9849		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
9850		$as_echo "$PKG_CONFIG" >&6; }
9851		else
9852		- { $as_echo "$as_me:$LINENO: result: no" >&5
9853		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9854		$as_echo "no" >&6; }
9855		fi
9856
9857		@@ -14708,9 +12738,9 @@
9858		ac_pt_PKG_CONFIG=$PKG_CONFIG
9859		# Extract the first word of "pkg-config", so it can be a program name with args.
9860		set dummy pkg-config; ac_word=$2
9861		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9862		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9863		$as_echo_n "checking for $ac_word... " >&6; }
9864		-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
9865		+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
9866		$as_echo_n "(cached) " >&6
9867		else
9868		case $ac_pt_PKG_CONFIG in
9869		@@ -14723,14 +12753,14 @@
9870		do
9871		IFS=$as_save_IFS
9872		test -z "$as_dir" && as_dir=.
9873		- for ac_exec_ext in '' $ac_executable_extensions; do
9874		+ for ac_exec_ext in '' $ac_executable_extensions; do
9875		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9876		ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
9877		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9878		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9879		break 2
9880		fi
9881		done
9882		-done
9883		+ done
9884		IFS=$as_save_IFS
9885
9886		;;
9887		@@ -14738,10 +12768,10 @@
9888		fi
9889		ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
9890		if test -n "$ac_pt_PKG_CONFIG"; then
9891		- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
9892		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
9893		$as_echo "$ac_pt_PKG_CONFIG" >&6; }
9894		else
9895		- { $as_echo "$as_me:$LINENO: result: no" >&5
9896		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9897		$as_echo "no" >&6; }
9898		fi
9899
9900		@@ -14750,7 +12780,7 @@
9901		else
9902		case $cross_compiling:$ac_tool_warned in
9903		yes:)
9904		-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
9905		+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9906		$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9907		ac_tool_warned=yes ;;
9908		esac
9909		@@ -14763,13 +12793,13 @@
9910		fi
9911		if test -n "$PKG_CONFIG"; then
9912		_pkg_min_version=0.9.0
9913		- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
9914		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
9915		$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
9916		if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
9917		- { $as_echo "$as_me:$LINENO: result: yes" >&5
9918		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9919		$as_echo "yes" >&6; }
9920		else
9921		- { $as_echo "$as_me:$LINENO: result: no" >&5
9922		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9923		$as_echo "no" >&6; }
9924		PKG_CONFIG=""
9925		fi
9926		@@ -14777,26 +12807,27 @@
9927		fi
9928
9929		pkg_failed=no
9930		-{ $as_echo "$as_me:$LINENO: checking for EOG" >&5
9931		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EOG" >&5
9932		$as_echo_n "checking for EOG... " >&6; }
9933
9934		-if test -n "$EOG_CFLAGS"; then
9935		- pkg_cv_EOG_CFLAGS="$EOG_CFLAGS"
9936		- elif test -n "$PKG_CONFIG"; then
9937		- if test -n "$PKG_CONFIG" && \
9938		- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
9939		+if test -n "$PKG_CONFIG"; then
9940		+ if test -n "$EOG_CFLAGS"; then
9941		+ pkg_cv_EOG_CFLAGS="$EOG_CFLAGS"
9942		+ else
9943		+ if test -n "$PKG_CONFIG" && \
9944		+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
9945		glib-2.0 >= 2.12.0
9946		gtk+-2.0 >= 2.12.0
9947		eog >= 2.19.0
9948		-\"") >&5
9949		+\""; } >&5
9950		($PKG_CONFIG --exists --print-errors "
9951		glib-2.0 >= 2.12.0
9952		gtk+-2.0 >= 2.12.0
9953		eog >= 2.19.0
9954		") 2>&5
9955		ac_status=$?
9956		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9957		- (exit $ac_status); }; then
9958		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9959		+ test $ac_status = 0; }; then
9960		pkg_cv_EOG_CFLAGS=`$PKG_CONFIG --cflags "
9961		glib-2.0 >= 2.12.0
9962		gtk+-2.0 >= 2.12.0
9963		@@ -14805,26 +12836,28 @@
9964		else
9965		pkg_failed=yes
9966		fi
9967		- else
9968		- pkg_failed=untried
9969		+ fi
9970		+else
9971		+ pkg_failed=untried
9972		fi
9973		-if test -n "$EOG_LIBS"; then
9974		- pkg_cv_EOG_LIBS="$EOG_LIBS"
9975		- elif test -n "$PKG_CONFIG"; then
9976		- if test -n "$PKG_CONFIG" && \
9977		- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
9978		+if test -n "$PKG_CONFIG"; then
9979		+ if test -n "$EOG_LIBS"; then
9980		+ pkg_cv_EOG_LIBS="$EOG_LIBS"
9981		+ else
9982		+ if test -n "$PKG_CONFIG" && \
9983		+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
9984		glib-2.0 >= 2.12.0
9985		gtk+-2.0 >= 2.12.0
9986		eog >= 2.19.0
9987		-\"") >&5
9988		+\""; } >&5
9989		($PKG_CONFIG --exists --print-errors "
9990		glib-2.0 >= 2.12.0
9991		gtk+-2.0 >= 2.12.0
9992		eog >= 2.19.0
9993		") 2>&5
9994		ac_status=$?
9995		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9996		- (exit $ac_status); }; then
9997		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9998		+ test $ac_status = 0; }; then
9999		pkg_cv_EOG_LIBS=`$PKG_CONFIG --libs "
10000		glib-2.0 >= 2.12.0
10001		gtk+-2.0 >= 2.12.0
10002		@@ -14833,8 +12866,9 @@
10003		else
10004		pkg_failed=yes
10005		fi
10006		- else
10007		- pkg_failed=untried
10008		+ fi
10009		+else
10010		+ pkg_failed=untried
10011		fi
10012
10013
10014		@@ -14847,37 +12881,22 @@
10015		_pkg_short_errors_supported=no
10016		fi
10017		if test $_pkg_short_errors_supported = yes; then
10018		- EOG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
10019		+ EOG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
10020		glib-2.0 >= 2.12.0
10021		gtk+-2.0 >= 2.12.0
10022		eog >= 2.19.0
10023		-" 2>&1`
10024		+"`
10025		else
10026		- EOG_PKG_ERRORS=`$PKG_CONFIG --print-errors "
10027		+ EOG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
10028		glib-2.0 >= 2.12.0
10029		gtk+-2.0 >= 2.12.0
10030		eog >= 2.19.0
10031		-" 2>&1`
10032		+"`
10033		fi
10034		# Put the nasty error message in config.log where it belongs
10035		echo "$EOG_PKG_ERRORS" >&5
10036
10037		- { { $as_echo "$as_me:$LINENO: error: Package requirements (
10038		- glib-2.0 >= 2.12.0
10039		- gtk+-2.0 >= 2.12.0
10040		- eog >= 2.19.0
10041		-) were not met:
10042		-
10043		-$EOG_PKG_ERRORS
10044		-
10045		-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10046		-installed software in a non-standard prefix.
10047		-
10048		-Alternatively, you may set the environment variables EOG_CFLAGS
10049		-and EOG_LIBS to avoid the need to call pkg-config.
10050		-See the pkg-config man page for more details.
10051		-" >&5
10052		-$as_echo "$as_me: error: Package requirements (
10053		+ as_fn_error "Package requirements (
10054		glib-2.0 >= 2.12.0
10055		gtk+-2.0 >= 2.12.0
10056		eog >= 2.19.0
10057		@@ -14891,22 +12910,11 @@
10058		Alternatively, you may set the environment variables EOG_CFLAGS
10059		and EOG_LIBS to avoid the need to call pkg-config.
10060		See the pkg-config man page for more details.
10061		-" >&2;}
10062		- { (exit 1); exit 1; }; }
10063		+" "$LINENO" 5
10064		elif test $pkg_failed = untried; then
10065		- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10066		+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10067		$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10068		-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10069		-is in your PATH or set the PKG_CONFIG environment variable to the full
10070		-path to pkg-config.
10071		-
10072		-Alternatively, you may set the environment variables EOG_CFLAGS
10073		-and EOG_LIBS to avoid the need to call pkg-config.
10074		-See the pkg-config man page for more details.
10075		-
10076		-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10077		-See \`config.log' for more details." >&5
10078		-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10079		+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10080		is in your PATH or set the PKG_CONFIG environment variable to the full
10081		path to pkg-config.
10082
10083		@@ -14915,12 +12923,11 @@
10084		See the pkg-config man page for more details.
10085
10086		To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10087		-See \`config.log' for more details." >&2;}
10088		- { (exit 1); exit 1; }; }; }
10089		+See \`config.log' for more details." "$LINENO" 5; }
10090		else
10091		EOG_CFLAGS=$pkg_cv_EOG_CFLAGS
10092		EOG_LIBS=$pkg_cv_EOG_LIBS
10093		- { $as_echo "$as_me:$LINENO: result: yes" >&5
10094		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10095		$as_echo "yes" >&6; }
10096		:
10097		fi
10098		@@ -14935,7 +12942,7 @@
10099		EOG_HAS_PYTHON=1
10100		#/FIXME
10101
10102		-{ $as_echo "$as_me:$LINENO: checking which plugins to build" >&5
10103		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which plugins to build" >&5
10104		$as_echo_n "checking which plugins to build... " >&6; }
10105
10106		ALL_PLUGINS="postr champlain fit-to-width exif-display"
10107		@@ -14954,12 +12961,12 @@
10108		USEFUL_PLUGINS="$USEFUL_PLUGINS $PYTHON_USEFUL_PLUGINS"
10109		DEFAULT_PLUGINS="$DEFAULT_PLUGINS $PYTHON_DEFAULT_PLUGINS"
10110		else
10111		- { $as_echo "$as_me:$LINENO: WARNING: eog compiled without python support, plugins $PYTHON_ALL_PLUGINS will not be available" >&5
10112		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: eog compiled without python support, plugins $PYTHON_ALL_PLUGINS will not be available" >&5
10113		$as_echo "$as_me: WARNING: eog compiled without python support, plugins $PYTHON_ALL_PLUGINS will not be available" >&2;}
10114		fi
10115
10116		# Check whether --with-plugins was given.
10117		-if test "${with_plugins+set}" = set; then
10118		+if test "${with_plugins+set}" = set; then :
10119		withval=$with_plugins; plugins=$with_plugins
10120		else
10121		plugins="default"
10122		@@ -14992,9 +12999,7 @@
10123		PLUGINS="$PLUGINS $ALL_PLUGINS"
10124		else
10125		IFS=$eogpl_save_ifs
10126		- { { $as_echo "$as_me:$LINENO: error: the specified plugin $pl does not exist" >&5
10127		-$as_echo "$as_me: error: the specified plugin $pl does not exist" >&2;}
10128		- { (exit 1); exit 1; }; }
10129		+ as_fn_error "the specified plugin $pl does not exist" "$LINENO" 5
10130		fi
10131
10132		if echo "$PYTHON_ALL_PLUGINS" \| egrep "(^\| )$pl(\$\| )" > /dev/null
10133		@@ -15004,7 +13009,7 @@
10134		done
10135		IFS="$eogpl_save_ifs"
10136
10137		-{ $as_echo "$as_me:$LINENO: result: $PLUGINS" >&5
10138		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PLUGINS" >&5
10139		$as_echo "$PLUGINS" >&6; }
10140
10141		# *****
10142		@@ -15013,9 +13018,9 @@
10143
10144		# Extract the first word of "gconftool-2", so it can be a program name with args.
10145		set dummy gconftool-2; ac_word=$2
10146		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10147		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10148		$as_echo_n "checking for $ac_word... " >&6; }
10149		-if test "${ac_cv_path_GCONFTOOL+set}" = set; then
10150		+if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
10151		$as_echo_n "(cached) " >&6
10152		else
10153		case $GCONFTOOL in
10154		@@ -15028,14 +13033,14 @@
10155		do
10156		IFS=$as_save_IFS
10157		test -z "$as_dir" && as_dir=.
10158		- for ac_exec_ext in '' $ac_executable_extensions; do
10159		+ for ac_exec_ext in '' $ac_executable_extensions; do
10160		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10161		ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
10162		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10163		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10164		break 2
10165		fi
10166		done
10167		-done
10168		+ done
10169		IFS=$as_save_IFS
10170
10171		;;
10172		@@ -15043,10 +13048,10 @@
10173		fi
10174		GCONFTOOL=$ac_cv_path_GCONFTOOL
10175		if test -n "$GCONFTOOL"; then
10176		- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
10177		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
10178		$as_echo "$GCONFTOOL" >&6; }
10179		else
10180		- { $as_echo "$as_me:$LINENO: result: no" >&5
10181		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10182		$as_echo "no" >&6; }
10183		fi
10184
10185		@@ -15061,13 +13066,13 @@
10186
10187
10188		# Check whether --with-gconf-source was given.
10189		-if test "${with_gconf_source+set}" = set; then
10190		+if test "${with_gconf_source+set}" = set; then :
10191		withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
10192		fi
10193
10194
10195
10196		- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
10197		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
10198		$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
10199
10200		if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
10201		@@ -15076,22 +13081,20 @@
10202
10203
10204		# Check whether --with-gconf-schema-file-dir was given.
10205		-if test "${with_gconf_schema_file_dir+set}" = set; then
10206		+if test "${with_gconf_schema_file_dir+set}" = set; then :
10207		withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
10208		fi
10209
10210
10211
10212		- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
10213		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
10214		$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
10215
10216		# Check whether --enable-schemas-install was given.
10217		-if test "${enable_schemas_install+set}" = set; then
10218		+if test "${enable_schemas_install+set}" = set; then :
10219		enableval=$enable_schemas_install; case ${enableval} in
10220		yes\|no) ;;
10221		- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
10222		-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
10223		- { (exit 1); exit 1; }; } ;;
10224		+ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
10225		esac
10226		fi
10227
10228		@@ -15109,18 +13112,18 @@
10229		# Python Support
10230		# **************
10231
10232		-{ $as_echo "$as_me:$LINENO: checking whether Python support is requested" >&5
10233		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Python support is requested" >&5
10234		$as_echo_n "checking whether Python support is requested... " >&6; }
10235
10236		# Check whether --enable-python was given.
10237		-if test "${enable_python+set}" = set; then
10238		+if test "${enable_python+set}" = set; then :
10239		enableval=$enable_python; enable_python=$enableval have_python=$enableval
10240		else
10241		enable_python=autodetect have_python=yes
10242		fi
10243
10244
10245		-{ $as_echo "$as_me:$LINENO: result: $enable_python" >&5
10246		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python" >&5
10247		$as_echo "$enable_python" >&6; }
10248
10249		if test "x$have_python" != "xno"; then
10250		@@ -15130,7 +13133,7 @@
10251
10252		if test -n "$PYTHON"; then
10253		# If the user set $PYTHON, use it and don't search something else.
10254		- { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.3" >&5
10255		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3" >&5
10256		$as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; }
10257		prog="import sys
10258		# split strings by '.' and convert to numeric. Append some zeros
10259		@@ -15145,22 +13148,19 @@
10260		($PYTHON -c "$prog") >&5 2>&5
10261		ac_status=$?
10262		echo "$as_me:$LINENO: \$? = $ac_status" >&5
10263		- (exit $ac_status); }; then
10264		- { $as_echo "$as_me:$LINENO: result: yes" >&5
10265		+ (exit $ac_status); }; then :
10266		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10267		$as_echo "yes" >&6; }
10268		else
10269		- { { $as_echo "$as_me:$LINENO: error: too old" >&5
10270		-$as_echo "$as_me: error: too old" >&2;}
10271		- { (exit 1); exit 1; }; }
10272		+ as_fn_error "too old" "$LINENO" 5
10273		fi
10274		-
10275		am_display_PYTHON=$PYTHON
10276		else
10277		# Otherwise, try each interpreter until we find one that satisfies
10278		# VERSION.
10279		- { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.3" >&5
10280		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3" >&5
10281		$as_echo_n "checking for a Python interpreter with version >= 2.3... " >&6; }
10282		-if test "${am_cv_pathless_PYTHON+set}" = set; then
10283		+if test "${am_cv_pathless_PYTHON+set}" = set; then :
10284		$as_echo_n "(cached) " >&6
10285		else
10286
10287		@@ -15179,13 +13179,12 @@
10288		($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
10289		ac_status=$?
10290		echo "$as_me:$LINENO: \$? = $ac_status" >&5
10291		- (exit $ac_status); }; then
10292		+ (exit $ac_status); }; then :
10293		break
10294		fi
10295		-
10296		done
10297		fi
10298		-{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
10299		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
10300		$as_echo "$am_cv_pathless_PYTHON" >&6; }
10301		# Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
10302		if test "$am_cv_pathless_PYTHON" = none; then
10303		@@ -15193,9 +13192,9 @@
10304		else
10305		# Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
10306		set dummy $am_cv_pathless_PYTHON; ac_word=$2
10307		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10308		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10309		$as_echo_n "checking for $ac_word... " >&6; }
10310		-if test "${ac_cv_path_PYTHON+set}" = set; then
10311		+if test "${ac_cv_path_PYTHON+set}" = set; then :
10312		$as_echo_n "(cached) " >&6
10313		else
10314		case $PYTHON in
10315		@@ -15208,14 +13207,14 @@
10316		do
10317		IFS=$as_save_IFS
10318		test -z "$as_dir" && as_dir=.
10319		- for ac_exec_ext in '' $ac_executable_extensions; do
10320		+ for ac_exec_ext in '' $ac_executable_extensions; do
10321		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10322		ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
10323		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10324		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10325		break 2
10326		fi
10327		done
10328		-done
10329		+ done
10330		IFS=$as_save_IFS
10331
10332		;;
10333		@@ -15223,10 +13222,10 @@
10334		fi
10335		PYTHON=$ac_cv_path_PYTHON
10336		if test -n "$PYTHON"; then
10337		- { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
10338		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
10339		$as_echo "$PYTHON" >&6; }
10340		else
10341		- { $as_echo "$as_me:$LINENO: result: no" >&5
10342		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10343		$as_echo "no" >&6; }
10344		fi
10345
10346		@@ -15241,14 +13240,14 @@
10347		else
10348
10349
10350		- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
10351		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
10352		$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
10353		-if test "${am_cv_python_version+set}" = set; then
10354		+if test "${am_cv_python_version+set}" = set; then :
10355		$as_echo_n "(cached) " >&6
10356		else
10357		am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
10358		fi
10359		-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
10360		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
10361		$as_echo "$am_cv_python_version" >&6; }
10362		PYTHON_VERSION=$am_cv_python_version
10363
10364		@@ -15260,23 +13259,23 @@
10365
10366
10367
10368		- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
10369		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
10370		$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
10371		-if test "${am_cv_python_platform+set}" = set; then
10372		+if test "${am_cv_python_platform+set}" = set; then :
10373		$as_echo_n "(cached) " >&6
10374		else
10375		am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
10376		fi
10377		-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
10378		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
10379		$as_echo "$am_cv_python_platform" >&6; }
10380		PYTHON_PLATFORM=$am_cv_python_platform
10381
10382
10383
10384
10385		- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
10386		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
10387		$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
10388		-if test "${am_cv_python_pythondir+set}" = set; then
10389		+if test "${am_cv_python_pythondir+set}" = set; then :
10390		$as_echo_n "(cached) " >&6
10391		else
10392		if test "x$prefix" = xNONE
10393		@@ -15295,7 +13294,7 @@
10394		esac
10395
10396		fi
10397		-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
10398		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
10399		$as_echo "$am_cv_python_pythondir" >&6; }
10400		pythondir=$am_cv_python_pythondir
10401
10402		@@ -15304,9 +13303,9 @@
10403		pkgpythondir=\${pythondir}/$PACKAGE
10404
10405
10406		- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
10407		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
10408		$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
10409		-if test "${am_cv_python_pyexecdir+set}" = set; then
10410		+if test "${am_cv_python_pyexecdir+set}" = set; then :
10411		$as_echo_n "(cached) " >&6
10412		else
10413		if test "x$exec_prefix" = xNONE
10414		@@ -15325,7 +13324,7 @@
10415		esac
10416
10417		fi
10418		-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
10419		+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
10420		$as_echo "$am_cv_python_pyexecdir" >&6; }
10421		pyexecdir=$am_cv_python_pyexecdir
10422
10423		@@ -15367,24 +13366,25 @@
10424
10425
10426		pkg_failed=no
10427		-{ $as_echo "$as_me:$LINENO: checking for PYGTK" >&5
10428		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5
10429		$as_echo_n "checking for PYGTK... " >&6; }
10430
10431		-if test -n "$PYGTK_CFLAGS"; then
10432		- pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
10433		- elif test -n "$PKG_CONFIG"; then
10434		- if test -n "$PKG_CONFIG" && \
10435		- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
10436		+if test -n "$PKG_CONFIG"; then
10437		+ if test -n "$PYGTK_CFLAGS"; then
10438		+ pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
10439		+ else
10440		+ if test -n "$PKG_CONFIG" && \
10441		+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
10442		pygobject-2.0 >= \$PYGOBJECT_REQUIRED
10443		gnome-python-2.0 >= \$GNOME_PYTHON_REQUIRED
10444		- pygtk-2.0 >= \$PYGTK_REQUIRED\"") >&5
10445		+ pygtk-2.0 >= \$PYGTK_REQUIRED\""; } >&5
10446		($PKG_CONFIG --exists --print-errors "
10447		pygobject-2.0 >= $PYGOBJECT_REQUIRED
10448		gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED
10449		pygtk-2.0 >= $PYGTK_REQUIRED") 2>&5
10450		ac_status=$?
10451		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10452		- (exit $ac_status); }; then
10453		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10454		+ test $ac_status = 0; }; then
10455		pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "
10456		pygobject-2.0 >= $PYGOBJECT_REQUIRED
10457		gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED
10458		@@ -15392,24 +13392,26 @@
10459		else
10460		pkg_failed=yes
10461		fi
10462		- else
10463		- pkg_failed=untried
10464		+ fi
10465		+else
10466		+ pkg_failed=untried
10467		fi
10468		-if test -n "$PYGTK_LIBS"; then
10469		- pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
10470		- elif test -n "$PKG_CONFIG"; then
10471		- if test -n "$PKG_CONFIG" && \
10472		- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
10473		+if test -n "$PKG_CONFIG"; then
10474		+ if test -n "$PYGTK_LIBS"; then
10475		+ pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
10476		+ else
10477		+ if test -n "$PKG_CONFIG" && \
10478		+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
10479		pygobject-2.0 >= \$PYGOBJECT_REQUIRED
10480		gnome-python-2.0 >= \$GNOME_PYTHON_REQUIRED
10481		- pygtk-2.0 >= \$PYGTK_REQUIRED\"") >&5
10482		+ pygtk-2.0 >= \$PYGTK_REQUIRED\""; } >&5
10483		($PKG_CONFIG --exists --print-errors "
10484		pygobject-2.0 >= $PYGOBJECT_REQUIRED
10485		gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED
10486		pygtk-2.0 >= $PYGTK_REQUIRED") 2>&5
10487		ac_status=$?
10488		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10489		- (exit $ac_status); }; then
10490		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10491		+ test $ac_status = 0; }; then
10492		pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs "
10493		pygobject-2.0 >= $PYGOBJECT_REQUIRED
10494		gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED
10495		@@ -15417,8 +13419,9 @@
10496		else
10497		pkg_failed=yes
10498		fi
10499		- else
10500		- pkg_failed=untried
10501		+ fi
10502		+else
10503		+ pkg_failed=untried
10504		fi
10505
10506
10507		@@ -15431,20 +13434,20 @@
10508		_pkg_short_errors_supported=no
10509		fi
10510		if test $_pkg_short_errors_supported = yes; then
10511		- PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
10512		+ PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
10513		pygobject-2.0 >= $PYGOBJECT_REQUIRED
10514		gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED
10515		- pygtk-2.0 >= $PYGTK_REQUIRED" 2>&1`
10516		+ pygtk-2.0 >= $PYGTK_REQUIRED"`
10517		else
10518		- PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "
10519		+ PYGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
10520		pygobject-2.0 >= $PYGOBJECT_REQUIRED
10521		gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED
10522		- pygtk-2.0 >= $PYGTK_REQUIRED" 2>&1`
10523		+ pygtk-2.0 >= $PYGTK_REQUIRED"`
10524		fi
10525		# Put the nasty error message in config.log where it belongs
10526		echo "$PYGTK_PKG_ERRORS" >&5
10527
10528		- { $as_echo "$as_me:$LINENO: result: no" >&5
10529		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10530		$as_echo "no" >&6; }
10531		have_python=no
10532		elif test $pkg_failed = untried; then
10533		@@ -15452,7 +13455,7 @@
10534		else
10535		PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS
10536		PYGTK_LIBS=$pkg_cv_PYGTK_LIBS
10537		- { $as_echo "$as_me:$LINENO: result: yes" >&5
10538		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10539		$as_echo "yes" >&6; }
10540		:
10541		fi
10542		@@ -15462,22 +13465,22 @@
10543		fi
10544
10545		if test "x$have_python" != "xno"; then
10546		- { $as_echo "$as_me:$LINENO: checking for pygtk defs" >&5
10547		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk defs" >&5
10548		$as_echo_n "checking for pygtk defs... " >&6; }
10549		PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
10550		- { $as_echo "$as_me:$LINENO: result: $PYGTK_DEFSDIR" >&5
10551		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_DEFSDIR" >&5
10552		$as_echo "$PYGTK_DEFSDIR" >&6; }
10553
10554		- { $as_echo "$as_me:$LINENO: checking for pygtk codegen" >&5
10555		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk codegen" >&5
10556		$as_echo_n "checking for pygtk codegen... " >&6; }
10557		PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
10558		- { $as_echo "$as_me:$LINENO: result: $PYGTK_CODEGEN" >&5
10559		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_CODEGEN" >&5
10560		$as_echo "$PYGTK_CODEGEN" >&6; }
10561
10562		- { $as_echo "$as_me:$LINENO: checking for pygtk h2def" >&5
10563		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk h2def" >&5
10564		$as_echo_n "checking for pygtk h2def... " >&6; }
10565		PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py"
10566		- { $as_echo "$as_me:$LINENO: result: $PYGTK_H2DEF" >&5
10567		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_H2DEF" >&5
10568		$as_echo "$PYGTK_H2DEF" >&6; }
10569
10570
10571		@@ -15487,13 +13490,9 @@
10572		FLAGS="-fno-strict-aliasing"
10573		save_CFLAGS="$CFLAGS"
10574		CFLAGS="$CFLAGS $FLAGS"
10575		- { $as_echo "$as_me:$LINENO: checking whether $CC understands $FLAGS" >&5
10576		+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands $FLAGS" >&5
10577		$as_echo_n "checking whether $CC understands $FLAGS... " >&6; }
10578		- cat >conftest.$ac_ext <<_ACEOF
10579		-/* confdefs.h. */
10580		-_ACEOF
10581		-cat confdefs.h >>conftest.$ac_ext
10582		-cat >>conftest.$ac_ext <<_ACEOF
10583		+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10584		/* end confdefs.h. */
10585
10586		int
10587		@@ -15504,35 +13503,14 @@
10588		return 0;
10589		}
10590		_ACEOF
10591		-rm -f conftest.$ac_objext
10592		-if { (ac_try="$ac_compile"
10593		-case "(($ac_try" in
10594		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
10595		- *) ac_try_echo=$ac_try;;
10596		-esac
10597		-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10598		-$as_echo "$ac_try_echo") >&5
10599		- (eval "$ac_compile") 2>conftest.er1
10600		- ac_status=$?
10601		- grep -v '^ *+' conftest.er1 >conftest.err
10602		- rm -f conftest.er1
10603		- cat conftest.err >&5
10604		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10605		- (exit $ac_status); } && {
10606		- test -z "$ac_c_werror_flag" \|\|
10607		- test ! -s conftest.err
10608		- } && test -s conftest.$ac_objext; then
10609		+if ac_fn_c_try_compile "$LINENO"; then :
10610		compiler_has_option=yes
10611		else
10612		- $as_echo "$as_me: failed program was:" >&5
10613		-sed 's/^/\| /' conftest.$ac_ext >&5
10614		-
10615		- compiler_has_option=no
10616		+ compiler_has_option=no
10617		fi
10618		-
10619		rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10620		CFLAGS="$save_CFLAGS"
10621		- { $as_echo "$as_me:$LINENO: result: $compiler_has_option" >&5
10622		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_has_option" >&5
10623		$as_echo "$compiler_has_option" >&6; }
10624		if test $compiler_has_option = yes; then
10625		NO_STRICT_ALIASING_CFLAGS="$FLAGS"
10626		@@ -15542,20 +13520,16 @@
10627
10628		if test "x$have_python" != "xyes"; then
10629		if test "x$enable_python" = "xyes"; then
10630		- { { $as_echo "$as_me:$LINENO: error: Python not found" >&5
10631		-$as_echo "$as_me: error: Python not found" >&2;}
10632		- { (exit 1); exit 1; }; }
10633		+ as_fn_error "Python not found" "$LINENO" 5
10634		elif test "x$enable_python" = "xautodetect"; then
10635		enable_python=no
10636		- { $as_echo "$as_me:$LINENO: WARNING: Python not found, disabling python support" >&5
10637		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python not found, disabling python support" >&5
10638		$as_echo "$as_me: WARNING: Python not found, disabling python support" >&2;}
10639		fi
10640		elif test "x$enable_python" != "xno"; then
10641		enable_python=yes
10642
10643		-cat >>confdefs.h <<\_ACEOF
10644		-#define ENABLE_PYTHON 1
10645		-_ACEOF
10646		+$as_echo "#define ENABLE_PYTHON 1" >>confdefs.h
10647
10648		fi
10649
10650		@@ -15621,9 +13595,9 @@
10651		then
10652		# Extract the first word of "postr", so it can be a program name with args.
10653		set dummy postr; ac_word=$2
10654		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10655		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10656		$as_echo_n "checking for $ac_word... " >&6; }
10657		-if test "${ac_cv_path_POSTR+set}" = set; then
10658		+if test "${ac_cv_path_POSTR+set}" = set; then :
10659		$as_echo_n "(cached) " >&6
10660		else
10661		case $POSTR in
10662		@@ -15636,14 +13610,14 @@
10663		do
10664		IFS=$as_save_IFS
10665		test -z "$as_dir" && as_dir=.
10666		- for ac_exec_ext in '' $ac_executable_extensions; do
10667		+ for ac_exec_ext in '' $ac_executable_extensions; do
10668		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10669		ac_cv_path_POSTR="$as_dir/$ac_word$ac_exec_ext"
10670		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10671		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10672		break 2
10673		fi
10674		done
10675		-done
10676		+ done
10677		IFS=$as_save_IFS
10678
10679		;;
10680		@@ -15651,10 +13625,10 @@
10681		fi
10682		POSTR=$ac_cv_path_POSTR
10683		if test -n "$POSTR"; then
10684		- { $as_echo "$as_me:$LINENO: result: $POSTR" >&5
10685		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POSTR" >&5
10686		$as_echo "$POSTR" >&6; }
10687		else
10688		- { $as_echo "$as_me:$LINENO: result: no" >&5
10689		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10690		$as_echo "no" >&6; }
10691		fi
10692
10693		@@ -15674,24 +13648,25 @@
10694
10695
10696		pkg_failed=no
10697		-{ $as_echo "$as_me:$LINENO: checking for CHAMPLAIN" >&5
10698		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHAMPLAIN" >&5
10699		$as_echo_n "checking for CHAMPLAIN... " >&6; }
10700
10701		-if test -n "$CHAMPLAIN_CFLAGS"; then
10702		- pkg_cv_CHAMPLAIN_CFLAGS="$CHAMPLAIN_CFLAGS"
10703		- elif test -n "$PKG_CONFIG"; then
10704		- if test -n "$PKG_CONFIG" && \
10705		- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" champlain-0.4 >= 0.4,
10706		+if test -n "$PKG_CONFIG"; then
10707		+ if test -n "$CHAMPLAIN_CFLAGS"; then
10708		+ pkg_cv_CHAMPLAIN_CFLAGS="$CHAMPLAIN_CFLAGS"
10709		+ else
10710		+ if test -n "$PKG_CONFIG" && \
10711		+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.4 >= 0.4,
10712		champlain-gtk-0.4 >= 0.4,
10713		clutter-gtk-0.10 >= 0.10,
10714		- libexif >= 0.6.16 \"") >&5
10715		+ libexif >= 0.6.16 \""; } >&5
10716		($PKG_CONFIG --exists --print-errors " champlain-0.4 >= 0.4,
10717		champlain-gtk-0.4 >= 0.4,
10718		clutter-gtk-0.10 >= 0.10,
10719		libexif >= 0.6.16 ") 2>&5
10720		ac_status=$?
10721		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10722		- (exit $ac_status); }; then
10723		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10724		+ test $ac_status = 0; }; then
10725		pkg_cv_CHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags " champlain-0.4 >= 0.4,
10726		champlain-gtk-0.4 >= 0.4,
10727		clutter-gtk-0.10 >= 0.10,
10728		@@ -15699,24 +13674,26 @@
10729		else
10730		pkg_failed=yes
10731		fi
10732		- else
10733		- pkg_failed=untried
10734		+ fi
10735		+else
10736		+ pkg_failed=untried
10737		fi
10738		-if test -n "$CHAMPLAIN_LIBS"; then
10739		- pkg_cv_CHAMPLAIN_LIBS="$CHAMPLAIN_LIBS"
10740		- elif test -n "$PKG_CONFIG"; then
10741		- if test -n "$PKG_CONFIG" && \
10742		- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" champlain-0.4 >= 0.4,
10743		+if test -n "$PKG_CONFIG"; then
10744		+ if test -n "$CHAMPLAIN_LIBS"; then
10745		+ pkg_cv_CHAMPLAIN_LIBS="$CHAMPLAIN_LIBS"
10746		+ else
10747		+ if test -n "$PKG_CONFIG" && \
10748		+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.4 >= 0.4,
10749		champlain-gtk-0.4 >= 0.4,
10750		clutter-gtk-0.10 >= 0.10,
10751		- libexif >= 0.6.16 \"") >&5
10752		+ libexif >= 0.6.16 \""; } >&5
10753		($PKG_CONFIG --exists --print-errors " champlain-0.4 >= 0.4,
10754		champlain-gtk-0.4 >= 0.4,
10755		clutter-gtk-0.10 >= 0.10,
10756		libexif >= 0.6.16 ") 2>&5
10757		ac_status=$?
10758		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10759		- (exit $ac_status); }; then
10760		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10761		+ test $ac_status = 0; }; then
10762		pkg_cv_CHAMPLAIN_LIBS=`$PKG_CONFIG --libs " champlain-0.4 >= 0.4,
10763		champlain-gtk-0.4 >= 0.4,
10764		clutter-gtk-0.10 >= 0.10,
10765		@@ -15724,8 +13701,9 @@
10766		else
10767		pkg_failed=yes
10768		fi
10769		- else
10770		- pkg_failed=untried
10771		+ fi
10772		+else
10773		+ pkg_failed=untried
10774		fi
10775
10776
10777		@@ -15738,20 +13716,20 @@
10778		_pkg_short_errors_supported=no
10779		fi
10780		if test $_pkg_short_errors_supported = yes; then
10781		- CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " champlain-0.4 >= 0.4,
10782		+ CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " champlain-0.4 >= 0.4,
10783		champlain-gtk-0.4 >= 0.4,
10784		clutter-gtk-0.10 >= 0.10,
10785		- libexif >= 0.6.16 " 2>&1`
10786		+ libexif >= 0.6.16 "`
10787		else
10788		- CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors " champlain-0.4 >= 0.4,
10789		+ CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " champlain-0.4 >= 0.4,
10790		champlain-gtk-0.4 >= 0.4,
10791		clutter-gtk-0.10 >= 0.10,
10792		- libexif >= 0.6.16 " 2>&1`
10793		+ libexif >= 0.6.16 "`
10794		fi
10795		# Put the nasty error message in config.log where it belongs
10796		echo "$CHAMPLAIN_PKG_ERRORS" >&5
10797
10798		- { $as_echo "$as_me:$LINENO: result: no" >&5
10799		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10800		$as_echo "no" >&6; }
10801		have_champlain=no
10802		elif test $pkg_failed = untried; then
10803		@@ -15759,7 +13737,7 @@
10804		else
10805		CHAMPLAIN_CFLAGS=$pkg_cv_CHAMPLAIN_CFLAGS
10806		CHAMPLAIN_LIBS=$pkg_cv_CHAMPLAIN_LIBS
10807		- { $as_echo "$as_me:$LINENO: result: yes" >&5
10808		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10809		$as_echo "yes" >&6; }
10810		:
10811		fi
10812		@@ -15780,40 +13758,44 @@
10813
10814
10815		pkg_failed=no
10816		-{ $as_echo "$as_me:$LINENO: checking for EXIFDISPLAY" >&5
10817		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXIFDISPLAY" >&5
10818		$as_echo_n "checking for EXIFDISPLAY... " >&6; }
10819
10820		-if test -n "$EXIFDISPLAY_CFLAGS"; then
10821		- pkg_cv_EXIFDISPLAY_CFLAGS="$EXIFDISPLAY_CFLAGS"
10822		- elif test -n "$PKG_CONFIG"; then
10823		- if test -n "$PKG_CONFIG" && \
10824		- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libexif >= 0.6.16 \"") >&5
10825		+if test -n "$PKG_CONFIG"; then
10826		+ if test -n "$EXIFDISPLAY_CFLAGS"; then
10827		+ pkg_cv_EXIFDISPLAY_CFLAGS="$EXIFDISPLAY_CFLAGS"
10828		+ else
10829		+ if test -n "$PKG_CONFIG" && \
10830		+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libexif >= 0.6.16 \""; } >&5
10831		($PKG_CONFIG --exists --print-errors " libexif >= 0.6.16 ") 2>&5
10832		ac_status=$?
10833		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10834		- (exit $ac_status); }; then
10835		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10836		+ test $ac_status = 0; }; then
10837		pkg_cv_EXIFDISPLAY_CFLAGS=`$PKG_CONFIG --cflags " libexif >= 0.6.16 " 2>/dev/null`
10838		else
10839		pkg_failed=yes
10840		fi
10841		- else
10842		- pkg_failed=untried
10843		+ fi
10844		+else
10845		+ pkg_failed=untried
10846		fi
10847		-if test -n "$EXIFDISPLAY_LIBS"; then
10848		- pkg_cv_EXIFDISPLAY_LIBS="$EXIFDISPLAY_LIBS"
10849		- elif test -n "$PKG_CONFIG"; then
10850		- if test -n "$PKG_CONFIG" && \
10851		- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libexif >= 0.6.16 \"") >&5
10852		+if test -n "$PKG_CONFIG"; then
10853		+ if test -n "$EXIFDISPLAY_LIBS"; then
10854		+ pkg_cv_EXIFDISPLAY_LIBS="$EXIFDISPLAY_LIBS"
10855		+ else
10856		+ if test -n "$PKG_CONFIG" && \
10857		+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libexif >= 0.6.16 \""; } >&5
10858		($PKG_CONFIG --exists --print-errors " libexif >= 0.6.16 ") 2>&5
10859		ac_status=$?
10860		- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10861		- (exit $ac_status); }; then
10862		+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10863		+ test $ac_status = 0; }; then
10864		pkg_cv_EXIFDISPLAY_LIBS=`$PKG_CONFIG --libs " libexif >= 0.6.16 " 2>/dev/null`
10865		else
10866		pkg_failed=yes
10867		fi
10868		- else
10869		- pkg_failed=untried
10870		+ fi
10871		+else
10872		+ pkg_failed=untried
10873		fi
10874
10875
10876		@@ -15826,14 +13808,14 @@
10877		_pkg_short_errors_supported=no
10878		fi
10879		if test $_pkg_short_errors_supported = yes; then
10880		- EXIFDISPLAY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libexif >= 0.6.16 " 2>&1`
10881		+ EXIFDISPLAY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " libexif >= 0.6.16 "`
10882		else
10883		- EXIFDISPLAY_PKG_ERRORS=`$PKG_CONFIG --print-errors " libexif >= 0.6.16 " 2>&1`
10884		+ EXIFDISPLAY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " libexif >= 0.6.16 "`
10885		fi
10886		# Put the nasty error message in config.log where it belongs
10887		echo "$EXIFDISPLAY_PKG_ERRORS" >&5
10888
10889		- { $as_echo "$as_me:$LINENO: result: no" >&5
10890		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10891		$as_echo "no" >&6; }
10892		have_exifdisplay=no
10893		elif test $pkg_failed = untried; then
10894		@@ -15841,7 +13823,7 @@
10895		else
10896		EXIFDISPLAY_CFLAGS=$pkg_cv_EXIFDISPLAY_CFLAGS
10897		EXIFDISPLAY_LIBS=$pkg_cv_EXIFDISPLAY_LIBS
10898		- { $as_echo "$as_me:$LINENO: result: yes" >&5
10899		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10900		$as_echo "yes" >&6; }
10901		:
10902		fi
10903		@@ -15869,9 +13851,9 @@
10904		# ****
10905		# Extract the first word of "glib-genmarshal", so it can be a program name with args.
10906		set dummy glib-genmarshal; ac_word=$2
10907		-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10908		+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10909		$as_echo_n "checking for $ac_word... " >&6; }
10910		-if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then
10911		+if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then :
10912		$as_echo_n "(cached) " >&6
10913		else
10914		case $GLIB_GENMARSHAL in
10915		@@ -15884,14 +13866,14 @@
10916		do
10917		IFS=$as_save_IFS
10918		test -z "$as_dir" && as_dir=.
10919		- for ac_exec_ext in '' $ac_executable_extensions; do
10920		+ for ac_exec_ext in '' $ac_executable_extensions; do
10921		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10922		ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
10923		- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10924		+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10925		break 2
10926		fi
10927		done
10928		-done
10929		+ done
10930		IFS=$as_save_IFS
10931
10932		;;
10933		@@ -15899,10 +13881,10 @@
10934		fi
10935		GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
10936		if test -n "$GLIB_GENMARSHAL"; then
10937		- { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
10938		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5
10939		$as_echo "$GLIB_GENMARSHAL" >&6; }
10940		else
10941		- { $as_echo "$as_me:$LINENO: result: no" >&5
10942		+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10943		$as_echo "no" >&6; }
10944		fi
10945
10946		@@ -15941,13 +13923,13 @@
10947		case $ac_val in #(
10948		${as_nl})
10949		case $ac_var in #(
10950		- _cv_) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
10951		+ _cv_) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
10952		$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
10953		esac
10954		case $ac_var in #(
10955		_ \| IFS \| as_nl) ;; #(
10956		BASH_ARGV \| BASH_SOURCE) eval $ac_var= ;; #(
10957		- *) $as_unset $ac_var ;;
10958		+ *) { eval $ac_var=; unset $ac_var;} ;;
10959		esac ;;
10960		esac
10961		done
10962		@@ -15955,8 +13937,8 @@
10963		(set) 2>&1 \|
10964		case $as_nl`(ac_space=' '; set) 2>&1` in #(
10965		${as_nl}ac_space=\ )
10966		- # `set' does not quote correctly, so add quotes (double-quote
10967		- # substitution turns \\\\ into \\, and sed turns \\ into \).
10968		+ # `set' does not quote correctly, so add quotes: double-quote
10969		+ # substitution turns \\\\ into \\, and sed turns \\ into \.
10970		sed -n \
10971		"s/'/'\\\\''/g;
10972		s/^\$[_$as_cr_alnum]_cv_[_$as_cr_alnum]\$=\$.*\$/\\1='\\2'/p"
10973		@@ -15979,11 +13961,11 @@
10974		if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
10975		if test -w "$cache_file"; then
10976		test "x$cache_file" != "x/dev/null" &&
10977		- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
10978		+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
10979		$as_echo "$as_me: updating cache $cache_file" >&6;}
10980		cat confcache >$cache_file
10981		else
10982		- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
10983		+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
10984		$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
10985		fi
10986		fi
10987		@@ -16003,8 +13985,8 @@
10988		ac_i=`$as_echo "$ac_i" \| sed "$ac_script"`
10989		# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
10990		# will be set to the directory where LIBOBJS objects are built.
10991		- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
10992		- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
10993		+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
10994		+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
10995		done
10996		LIBOBJS=$ac_libobjs
10997
10998		@@ -16020,59 +14002,42 @@
10999		fi
11000
11001		if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
11002		- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
11003		-Usually this means the macro was only invoked conditionally." >&5
11004		-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
11005		-Usually this means the macro was only invoked conditionally." >&2;}
11006		- { (exit 1); exit 1; }; }
11007		+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
11008		+Usually this means the macro was only invoked conditionally." "$LINENO" 5
11009		fi
11010		if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
11011		- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
11012		-Usually this means the macro was only invoked conditionally." >&5
11013		-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
11014		-Usually this means the macro was only invoked conditionally." >&2;}
11015		- { (exit 1); exit 1; }; }
11016		+ as_fn_error "conditional \"AMDEP\" was never defined.
11017		+Usually this means the macro was only invoked conditionally." "$LINENO" 5
11018		fi
11019		if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
11020		- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
11021		-Usually this means the macro was only invoked conditionally." >&5
11022		-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
11023		-Usually this means the macro was only invoked conditionally." >&2;}
11024		- { (exit 1); exit 1; }; }
11025		+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
11026		+Usually this means the macro was only invoked conditionally." "$LINENO" 5
11027		fi
11028		if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
11029		- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
11030		-Usually this means the macro was only invoked conditionally." >&5
11031		-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
11032		-Usually this means the macro was only invoked conditionally." >&2;}
11033		- { (exit 1); exit 1; }; }
11034		+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
11035		+Usually this means the macro was only invoked conditionally." "$LINENO" 5
11036		fi
11037
11038		ac_config_commands="$ac_config_commands po/stamp-it"
11039
11040
11041		if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
11042		- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
11043		-Usually this means the macro was only invoked conditionally." >&5
11044		-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
11045		-Usually this means the macro was only invoked conditionally." >&2;}
11046		- { (exit 1); exit 1; }; }
11047		+ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
11048		+Usually this means the macro was only invoked conditionally." "$LINENO" 5
11049		fi
11050		if test -z "${ENABLE_PYTHON_TRUE}" && test -z "${ENABLE_PYTHON_FALSE}"; then
11051		- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_PYTHON\" was never defined.
11052		-Usually this means the macro was only invoked conditionally." >&5
11053		-$as_echo "$as_me: error: conditional \"ENABLE_PYTHON\" was never defined.
11054		-Usually this means the macro was only invoked conditionally." >&2;}
11055		- { (exit 1); exit 1; }; }
11056		+ as_fn_error "conditional \"ENABLE_PYTHON\" was never defined.
11057		+Usually this means the macro was only invoked conditionally." "$LINENO" 5
11058		fi
11059
11060		: ${CONFIG_STATUS=./config.status}
11061		ac_write_fail=0
11062		ac_clean_files_save=$ac_clean_files
11063		ac_clean_files="$ac_clean_files $CONFIG_STATUS"
11064		-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
11065		+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
11066		$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
11067		-cat >$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
11068		+as_write_fail=0
11069		+cat >$CONFIG_STATUS <<_ASEOF \|\| as_write_fail=1
11070		#! $SHELL
11071		# Generated by $as_me.
11072		# Run this file to recreate the current configuration.
11073		@@ -16082,17 +14047,18 @@
11074		debug=false
11075		ac_cs_recheck=false
11076		ac_cs_silent=false
11077		-SHELL=\${CONFIG_SHELL-$SHELL}
11078		-_ACEOF
11079
11080		-cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
11081		-## --------------------- ##
11082		-## M4sh Initialization. ##
11083		-## --------------------- ##
11084		+SHELL=\${CONFIG_SHELL-$SHELL}
11085		+export SHELL
11086		+_ASEOF
11087		+cat >>$CONFIG_STATUS <<\_ASEOF \|\| as_write_fail=1
11088		+## -------------------- ##
11089		+## M4sh Initialization. ##
11090		+## -------------------- ##
11091
11092		# Be more Bourne compatible
11093		DUALCASE=1; export DUALCASE # for MKS sh
11094		-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
11095		+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
11096		emulate sh
11097		NULLCMD=:
11098		# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
11099		@@ -16100,23 +14066,15 @@
11100		alias -g '${1+"$@"}'='"$@"'
11101		setopt NO_GLOB_SUBST
11102		else
11103		- case `(set -o) 2>/dev/null` in
11104		- posix) set -o posix ;;
11105		+ case `(set -o) 2>/dev/null` in #(
11106		+ posix) :
11107		+ set -o posix ;; #(
11108		+ *) :
11109		+ ;;
11110		esac
11111		-
11112		fi
11113
11114
11115		-
11116		-
11117		-# PATH needs CR
11118		-# Avoid depending upon Character Ranges.
11119		-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
11120		-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
11121		-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
11122		-as_cr_digits='0123456789'
11123		-as_cr_alnum=$as_cr_Letters$as_cr_digits
11124		-
11125		as_nl='
11126		'
11127		export as_nl
11128		@@ -16124,7 +14082,13 @@
11129		as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
11130		as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
11131		as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
11132		-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
11133		+# Prefer a ksh shell builtin over an external printf program on Solaris,
11134		+# but without wasting forks for bash or zsh.
11135		+if test -z "$BASH_VERSION$ZSH_VERSION" \
11136		+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
11137		+ as_echo='print -r --'
11138		+ as_echo_n='print -rn --'
11139		+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
11140		as_echo='printf %s\n'
11141		as_echo_n='printf %s'
11142		else
11143		@@ -16135,7 +14099,7 @@
11144		as_echo_body='eval expr "X$1" : "X\$.*\$"'
11145		as_echo_n_body='eval
11146		arg=$1;
11147		- case $arg in
11148		+ case $arg in #(
11149		"$as_nl")
11150		expr "X$arg" : "X\$.*\$$as_nl";
11151		arg=`expr "X$arg" : ".$as_nl\$.\$"`;;
11152		@@ -16158,13 +14122,6 @@
11153		}
11154		fi
11155
11156		-# Support unset when possible.
11157		-if ( (MAIL=60; unset MAIL) \|\| exit) >/dev/null 2>&1; then
11158		- as_unset=unset
11159		-else
11160		- as_unset=false
11161		-fi
11162		-
11163
11164		# IFS
11165		# We need space, tab and new line, in precisely that order. Quoting is
11166		@@ -16174,15 +14131,15 @@
11167		IFS=" "" $as_nl"
11168
11169		# Find who we are. Look in the path if we contain no directory separator.
11170		-case $0 in
11171		+case $0 in #((
11172		[\\/] ) as_myself=$0 ;;
11173		*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11174		for as_dir in $PATH
11175		do
11176		IFS=$as_save_IFS
11177		test -z "$as_dir" && as_dir=.
11178		- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
11179		-done
11180		+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
11181		+ done
11182		IFS=$as_save_IFS
11183
11184		;;
11185		@@ -16194,12 +14151,16 @@
11186		fi
11187		if test ! -f "$as_myself"; then
11188		$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
11189		- { (exit 1); exit 1; }
11190		+ exit 1
11191		fi
11192
11193		-# Work around bugs in pre-3.0 UWIN ksh.
11194		-for as_var in ENV MAIL MAILPATH
11195		-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
11196		+# Unset variables that we do not need and which cause bugs (e.g. in
11197		+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "\|\| exit 1"
11198		+# suppresses any "Segmentation fault" message there. '((' could
11199		+# trigger a bug in pdksh 5.2.14.
11200		+for as_var in BASH_ENV ENV MAIL MAILPATH
11201		+do eval test x\${$as_var+set} = xset \
11202		+ && ( (unset $as_var) \|\| exit 1) >/dev/null 2>&1 && unset $as_var \|\| :
11203		done
11204		PS1='$ '
11205		PS2='> '
11206		@@ -16211,7 +14172,89 @@
11207		LANGUAGE=C
11208		export LANGUAGE
11209
11210		-# Required to use basename.
11211		+# CDPATH.
11212		+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
11213		+
11214		+
11215		+# as_fn_error ERROR [LINENO LOG_FD]
11216		+# ---------------------------------
11217		+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
11218		+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
11219		+# script with status $?, using 1 if that was 0.
11220		+as_fn_error ()
11221		+{
11222		+ as_status=$?; test $as_status -eq 0 && as_status=1
11223		+ if test "$3"; then
11224		+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
11225		+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
11226		+ fi
11227		+ $as_echo "$as_me: error: $1" >&2
11228		+ as_fn_exit $as_status
11229		+} # as_fn_error
11230		+
11231		+
11232		+# as_fn_set_status STATUS
11233		+# -----------------------
11234		+# Set $? to STATUS, without forking.
11235		+as_fn_set_status ()
11236		+{
11237		+ return $1
11238		+} # as_fn_set_status
11239		+
11240		+# as_fn_exit STATUS
11241		+# -----------------
11242		+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
11243		+as_fn_exit ()
11244		+{
11245		+ set +e
11246		+ as_fn_set_status $1
11247		+ exit $1
11248		+} # as_fn_exit
11249		+
11250		+# as_fn_unset VAR
11251		+# ---------------
11252		+# Portably unset VAR.
11253		+as_fn_unset ()
11254		+{
11255		+ { eval $1=; unset $1;}
11256		+}
11257		+as_unset=as_fn_unset
11258		+# as_fn_append VAR VALUE
11259		+# ----------------------
11260		+# Append the text in VALUE to the end of the definition contained in VAR. Take
11261		+# advantage of any shell optimizations that allow amortized linear growth over
11262		+# repeated appends, instead of the typical quadratic growth present in naive
11263		+# implementations.
11264		+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
11265		+ eval 'as_fn_append ()
11266		+ {
11267		+ eval $1+=\$2
11268		+ }'
11269		+else
11270		+ as_fn_append ()
11271		+ {
11272		+ eval $1=\$$1\$2
11273		+ }
11274		+fi # as_fn_append
11275		+
11276		+# as_fn_arith ARG...
11277		+# ------------------
11278		+# Perform arithmetic evaluation on the ARGs, and store the result in the
11279		+# global $as_val. Take advantage of shells that can avoid forks. The arguments
11280		+# must be portable across $(()) and expr.
11281		+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
11282		+ eval 'as_fn_arith ()
11283		+ {
11284		+ as_val=$(( $* ))
11285		+ }'
11286		+else
11287		+ as_fn_arith ()
11288		+ {
11289		+ as_val=`expr "$@" \|\| test $? -eq 1`
11290		+ }
11291		+fi # as_fn_arith
11292		+
11293		+
11294		if expr a : '$a$' >/dev/null 2>&1 &&
11295		test "X`expr 00001 : '.*$...$'`" = X001; then
11296		as_expr=expr
11297		@@ -16225,8 +14268,12 @@
11298		as_basename=false
11299		fi
11300
11301		+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
11302		+ as_dirname=dirname
11303		+else
11304		+ as_dirname=false
11305		+fi
11306
11307		-# Name of the executable.
11308		as_me=`$as_basename -- "$0" \|\|
11309		$as_expr X/"$0" : './$[^/][^/]$/*$' \\| \
11310		X"$0" : 'X$//$$' \\| \
11311		@@ -16246,76 +14293,25 @@
11312		}
11313		s/.*/./; q'`
11314
11315		-# CDPATH.
11316		-$as_unset CDPATH
11317		-
11318		-
11319		-
11320		- as_lineno_1=$LINENO
11321		- as_lineno_2=$LINENO
11322		- test "x$as_lineno_1" != "x$as_lineno_2" &&
11323		- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" \|\| {
11324		-
11325		- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
11326		- # uniformly replaced by the line number. The first 'sed' inserts a
11327		- # line-number line after each line using $LINENO; the second 'sed'
11328		- # does the real work. The second script uses 'N' to pair each
11329		- # line-number line with the line containing $LINENO, and appends
11330		- # trailing '-' during substitution so that $LINENO is not a special
11331		- # case at line end.
11332		- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
11333		- # scripts with optimization help from Paolo Bonzini. Blame Lee
11334		- # E. McMahon (1931-1989) for sed's syntax. :-)
11335		- sed -n '
11336		- p
11337		- /[$]LINENO/=
11338		- ' <$as_myself \|
11339		- sed '
11340		- s/[$]LINENO.*/&-/
11341		- t lineno
11342		- b
11343		- :lineno
11344		- N
11345		- :loop
11346		- s/[$]LINENO$[^'$as_cr_alnum'_].\n$$.$/\2\1\2/
11347		- t loop
11348		- s/-\n.*//
11349		- ' >$as_me.lineno &&
11350		- chmod +x "$as_me.lineno" \|\|
11351		- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
11352		- { (exit 1); exit 1; }; }
11353		-
11354		- # Don't try to exec as it changes $[0], causing all sort of problems
11355		- # (the dirname of $[0] is not the place where we might find the
11356		- # original and so on. Autoconf is especially sensitive to this).
11357		- . "./$as_me.lineno"
11358		- # Exit status is that of the last command.
11359		- exit
11360		-}
11361		-
11362		-
11363		-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
11364		- as_dirname=dirname
11365		-else
11366		- as_dirname=false
11367		-fi
11368		+# Avoid depending upon Character Ranges.
11369		+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
11370		+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
11371		+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
11372		+as_cr_digits='0123456789'
11373		+as_cr_alnum=$as_cr_Letters$as_cr_digits
11374
11375		ECHO_C= ECHO_N= ECHO_T=
11376		-case `echo -n x` in
11377		+case `echo -n x` in #(((((
11378		-n*)
11379		- case `echo 'x\c'` in
11380		+ case `echo 'xy\c'` in
11381		c) ECHO_T=' ';; # ECHO_T is single tab character.
11382		- *) ECHO_C='\c';;
11383		+ xy) ECHO_C='\c';;
11384		+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
11385		+ ECHO_T=' ';;
11386		esac;;
11387		*)
11388		ECHO_N='-n';;
11389		esac
11390		-if expr a : '$a$' >/dev/null 2>&1 &&
11391		- test "X`expr 00001 : '.*$...$'`" = X001; then
11392		- as_expr=expr
11393		-else
11394		- as_expr=false
11395		-fi
11396
11397		rm -f conf$$ conf$$.exe conf$$.file
11398		if test -d conf$$.dir; then
11399		@@ -16344,8 +14340,56 @@
11400		rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
11401		rmdir conf$$.dir 2>/dev/null
11402
11403		+
11404		+# as_fn_mkdir_p
11405		+# -------------
11406		+# Create "$as_dir" as a directory, including parents if necessary.
11407		+as_fn_mkdir_p ()
11408		+{
11409		+
11410		+ case $as_dir in #(
11411		+ -*) as_dir=./$as_dir;;
11412		+ esac
11413		+ test -d "$as_dir" \|\| eval $as_mkdir_p \|\| {
11414		+ as_dirs=
11415		+ while :; do
11416		+ case $as_dir in #(
11417		+ \') as_qdir=`$as_echo "$as_dir" \| sed "s/'/'\\\\\\\\''/g"`;; #'(
11418		+ *) as_qdir=$as_dir;;
11419		+ esac
11420		+ as_dirs="'$as_qdir' $as_dirs"
11421		+ as_dir=`$as_dirname -- "$as_dir" \|\|
11422		+$as_expr X"$as_dir" : 'X$.[^/]$//[^/][^/]/$' \\| \
11423		+ X"$as_dir" : 'X$//$[^/]' \\| \
11424		+ X"$as_dir" : 'X$//$$' \\| \
11425		+ X"$as_dir" : 'X$/$' \\| . 2>/dev/null \|\|
11426		+$as_echo X"$as_dir" \|
11427		+ sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
11428		+ s//\1/
11429		+ q
11430		+ }
11431		+ /^X$\/\/$[^/].*/{
11432		+ s//\1/
11433		+ q
11434		+ }
11435		+ /^X$\/\/$$/{
11436		+ s//\1/
11437		+ q
11438		+ }
11439		+ /^X$\/$.*/{
11440		+ s//\1/
11441		+ q
11442		+ }
11443		+ s/.*/./; q'`
11444		+ test -d "$as_dir" && break
11445		+ done
11446		+ test -z "$as_dirs" \|\| eval "mkdir $as_dirs"
11447		+ } \|\| test -d "$as_dir" \|\| as_fn_error "cannot create directory $as_dir"
11448		+
11449		+
11450		+} # as_fn_mkdir_p
11451		if mkdir -p . 2>/dev/null; then
11452		- as_mkdir_p=:
11453		+ as_mkdir_p='mkdir -p "$as_dir"'
11454		else
11455		test -d ./-p && rmdir ./-p
11456		as_mkdir_p=false
11457		@@ -16364,10 +14408,10 @@
11458		if test -d "$1"; then
11459		test -d "$1/.";
11460		else
11461		- case $1 in
11462		+ case $1 in #(
11463		-*)set "./$1";;
11464		esac;
11465		- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
11466		+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
11467		???[sx]):;;)false;;esac;fi
11468		'\'' sh
11469		'
11470		@@ -16382,13 +14426,19 @@
11471
11472
11473		exec 6>&1
11474		+## ----------------------------------- ##
11475		+## Main body of $CONFIG_STATUS script. ##
11476		+## ----------------------------------- ##
11477		+_ASEOF
11478		+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS \|\| ac_write_fail=1
11479
11480		-# Save the log message, to keep $[0] and so on meaningful, and to
11481		+cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
11482		+# Save the log message, to keep $0 and so on meaningful, and to
11483		# report actual input values of CONFIG_FILES etc. instead of their
11484		# values after options handling.
11485		ac_log="
11486		This file was extended by eog-plugins $as_me 2.28.0, which was
11487		-generated by GNU Autoconf 2.63. Invocation command line was
11488		+generated by GNU Autoconf 2.64. Invocation command line was
11489
11490		CONFIG_FILES = $CONFIG_FILES
11491		CONFIG_HEADERS = $CONFIG_HEADERS
11492		@@ -16420,10 +14470,11 @@
11493
11494		cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
11495		ac_cs_usage="\
11496		-\`$as_me' instantiates files from templates according to the
11497		-current configuration.
11498		+\`$as_me' instantiates files and other configuration actions
11499		+from templates according to the current configuration. Unless the files
11500		+and actions are specified as TAGs, all are instantiated by default.
11501
11502		-Usage: $0 [OPTION]... [FILE]...
11503		+Usage: $0 [OPTION]... [TAG]...
11504
11505		-h, --help print this help, then exit
11506		-V, --version print version number and configuration settings, then exit
11507		@@ -16445,16 +14496,16 @@
11508		Configuration commands:
11509		$config_commands
11510
11511		-Report bugs to <bug-autoconf@gnu.org>."
11512		+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=eog&component=plugins>."
11513
11514		_ACEOF
11515		cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
11516		ac_cs_version="\\
11517		eog-plugins config.status 2.28.0
11518		-configured by $0, generated by GNU Autoconf 2.63,
11519		+configured by $0, generated by GNU Autoconf 2.64,
11520		with options \\"`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
11521
11522		-Copyright (C) 2008 Free Software Foundation, Inc.
11523		+Copyright (C) 2009 Free Software Foundation, Inc.
11524		This config.status script is free software; the Free Software Foundation
11525		gives unlimited permission to copy, distribute and modify it."
11526
11527		@@ -16497,20 +14548,19 @@
11528		case $ac_optarg in
11529		\') ac_optarg=`$as_echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"` ;;
11530		esac
11531		- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
11532		+ as_fn_append CONFIG_FILES " '$ac_optarg'"
11533		ac_need_defaults=false;;
11534		--header \| --heade \| --head \| --hea )
11535		$ac_shift
11536		case $ac_optarg in
11537		\') ac_optarg=`$as_echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"` ;;
11538		esac
11539		- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
11540		+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
11541		ac_need_defaults=false;;
11542		--he \| --h)
11543		# Conflict between --help and --header
11544		- { $as_echo "$as_me: error: ambiguous option: $1
11545		-Try \`$0 --help' for more information." >&2
11546		- { (exit 1); exit 1; }; };;
11547		+ as_fn_error "ambiguous option: \`$1'
11548		+Try \`$0 --help' for more information.";;
11549		--help \| --hel \| -h )
11550		$as_echo "$ac_cs_usage"; exit ;;
11551		-q \| -quiet \| --quiet \| --quie \| --qui \| --qu \| --q \
11552		@@ -16518,11 +14568,10 @@
11553		ac_cs_silent=: ;;
11554
11555		# This is an error.
11556		- -*) { $as_echo "$as_me: error: unrecognized option: $1
11557		-Try \`$0 --help' for more information." >&2
11558		- { (exit 1); exit 1; }; } ;;
11559		+ -*) as_fn_error "unrecognized option: \`$1'
11560		+Try \`$0 --help' for more information." ;;
11561
11562		- *) ac_config_targets="$ac_config_targets $1"
11563		+ *) as_fn_append ac_config_targets " $1"
11564		ac_need_defaults=false ;;
11565
11566		esac
11567		@@ -16844,9 +14893,7 @@
11568		"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
11569		"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
11570
11571		- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
11572		-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
11573		- { (exit 1); exit 1; }; };;
11574		+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
11575		esac
11576		done
11577
11578		@@ -16873,7 +14920,7 @@
11579		trap 'exit_status=$?
11580		{ test -z "$tmp" \|\| test ! -d "$tmp" \|\| rm -fr "$tmp"; } && exit $exit_status
11581		' 0
11582		- trap '{ (exit 1); exit 1; }' 1 2 13 15
11583		+ trap 'as_fn_exit 1' 1 2 13 15
11584		}
11585		# Create a (secure) tmp directory for tmp files.
11586
11587		@@ -16884,11 +14931,7 @@
11588		{
11589		tmp=./conf$$-$RANDOM
11590		(umask 077 && mkdir "$tmp")
11591		-} \|\|
11592		-{
11593		- $as_echo "$as_me: cannot create a temporary directory in ." >&2
11594		- { (exit 1); exit 1; }
11595		-}
11596		+} \|\| as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
11597
11598		# Set up the scripts for CONFIG_FILES section.
11599		# No need to generate them if there are no CONFIG_FILES.
11600		@@ -16896,10 +14939,16 @@
11601		if test -n "$CONFIG_FILES"; then
11602
11603
11604		-ac_cr=' ⏎
11605		'
11606		+ac_cr=`echo X \| tr X '\015'`
11607		+# On cygwin, bash can eat \r inside `` if the user requested igncr.
11608		+# But we know of no other shell where ac_cr would be empty at this
11609		+# point, so we can use a bashism as a fallback.
11610		+if test "x$ac_cr" = x; then
11611		+ eval ac_cr=\$\'\\r\'
11612		+fi
11613		ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
11614		if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
11615		- ac_cs_awk_cr='\\r'
11616		+ ac_cs_awk_cr='\r'
11617		else
11618		ac_cs_awk_cr=$ac_cr
11619		fi
11620		@@ -16913,24 +14962,18 @@
11621		echo "$ac_subst_vars" \| sed 's/.*/&!$&$ac_delim/' &&
11622		echo "_ACEOF"
11623		} >conf$$subs.sh \|\|
11624		- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
11625		-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
11626		- { (exit 1); exit 1; }; }
11627		+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
11628		ac_delim_num=`echo "$ac_subst_vars" \| grep -c '$'`
11629		ac_delim='%!_!# '
11630		for ac_last_try in false false false false false :; do
11631		. ./conf$$subs.sh \|\|
11632		- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
11633		-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
11634		- { (exit 1); exit 1; }; }
11635		+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
11636
11637		ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk \| grep -c X`
11638		if test $ac_delim_n = $ac_delim_num; then
11639		break
11640		elif $ac_last_try; then
11641		- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
11642		-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
11643		- { (exit 1); exit 1; }; }
11644		+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
11645		else
11646		ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
11647		fi
11648		@@ -17019,9 +15062,7 @@
11649		else
11650		cat
11651		fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
11652		- \|\| { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
11653		-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
11654		- { (exit 1); exit 1; }; }
11655		+ \|\| as_fn_error "could not setup config files machinery" "$LINENO" 5
11656		_ACEOF
11657
11658		# VPATH may cause trouble with some makes, so we remove $(srcdir),
11659		@@ -17062,9 +15103,7 @@
11660		if test -z "$ac_t"; then
11661		break
11662		elif $ac_last_try; then
11663		- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
11664		-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
11665		- { (exit 1); exit 1; }; }
11666		+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
11667		else
11668		ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
11669		fi
11670		@@ -17149,9 +15188,7 @@
11671		_ACAWK
11672		_ACEOF
11673		cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
11674		- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
11675		-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
11676		- { (exit 1); exit 1; }; }
11677		+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
11678		fi # test -n "$CONFIG_HEADERS"
11679
11680
11681		@@ -17164,9 +15201,7 @@
11682		esac
11683		case $ac_mode$ac_tag in
11684		:[FHL]:);;
11685		- :L* \| :C:) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
11686		-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
11687		- { (exit 1); exit 1; }; };;
11688		+ :L* \| :C:) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
11689		:[FH]-) ac_tag=-:-;;
11690		:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
11691		esac
11692		@@ -17194,12 +15229,10 @@
11693		[\\/$]*) false;;
11694		*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
11695		esac \|\|
11696		- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
11697		-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
11698		- { (exit 1); exit 1; }; };;
11699		+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
11700		esac
11701		case $ac_f in \') ac_f=`$as_echo "$ac_f" \| sed "s/'/'\\\\\\\\''/g"`;; esac
11702		- ac_file_inputs="$ac_file_inputs '$ac_f'"
11703		+ as_fn_append ac_file_inputs " '$ac_f'"
11704		done
11705
11706		# Let's still pretend it is `configure' which instantiates (i.e., don't
11707		@@ -17210,7 +15243,7 @@
11708		`' by configure.'
11709		if test x"$ac_file" != x-; then
11710		configure_input="$ac_file. $configure_input"
11711		- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
11712		+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
11713		$as_echo "$as_me: creating $ac_file" >&6;}
11714		fi
11715		# Neutralize special characters interpreted by sed in replacement strings.
11716		@@ -17223,9 +15256,7 @@
11717
11718		case $ac_tag in
11719		:-: \| *:-) cat >"$tmp/stdin" \
11720		- \|\| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
11721		-$as_echo "$as_me: error: could not create $ac_file" >&2;}
11722		- { (exit 1); exit 1; }; } ;;
11723		+ \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
11724		esac
11725		;;
11726		esac
11727		@@ -17253,47 +15284,7 @@
11728		q
11729		}
11730		s/.*/./; q'`
11731		- { as_dir="$ac_dir"
11732		- case $as_dir in #(
11733		- -*) as_dir=./$as_dir;;
11734		- esac
11735		- test -d "$as_dir" \|\| { $as_mkdir_p && mkdir -p "$as_dir"; } \|\| {
11736		- as_dirs=
11737		- while :; do
11738		- case $as_dir in #(
11739		- \') as_qdir=`$as_echo "$as_dir" \| sed "s/'/'\\\\\\\\''/g"`;; #'(
11740		- *) as_qdir=$as_dir;;
11741		- esac
11742		- as_dirs="'$as_qdir' $as_dirs"
11743		- as_dir=`$as_dirname -- "$as_dir" \|\|
11744		-$as_expr X"$as_dir" : 'X$.[^/]$//[^/][^/]/$' \\| \
11745		- X"$as_dir" : 'X$//$[^/]' \\| \
11746		- X"$as_dir" : 'X$//$$' \\| \
11747		- X"$as_dir" : 'X$/$' \\| . 2>/dev/null \|\|
11748		-$as_echo X"$as_dir" \|
11749		- sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
11750		- s//\1/
11751		- q
11752		- }
11753		- /^X$\/\/$[^/].*/{
11754		- s//\1/
11755		- q
11756		- }
11757		- /^X$\/\/$$/{
11758		- s//\1/
11759		- q
11760		- }
11761		- /^X$\/$.*/{
11762		- s//\1/
11763		- q
11764		- }
11765		- s/.*/./; q'`
11766		- test -d "$as_dir" && break
11767		- done
11768		- test -z "$as_dirs" \|\| eval "mkdir $as_dirs"
11769		- } \|\| test -d "$as_dir" \|\| { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
11770		-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
11771		- { (exit 1); exit 1; }; }; }
11772		+ as_dir="$ac_dir"; as_fn_mkdir_p
11773		ac_builddir=.
11774
11775		case "$ac_dir" in
11776		@@ -17350,7 +15341,6 @@
11777		# If the template does not know about datarootdir, expand it.
11778		# FIXME: This hack should be removed a few years after 2.60.
11779		ac_datarootdir_hack=; ac_datarootdir_seen=
11780		-
11781		ac_sed_dataroot='
11782		/datarootdir/ {
11783		p
11784		@@ -17360,12 +15350,11 @@
11785		/@docdir@/p
11786		/@infodir@/p
11787		/@localedir@/p
11788		-/@mandir@/p
11789		-'
11790		+/@mandir@/p'
11791		case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
11792		datarootdir) ac_datarootdir_seen=yes;;
11793		@datadir@\|@docdir@\|@infodir@\|@localedir@\|@mandir@)
11794		- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
11795		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
11796		$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
11797		_ACEOF
11798		cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
11799		@@ -17375,7 +15364,7 @@
11800		s&@infodir@&$infodir&g
11801		s&@localedir@&$localedir&g
11802		s&@mandir@&$mandir&g
11803		- s&\\\${datarootdir}&$datarootdir&g' ;;
11804		+ s&\\\${datarootdir}&$datarootdir&g' ;;
11805		esac
11806		_ACEOF
11807
11808		@@ -17404,14 +15393,12 @@
11809		$ac_datarootdir_hack
11810		"
11811		eval sed \"\$ac_sed_extra\" "$ac_file_inputs" \| $AWK -f "$tmp/subs.awk" >$tmp/out \
11812		- \|\| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
11813		-$as_echo "$as_me: error: could not create $ac_file" >&2;}
11814		- { (exit 1); exit 1; }; }
11815		+ \|\| as_fn_error "could not create $ac_file" "$LINENO" 5
11816
11817		test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
11818		{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
11819		{ ac_out=`sed -n '/^[ ]datarootdir[ ]:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
11820		- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
11821		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
11822		which seems to be undefined. Please make sure it is defined." >&5
11823		$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
11824		which seems to be undefined. Please make sure it is defined." >&2;}
11825		@@ -17421,9 +15408,7 @@
11826		-) cat "$tmp/out" && rm -f "$tmp/out";;
11827		*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
11828		esac \
11829		- \|\| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
11830		-$as_echo "$as_me: error: could not create $ac_file" >&2;}
11831		- { (exit 1); exit 1; }; }
11832		+ \|\| as_fn_error "could not create $ac_file" "$LINENO" 5
11833		;;
11834		:H)
11835		#
11836		@@ -17434,25 +15419,19 @@
11837		$as_echo "/* $configure_input */" \
11838		&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
11839		} >"$tmp/config.h" \
11840		- \|\| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
11841		-$as_echo "$as_me: error: could not create $ac_file" >&2;}
11842		- { (exit 1); exit 1; }; }
11843		+ \|\| as_fn_error "could not create $ac_file" "$LINENO" 5
11844		if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
11845		- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
11846		+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
11847		$as_echo "$as_me: $ac_file is unchanged" >&6;}
11848		else
11849		rm -f "$ac_file"
11850		mv "$tmp/config.h" "$ac_file" \
11851		- \|\| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
11852		-$as_echo "$as_me: error: could not create $ac_file" >&2;}
11853		- { (exit 1); exit 1; }; }
11854		+ \|\| as_fn_error "could not create $ac_file" "$LINENO" 5
11855		fi
11856		else
11857		$as_echo "/* $configure_input */" \
11858		&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
11859		- \|\| { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
11860		-$as_echo "$as_me: error: could not create -" >&2;}
11861		- { (exit 1); exit 1; }; }
11862		+ \|\| as_fn_error "could not create -" "$LINENO" 5
11863		fi
11864		# Compute "$ac_file"'s index in $config_headers.
11865		_am_arg="$ac_file"
11866		@@ -17490,7 +15469,7 @@
11867		s/.*/./; q'`/stamp-h$_am_stamp_count
11868		;;
11869
11870		- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
11871		+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
11872		$as_echo "$as_me: executing $ac_file commands" >&6;}
11873		;;
11874		esac
11875		@@ -17585,47 +15564,7 @@
11876		q
11877		}
11878		s/.*/./; q'`
11879		- { as_dir=$dirpart/$fdir
11880		- case $as_dir in #(
11881		- -*) as_dir=./$as_dir;;
11882		- esac
11883		- test -d "$as_dir" \|\| { $as_mkdir_p && mkdir -p "$as_dir"; } \|\| {
11884		- as_dirs=
11885		- while :; do
11886		- case $as_dir in #(
11887		- \') as_qdir=`$as_echo "$as_dir" \| sed "s/'/'\\\\\\\\''/g"`;; #'(
11888		- *) as_qdir=$as_dir;;
11889		- esac
11890		- as_dirs="'$as_qdir' $as_dirs"
11891		- as_dir=`$as_dirname -- "$as_dir" \|\|
11892		-$as_expr X"$as_dir" : 'X$.[^/]$//[^/][^/]/$' \\| \
11893		- X"$as_dir" : 'X$//$[^/]' \\| \
11894		- X"$as_dir" : 'X$//$$' \\| \
11895		- X"$as_dir" : 'X$/$' \\| . 2>/dev/null \|\|
11896		-$as_echo X"$as_dir" \|
11897		- sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
11898		- s//\1/
11899		- q
11900		- }
11901		- /^X$\/\/$[^/].*/{
11902		- s//\1/
11903		- q
11904		- }
11905		- /^X$\/\/$$/{
11906		- s//\1/
11907		- q
11908		- }
11909		- /^X$\/$.*/{
11910		- s//\1/
11911		- q
11912		- }
11913		- s/.*/./; q'`
11914		- test -d "$as_dir" && break
11915		- done
11916		- test -z "$as_dirs" \|\| eval "mkdir $as_dirs"
11917		- } \|\| test -d "$as_dir" \|\| { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
11918		-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
11919		- { (exit 1); exit 1; }; }; }
11920		+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
11921		# echo "creating $dirpart/$file"
11922		echo '# dummy' > "$dirpart/$file"
11923		done
11924		@@ -18272,9 +16211,7 @@
11925		esac ;;
11926		"po/stamp-it":C)
11927		if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
11928		- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
11929		-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
11930		- { (exit 1); exit 1; }; }
11931		+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
11932		fi
11933		rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
11934		>"po/stamp-it.tmp"
11935		@@ -18297,15 +16234,12 @@
11936		done # for ac_tag
11937
11938
11939		-{ (exit 0); exit 0; }
11940		+as_fn_exit 0
11941		_ACEOF
11942		-chmod +x $CONFIG_STATUS
11943		ac_clean_files=$ac_clean_files_save
11944
11945		test $ac_write_fail = 0 \|\|
11946		- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
11947		-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
11948		- { (exit 1); exit 1; }; }
11949		+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
11950
11951
11952		# configure is writing to config.log, and then calls config.status.
11953		@@ -18326,10 +16260,10 @@
11954		exec 5>>config.log
11955		# Use \|\|, not &&, to avoid exiting from the if with $? = 1, which
11956		# would make configure fail if this is the last instruction.
11957		- $ac_cs_success \|\| { (exit 1); exit 1; }
11958		+ $ac_cs_success \|\| as_fn_exit $?
11959		fi
11960		if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
11961		- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
11962		+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
11963		$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
11964		fi
11965
11966		diff -urN -x config.guess -x config.sub eog-plugins-2.28.0.orig/ltmain.sh eog-plugins-2.28.0/ltmain.sh
11967		--- eog-plugins-2.28.0.orig/ltmain.sh 2009-09-08 12:48:00.000000000 +0200
11968		+++ eog-plugins-2.28.0/ltmain.sh 2009-09-26 02:15:59.000000000 +0200
11969		@@ -65,7 +65,7 @@
11970		# compiler: $LTCC
11971		# compiler flags: $LTCFLAGS
11972		# linker: $LD (gnu? $with_gnu_ld)
11973		-# $progname: (GNU libtool) 2.2.6
11974		+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
11975		# automake: $automake_version
11976		# autoconf: $autoconf_version
11977		#
11978		@@ -73,7 +73,7 @@
11979
11980		PROGRAM=ltmain.sh
11981		PACKAGE=libtool
11982		-VERSION=2.2.6
11983		+VERSION="2.2.6 Debian-2.2.6a-4"
11984		TIMESTAMP=""
11985		package_revision=1.3012
11986
11987		@@ -116,15 +116,15 @@
11988
11989		: ${CP="cp -f"}
11990		: ${ECHO="echo"}
11991		-: ${EGREP="/usr/bin/grep -E"}
11992		-: ${FGREP="/usr/bin/grep -F"}
11993		-: ${GREP="/usr/bin/grep"}
11994		+: ${EGREP="/bin/grep -E"}
11995		+: ${FGREP="/bin/grep -F"}
11996		+: ${GREP="/bin/grep"}
11997		: ${LN_S="ln -s"}
11998		: ${MAKE="make"}
11999		: ${MKDIR="mkdir"}
12000		: ${MV="mv -f"}
12001		: ${RM="rm -f"}
12002		-: ${SED="/opt/local/bin/gsed"}
12003		+: ${SED="/bin/sed"}
12004		: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
12005		: ${Xsed="$SED -e 1s/^X//"}
12006
12007		@@ -570,13 +570,6 @@
12008		# Restart under the correct shell, and then maybe $ECHO will work.
12009		exec $SHELL "$progpath" --no-reexec ${1+"$@"}
12010		fi
12011		-# Same for EGREP, and just to be sure, do LTCC as well
12012		-if test "x$EGREP" = x ; then
12013		- EGREP=egrep
12014		-fi
12015		-if test "x$LTCC" = x ; then
12016		- LTCC=${CC-gcc}
12017		-fi
12018
12019		if test "X$1" = X--fallback-echo; then
12020		# used as fallback echo
12021		@@ -4723,11 +4716,6 @@
12022		arg=$func_stripname_result
12023		;;
12024
12025		- -Wl,--as-needed\|-Wl,--no-as-needed)
12026		- deplibs="$deplibs $arg"
12027		- continue
12028		- ;;
12029		-
12030		-Wl,*)
12031		func_stripname '-Wl,' '' "$arg"
12032		args=$func_stripname_result
12033		@@ -5045,7 +5033,10 @@
12034		case $pass in
12035		dlopen) libs="$dlfiles" ;;
12036		dlpreopen) libs="$dlprefiles" ;;
12037		- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
12038		+ link)
12039		+ libs="$deplibs %DEPLIBS%"
12040		+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
12041		+ ;;
12042		esac
12043		fi
12044		if test "$linkmode,$pass" = "lib,dlpreopen"; then
12045		@@ -5079,15 +5070,6 @@
12046		lib=
12047		found=no
12048		case $deplib in
12049		- -Wl,--as-needed\|-Wl,--no-as-needed)
12050		- if test "$linkmode,$pass" = "prog,link"; then
12051		- compile_deplibs="$deplib $compile_deplibs"
12052		- finalize_deplibs="$deplib $finalize_deplibs"
12053		- else
12054		- deplibs="$deplib $deplibs"
12055		- fi
12056		- continue
12057		- ;;
12058		-mt\|-mthreads\|-kthread\|-Kthread\|-pthread\|-pthreads\|--thread-safe\|-threads)
12059		if test "$linkmode,$pass" = "prog,link"; then
12060		compile_deplibs="$deplib $compile_deplibs"
12061		@@ -5365,19 +5347,19 @@
12062		# It is a libtool convenience library, so add in its objects.
12063		convenience="$convenience $ladir/$objdir/$old_library"
12064		old_convenience="$old_convenience $ladir/$objdir/$old_library"
12065		+ tmp_libs=
12066		+ for deplib in $dependency_libs; do
12067		+ deplibs="$deplib $deplibs"
12068		+ if $opt_duplicate_deps ; then
12069		+ case "$tmp_libs " in
12070		+ " $deplib ") specialdeplibs="$specialdeplibs $deplib" ;;
12071		+ esac
12072		+ fi
12073		+ tmp_libs="$tmp_libs $deplib"
12074		+ done
12075		elif test "$linkmode" != prog && test "$linkmode" != lib; then
12076		func_fatal_error "\`$lib' is not a convenience library"
12077		fi
12078		- tmp_libs=
12079		- for deplib in $dependency_libs; do
12080		- deplibs="$deplib $deplibs"
12081		- if $opt_duplicate_deps ; then
12082		- case "$tmp_libs " in
12083		- " $deplib ") specialdeplibs="$specialdeplibs $deplib" ;;
12084		- esac
12085		- fi
12086		- tmp_libs="$tmp_libs $deplib"
12087		- done
12088		continue
12089		fi # $pass = conv
12090
12091		@@ -5914,6 +5896,7 @@
12092		if test "$link_all_deplibs" != no; then
12093		# Add the search paths of all dependency libraries
12094		for deplib in $dependency_libs; do
12095		+ path=
12096		case $deplib in
12097		-L*) path="$deplib" ;;
12098		*.la)
12099		@@ -6227,6 +6210,9 @@
12100		revision="$number_minor"
12101		lt_irix_increment=no
12102		;;
12103		+ *)
12104		+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
12105		+ ;;
12106		esac
12107		;;
12108		no)
12109		@@ -8080,53 +8066,9 @@
12110		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
12111		test -z "$libdir" && \
12112		func_fatal_error "\`$deplib' is not a valid libtool archive"
12113		- if test "x$EGREP" = x ; then
12114		- EGREP=egrep
12115		- fi
12116		- # We do not want portage's install root ($D) present. Check only for
12117		- # this if the .la is being installed.
12118		- if test "$installed" = yes && test "$D"; then
12119		- eval mynewdependency_lib=`echo "$libdir/$name" \|sed -e "s:$D:/:g" -e 's:/\+:/:g'`
12120		- else
12121		- mynewdependency_lib="$libdir/$name"
12122		- fi
12123		- # Do not add duplicates
12124		- if test "$mynewdependency_lib"; then
12125		- my_little_ninja_foo_1=`echo $newdependency_libs \|$EGREP -e "$mynewdependency_lib"`
12126		- if test -z "$my_little_ninja_foo_1"; then
12127		- newdependency_libs="$newdependency_libs $mynewdependency_lib"
12128		- fi
12129		- fi
12130		- ;;
12131		- *)
12132		- if test "$installed" = yes; then
12133		- # Rather use S=WORKDIR if our version of portage supports it.
12134		- # This is because some ebuild (gcc) do not use $S as buildroot.
12135		- if test "$PWORKDIR"; then
12136		- S="$PWORKDIR"
12137		- fi
12138		- # We do not want portage's build root ($S) present.
12139		- my_little_ninja_foo_2=`echo $deplib \|$EGREP -e "$S"`
12140		- # We do not want portage's install root ($D) present.
12141		- my_little_ninja_foo_3=`echo $deplib \|$EGREP -e "$D"`
12142		- if test -n "$my_little_ninja_foo_2" && test "$S"; then
12143		- mynewdependency_lib=""
12144		- elif test -n "$my_little_ninja_foo_3" && test "$D"; then
12145		- eval mynewdependency_lib=`echo "$deplib" \|sed -e "s:$D:/:g" -e 's:/\+:/:g'`
12146		- else
12147		- mynewdependency_lib="$deplib"
12148		- fi
12149		- else
12150		- mynewdependency_lib="$deplib"
12151		- fi
12152		- # Do not add duplicates
12153		- if test "$mynewdependency_lib"; then
12154		- my_little_ninja_foo_4=`echo $newdependency_libs \|$EGREP -e "$mynewdependency_lib"`
12155		- if test -z "$my_little_ninja_foo_4"; then
12156		- newdependency_libs="$newdependency_libs $mynewdependency_lib"
12157		- fi
12158		- fi
12159		+ newdependency_libs="$newdependency_libs $libdir/$name"
12160		;;
12161		+ *) newdependency_libs="$newdependency_libs $deplib" ;;
12162		esac
12163		done
12164		dependency_libs="$newdependency_libs"
12165		@@ -8190,10 +8132,6 @@
12166		case $host,$output,$installed,$module,$dlname in
12167		cygwin,lai,yes,no,.dll \| mingw,lai,yes,no,.dll \| cegcc,lai,yes,no,.dll) tdlname=../bin/$dlname ;;
12168		esac
12169		- # Do not add duplicates
12170		- if test "$installed" = yes && test "$D"; then
12171		- install_libdir=`echo "$install_libdir" \|sed -e "s:$D:/:g" -e 's:/\+:/:g'`
12172		- fi
12173		$ECHO > $output "\
12174		# $outputname - a libtool library file
12175		# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION

-30

~~debian/patches/99_ltmain_as-needed.patch~~ less more

0		--- ltmain.sh.orig 2009-09-26 02:15:59.000000000 +0200
1		+++ ltmain.sh 2009-09-26 12:19:55.000000000 +0200
2		@@ -4715,6 +4715,11 @@
3		func_stripname ' ' '' "$arg"
4		arg=$func_stripname_result
5		;;
6		+
7		+ -Wl,--as-needed)
8		+ deplibs="$deplibs $arg"
9		+ continue
10		+ ;;
11
12		-Wl,*)
13		func_stripname '-Wl,' '' "$arg"
14		@@ -5070,6 +5075,15 @@
15		lib=
16		found=no
17		case $deplib in
18		+ -Wl,--as-needed)
19		+ if test "$linkmode,$pass" = "prog,link"; then
20		+ compile_deplibs="$deplib $compile_deplibs"
21		+ finalize_deplibs="$deplib $finalize_deplibs"
22		+ else
23		+ deplibs="$deplib $deplibs"
24		+ fi
25		+ continue
26		+ ;;
27		-mt\|-mthreads\|-kthread\|-Kthread\|-pthread\|-pthreads\|--thread-safe\|-threads)
28		if test "$linkmode,$pass" = "prog,link"; then
29		compile_deplibs="$deplib $compile_deplibs"