diff options
author | Chris Lord <chris@openedhand.com> | 2006-09-21 14:32:50 +0000 |
---|---|---|
committer | Chris Lord <chris@openedhand.com> | 2006-09-21 14:32:50 +0000 |
commit | 650cd19cb5bee8cf0c643470546d39e4357f8fec (patch) | |
tree | a7499f458a3d0cc12e4dccd7f9aad070479f2105 /meta | |
parent | 2b9b7684a6059ecfc31b125509bf779f7dda7109 (diff) | |
download | poky-650cd19cb5bee8cf0c643470546d39e4357f8fec.tar.gz |
Update GStreamer packages, add missing gst-meta-debug package, add
Tremor vorbis stream decoder patch (GNOME bug #357055)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@738 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/gstreamer/gst-meta-audio_0.10.bb | 2 | ||||
-rw-r--r-- | meta/packages/gstreamer/gst-meta-debug_0.10.bb | 5 | ||||
-rw-r--r-- | meta/packages/gstreamer/gst-meta-video_0.10.bb | 9 | ||||
-rw-r--r-- | meta/packages/gstreamer/gst-plugins-bad-0.10.3/configure.patch | 24857 | ||||
-rw-r--r-- | meta/packages/gstreamer/gst-plugins-bad-0.10.3/ivorbisdec.patch | 1365 | ||||
-rw-r--r-- | meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb | 4 | ||||
-rw-r--r-- | meta/packages/gstreamer/gst-plugins-base_0.10.9.bb | 4 | ||||
-rw-r--r-- | meta/packages/gstreamer/gst-plugins-good_0.10.4.bb | 4 | ||||
-rw-r--r-- | meta/packages/gstreamer/gst-plugins.inc | 6 |
9 files changed, 26239 insertions, 17 deletions
diff --git a/meta/packages/gstreamer/gst-meta-audio_0.10.bb b/meta/packages/gstreamer/gst-meta-audio_0.10.bb index 3e9a46680b..39cad65b78 100644 --- a/meta/packages/gstreamer/gst-meta-audio_0.10.bb +++ b/meta/packages/gstreamer/gst-meta-audio_0.10.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | DEPENDS = "gst-meta-base gst-plugins-bad" | 1 | DEPENDS = "gst-meta-base gst-plugins-bad" |
2 | RDEPENDS = "gst-meta-base gst-plugin-ivorbis gst-plugin-ogg" | 2 | RDEPENDS = "gst-meta-base gst-plugin-ivorbis gst-plugin-ogg" |
3 | PR = "r3" | 3 | PR = "r4" |
4 | 4 | ||
5 | ALLOW_EMPTY = "1" | 5 | ALLOW_EMPTY = "1" |
diff --git a/meta/packages/gstreamer/gst-meta-debug_0.10.bb b/meta/packages/gstreamer/gst-meta-debug_0.10.bb new file mode 100644 index 0000000000..f31a6f9c0b --- /dev/null +++ b/meta/packages/gstreamer/gst-meta-debug_0.10.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | DEPENDS = "gst-meta-base gst-plugins-good" | ||
2 | RDEPENDS = "gst-meta-base gst-plugin-debug gst-plugin-audiotestsrc \ | ||
3 | gst-plugin-videotestsrc" | ||
4 | |||
5 | ALLOW_EMPTY = "1" | ||
diff --git a/meta/packages/gstreamer/gst-meta-video_0.10.bb b/meta/packages/gstreamer/gst-meta-video_0.10.bb index cd63d4ba2e..8d1d363d28 100644 --- a/meta/packages/gstreamer/gst-meta-video_0.10.bb +++ b/meta/packages/gstreamer/gst-meta-video_0.10.bb | |||
@@ -1,9 +1,6 @@ | |||
1 | DEPENDS = "gst-meta-base gst-plugins-good gst-fluendo-mpegdemux \ | 1 | DEPENDS = "gst-meta-base gst-plugins-good gst-plugins-ugly" |
2 | gst-plugins-ugly" | 2 | RDEPENDS = "gst-meta-base gst-plugin-matroska gst-plugin-mpeg2dec" |
3 | RDEPENDS = "gst-meta-base gst-plugin-avi \ | ||
4 | gst-plugin-matroska gst-plugin-ogg \ | ||
5 | gst-fluendo-mpegdemux gst-plugin-mpeg2dec" | ||
6 | RRECOMMENDS = "gst-meta-audio" | 3 | RRECOMMENDS = "gst-meta-audio" |
7 | PR = "r2" | 4 | PR = "r3" |
8 | 5 | ||
9 | ALLOW_EMPTY = "1" | 6 | ALLOW_EMPTY = "1" |
diff --git a/meta/packages/gstreamer/gst-plugins-bad-0.10.3/configure.patch b/meta/packages/gstreamer/gst-plugins-bad-0.10.3/configure.patch new file mode 100644 index 0000000000..e41ebcf1fd --- /dev/null +++ b/meta/packages/gstreamer/gst-plugins-bad-0.10.3/configure.patch | |||
@@ -0,0 +1,24857 @@ | |||
1 | --- gst-plugins-bad-0.10.3/ext/ivorbis/Makefile.in.old 2006-09-21 15:26:30.000000000 +0100 | ||
2 | +++ gst-plugins-bad-0.10.3/ext/ivorbis/Makefile.in 2006-09-21 15:26:58.000000000 +0100 | ||
3 | @@ -80,7 +80,7 @@ | ||
4 | libgstivorbis_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ | ||
5 | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) | ||
6 | am_libgstivorbis_la_OBJECTS = libgstivorbis_la-vorbis.lo \ | ||
7 | - libgstivorbis_la-vorbisfile.lo | ||
8 | + libgstivorbis_la-vorbisfile.lo libgstivorbis_la-vorbisdec.lo | ||
9 | libgstivorbis_la_OBJECTS = $(am_libgstivorbis_la_OBJECTS) | ||
10 | DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) | ||
11 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
12 | @@ -153,6 +153,7 @@ | ||
13 | GLIB_LIBS = @GLIB_LIBS@ | ||
14 | GLIB_REQ = @GLIB_REQ@ | ||
15 | GMSGFMT = @GMSGFMT@ | ||
16 | +GREP = @GREP@ | ||
17 | GSM_LIBS = @GSM_LIBS@ | ||
18 | GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@ | ||
19 | GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ | ||
20 | @@ -340,13 +341,9 @@ | ||
21 | XGETTEXT = @XGETTEXT@ | ||
22 | XVIDEO_LIBS = @XVIDEO_LIBS@ | ||
23 | XVID_LIBS = @XVID_LIBS@ | ||
24 | -ac_ct_AR = @ac_ct_AR@ | ||
25 | ac_ct_CC = @ac_ct_CC@ | ||
26 | ac_ct_CXX = @ac_ct_CXX@ | ||
27 | ac_ct_F77 = @ac_ct_F77@ | ||
28 | -ac_ct_RANLIB = @ac_ct_RANLIB@ | ||
29 | -ac_ct_STRIP = @ac_ct_STRIP@ | ||
30 | -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ | ||
31 | am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ | ||
32 | am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ | ||
33 | am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ | ||
34 | @@ -363,26 +360,33 @@ | ||
35 | build_os = @build_os@ | ||
36 | build_vendor = @build_vendor@ | ||
37 | datadir = @datadir@ | ||
38 | +datarootdir = @datarootdir@ | ||
39 | +docdir = @docdir@ | ||
40 | +dvidir = @dvidir@ | ||
41 | exec_prefix = @exec_prefix@ | ||
42 | host = @host@ | ||
43 | host_alias = @host_alias@ | ||
44 | host_cpu = @host_cpu@ | ||
45 | host_os = @host_os@ | ||
46 | host_vendor = @host_vendor@ | ||
47 | +htmldir = @htmldir@ | ||
48 | includedir = @includedir@ | ||
49 | infodir = @infodir@ | ||
50 | install_sh = @install_sh@ | ||
51 | libdir = @libdir@ | ||
52 | libexecdir = @libexecdir@ | ||
53 | +localedir = @localedir@ | ||
54 | localstatedir = @localstatedir@ | ||
55 | mandir = @mandir@ | ||
56 | mkdir_p = @mkdir_p@ | ||
57 | oldincludedir = @oldincludedir@ | ||
58 | +pdfdir = @pdfdir@ | ||
59 | pkgpyexecdir = @pkgpyexecdir@ | ||
60 | pkgpythondir = @pkgpythondir@ | ||
61 | plugindir = @plugindir@ | ||
62 | prefix = @prefix@ | ||
63 | program_transform_name = @program_transform_name@ | ||
64 | +psdir = @psdir@ | ||
65 | pyexecdir = @pyexecdir@ | ||
66 | pythondir = @pythondir@ | ||
67 | sbindir = @sbindir@ | ||
68 | @@ -390,7 +394,7 @@ | ||
69 | sysconfdir = @sysconfdir@ | ||
70 | target_alias = @target_alias@ | ||
71 | plugin_LTLIBRARIES = libgstivorbis.la | ||
72 | -libgstivorbis_la_SOURCES = vorbis.c vorbisfile.c | ||
73 | +libgstivorbis_la_SOURCES = vorbis.c vorbisfile.c vorbisdec.c | ||
74 | libgstivorbis_la_CFLAGS = $(GST_CFLAGS) $(IVORBIS_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) | ||
75 | libgstivorbis_la_LIBADD = $(IVORBIS_LIBS) \ | ||
76 | $(IVORBISFILE_LIBS) \ | ||
77 | @@ -469,6 +473,7 @@ | ||
78 | -rm -f *.tab.c | ||
79 | |||
80 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstivorbis_la-vorbis.Plo@am__quote@ | ||
81 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstivorbis_la-vorbisdec.Plo@am__quote@ | ||
82 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstivorbis_la-vorbisfile.Plo@am__quote@ | ||
83 | |||
84 | .c.o: | ||
85 | @@ -506,6 +511,13 @@ | ||
86 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
87 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstivorbis_la_CFLAGS) $(CFLAGS) -c -o libgstivorbis_la-vorbisfile.lo `test -f 'vorbisfile.c' || echo '$(srcdir)/'`vorbisfile.c | ||
88 | |||
89 | +libgstivorbis_la-vorbisdec.lo: vorbisdec.c | ||
90 | +@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstivorbis_la_CFLAGS) $(CFLAGS) -MT libgstivorbis_la-vorbisdec.lo -MD -MP -MF "$(DEPDIR)/libgstivorbis_la-vorbisdec.Tpo" -c -o libgstivorbis_la-vorbisdec.lo `test -f 'vorbisdec.c' || echo '$(srcdir)/'`vorbisdec.c; \ | ||
91 | +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgstivorbis_la-vorbisdec.Tpo" "$(DEPDIR)/libgstivorbis_la-vorbisdec.Plo"; else rm -f "$(DEPDIR)/libgstivorbis_la-vorbisdec.Tpo"; exit 1; fi | ||
92 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vorbisdec.c' object='libgstivorbis_la-vorbisdec.lo' libtool=yes @AMDEPBACKSLASH@ | ||
93 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
94 | +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstivorbis_la_CFLAGS) $(CFLAGS) -c -o libgstivorbis_la-vorbisdec.lo `test -f 'vorbisdec.c' || echo '$(srcdir)/'`vorbisdec.c | ||
95 | + | ||
96 | mostlyclean-libtool: | ||
97 | -rm -f *.lo | ||
98 | |||
99 | --- gst-plugins-bad-0.10.3/configure.old 2006-09-21 15:29:31.000000000 +0100 | ||
100 | +++ gst-plugins-bad-0.10.3/configure 2006-09-21 15:30:02.000000000 +0100 | ||
101 | @@ -1,10 +1,11 @@ | ||
102 | #! /bin/sh | ||
103 | # Guess values for system-dependent variables and create Makefiles. | ||
104 | -# Generated by GNU Autoconf 2.59 for GStreamer Bad Plug-ins 0.10.3. | ||
105 | +# Generated by GNU Autoconf 2.60 for GStreamer Bad Plug-ins 0.10.3. | ||
106 | # | ||
107 | # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>. | ||
108 | # | ||
109 | -# Copyright (C) 2003 Free Software Foundation, Inc. | ||
110 | +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | ||
111 | +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | ||
112 | # This configure script is free software; the Free Software Foundation | ||
113 | # gives unlimited permission to copy, distribute and modify it. | ||
114 | ## --------------------- ## | ||
115 | @@ -18,11 +19,35 @@ | ||
116 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
117 | # is contrary to our usage. Disable this feature. | ||
118 | alias -g '${1+"$@"}'='"$@"' | ||
119 | -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | ||
120 | - set -o posix | ||
121 | + setopt NO_GLOB_SUBST | ||
122 | +else | ||
123 | + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | ||
124 | fi | ||
125 | +BIN_SH=xpg4; export BIN_SH # for Tru64 | ||
126 | DUALCASE=1; export DUALCASE # for MKS sh | ||
127 | |||
128 | + | ||
129 | +# PATH needs CR | ||
130 | +# Avoid depending upon Character Ranges. | ||
131 | +as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
132 | +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
133 | +as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
134 | +as_cr_digits='0123456789' | ||
135 | +as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
136 | + | ||
137 | +# The user is always right. | ||
138 | +if test "${PATH_SEPARATOR+set}" != set; then | ||
139 | + echo "#! /bin/sh" >conf$$.sh | ||
140 | + echo "exit 0" >>conf$$.sh | ||
141 | + chmod +x conf$$.sh | ||
142 | + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
143 | + PATH_SEPARATOR=';' | ||
144 | + else | ||
145 | + PATH_SEPARATOR=: | ||
146 | + fi | ||
147 | + rm -f conf$$.sh | ||
148 | +fi | ||
149 | + | ||
150 | # Support unset when possible. | ||
151 | if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
152 | as_unset=unset | ||
153 | @@ -31,8 +56,43 @@ | ||
154 | fi | ||
155 | |||
156 | |||
157 | +# IFS | ||
158 | +# We need space, tab and new line, in precisely that order. Quoting is | ||
159 | +# there to prevent editors from complaining about space-tab. | ||
160 | +# (If _AS_PATH_WALK were called with IFS unset, it would disable word | ||
161 | +# splitting by setting IFS to empty value.) | ||
162 | +as_nl=' | ||
163 | +' | ||
164 | +IFS=" "" $as_nl" | ||
165 | + | ||
166 | +# Find who we are. Look in the path if we contain no directory separator. | ||
167 | +case $0 in | ||
168 | + *[\\/]* ) as_myself=$0 ;; | ||
169 | + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
170 | +for as_dir in $PATH | ||
171 | +do | ||
172 | + IFS=$as_save_IFS | ||
173 | + test -z "$as_dir" && as_dir=. | ||
174 | + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
175 | +done | ||
176 | +IFS=$as_save_IFS | ||
177 | + | ||
178 | + ;; | ||
179 | +esac | ||
180 | +# We did not find ourselves, most probably we were run as `sh COMMAND' | ||
181 | +# in which case we are not to be found in the path. | ||
182 | +if test "x$as_myself" = x; then | ||
183 | + as_myself=$0 | ||
184 | +fi | ||
185 | +if test ! -f "$as_myself"; then | ||
186 | + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | ||
187 | + { (exit 1); exit 1; } | ||
188 | +fi | ||
189 | + | ||
190 | # Work around bugs in pre-3.0 UWIN ksh. | ||
191 | -$as_unset ENV MAIL MAILPATH | ||
192 | +for as_var in ENV MAIL MAILPATH | ||
193 | +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
194 | +done | ||
195 | PS1='$ ' | ||
196 | PS2='> ' | ||
197 | PS4='+ ' | ||
198 | @@ -46,18 +106,19 @@ | ||
199 | if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
200 | eval $as_var=C; export $as_var | ||
201 | else | ||
202 | - $as_unset $as_var | ||
203 | + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
204 | fi | ||
205 | done | ||
206 | |||
207 | # Required to use basename. | ||
208 | -if expr a : '\(a\)' >/dev/null 2>&1; then | ||
209 | +if expr a : '\(a\)' >/dev/null 2>&1 && | ||
210 | + test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
211 | as_expr=expr | ||
212 | else | ||
213 | as_expr=false | ||
214 | fi | ||
215 | |||
216 | -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then | ||
217 | +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then | ||
218 | as_basename=basename | ||
219 | else | ||
220 | as_basename=false | ||
221 | @@ -65,157 +126,386 @@ | ||
222 | |||
223 | |||
224 | # Name of the executable. | ||
225 | -as_me=`$as_basename "$0" || | ||
226 | +as_me=`$as_basename -- "$0" || | ||
227 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | ||
228 | X"$0" : 'X\(//\)$' \| \ | ||
229 | - X"$0" : 'X\(/\)$' \| \ | ||
230 | - . : '\(.\)' 2>/dev/null || | ||
231 | + X"$0" : 'X\(/\)' \| . 2>/dev/null || | ||
232 | echo X/"$0" | | ||
233 | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } | ||
234 | - /^X\/\(\/\/\)$/{ s//\1/; q; } | ||
235 | - /^X\/\(\/\).*/{ s//\1/; q; } | ||
236 | - s/.*/./; q'` | ||
237 | + sed '/^.*\/\([^/][^/]*\)\/*$/{ | ||
238 | + s//\1/ | ||
239 | + q | ||
240 | + } | ||
241 | + /^X\/\(\/\/\)$/{ | ||
242 | + s//\1/ | ||
243 | + q | ||
244 | + } | ||
245 | + /^X\/\(\/\).*/{ | ||
246 | + s//\1/ | ||
247 | + q | ||
248 | + } | ||
249 | + s/.*/./; q'` | ||
250 | |||
251 | +# CDPATH. | ||
252 | +$as_unset CDPATH | ||
253 | |||
254 | -# PATH needs CR, and LINENO needs CR and PATH. | ||
255 | -# Avoid depending upon Character Ranges. | ||
256 | -as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
257 | -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
258 | -as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
259 | -as_cr_digits='0123456789' | ||
260 | -as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
261 | |||
262 | -# The user is always right. | ||
263 | -if test "${PATH_SEPARATOR+set}" != set; then | ||
264 | - echo "#! /bin/sh" >conf$$.sh | ||
265 | - echo "exit 0" >>conf$$.sh | ||
266 | - chmod +x conf$$.sh | ||
267 | - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
268 | - PATH_SEPARATOR=';' | ||
269 | - else | ||
270 | - PATH_SEPARATOR=: | ||
271 | - fi | ||
272 | - rm -f conf$$.sh | ||
273 | +if test "x$CONFIG_SHELL" = x; then | ||
274 | + if (eval ":") 2>/dev/null; then | ||
275 | + as_have_required=yes | ||
276 | +else | ||
277 | + as_have_required=no | ||
278 | fi | ||
279 | |||
280 | + if test $as_have_required = yes && (eval ": | ||
281 | +(as_func_return () { | ||
282 | + (exit \$1) | ||
283 | +} | ||
284 | +as_func_success () { | ||
285 | + as_func_return 0 | ||
286 | +} | ||
287 | +as_func_failure () { | ||
288 | + as_func_return 1 | ||
289 | +} | ||
290 | +as_func_ret_success () { | ||
291 | + return 0 | ||
292 | +} | ||
293 | +as_func_ret_failure () { | ||
294 | + return 1 | ||
295 | +} | ||
296 | |||
297 | - as_lineno_1=$LINENO | ||
298 | - as_lineno_2=$LINENO | ||
299 | - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
300 | - test "x$as_lineno_1" != "x$as_lineno_2" && | ||
301 | - test "x$as_lineno_3" = "x$as_lineno_2" || { | ||
302 | - # Find who we are. Look in the path if we contain no path at all | ||
303 | - # relative or not. | ||
304 | - case $0 in | ||
305 | - *[\\/]* ) as_myself=$0 ;; | ||
306 | - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
307 | -for as_dir in $PATH | ||
308 | -do | ||
309 | - IFS=$as_save_IFS | ||
310 | - test -z "$as_dir" && as_dir=. | ||
311 | - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
312 | -done | ||
313 | +exitcode=0 | ||
314 | +if as_func_success; then | ||
315 | + : | ||
316 | +else | ||
317 | + exitcode=1 | ||
318 | + echo as_func_success failed. | ||
319 | +fi | ||
320 | |||
321 | - ;; | ||
322 | - esac | ||
323 | - # We did not find ourselves, most probably we were run as `sh COMMAND' | ||
324 | - # in which case we are not to be found in the path. | ||
325 | - if test "x$as_myself" = x; then | ||
326 | - as_myself=$0 | ||
327 | - fi | ||
328 | - if test ! -f "$as_myself"; then | ||
329 | - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 | ||
330 | - { (exit 1); exit 1; }; } | ||
331 | - fi | ||
332 | - case $CONFIG_SHELL in | ||
333 | - '') | ||
334 | +if as_func_failure; then | ||
335 | + exitcode=1 | ||
336 | + echo as_func_failure succeeded. | ||
337 | +fi | ||
338 | + | ||
339 | +if as_func_ret_success; then | ||
340 | + : | ||
341 | +else | ||
342 | + exitcode=1 | ||
343 | + echo as_func_ret_success failed. | ||
344 | +fi | ||
345 | + | ||
346 | +if as_func_ret_failure; then | ||
347 | + exitcode=1 | ||
348 | + echo as_func_ret_failure succeeded. | ||
349 | +fi | ||
350 | + | ||
351 | +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then | ||
352 | + : | ||
353 | +else | ||
354 | + exitcode=1 | ||
355 | + echo positional parameters were not saved. | ||
356 | +fi | ||
357 | + | ||
358 | +test \$exitcode = 0) || { (exit 1); exit 1; } | ||
359 | + | ||
360 | +( | ||
361 | + as_lineno_1=\$LINENO | ||
362 | + as_lineno_2=\$LINENO | ||
363 | + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && | ||
364 | + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } | ||
365 | +") 2> /dev/null; then | ||
366 | + : | ||
367 | +else | ||
368 | + as_candidate_shells= | ||
369 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
370 | -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | ||
371 | +for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | ||
372 | do | ||
373 | IFS=$as_save_IFS | ||
374 | test -z "$as_dir" && as_dir=. | ||
375 | - for as_base in sh bash ksh sh5; do | ||
376 | - case $as_dir in | ||
377 | + case $as_dir in | ||
378 | /*) | ||
379 | - if ("$as_dir/$as_base" -c ' | ||
380 | + for as_base in sh bash ksh sh5; do | ||
381 | + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" | ||
382 | + done;; | ||
383 | + esac | ||
384 | +done | ||
385 | +IFS=$as_save_IFS | ||
386 | + | ||
387 | + | ||
388 | + for as_shell in $as_candidate_shells $SHELL; do | ||
389 | + # Try only shells that exist, to save several forks. | ||
390 | + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && | ||
391 | + { ("$as_shell") 2> /dev/null <<\_ASEOF | ||
392 | +# Be Bourne compatible | ||
393 | +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
394 | + emulate sh | ||
395 | + NULLCMD=: | ||
396 | + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
397 | + # is contrary to our usage. Disable this feature. | ||
398 | + alias -g '${1+"$@"}'='"$@"' | ||
399 | + setopt NO_GLOB_SUBST | ||
400 | +else | ||
401 | + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | ||
402 | +fi | ||
403 | +BIN_SH=xpg4; export BIN_SH # for Tru64 | ||
404 | +DUALCASE=1; export DUALCASE # for MKS sh | ||
405 | + | ||
406 | +: | ||
407 | +_ASEOF | ||
408 | +}; then | ||
409 | + CONFIG_SHELL=$as_shell | ||
410 | + as_have_required=yes | ||
411 | + if { "$as_shell" 2> /dev/null <<\_ASEOF | ||
412 | +# Be Bourne compatible | ||
413 | +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
414 | + emulate sh | ||
415 | + NULLCMD=: | ||
416 | + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
417 | + # is contrary to our usage. Disable this feature. | ||
418 | + alias -g '${1+"$@"}'='"$@"' | ||
419 | + setopt NO_GLOB_SUBST | ||
420 | +else | ||
421 | + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | ||
422 | +fi | ||
423 | +BIN_SH=xpg4; export BIN_SH # for Tru64 | ||
424 | +DUALCASE=1; export DUALCASE # for MKS sh | ||
425 | + | ||
426 | +: | ||
427 | +(as_func_return () { | ||
428 | + (exit $1) | ||
429 | +} | ||
430 | +as_func_success () { | ||
431 | + as_func_return 0 | ||
432 | +} | ||
433 | +as_func_failure () { | ||
434 | + as_func_return 1 | ||
435 | +} | ||
436 | +as_func_ret_success () { | ||
437 | + return 0 | ||
438 | +} | ||
439 | +as_func_ret_failure () { | ||
440 | + return 1 | ||
441 | +} | ||
442 | + | ||
443 | +exitcode=0 | ||
444 | +if as_func_success; then | ||
445 | + : | ||
446 | +else | ||
447 | + exitcode=1 | ||
448 | + echo as_func_success failed. | ||
449 | +fi | ||
450 | + | ||
451 | +if as_func_failure; then | ||
452 | + exitcode=1 | ||
453 | + echo as_func_failure succeeded. | ||
454 | +fi | ||
455 | + | ||
456 | +if as_func_ret_success; then | ||
457 | + : | ||
458 | +else | ||
459 | + exitcode=1 | ||
460 | + echo as_func_ret_success failed. | ||
461 | +fi | ||
462 | + | ||
463 | +if as_func_ret_failure; then | ||
464 | + exitcode=1 | ||
465 | + echo as_func_ret_failure succeeded. | ||
466 | +fi | ||
467 | + | ||
468 | +if ( set x; as_func_ret_success y && test x = "$1" ); then | ||
469 | + : | ||
470 | +else | ||
471 | + exitcode=1 | ||
472 | + echo positional parameters were not saved. | ||
473 | +fi | ||
474 | + | ||
475 | +test $exitcode = 0) || { (exit 1); exit 1; } | ||
476 | + | ||
477 | +( | ||
478 | as_lineno_1=$LINENO | ||
479 | as_lineno_2=$LINENO | ||
480 | - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
481 | test "x$as_lineno_1" != "x$as_lineno_2" && | ||
482 | - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then | ||
483 | - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } | ||
484 | - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } | ||
485 | - CONFIG_SHELL=$as_dir/$as_base | ||
486 | - export CONFIG_SHELL | ||
487 | - exec "$CONFIG_SHELL" "$0" ${1+"$@"} | ||
488 | - fi;; | ||
489 | - esac | ||
490 | - done | ||
491 | -done | ||
492 | -;; | ||
493 | - esac | ||
494 | + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } | ||
495 | + | ||
496 | +_ASEOF | ||
497 | +}; then | ||
498 | + break | ||
499 | +fi | ||
500 | + | ||
501 | +fi | ||
502 | + | ||
503 | + done | ||
504 | + | ||
505 | + if test "x$CONFIG_SHELL" != x; then | ||
506 | + for as_var in BASH_ENV ENV | ||
507 | + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
508 | + done | ||
509 | + export CONFIG_SHELL | ||
510 | + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} | ||
511 | +fi | ||
512 | + | ||
513 | + | ||
514 | + if test $as_have_required = no; then | ||
515 | + echo This script requires a shell more modern than all the | ||
516 | + echo shells that I found on your system. Please install a | ||
517 | + echo modern shell, or manually run the script under such a | ||
518 | + echo shell if you do have one. | ||
519 | + { (exit 1); exit 1; } | ||
520 | +fi | ||
521 | + | ||
522 | + | ||
523 | +fi | ||
524 | + | ||
525 | +fi | ||
526 | + | ||
527 | + | ||
528 | + | ||
529 | +(eval "as_func_return () { | ||
530 | + (exit \$1) | ||
531 | +} | ||
532 | +as_func_success () { | ||
533 | + as_func_return 0 | ||
534 | +} | ||
535 | +as_func_failure () { | ||
536 | + as_func_return 1 | ||
537 | +} | ||
538 | +as_func_ret_success () { | ||
539 | + return 0 | ||
540 | +} | ||
541 | +as_func_ret_failure () { | ||
542 | + return 1 | ||
543 | +} | ||
544 | + | ||
545 | +exitcode=0 | ||
546 | +if as_func_success; then | ||
547 | + : | ||
548 | +else | ||
549 | + exitcode=1 | ||
550 | + echo as_func_success failed. | ||
551 | +fi | ||
552 | + | ||
553 | +if as_func_failure; then | ||
554 | + exitcode=1 | ||
555 | + echo as_func_failure succeeded. | ||
556 | +fi | ||
557 | + | ||
558 | +if as_func_ret_success; then | ||
559 | + : | ||
560 | +else | ||
561 | + exitcode=1 | ||
562 | + echo as_func_ret_success failed. | ||
563 | +fi | ||
564 | + | ||
565 | +if as_func_ret_failure; then | ||
566 | + exitcode=1 | ||
567 | + echo as_func_ret_failure succeeded. | ||
568 | +fi | ||
569 | + | ||
570 | +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then | ||
571 | + : | ||
572 | +else | ||
573 | + exitcode=1 | ||
574 | + echo positional parameters were not saved. | ||
575 | +fi | ||
576 | + | ||
577 | +test \$exitcode = 0") || { | ||
578 | + echo No shell found that supports shell functions. | ||
579 | + echo Please tell autoconf@gnu.org about your system, | ||
580 | + echo including any error possibly output before this | ||
581 | + echo message | ||
582 | +} | ||
583 | + | ||
584 | + | ||
585 | + | ||
586 | + as_lineno_1=$LINENO | ||
587 | + as_lineno_2=$LINENO | ||
588 | + test "x$as_lineno_1" != "x$as_lineno_2" && | ||
589 | + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { | ||
590 | |||
591 | # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | ||
592 | # uniformly replaced by the line number. The first 'sed' inserts a | ||
593 | - # line-number line before each line; the second 'sed' does the real | ||
594 | - # work. The second script uses 'N' to pair each line-number line | ||
595 | - # with the numbered line, and appends trailing '-' during | ||
596 | - # substitution so that $LINENO is not a special case at line end. | ||
597 | + # line-number line after each line using $LINENO; the second 'sed' | ||
598 | + # does the real work. The second script uses 'N' to pair each | ||
599 | + # line-number line with the line containing $LINENO, and appends | ||
600 | + # trailing '-' during substitution so that $LINENO is not a special | ||
601 | + # case at line end. | ||
602 | # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | ||
603 | - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) | ||
604 | - sed '=' <$as_myself | | ||
605 | + # scripts with optimization help from Paolo Bonzini. Blame Lee | ||
606 | + # E. McMahon (1931-1989) for sed's syntax. :-) | ||
607 | + sed -n ' | ||
608 | + p | ||
609 | + /[$]LINENO/= | ||
610 | + ' <$as_myself | | ||
611 | sed ' | ||
612 | + s/[$]LINENO.*/&-/ | ||
613 | + t lineno | ||
614 | + b | ||
615 | + :lineno | ||
616 | N | ||
617 | - s,$,-, | ||
618 | - : loop | ||
619 | - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, | ||
620 | + :loop | ||
621 | + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ | ||
622 | t loop | ||
623 | - s,-$,, | ||
624 | - s,^['$as_cr_digits']*\n,, | ||
625 | + s/-\n.*// | ||
626 | ' >$as_me.lineno && | ||
627 | - chmod +x $as_me.lineno || | ||
628 | + chmod +x "$as_me.lineno" || | ||
629 | { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | ||
630 | { (exit 1); exit 1; }; } | ||
631 | |||
632 | # Don't try to exec as it changes $[0], causing all sort of problems | ||
633 | # (the dirname of $[0] is not the place where we might find the | ||
634 | - # original and so on. Autoconf is especially sensible to this). | ||
635 | - . ./$as_me.lineno | ||
636 | + # original and so on. Autoconf is especially sensitive to this). | ||
637 | + . "./$as_me.lineno" | ||
638 | # Exit status is that of the last command. | ||
639 | exit | ||
640 | } | ||
641 | |||
642 | |||
643 | -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in | ||
644 | - *c*,-n*) ECHO_N= ECHO_C=' | ||
645 | -' ECHO_T=' ' ;; | ||
646 | - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; | ||
647 | - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; | ||
648 | +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | ||
649 | + as_dirname=dirname | ||
650 | +else | ||
651 | + as_dirname=false | ||
652 | +fi | ||
653 | + | ||
654 | +ECHO_C= ECHO_N= ECHO_T= | ||
655 | +case `echo -n x` in | ||
656 | +-n*) | ||
657 | + case `echo 'x\c'` in | ||
658 | + *c*) ECHO_T=' ';; # ECHO_T is single tab character. | ||
659 | + *) ECHO_C='\c';; | ||
660 | + esac;; | ||
661 | +*) | ||
662 | + ECHO_N='-n';; | ||
663 | esac | ||
664 | |||
665 | -if expr a : '\(a\)' >/dev/null 2>&1; then | ||
666 | +if expr a : '\(a\)' >/dev/null 2>&1 && | ||
667 | + test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
668 | as_expr=expr | ||
669 | else | ||
670 | as_expr=false | ||
671 | fi | ||
672 | |||
673 | rm -f conf$$ conf$$.exe conf$$.file | ||
674 | +if test -d conf$$.dir; then | ||
675 | + rm -f conf$$.dir/conf$$.file | ||
676 | +else | ||
677 | + rm -f conf$$.dir | ||
678 | + mkdir conf$$.dir | ||
679 | +fi | ||
680 | echo >conf$$.file | ||
681 | if ln -s conf$$.file conf$$ 2>/dev/null; then | ||
682 | - # We could just check for DJGPP; but this test a) works b) is more generic | ||
683 | - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). | ||
684 | - if test -f conf$$.exe; then | ||
685 | - # Don't use ln at all; we don't have any links | ||
686 | + as_ln_s='ln -s' | ||
687 | + # ... but there are two gotchas: | ||
688 | + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | ||
689 | + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | ||
690 | + # In both cases, we have to default to `cp -p'. | ||
691 | + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | ||
692 | as_ln_s='cp -p' | ||
693 | - else | ||
694 | - as_ln_s='ln -s' | ||
695 | - fi | ||
696 | elif ln conf$$.file conf$$ 2>/dev/null; then | ||
697 | as_ln_s=ln | ||
698 | else | ||
699 | as_ln_s='cp -p' | ||
700 | fi | ||
701 | -rm -f conf$$ conf$$.exe conf$$.file | ||
702 | +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | ||
703 | +rmdir conf$$.dir 2>/dev/null | ||
704 | |||
705 | if mkdir -p . 2>/dev/null; then | ||
706 | as_mkdir_p=: | ||
707 | @@ -224,7 +514,19 @@ | ||
708 | as_mkdir_p=false | ||
709 | fi | ||
710 | |||
711 | -as_executable_p="test -f" | ||
712 | +# Find out whether ``test -x'' works. Don't use a zero-byte file, as | ||
713 | +# systems may use methods other than mode bits to determine executability. | ||
714 | +cat >conf$$.file <<_ASEOF | ||
715 | +#! /bin/sh | ||
716 | +exit 0 | ||
717 | +_ASEOF | ||
718 | +chmod +x conf$$.file | ||
719 | +if test -x conf$$.file >/dev/null 2>&1; then | ||
720 | + as_executable_p="test -x" | ||
721 | +else | ||
722 | + as_executable_p=: | ||
723 | +fi | ||
724 | +rm -f conf$$.file | ||
725 | |||
726 | # Sed expression to map a string onto a valid CPP name. | ||
727 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | ||
728 | @@ -233,15 +535,6 @@ | ||
729 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | ||
730 | |||
731 | |||
732 | -# IFS | ||
733 | -# We need space, tab and new line, in precisely that order. | ||
734 | -as_nl=' | ||
735 | -' | ||
736 | -IFS=" $as_nl" | ||
737 | - | ||
738 | -# CDPATH. | ||
739 | -$as_unset CDPATH | ||
740 | - | ||
741 | |||
742 | |||
743 | # Check that we are running under the correct shell. | ||
744 | @@ -397,29 +690,26 @@ | ||
745 | |||
746 | tagnames=${tagnames+${tagnames},}F77 | ||
747 | |||
748 | +exec 7<&0 </dev/null 6>&1 | ||
749 | + | ||
750 | # Name of the host. | ||
751 | # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, | ||
752 | # so uname gets run too. | ||
753 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` | ||
754 | |||
755 | -exec 6>&1 | ||
756 | - | ||
757 | # | ||
758 | # Initializations. | ||
759 | # | ||
760 | ac_default_prefix=/usr/local | ||
761 | +ac_clean_files= | ||
762 | ac_config_libobj_dir=. | ||
763 | +LIBOBJS= | ||
764 | cross_compiling=no | ||
765 | subdirs= | ||
766 | MFLAGS= | ||
767 | MAKEFLAGS= | ||
768 | SHELL=${CONFIG_SHELL-/bin/sh} | ||
769 | |||
770 | -# Maximum number of lines to put in a shell here document. | ||
771 | -# This variable seems obsolete. It should probably be removed, and | ||
772 | -# only ac_max_sed_lines should be used. | ||
773 | -: ${ac_max_here_lines=38} | ||
774 | - | ||
775 | # Identity of this package. | ||
776 | PACKAGE_NAME='GStreamer Bad Plug-ins' | ||
777 | PACKAGE_TARNAME='gst-plugins-bad' | ||
778 | @@ -456,17 +746,357 @@ | ||
779 | #endif | ||
780 | #if HAVE_INTTYPES_H | ||
781 | # include <inttypes.h> | ||
782 | -#else | ||
783 | -# if HAVE_STDINT_H | ||
784 | -# include <stdint.h> | ||
785 | -# endif | ||
786 | +#endif | ||
787 | +#if HAVE_STDINT_H | ||
788 | +# include <stdint.h> | ||
789 | #endif | ||
790 | #if HAVE_UNISTD_H | ||
791 | # include <unistd.h> | ||
792 | #endif" | ||
793 | |||
794 | -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar PACKAGE_VERSION_MAJOR PACKAGE_VERSION_MINOR PACKAGE_VERSION_MICRO PACKAGE_VERSION_NANO PACKAGE_VERSION_RELEASE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os GST_MAJORMINOR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ACLOCAL_AMFLAGS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE LOCALEDIR PKG_CONFIG ac_pt_PKG_CONFIG VALGRIND_CFLAGS VALGRIND_LIBS GST_GCOV_ENABLED_TRUE GST_GCOV_ENABLED_FALSE BUILD_EXAMPLES_TRUE BUILD_EXAMPLES_FALSE GST_PACKAGE_NAME GST_PACKAGE_ORIGIN GST_PLUGINS_ALL USE_EXTERNAL_TRUE USE_EXTERNAL_FALSE BUILD_EXTERNAL_TRUE BUILD_EXTERNAL_FALSE USE_EXPERIMENTAL_TRUE USE_EXPERIMENTAL_FALSE BUILD_EXPERIMENTAL_TRUE BUILD_EXPERIMENTAL_FALSE HAVE_CPU_I386_TRUE HAVE_CPU_I386_FALSE HAVE_CPU_PPC_TRUE HAVE_CPU_PPC_FALSE HAVE_CPU_ALPHA_TRUE HAVE_CPU_ALPHA_FALSE HAVE_CPU_ARM_TRUE HAVE_CPU_ARM_FALSE HAVE_CPU_SPARC_TRUE HAVE_CPU_SPARC_FALSE HAVE_CPU_HPPA_TRUE HAVE_CPU_HPPA_FALSE HAVE_CPU_MIPS_TRUE HAVE_CPU_MIPS_FALSE HAVE_CPU_S390_TRUE HAVE_CPU_S390_FALSE HAVE_CPU_IA64_TRUE HAVE_CPU_IA64_FALSE HAVE_CPU_M68K_TRUE HAVE_CPU_M68K_FALSE HAVE_CPU_X86_64_TRUE HAVE_CPU_X86_64_FALSE HAVE_CXX VALGRIND_PATH HAVE_VALGRIND_TRUE HAVE_VALGRIND_FALSE HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir GLIB_REQ GLIB_CFLAGS GLIB_LIBS LIBOIL_CFLAGS LIBOIL_LIBS GST_CFLAGS GST_LIBS GST_TOOLS_DIR GST_PLUGINS_DIR GST_BASE_CFLAGS GST_BASE_LIBS GST_CHECK_CFLAGS GST_CHECK_LIBS CHECK_CFLAGS CHECK_LIBS HAVE_CHECK_TRUE HAVE_CHECK_FALSE GST_PLUGINS_BASE_CFLAGS GST_PLUGINS_BASE_LIBS GSTPB_PLUGINS_DIR GST_LICENSE PLUGINDIR plugindir ERROR_CFLAGS GST_LEVEL_DEFAULT GST_PLUGINS_SELECTED HAVE_GL USE_OPENGL_TRUE USE_OPENGL_FALSE XVIDEO_LIBS USE_GST_V4L2_TRUE USE_GST_V4L2_FALSE USE_XVIDEO_TRUE USE_XVIDEO_FALSE HAVE_AMRWB USE_AMRWB_TRUE USE_AMRWB_FALSE HAVE_BZ2 BZ2_LIBS USE_BZ2_TRUE USE_BZ2_FALSE DIRECTFB_CFLAGS DIRECTFB_LIBS USE_DIRECTFB_TRUE USE_DIRECTFB_FALSE HAVE_DTS DTS_LIBS USE_DTS_TRUE USE_DTS_FALSE DIVXENC_LIBS DIVXDEC_LIBS USE_DIVX_TRUE USE_DIVX_FALSE HAVE_FAAC FAAC_LIBS USE_FAAC_TRUE USE_FAAC_FALSE HAVE_FAAD FAAD_LIBS USE_FAAD_TRUE USE_FAAD_FALSE HAVE_GSM GSM_LIBS USE_GSM_TRUE USE_GSM_FALSE IVORBIS_LIBS IVORBIS_CFLAGS USE_IVORBIS_TRUE USE_IVORBIS_FALSE LIBMMS_CFLAGS LIBMMS_LIBS USE_LIBMMS_TRUE USE_LIBMMS_FALSE MUSEPACK_LIBS USE_MUSEPACK_TRUE USE_MUSEPACK_FALSE MUSICBRAINZ_CFLAGS MUSICBRAINZ_LIBS USE_MUSICBRAINZ_TRUE USE_MUSICBRAINZ_FALSE NEON_CFLAGS NEON_LIBS USE_NEON_TRUE USE_NEON_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS USE_SDL_TRUE USE_SDL_FALSE SOUNDTOUCH_CFLAGS SOUNDTOUCH_LIBS USE_SOUNDTOUCH_TRUE USE_SOUNDTOUCH_FALSE SWFDEC_CFLAGS SWFDEC_LIBS USE_SWFDEC_TRUE USE_SWFDEC_FALSE THEORADEC_CFLAGS THEORADEC_LIBS USE_THEORADEC_TRUE USE_THEORADEC_FALSE XVID_LIBS USE_XVID_TRUE USE_XVID_FALSE WAVPACK_CFLAGS WAVPACK_LIBS USE_WAVPACK_TRUE USE_WAVPACK_FALSE PROFILE_CFLAGS DEPRECATED_CFLAGS GST_OPTION_CFLAGS GST_PLUGIN_LDFLAGS LIBOBJS LTLIBOBJS' | ||
795 | +ac_subst_vars='SHELL | ||
796 | +PATH_SEPARATOR | ||
797 | +PACKAGE_NAME | ||
798 | +PACKAGE_TARNAME | ||
799 | +PACKAGE_VERSION | ||
800 | +PACKAGE_STRING | ||
801 | +PACKAGE_BUGREPORT | ||
802 | +exec_prefix | ||
803 | +prefix | ||
804 | +program_transform_name | ||
805 | +bindir | ||
806 | +sbindir | ||
807 | +libexecdir | ||
808 | +datarootdir | ||
809 | +datadir | ||
810 | +sysconfdir | ||
811 | +sharedstatedir | ||
812 | +localstatedir | ||
813 | +includedir | ||
814 | +oldincludedir | ||
815 | +docdir | ||
816 | +infodir | ||
817 | +htmldir | ||
818 | +dvidir | ||
819 | +pdfdir | ||
820 | +psdir | ||
821 | +libdir | ||
822 | +localedir | ||
823 | +mandir | ||
824 | +DEFS | ||
825 | +ECHO_C | ||
826 | +ECHO_N | ||
827 | +ECHO_T | ||
828 | +LIBS | ||
829 | +build_alias | ||
830 | +host_alias | ||
831 | +target_alias | ||
832 | +INSTALL_PROGRAM | ||
833 | +INSTALL_SCRIPT | ||
834 | +INSTALL_DATA | ||
835 | +CYGPATH_W | ||
836 | +PACKAGE | ||
837 | +VERSION | ||
838 | +ACLOCAL | ||
839 | +AUTOCONF | ||
840 | +AUTOMAKE | ||
841 | +AUTOHEADER | ||
842 | +MAKEINFO | ||
843 | +install_sh | ||
844 | +STRIP | ||
845 | +INSTALL_STRIP_PROGRAM | ||
846 | +mkdir_p | ||
847 | +AWK | ||
848 | +SET_MAKE | ||
849 | +am__leading_dot | ||
850 | +AMTAR | ||
851 | +am__tar | ||
852 | +am__untar | ||
853 | +PACKAGE_VERSION_MAJOR | ||
854 | +PACKAGE_VERSION_MINOR | ||
855 | +PACKAGE_VERSION_MICRO | ||
856 | +PACKAGE_VERSION_NANO | ||
857 | +PACKAGE_VERSION_RELEASE | ||
858 | +MAINTAINER_MODE_TRUE | ||
859 | +MAINTAINER_MODE_FALSE | ||
860 | +MAINT | ||
861 | +build | ||
862 | +build_cpu | ||
863 | +build_vendor | ||
864 | +build_os | ||
865 | +host | ||
866 | +host_cpu | ||
867 | +host_vendor | ||
868 | +host_os | ||
869 | +GST_MAJORMINOR | ||
870 | +CC | ||
871 | +CFLAGS | ||
872 | +LDFLAGS | ||
873 | +CPPFLAGS | ||
874 | +ac_ct_CC | ||
875 | +EXEEXT | ||
876 | +OBJEXT | ||
877 | +DEPDIR | ||
878 | +am__include | ||
879 | +am__quote | ||
880 | +AMDEP_TRUE | ||
881 | +AMDEP_FALSE | ||
882 | +AMDEPBACKSLASH | ||
883 | +CCDEPMODE | ||
884 | +am__fastdepCC_TRUE | ||
885 | +am__fastdepCC_FALSE | ||
886 | +GREP | ||
887 | +EGREP | ||
888 | +LN_S | ||
889 | +ECHO | ||
890 | +AR | ||
891 | +RANLIB | ||
892 | +CPP | ||
893 | +CXX | ||
894 | +CXXFLAGS | ||
895 | +ac_ct_CXX | ||
896 | +CXXDEPMODE | ||
897 | +am__fastdepCXX_TRUE | ||
898 | +am__fastdepCXX_FALSE | ||
899 | +CXXCPP | ||
900 | +F77 | ||
901 | +FFLAGS | ||
902 | +ac_ct_F77 | ||
903 | +LIBTOOL | ||
904 | +ACLOCAL_AMFLAGS | ||
905 | +MKINSTALLDIRS | ||
906 | +MSGFMT | ||
907 | +GMSGFMT | ||
908 | +XGETTEXT | ||
909 | +MSGMERGE | ||
910 | +USE_NLS | ||
911 | +LIBICONV | ||
912 | +LTLIBICONV | ||
913 | +INTLLIBS | ||
914 | +LIBINTL | ||
915 | +LTLIBINTL | ||
916 | +POSUB | ||
917 | +GETTEXT_PACKAGE | ||
918 | +LOCALEDIR | ||
919 | +PKG_CONFIG | ||
920 | +VALGRIND_CFLAGS | ||
921 | +VALGRIND_LIBS | ||
922 | +GST_GCOV_ENABLED_TRUE | ||
923 | +GST_GCOV_ENABLED_FALSE | ||
924 | +BUILD_EXAMPLES_TRUE | ||
925 | +BUILD_EXAMPLES_FALSE | ||
926 | +GST_PACKAGE_NAME | ||
927 | +GST_PACKAGE_ORIGIN | ||
928 | +GST_PLUGINS_ALL | ||
929 | +USE_EXTERNAL_TRUE | ||
930 | +USE_EXTERNAL_FALSE | ||
931 | +BUILD_EXTERNAL_TRUE | ||
932 | +BUILD_EXTERNAL_FALSE | ||
933 | +USE_EXPERIMENTAL_TRUE | ||
934 | +USE_EXPERIMENTAL_FALSE | ||
935 | +BUILD_EXPERIMENTAL_TRUE | ||
936 | +BUILD_EXPERIMENTAL_FALSE | ||
937 | +HAVE_CPU_I386_TRUE | ||
938 | +HAVE_CPU_I386_FALSE | ||
939 | +HAVE_CPU_PPC_TRUE | ||
940 | +HAVE_CPU_PPC_FALSE | ||
941 | +HAVE_CPU_ALPHA_TRUE | ||
942 | +HAVE_CPU_ALPHA_FALSE | ||
943 | +HAVE_CPU_ARM_TRUE | ||
944 | +HAVE_CPU_ARM_FALSE | ||
945 | +HAVE_CPU_SPARC_TRUE | ||
946 | +HAVE_CPU_SPARC_FALSE | ||
947 | +HAVE_CPU_HPPA_TRUE | ||
948 | +HAVE_CPU_HPPA_FALSE | ||
949 | +HAVE_CPU_MIPS_TRUE | ||
950 | +HAVE_CPU_MIPS_FALSE | ||
951 | +HAVE_CPU_S390_TRUE | ||
952 | +HAVE_CPU_S390_FALSE | ||
953 | +HAVE_CPU_IA64_TRUE | ||
954 | +HAVE_CPU_IA64_FALSE | ||
955 | +HAVE_CPU_M68K_TRUE | ||
956 | +HAVE_CPU_M68K_FALSE | ||
957 | +HAVE_CPU_X86_64_TRUE | ||
958 | +HAVE_CPU_X86_64_FALSE | ||
959 | +HAVE_CXX | ||
960 | +VALGRIND_PATH | ||
961 | +HAVE_VALGRIND_TRUE | ||
962 | +HAVE_VALGRIND_FALSE | ||
963 | +HTML_DIR | ||
964 | +ENABLE_GTK_DOC_TRUE | ||
965 | +ENABLE_GTK_DOC_FALSE | ||
966 | +GTK_DOC_USE_LIBTOOL_TRUE | ||
967 | +GTK_DOC_USE_LIBTOOL_FALSE | ||
968 | +PYTHON | ||
969 | +PYTHON_VERSION | ||
970 | +PYTHON_PREFIX | ||
971 | +PYTHON_EXEC_PREFIX | ||
972 | +PYTHON_PLATFORM | ||
973 | +pythondir | ||
974 | +pkgpythondir | ||
975 | +pyexecdir | ||
976 | +pkgpyexecdir | ||
977 | +GLIB_REQ | ||
978 | +GLIB_CFLAGS | ||
979 | +GLIB_LIBS | ||
980 | +LIBOIL_CFLAGS | ||
981 | +LIBOIL_LIBS | ||
982 | +GST_CFLAGS | ||
983 | +GST_LIBS | ||
984 | +GST_TOOLS_DIR | ||
985 | +GST_PLUGINS_DIR | ||
986 | +GST_BASE_CFLAGS | ||
987 | +GST_BASE_LIBS | ||
988 | +GST_CHECK_CFLAGS | ||
989 | +GST_CHECK_LIBS | ||
990 | +CHECK_CFLAGS | ||
991 | +CHECK_LIBS | ||
992 | +HAVE_CHECK_TRUE | ||
993 | +HAVE_CHECK_FALSE | ||
994 | +GST_PLUGINS_BASE_CFLAGS | ||
995 | +GST_PLUGINS_BASE_LIBS | ||
996 | +GSTPB_PLUGINS_DIR | ||
997 | +GST_LICENSE | ||
998 | +PLUGINDIR | ||
999 | +plugindir | ||
1000 | +ERROR_CFLAGS | ||
1001 | +GST_LEVEL_DEFAULT | ||
1002 | +GST_PLUGINS_SELECTED | ||
1003 | +HAVE_GL | ||
1004 | +USE_OPENGL_TRUE | ||
1005 | +USE_OPENGL_FALSE | ||
1006 | +XVIDEO_LIBS | ||
1007 | +USE_GST_V4L2_TRUE | ||
1008 | +USE_GST_V4L2_FALSE | ||
1009 | +USE_XVIDEO_TRUE | ||
1010 | +USE_XVIDEO_FALSE | ||
1011 | +HAVE_AMRWB | ||
1012 | +USE_AMRWB_TRUE | ||
1013 | +USE_AMRWB_FALSE | ||
1014 | +HAVE_BZ2 | ||
1015 | +BZ2_LIBS | ||
1016 | +USE_BZ2_TRUE | ||
1017 | +USE_BZ2_FALSE | ||
1018 | +DIRECTFB_CFLAGS | ||
1019 | +DIRECTFB_LIBS | ||
1020 | +USE_DIRECTFB_TRUE | ||
1021 | +USE_DIRECTFB_FALSE | ||
1022 | +HAVE_DTS | ||
1023 | +DTS_LIBS | ||
1024 | +USE_DTS_TRUE | ||
1025 | +USE_DTS_FALSE | ||
1026 | +DIVXENC_LIBS | ||
1027 | +DIVXDEC_LIBS | ||
1028 | +USE_DIVX_TRUE | ||
1029 | +USE_DIVX_FALSE | ||
1030 | +HAVE_FAAC | ||
1031 | +FAAC_LIBS | ||
1032 | +USE_FAAC_TRUE | ||
1033 | +USE_FAAC_FALSE | ||
1034 | +HAVE_FAAD | ||
1035 | +FAAD_LIBS | ||
1036 | +USE_FAAD_TRUE | ||
1037 | +USE_FAAD_FALSE | ||
1038 | +HAVE_GSM | ||
1039 | +GSM_LIBS | ||
1040 | +USE_GSM_TRUE | ||
1041 | +USE_GSM_FALSE | ||
1042 | +IVORBIS_LIBS | ||
1043 | +IVORBIS_CFLAGS | ||
1044 | +USE_IVORBIS_TRUE | ||
1045 | +USE_IVORBIS_FALSE | ||
1046 | +LIBMMS_CFLAGS | ||
1047 | +LIBMMS_LIBS | ||
1048 | +USE_LIBMMS_TRUE | ||
1049 | +USE_LIBMMS_FALSE | ||
1050 | +MUSEPACK_LIBS | ||
1051 | +USE_MUSEPACK_TRUE | ||
1052 | +USE_MUSEPACK_FALSE | ||
1053 | +MUSICBRAINZ_CFLAGS | ||
1054 | +MUSICBRAINZ_LIBS | ||
1055 | +USE_MUSICBRAINZ_TRUE | ||
1056 | +USE_MUSICBRAINZ_FALSE | ||
1057 | +NEON_CFLAGS | ||
1058 | +NEON_LIBS | ||
1059 | +USE_NEON_TRUE | ||
1060 | +USE_NEON_FALSE | ||
1061 | +SDL_CONFIG | ||
1062 | +SDL_CFLAGS | ||
1063 | +SDL_LIBS | ||
1064 | +USE_SDL_TRUE | ||
1065 | +USE_SDL_FALSE | ||
1066 | +SOUNDTOUCH_CFLAGS | ||
1067 | +SOUNDTOUCH_LIBS | ||
1068 | +USE_SOUNDTOUCH_TRUE | ||
1069 | +USE_SOUNDTOUCH_FALSE | ||
1070 | +SWFDEC_CFLAGS | ||
1071 | +SWFDEC_LIBS | ||
1072 | +USE_SWFDEC_TRUE | ||
1073 | +USE_SWFDEC_FALSE | ||
1074 | +THEORADEC_CFLAGS | ||
1075 | +THEORADEC_LIBS | ||
1076 | +USE_THEORADEC_TRUE | ||
1077 | +USE_THEORADEC_FALSE | ||
1078 | +XVID_LIBS | ||
1079 | +USE_XVID_TRUE | ||
1080 | +USE_XVID_FALSE | ||
1081 | +WAVPACK_CFLAGS | ||
1082 | +WAVPACK_LIBS | ||
1083 | +USE_WAVPACK_TRUE | ||
1084 | +USE_WAVPACK_FALSE | ||
1085 | +PROFILE_CFLAGS | ||
1086 | +DEPRECATED_CFLAGS | ||
1087 | +GST_OPTION_CFLAGS | ||
1088 | +GST_PLUGIN_LDFLAGS | ||
1089 | +LIBOBJS | ||
1090 | +LTLIBOBJS' | ||
1091 | ac_subst_files='' | ||
1092 | + ac_precious_vars='build_alias | ||
1093 | +host_alias | ||
1094 | +target_alias | ||
1095 | +CC | ||
1096 | +CFLAGS | ||
1097 | +LDFLAGS | ||
1098 | +CPPFLAGS | ||
1099 | +CPP | ||
1100 | +CXX | ||
1101 | +CXXFLAGS | ||
1102 | +CCC | ||
1103 | +CXXCPP | ||
1104 | +F77 | ||
1105 | +FFLAGS | ||
1106 | +PKG_CONFIG | ||
1107 | +VALGRIND_CFLAGS | ||
1108 | +VALGRIND_LIBS | ||
1109 | +GLIB_CFLAGS | ||
1110 | +GLIB_LIBS | ||
1111 | +LIBOIL_CFLAGS | ||
1112 | +LIBOIL_LIBS | ||
1113 | +GST_CFLAGS | ||
1114 | +GST_LIBS | ||
1115 | +GST_BASE_CFLAGS | ||
1116 | +GST_BASE_LIBS | ||
1117 | +GST_CHECK_CFLAGS | ||
1118 | +GST_CHECK_LIBS | ||
1119 | +GST_PLUGINS_BASE_CFLAGS | ||
1120 | +GST_PLUGINS_BASE_LIBS | ||
1121 | +DIRECTFB_CFLAGS | ||
1122 | +DIRECTFB_LIBS | ||
1123 | +LIBMMS_CFLAGS | ||
1124 | +LIBMMS_LIBS | ||
1125 | +MUSICBRAINZ_CFLAGS | ||
1126 | +MUSICBRAINZ_LIBS | ||
1127 | +NEON_CFLAGS | ||
1128 | +NEON_LIBS | ||
1129 | +SOUNDTOUCH_CFLAGS | ||
1130 | +SOUNDTOUCH_LIBS | ||
1131 | +SWFDEC_CFLAGS | ||
1132 | +SWFDEC_LIBS | ||
1133 | +THEORADEC_CFLAGS | ||
1134 | +THEORADEC_LIBS | ||
1135 | +WAVPACK_CFLAGS | ||
1136 | +WAVPACK_LIBS' | ||
1137 | + | ||
1138 | |||
1139 | # Initialize some variables set by options. | ||
1140 | ac_init_help= | ||
1141 | @@ -493,34 +1123,48 @@ | ||
1142 | # and all the variables that are supposed to be based on exec_prefix | ||
1143 | # by default will actually change. | ||
1144 | # Use braces instead of parens because sh, perl, etc. also accept them. | ||
1145 | +# (The list follows the same order as the GNU Coding Standards.) | ||
1146 | bindir='${exec_prefix}/bin' | ||
1147 | sbindir='${exec_prefix}/sbin' | ||
1148 | libexecdir='${exec_prefix}/libexec' | ||
1149 | -datadir='${prefix}/share' | ||
1150 | +datarootdir='${prefix}/share' | ||
1151 | +datadir='${datarootdir}' | ||
1152 | sysconfdir='${prefix}/etc' | ||
1153 | sharedstatedir='${prefix}/com' | ||
1154 | localstatedir='${prefix}/var' | ||
1155 | -libdir='${exec_prefix}/lib' | ||
1156 | includedir='${prefix}/include' | ||
1157 | oldincludedir='/usr/include' | ||
1158 | -infodir='${prefix}/info' | ||
1159 | -mandir='${prefix}/man' | ||
1160 | +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' | ||
1161 | +infodir='${datarootdir}/info' | ||
1162 | +htmldir='${docdir}' | ||
1163 | +dvidir='${docdir}' | ||
1164 | +pdfdir='${docdir}' | ||
1165 | +psdir='${docdir}' | ||
1166 | +libdir='${exec_prefix}/lib' | ||
1167 | +localedir='${datarootdir}/locale' | ||
1168 | +mandir='${datarootdir}/man' | ||
1169 | |||
1170 | ac_prev= | ||
1171 | +ac_dashdash= | ||
1172 | for ac_option | ||
1173 | do | ||
1174 | # If the previous option needs an argument, assign it. | ||
1175 | if test -n "$ac_prev"; then | ||
1176 | - eval "$ac_prev=\$ac_option" | ||
1177 | + eval $ac_prev=\$ac_option | ||
1178 | ac_prev= | ||
1179 | continue | ||
1180 | fi | ||
1181 | |||
1182 | - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` | ||
1183 | + case $ac_option in | ||
1184 | + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; | ||
1185 | + *) ac_optarg=yes ;; | ||
1186 | + esac | ||
1187 | |||
1188 | # Accept the important Cygnus configure options, so we can diagnose typos. | ||
1189 | |||
1190 | - case $ac_option in | ||
1191 | + case $ac_dashdash$ac_option in | ||
1192 | + --) | ||
1193 | + ac_dashdash=yes ;; | ||
1194 | |||
1195 | -bindir | --bindir | --bindi | --bind | --bin | --bi) | ||
1196 | ac_prev=bindir ;; | ||
1197 | @@ -542,12 +1186,18 @@ | ||
1198 | --config-cache | -C) | ||
1199 | cache_file=config.cache ;; | ||
1200 | |||
1201 | - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) | ||
1202 | + -datadir | --datadir | --datadi | --datad) | ||
1203 | ac_prev=datadir ;; | ||
1204 | - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ | ||
1205 | - | --da=*) | ||
1206 | + -datadir=* | --datadir=* | --datadi=* | --datad=*) | ||
1207 | datadir=$ac_optarg ;; | ||
1208 | |||
1209 | + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ | ||
1210 | + | --dataroo | --dataro | --datar) | ||
1211 | + ac_prev=datarootdir ;; | ||
1212 | + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ | ||
1213 | + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) | ||
1214 | + datarootdir=$ac_optarg ;; | ||
1215 | + | ||
1216 | -disable-* | --disable-*) | ||
1217 | ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | ||
1218 | # Reject names that are not valid shell variable names. | ||
1219 | @@ -555,7 +1205,17 @@ | ||
1220 | { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | ||
1221 | { (exit 1); exit 1; }; } | ||
1222 | ac_feature=`echo $ac_feature | sed 's/-/_/g'` | ||
1223 | - eval "enable_$ac_feature=no" ;; | ||
1224 | + eval enable_$ac_feature=no ;; | ||
1225 | + | ||
1226 | + -docdir | --docdir | --docdi | --doc | --do) | ||
1227 | + ac_prev=docdir ;; | ||
1228 | + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) | ||
1229 | + docdir=$ac_optarg ;; | ||
1230 | + | ||
1231 | + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) | ||
1232 | + ac_prev=dvidir ;; | ||
1233 | + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) | ||
1234 | + dvidir=$ac_optarg ;; | ||
1235 | |||
1236 | -enable-* | --enable-*) | ||
1237 | ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | ||
1238 | @@ -564,11 +1224,7 @@ | ||
1239 | { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | ||
1240 | { (exit 1); exit 1; }; } | ||
1241 | ac_feature=`echo $ac_feature | sed 's/-/_/g'` | ||
1242 | - case $ac_option in | ||
1243 | - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; | ||
1244 | - *) ac_optarg=yes ;; | ||
1245 | - esac | ||
1246 | - eval "enable_$ac_feature='$ac_optarg'" ;; | ||
1247 | + eval enable_$ac_feature=\$ac_optarg ;; | ||
1248 | |||
1249 | -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | ||
1250 | | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ | ||
1251 | @@ -595,6 +1251,12 @@ | ||
1252 | -host=* | --host=* | --hos=* | --ho=*) | ||
1253 | host_alias=$ac_optarg ;; | ||
1254 | |||
1255 | + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) | ||
1256 | + ac_prev=htmldir ;; | ||
1257 | + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ | ||
1258 | + | --ht=*) | ||
1259 | + htmldir=$ac_optarg ;; | ||
1260 | + | ||
1261 | -includedir | --includedir | --includedi | --included | --include \ | ||
1262 | | --includ | --inclu | --incl | --inc) | ||
1263 | ac_prev=includedir ;; | ||
1264 | @@ -619,13 +1281,16 @@ | ||
1265 | | --libexe=* | --libex=* | --libe=*) | ||
1266 | libexecdir=$ac_optarg ;; | ||
1267 | |||
1268 | + -localedir | --localedir | --localedi | --localed | --locale) | ||
1269 | + ac_prev=localedir ;; | ||
1270 | + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) | ||
1271 | + localedir=$ac_optarg ;; | ||
1272 | + | ||
1273 | -localstatedir | --localstatedir | --localstatedi | --localstated \ | ||
1274 | - | --localstate | --localstat | --localsta | --localst \ | ||
1275 | - | --locals | --local | --loca | --loc | --lo) | ||
1276 | + | --localstate | --localstat | --localsta | --localst | --locals) | ||
1277 | ac_prev=localstatedir ;; | ||
1278 | -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ | ||
1279 | - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ | ||
1280 | - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) | ||
1281 | + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) | ||
1282 | localstatedir=$ac_optarg ;; | ||
1283 | |||
1284 | -mandir | --mandir | --mandi | --mand | --man | --ma | --m) | ||
1285 | @@ -690,6 +1355,16 @@ | ||
1286 | | --progr-tra=* | --program-tr=* | --program-t=*) | ||
1287 | program_transform_name=$ac_optarg ;; | ||
1288 | |||
1289 | + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) | ||
1290 | + ac_prev=pdfdir ;; | ||
1291 | + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) | ||
1292 | + pdfdir=$ac_optarg ;; | ||
1293 | + | ||
1294 | + -psdir | --psdir | --psdi | --psd | --ps) | ||
1295 | + ac_prev=psdir ;; | ||
1296 | + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) | ||
1297 | + psdir=$ac_optarg ;; | ||
1298 | + | ||
1299 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | ||
1300 | | -silent | --silent | --silen | --sile | --sil) | ||
1301 | silent=yes ;; | ||
1302 | @@ -746,11 +1421,7 @@ | ||
1303 | { echo "$as_me: error: invalid package name: $ac_package" >&2 | ||
1304 | { (exit 1); exit 1; }; } | ||
1305 | ac_package=`echo $ac_package| sed 's/-/_/g'` | ||
1306 | - case $ac_option in | ||
1307 | - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; | ||
1308 | - *) ac_optarg=yes ;; | ||
1309 | - esac | ||
1310 | - eval "with_$ac_package='$ac_optarg'" ;; | ||
1311 | + eval with_$ac_package=\$ac_optarg ;; | ||
1312 | |||
1313 | -without-* | --without-*) | ||
1314 | ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` | ||
1315 | @@ -759,7 +1430,7 @@ | ||
1316 | { echo "$as_me: error: invalid package name: $ac_package" >&2 | ||
1317 | { (exit 1); exit 1; }; } | ||
1318 | ac_package=`echo $ac_package | sed 's/-/_/g'` | ||
1319 | - eval "with_$ac_package=no" ;; | ||
1320 | + eval with_$ac_package=no ;; | ||
1321 | |||
1322 | --x) | ||
1323 | # Obsolete; use --with-x. | ||
1324 | @@ -790,8 +1461,7 @@ | ||
1325 | expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && | ||
1326 | { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 | ||
1327 | { (exit 1); exit 1; }; } | ||
1328 | - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` | ||
1329 | - eval "$ac_envvar='$ac_optarg'" | ||
1330 | + eval $ac_envvar=\$ac_optarg | ||
1331 | export $ac_envvar ;; | ||
1332 | |||
1333 | *) | ||
1334 | @@ -811,27 +1481,19 @@ | ||
1335 | { (exit 1); exit 1; }; } | ||
1336 | fi | ||
1337 | |||
1338 | -# Be sure to have absolute paths. | ||
1339 | -for ac_var in exec_prefix prefix | ||
1340 | -do | ||
1341 | - eval ac_val=$`echo $ac_var` | ||
1342 | - case $ac_val in | ||
1343 | - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; | ||
1344 | - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | ||
1345 | - { (exit 1); exit 1; }; };; | ||
1346 | - esac | ||
1347 | -done | ||
1348 | - | ||
1349 | -# Be sure to have absolute paths. | ||
1350 | -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ | ||
1351 | - localstatedir libdir includedir oldincludedir infodir mandir | ||
1352 | +# Be sure to have absolute directory names. | ||
1353 | +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ | ||
1354 | + datadir sysconfdir sharedstatedir localstatedir includedir \ | ||
1355 | + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ | ||
1356 | + libdir localedir mandir | ||
1357 | do | ||
1358 | - eval ac_val=$`echo $ac_var` | ||
1359 | + eval ac_val=\$$ac_var | ||
1360 | case $ac_val in | ||
1361 | - [\\/$]* | ?:[\\/]* ) ;; | ||
1362 | - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | ||
1363 | - { (exit 1); exit 1; }; };; | ||
1364 | + [\\/$]* | ?:[\\/]* ) continue;; | ||
1365 | + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; | ||
1366 | esac | ||
1367 | + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | ||
1368 | + { (exit 1); exit 1; }; } | ||
1369 | done | ||
1370 | |||
1371 | # There might be people who depend on the old broken behavior: `$host' | ||
1372 | @@ -858,218 +1520,76 @@ | ||
1373 | test "$silent" = yes && exec 6>/dev/null | ||
1374 | |||
1375 | |||
1376 | +ac_pwd=`pwd` && test -n "$ac_pwd" && | ||
1377 | +ac_ls_di=`ls -di .` && | ||
1378 | +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || | ||
1379 | + { echo "$as_me: error: Working directory cannot be determined" >&2 | ||
1380 | + { (exit 1); exit 1; }; } | ||
1381 | +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || | ||
1382 | + { echo "$as_me: error: pwd does not report name of working directory" >&2 | ||
1383 | + { (exit 1); exit 1; }; } | ||
1384 | + | ||
1385 | + | ||
1386 | # Find the source files, if location was not specified. | ||
1387 | if test -z "$srcdir"; then | ||
1388 | ac_srcdir_defaulted=yes | ||
1389 | - # Try the directory containing this script, then its parent. | ||
1390 | - ac_confdir=`(dirname "$0") 2>/dev/null || | ||
1391 | + # Try the directory containing this script, then the parent directory. | ||
1392 | + ac_confdir=`$as_dirname -- "$0" || | ||
1393 | $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
1394 | X"$0" : 'X\(//\)[^/]' \| \ | ||
1395 | X"$0" : 'X\(//\)$' \| \ | ||
1396 | - X"$0" : 'X\(/\)' \| \ | ||
1397 | - . : '\(.\)' 2>/dev/null || | ||
1398 | + X"$0" : 'X\(/\)' \| . 2>/dev/null || | ||
1399 | echo X"$0" | | ||
1400 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
1401 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
1402 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
1403 | - /^X\(\/\).*/{ s//\1/; q; } | ||
1404 | - s/.*/./; q'` | ||
1405 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
1406 | + s//\1/ | ||
1407 | + q | ||
1408 | + } | ||
1409 | + /^X\(\/\/\)[^/].*/{ | ||
1410 | + s//\1/ | ||
1411 | + q | ||
1412 | + } | ||
1413 | + /^X\(\/\/\)$/{ | ||
1414 | + s//\1/ | ||
1415 | + q | ||
1416 | + } | ||
1417 | + /^X\(\/\).*/{ | ||
1418 | + s//\1/ | ||
1419 | + q | ||
1420 | + } | ||
1421 | + s/.*/./; q'` | ||
1422 | srcdir=$ac_confdir | ||
1423 | - if test ! -r $srcdir/$ac_unique_file; then | ||
1424 | + if test ! -r "$srcdir/$ac_unique_file"; then | ||
1425 | srcdir=.. | ||
1426 | fi | ||
1427 | else | ||
1428 | ac_srcdir_defaulted=no | ||
1429 | fi | ||
1430 | -if test ! -r $srcdir/$ac_unique_file; then | ||
1431 | - if test "$ac_srcdir_defaulted" = yes; then | ||
1432 | - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 | ||
1433 | - { (exit 1); exit 1; }; } | ||
1434 | - else | ||
1435 | - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 | ||
1436 | - { (exit 1); exit 1; }; } | ||
1437 | - fi | ||
1438 | -fi | ||
1439 | -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || | ||
1440 | - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 | ||
1441 | - { (exit 1); exit 1; }; } | ||
1442 | -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` | ||
1443 | -ac_env_build_alias_set=${build_alias+set} | ||
1444 | -ac_env_build_alias_value=$build_alias | ||
1445 | -ac_cv_env_build_alias_set=${build_alias+set} | ||
1446 | -ac_cv_env_build_alias_value=$build_alias | ||
1447 | -ac_env_host_alias_set=${host_alias+set} | ||
1448 | -ac_env_host_alias_value=$host_alias | ||
1449 | -ac_cv_env_host_alias_set=${host_alias+set} | ||
1450 | -ac_cv_env_host_alias_value=$host_alias | ||
1451 | -ac_env_target_alias_set=${target_alias+set} | ||
1452 | -ac_env_target_alias_value=$target_alias | ||
1453 | -ac_cv_env_target_alias_set=${target_alias+set} | ||
1454 | -ac_cv_env_target_alias_value=$target_alias | ||
1455 | -ac_env_CC_set=${CC+set} | ||
1456 | -ac_env_CC_value=$CC | ||
1457 | -ac_cv_env_CC_set=${CC+set} | ||
1458 | -ac_cv_env_CC_value=$CC | ||
1459 | -ac_env_CFLAGS_set=${CFLAGS+set} | ||
1460 | -ac_env_CFLAGS_value=$CFLAGS | ||
1461 | -ac_cv_env_CFLAGS_set=${CFLAGS+set} | ||
1462 | -ac_cv_env_CFLAGS_value=$CFLAGS | ||
1463 | -ac_env_LDFLAGS_set=${LDFLAGS+set} | ||
1464 | -ac_env_LDFLAGS_value=$LDFLAGS | ||
1465 | -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} | ||
1466 | -ac_cv_env_LDFLAGS_value=$LDFLAGS | ||
1467 | -ac_env_CPPFLAGS_set=${CPPFLAGS+set} | ||
1468 | -ac_env_CPPFLAGS_value=$CPPFLAGS | ||
1469 | -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} | ||
1470 | -ac_cv_env_CPPFLAGS_value=$CPPFLAGS | ||
1471 | -ac_env_CPP_set=${CPP+set} | ||
1472 | -ac_env_CPP_value=$CPP | ||
1473 | -ac_cv_env_CPP_set=${CPP+set} | ||
1474 | -ac_cv_env_CPP_value=$CPP | ||
1475 | -ac_env_CXX_set=${CXX+set} | ||
1476 | -ac_env_CXX_value=$CXX | ||
1477 | -ac_cv_env_CXX_set=${CXX+set} | ||
1478 | -ac_cv_env_CXX_value=$CXX | ||
1479 | -ac_env_CXXFLAGS_set=${CXXFLAGS+set} | ||
1480 | -ac_env_CXXFLAGS_value=$CXXFLAGS | ||
1481 | -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} | ||
1482 | -ac_cv_env_CXXFLAGS_value=$CXXFLAGS | ||
1483 | -ac_env_CXXCPP_set=${CXXCPP+set} | ||
1484 | -ac_env_CXXCPP_value=$CXXCPP | ||
1485 | -ac_cv_env_CXXCPP_set=${CXXCPP+set} | ||
1486 | -ac_cv_env_CXXCPP_value=$CXXCPP | ||
1487 | -ac_env_F77_set=${F77+set} | ||
1488 | -ac_env_F77_value=$F77 | ||
1489 | -ac_cv_env_F77_set=${F77+set} | ||
1490 | -ac_cv_env_F77_value=$F77 | ||
1491 | -ac_env_FFLAGS_set=${FFLAGS+set} | ||
1492 | -ac_env_FFLAGS_value=$FFLAGS | ||
1493 | -ac_cv_env_FFLAGS_set=${FFLAGS+set} | ||
1494 | -ac_cv_env_FFLAGS_value=$FFLAGS | ||
1495 | -ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} | ||
1496 | -ac_env_PKG_CONFIG_value=$PKG_CONFIG | ||
1497 | -ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} | ||
1498 | -ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG | ||
1499 | -ac_env_VALGRIND_CFLAGS_set=${VALGRIND_CFLAGS+set} | ||
1500 | -ac_env_VALGRIND_CFLAGS_value=$VALGRIND_CFLAGS | ||
1501 | -ac_cv_env_VALGRIND_CFLAGS_set=${VALGRIND_CFLAGS+set} | ||
1502 | -ac_cv_env_VALGRIND_CFLAGS_value=$VALGRIND_CFLAGS | ||
1503 | -ac_env_VALGRIND_LIBS_set=${VALGRIND_LIBS+set} | ||
1504 | -ac_env_VALGRIND_LIBS_value=$VALGRIND_LIBS | ||
1505 | -ac_cv_env_VALGRIND_LIBS_set=${VALGRIND_LIBS+set} | ||
1506 | -ac_cv_env_VALGRIND_LIBS_value=$VALGRIND_LIBS | ||
1507 | -ac_env_GLIB_CFLAGS_set=${GLIB_CFLAGS+set} | ||
1508 | -ac_env_GLIB_CFLAGS_value=$GLIB_CFLAGS | ||
1509 | -ac_cv_env_GLIB_CFLAGS_set=${GLIB_CFLAGS+set} | ||
1510 | -ac_cv_env_GLIB_CFLAGS_value=$GLIB_CFLAGS | ||
1511 | -ac_env_GLIB_LIBS_set=${GLIB_LIBS+set} | ||
1512 | -ac_env_GLIB_LIBS_value=$GLIB_LIBS | ||
1513 | -ac_cv_env_GLIB_LIBS_set=${GLIB_LIBS+set} | ||
1514 | -ac_cv_env_GLIB_LIBS_value=$GLIB_LIBS | ||
1515 | -ac_env_LIBOIL_CFLAGS_set=${LIBOIL_CFLAGS+set} | ||
1516 | -ac_env_LIBOIL_CFLAGS_value=$LIBOIL_CFLAGS | ||
1517 | -ac_cv_env_LIBOIL_CFLAGS_set=${LIBOIL_CFLAGS+set} | ||
1518 | -ac_cv_env_LIBOIL_CFLAGS_value=$LIBOIL_CFLAGS | ||
1519 | -ac_env_LIBOIL_LIBS_set=${LIBOIL_LIBS+set} | ||
1520 | -ac_env_LIBOIL_LIBS_value=$LIBOIL_LIBS | ||
1521 | -ac_cv_env_LIBOIL_LIBS_set=${LIBOIL_LIBS+set} | ||
1522 | -ac_cv_env_LIBOIL_LIBS_value=$LIBOIL_LIBS | ||
1523 | -ac_env_GST_CFLAGS_set=${GST_CFLAGS+set} | ||
1524 | -ac_env_GST_CFLAGS_value=$GST_CFLAGS | ||
1525 | -ac_cv_env_GST_CFLAGS_set=${GST_CFLAGS+set} | ||
1526 | -ac_cv_env_GST_CFLAGS_value=$GST_CFLAGS | ||
1527 | -ac_env_GST_LIBS_set=${GST_LIBS+set} | ||
1528 | -ac_env_GST_LIBS_value=$GST_LIBS | ||
1529 | -ac_cv_env_GST_LIBS_set=${GST_LIBS+set} | ||
1530 | -ac_cv_env_GST_LIBS_value=$GST_LIBS | ||
1531 | -ac_env_GST_BASE_CFLAGS_set=${GST_BASE_CFLAGS+set} | ||
1532 | -ac_env_GST_BASE_CFLAGS_value=$GST_BASE_CFLAGS | ||
1533 | -ac_cv_env_GST_BASE_CFLAGS_set=${GST_BASE_CFLAGS+set} | ||
1534 | -ac_cv_env_GST_BASE_CFLAGS_value=$GST_BASE_CFLAGS | ||
1535 | -ac_env_GST_BASE_LIBS_set=${GST_BASE_LIBS+set} | ||
1536 | -ac_env_GST_BASE_LIBS_value=$GST_BASE_LIBS | ||
1537 | -ac_cv_env_GST_BASE_LIBS_set=${GST_BASE_LIBS+set} | ||
1538 | -ac_cv_env_GST_BASE_LIBS_value=$GST_BASE_LIBS | ||
1539 | -ac_env_GST_CHECK_CFLAGS_set=${GST_CHECK_CFLAGS+set} | ||
1540 | -ac_env_GST_CHECK_CFLAGS_value=$GST_CHECK_CFLAGS | ||
1541 | -ac_cv_env_GST_CHECK_CFLAGS_set=${GST_CHECK_CFLAGS+set} | ||
1542 | -ac_cv_env_GST_CHECK_CFLAGS_value=$GST_CHECK_CFLAGS | ||
1543 | -ac_env_GST_CHECK_LIBS_set=${GST_CHECK_LIBS+set} | ||
1544 | -ac_env_GST_CHECK_LIBS_value=$GST_CHECK_LIBS | ||
1545 | -ac_cv_env_GST_CHECK_LIBS_set=${GST_CHECK_LIBS+set} | ||
1546 | -ac_cv_env_GST_CHECK_LIBS_value=$GST_CHECK_LIBS | ||
1547 | -ac_env_GST_PLUGINS_BASE_CFLAGS_set=${GST_PLUGINS_BASE_CFLAGS+set} | ||
1548 | -ac_env_GST_PLUGINS_BASE_CFLAGS_value=$GST_PLUGINS_BASE_CFLAGS | ||
1549 | -ac_cv_env_GST_PLUGINS_BASE_CFLAGS_set=${GST_PLUGINS_BASE_CFLAGS+set} | ||
1550 | -ac_cv_env_GST_PLUGINS_BASE_CFLAGS_value=$GST_PLUGINS_BASE_CFLAGS | ||
1551 | -ac_env_GST_PLUGINS_BASE_LIBS_set=${GST_PLUGINS_BASE_LIBS+set} | ||
1552 | -ac_env_GST_PLUGINS_BASE_LIBS_value=$GST_PLUGINS_BASE_LIBS | ||
1553 | -ac_cv_env_GST_PLUGINS_BASE_LIBS_set=${GST_PLUGINS_BASE_LIBS+set} | ||
1554 | -ac_cv_env_GST_PLUGINS_BASE_LIBS_value=$GST_PLUGINS_BASE_LIBS | ||
1555 | -ac_env_DIRECTFB_CFLAGS_set=${DIRECTFB_CFLAGS+set} | ||
1556 | -ac_env_DIRECTFB_CFLAGS_value=$DIRECTFB_CFLAGS | ||
1557 | -ac_cv_env_DIRECTFB_CFLAGS_set=${DIRECTFB_CFLAGS+set} | ||
1558 | -ac_cv_env_DIRECTFB_CFLAGS_value=$DIRECTFB_CFLAGS | ||
1559 | -ac_env_DIRECTFB_LIBS_set=${DIRECTFB_LIBS+set} | ||
1560 | -ac_env_DIRECTFB_LIBS_value=$DIRECTFB_LIBS | ||
1561 | -ac_cv_env_DIRECTFB_LIBS_set=${DIRECTFB_LIBS+set} | ||
1562 | -ac_cv_env_DIRECTFB_LIBS_value=$DIRECTFB_LIBS | ||
1563 | -ac_env_LIBMMS_CFLAGS_set=${LIBMMS_CFLAGS+set} | ||
1564 | -ac_env_LIBMMS_CFLAGS_value=$LIBMMS_CFLAGS | ||
1565 | -ac_cv_env_LIBMMS_CFLAGS_set=${LIBMMS_CFLAGS+set} | ||
1566 | -ac_cv_env_LIBMMS_CFLAGS_value=$LIBMMS_CFLAGS | ||
1567 | -ac_env_LIBMMS_LIBS_set=${LIBMMS_LIBS+set} | ||
1568 | -ac_env_LIBMMS_LIBS_value=$LIBMMS_LIBS | ||
1569 | -ac_cv_env_LIBMMS_LIBS_set=${LIBMMS_LIBS+set} | ||
1570 | -ac_cv_env_LIBMMS_LIBS_value=$LIBMMS_LIBS | ||
1571 | -ac_env_MUSICBRAINZ_CFLAGS_set=${MUSICBRAINZ_CFLAGS+set} | ||
1572 | -ac_env_MUSICBRAINZ_CFLAGS_value=$MUSICBRAINZ_CFLAGS | ||
1573 | -ac_cv_env_MUSICBRAINZ_CFLAGS_set=${MUSICBRAINZ_CFLAGS+set} | ||
1574 | -ac_cv_env_MUSICBRAINZ_CFLAGS_value=$MUSICBRAINZ_CFLAGS | ||
1575 | -ac_env_MUSICBRAINZ_LIBS_set=${MUSICBRAINZ_LIBS+set} | ||
1576 | -ac_env_MUSICBRAINZ_LIBS_value=$MUSICBRAINZ_LIBS | ||
1577 | -ac_cv_env_MUSICBRAINZ_LIBS_set=${MUSICBRAINZ_LIBS+set} | ||
1578 | -ac_cv_env_MUSICBRAINZ_LIBS_value=$MUSICBRAINZ_LIBS | ||
1579 | -ac_env_NEON_CFLAGS_set=${NEON_CFLAGS+set} | ||
1580 | -ac_env_NEON_CFLAGS_value=$NEON_CFLAGS | ||
1581 | -ac_cv_env_NEON_CFLAGS_set=${NEON_CFLAGS+set} | ||
1582 | -ac_cv_env_NEON_CFLAGS_value=$NEON_CFLAGS | ||
1583 | -ac_env_NEON_LIBS_set=${NEON_LIBS+set} | ||
1584 | -ac_env_NEON_LIBS_value=$NEON_LIBS | ||
1585 | -ac_cv_env_NEON_LIBS_set=${NEON_LIBS+set} | ||
1586 | -ac_cv_env_NEON_LIBS_value=$NEON_LIBS | ||
1587 | -ac_env_SOUNDTOUCH_CFLAGS_set=${SOUNDTOUCH_CFLAGS+set} | ||
1588 | -ac_env_SOUNDTOUCH_CFLAGS_value=$SOUNDTOUCH_CFLAGS | ||
1589 | -ac_cv_env_SOUNDTOUCH_CFLAGS_set=${SOUNDTOUCH_CFLAGS+set} | ||
1590 | -ac_cv_env_SOUNDTOUCH_CFLAGS_value=$SOUNDTOUCH_CFLAGS | ||
1591 | -ac_env_SOUNDTOUCH_LIBS_set=${SOUNDTOUCH_LIBS+set} | ||
1592 | -ac_env_SOUNDTOUCH_LIBS_value=$SOUNDTOUCH_LIBS | ||
1593 | -ac_cv_env_SOUNDTOUCH_LIBS_set=${SOUNDTOUCH_LIBS+set} | ||
1594 | -ac_cv_env_SOUNDTOUCH_LIBS_value=$SOUNDTOUCH_LIBS | ||
1595 | -ac_env_SWFDEC_CFLAGS_set=${SWFDEC_CFLAGS+set} | ||
1596 | -ac_env_SWFDEC_CFLAGS_value=$SWFDEC_CFLAGS | ||
1597 | -ac_cv_env_SWFDEC_CFLAGS_set=${SWFDEC_CFLAGS+set} | ||
1598 | -ac_cv_env_SWFDEC_CFLAGS_value=$SWFDEC_CFLAGS | ||
1599 | -ac_env_SWFDEC_LIBS_set=${SWFDEC_LIBS+set} | ||
1600 | -ac_env_SWFDEC_LIBS_value=$SWFDEC_LIBS | ||
1601 | -ac_cv_env_SWFDEC_LIBS_set=${SWFDEC_LIBS+set} | ||
1602 | -ac_cv_env_SWFDEC_LIBS_value=$SWFDEC_LIBS | ||
1603 | -ac_env_THEORADEC_CFLAGS_set=${THEORADEC_CFLAGS+set} | ||
1604 | -ac_env_THEORADEC_CFLAGS_value=$THEORADEC_CFLAGS | ||
1605 | -ac_cv_env_THEORADEC_CFLAGS_set=${THEORADEC_CFLAGS+set} | ||
1606 | -ac_cv_env_THEORADEC_CFLAGS_value=$THEORADEC_CFLAGS | ||
1607 | -ac_env_THEORADEC_LIBS_set=${THEORADEC_LIBS+set} | ||
1608 | -ac_env_THEORADEC_LIBS_value=$THEORADEC_LIBS | ||
1609 | -ac_cv_env_THEORADEC_LIBS_set=${THEORADEC_LIBS+set} | ||
1610 | -ac_cv_env_THEORADEC_LIBS_value=$THEORADEC_LIBS | ||
1611 | -ac_env_WAVPACK_CFLAGS_set=${WAVPACK_CFLAGS+set} | ||
1612 | -ac_env_WAVPACK_CFLAGS_value=$WAVPACK_CFLAGS | ||
1613 | -ac_cv_env_WAVPACK_CFLAGS_set=${WAVPACK_CFLAGS+set} | ||
1614 | -ac_cv_env_WAVPACK_CFLAGS_value=$WAVPACK_CFLAGS | ||
1615 | -ac_env_WAVPACK_LIBS_set=${WAVPACK_LIBS+set} | ||
1616 | -ac_env_WAVPACK_LIBS_value=$WAVPACK_LIBS | ||
1617 | -ac_cv_env_WAVPACK_LIBS_set=${WAVPACK_LIBS+set} | ||
1618 | -ac_cv_env_WAVPACK_LIBS_value=$WAVPACK_LIBS | ||
1619 | +if test ! -r "$srcdir/$ac_unique_file"; then | ||
1620 | + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." | ||
1621 | + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 | ||
1622 | + { (exit 1); exit 1; }; } | ||
1623 | +fi | ||
1624 | +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" | ||
1625 | +ac_abs_confdir=`( | ||
1626 | + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 | ||
1627 | + { (exit 1); exit 1; }; } | ||
1628 | + pwd)` | ||
1629 | +# When building in place, set srcdir=. | ||
1630 | +if test "$ac_abs_confdir" = "$ac_pwd"; then | ||
1631 | + srcdir=. | ||
1632 | +fi | ||
1633 | +# Remove unnecessary trailing slashes from srcdir. | ||
1634 | +# Double slashes in file names in object file debugging info | ||
1635 | +# mess up M-x gdb in Emacs. | ||
1636 | +case $srcdir in | ||
1637 | +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; | ||
1638 | +esac | ||
1639 | +for ac_var in $ac_precious_vars; do | ||
1640 | + eval ac_env_${ac_var}_set=\${${ac_var}+set} | ||
1641 | + eval ac_env_${ac_var}_value=\$${ac_var} | ||
1642 | + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} | ||
1643 | + eval ac_cv_env_${ac_var}_value=\$${ac_var} | ||
1644 | +done | ||
1645 | |||
1646 | # | ||
1647 | # Report the --help message. | ||
1648 | @@ -1098,9 +1618,6 @@ | ||
1649 | -n, --no-create do not create output files | ||
1650 | --srcdir=DIR find the sources in DIR [configure dir or \`..'] | ||
1651 | |||
1652 | -_ACEOF | ||
1653 | - | ||
1654 | - cat <<_ACEOF | ||
1655 | Installation directories: | ||
1656 | --prefix=PREFIX install architecture-independent files in PREFIX | ||
1657 | [$ac_default_prefix] | ||
1658 | @@ -1118,15 +1635,22 @@ | ||
1659 | --bindir=DIR user executables [EPREFIX/bin] | ||
1660 | --sbindir=DIR system admin executables [EPREFIX/sbin] | ||
1661 | --libexecdir=DIR program executables [EPREFIX/libexec] | ||
1662 | - --datadir=DIR read-only architecture-independent data [PREFIX/share] | ||
1663 | --sysconfdir=DIR read-only single-machine data [PREFIX/etc] | ||
1664 | --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] | ||
1665 | --localstatedir=DIR modifiable single-machine data [PREFIX/var] | ||
1666 | --libdir=DIR object code libraries [EPREFIX/lib] | ||
1667 | --includedir=DIR C header files [PREFIX/include] | ||
1668 | --oldincludedir=DIR C header files for non-gcc [/usr/include] | ||
1669 | - --infodir=DIR info documentation [PREFIX/info] | ||
1670 | - --mandir=DIR man documentation [PREFIX/man] | ||
1671 | + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] | ||
1672 | + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] | ||
1673 | + --infodir=DIR info documentation [DATAROOTDIR/info] | ||
1674 | + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] | ||
1675 | + --mandir=DIR man documentation [DATAROOTDIR/man] | ||
1676 | + --docdir=DIR documentation root [DATAROOTDIR/doc/gst-plugins-bad] | ||
1677 | + --htmldir=DIR html documentation [DOCDIR] | ||
1678 | + --dvidir=DIR dvi documentation [DOCDIR] | ||
1679 | + --pdfdir=DIR pdf documentation [DOCDIR] | ||
1680 | + --psdir=DIR ps documentation [DOCDIR] | ||
1681 | _ACEOF | ||
1682 | |||
1683 | cat <<\_ACEOF | ||
1684 | @@ -1153,10 +1677,8 @@ | ||
1685 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | ||
1686 | --enable-maintainer-mode enable make rules and dependencies not useful | ||
1687 | (and sometimes confusing) to the casual installer | ||
1688 | - --enable-shared[=PKGS] | ||
1689 | - build shared libraries [default=yes] | ||
1690 | - --enable-static[=PKGS] | ||
1691 | - build static libraries [default=yes] | ||
1692 | + --enable-shared[=PKGS] build shared libraries [default=yes] | ||
1693 | + --enable-static[=PKGS] build static libraries [default=yes] | ||
1694 | --enable-fast-install[=PKGS] | ||
1695 | optimize for fast installation [default=yes] | ||
1696 | --disable-dependency-tracking speeds up one-time build | ||
1697 | @@ -1202,8 +1724,7 @@ | ||
1698 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
1699 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
1700 | both] | ||
1701 | - --with-tags[=TAGS] | ||
1702 | - include additional configurations [automatic] | ||
1703 | + --with-tags[=TAGS] include additional configurations [automatic] | ||
1704 | --with-autoconf use a different autoconf for regeneration of | ||
1705 | Makefiles | ||
1706 | --with-autoheader use a different autoheader for regeneration of | ||
1707 | @@ -1235,8 +1756,8 @@ | ||
1708 | CFLAGS C compiler flags | ||
1709 | LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a | ||
1710 | nonstandard directory <lib dir> | ||
1711 | - CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have | ||
1712 | - headers in a nonstandard directory <include dir> | ||
1713 | + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if | ||
1714 | + you have headers in a nonstandard directory <include dir> | ||
1715 | CPP C preprocessor | ||
1716 | CXX C++ compiler command | ||
1717 | CXXFLAGS C++ compiler flags | ||
1718 | @@ -1301,120 +1822,86 @@ | ||
1719 | |||
1720 | Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>. | ||
1721 | _ACEOF | ||
1722 | +ac_status=$? | ||
1723 | fi | ||
1724 | |||
1725 | if test "$ac_init_help" = "recursive"; then | ||
1726 | # If there are subdirs, report their specific --help. | ||
1727 | - ac_popdir=`pwd` | ||
1728 | for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue | ||
1729 | - test -d $ac_dir || continue | ||
1730 | + test -d "$ac_dir" || continue | ||
1731 | ac_builddir=. | ||
1732 | |||
1733 | -if test "$ac_dir" != .; then | ||
1734 | +case "$ac_dir" in | ||
1735 | +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; | ||
1736 | +*) | ||
1737 | ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | ||
1738 | - # A "../" for each directory in $ac_dir_suffix. | ||
1739 | - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` | ||
1740 | -else | ||
1741 | - ac_dir_suffix= ac_top_builddir= | ||
1742 | -fi | ||
1743 | + # A ".." for each directory in $ac_dir_suffix. | ||
1744 | + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` | ||
1745 | + case $ac_top_builddir_sub in | ||
1746 | + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; | ||
1747 | + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; | ||
1748 | + esac ;; | ||
1749 | +esac | ||
1750 | +ac_abs_top_builddir=$ac_pwd | ||
1751 | +ac_abs_builddir=$ac_pwd$ac_dir_suffix | ||
1752 | +# for backward compatibility: | ||
1753 | +ac_top_builddir=$ac_top_build_prefix | ||
1754 | |||
1755 | case $srcdir in | ||
1756 | - .) # No --srcdir option. We are building in place. | ||
1757 | + .) # We are building in place. | ||
1758 | ac_srcdir=. | ||
1759 | - if test -z "$ac_top_builddir"; then | ||
1760 | - ac_top_srcdir=. | ||
1761 | - else | ||
1762 | - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | ||
1763 | - fi ;; | ||
1764 | - [\\/]* | ?:[\\/]* ) # Absolute path. | ||
1765 | + ac_top_srcdir=$ac_top_builddir_sub | ||
1766 | + ac_abs_top_srcdir=$ac_pwd ;; | ||
1767 | + [\\/]* | ?:[\\/]* ) # Absolute name. | ||
1768 | ac_srcdir=$srcdir$ac_dir_suffix; | ||
1769 | - ac_top_srcdir=$srcdir ;; | ||
1770 | - *) # Relative path. | ||
1771 | - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | ||
1772 | - ac_top_srcdir=$ac_top_builddir$srcdir ;; | ||
1773 | -esac | ||
1774 | - | ||
1775 | -# Do not use `cd foo && pwd` to compute absolute paths, because | ||
1776 | -# the directories may not exist. | ||
1777 | -case `pwd` in | ||
1778 | -.) ac_abs_builddir="$ac_dir";; | ||
1779 | -*) | ||
1780 | - case "$ac_dir" in | ||
1781 | - .) ac_abs_builddir=`pwd`;; | ||
1782 | - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
1783 | - *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
1784 | - esac;; | ||
1785 | -esac | ||
1786 | -case $ac_abs_builddir in | ||
1787 | -.) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
1788 | -*) | ||
1789 | - case ${ac_top_builddir}. in | ||
1790 | - .) ac_abs_top_builddir=$ac_abs_builddir;; | ||
1791 | - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
1792 | - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | ||
1793 | - esac;; | ||
1794 | -esac | ||
1795 | -case $ac_abs_builddir in | ||
1796 | -.) ac_abs_srcdir=$ac_srcdir;; | ||
1797 | -*) | ||
1798 | - case $ac_srcdir in | ||
1799 | - .) ac_abs_srcdir=$ac_abs_builddir;; | ||
1800 | - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
1801 | - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
1802 | - esac;; | ||
1803 | -esac | ||
1804 | -case $ac_abs_builddir in | ||
1805 | -.) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
1806 | -*) | ||
1807 | - case $ac_top_srcdir in | ||
1808 | - .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
1809 | - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
1810 | - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
1811 | - esac;; | ||
1812 | -esac | ||
1813 | - | ||
1814 | - cd $ac_dir | ||
1815 | - # Check for guested configure; otherwise get Cygnus style configure. | ||
1816 | - if test -f $ac_srcdir/configure.gnu; then | ||
1817 | - echo | ||
1818 | - $SHELL $ac_srcdir/configure.gnu --help=recursive | ||
1819 | - elif test -f $ac_srcdir/configure; then | ||
1820 | - echo | ||
1821 | - $SHELL $ac_srcdir/configure --help=recursive | ||
1822 | - elif test -f $ac_srcdir/configure.ac || | ||
1823 | - test -f $ac_srcdir/configure.in; then | ||
1824 | - echo | ||
1825 | - $ac_configure --help | ||
1826 | + ac_top_srcdir=$srcdir | ||
1827 | + ac_abs_top_srcdir=$srcdir ;; | ||
1828 | + *) # Relative name. | ||
1829 | + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix | ||
1830 | + ac_top_srcdir=$ac_top_build_prefix$srcdir | ||
1831 | + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; | ||
1832 | +esac | ||
1833 | +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix | ||
1834 | + | ||
1835 | + cd "$ac_dir" || { ac_status=$?; continue; } | ||
1836 | + # Check for guested configure. | ||
1837 | + if test -f "$ac_srcdir/configure.gnu"; then | ||
1838 | + echo && | ||
1839 | + $SHELL "$ac_srcdir/configure.gnu" --help=recursive | ||
1840 | + elif test -f "$ac_srcdir/configure"; then | ||
1841 | + echo && | ||
1842 | + $SHELL "$ac_srcdir/configure" --help=recursive | ||
1843 | else | ||
1844 | echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 | ||
1845 | - fi | ||
1846 | - cd "$ac_popdir" | ||
1847 | + fi || ac_status=$? | ||
1848 | + cd "$ac_pwd" || { ac_status=$?; break; } | ||
1849 | done | ||
1850 | fi | ||
1851 | |||
1852 | -test -n "$ac_init_help" && exit 0 | ||
1853 | +test -n "$ac_init_help" && exit $ac_status | ||
1854 | if $ac_init_version; then | ||
1855 | cat <<\_ACEOF | ||
1856 | GStreamer Bad Plug-ins configure 0.10.3 | ||
1857 | -generated by GNU Autoconf 2.59 | ||
1858 | +generated by GNU Autoconf 2.60 | ||
1859 | |||
1860 | -Copyright (C) 2003 Free Software Foundation, Inc. | ||
1861 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | ||
1862 | +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | ||
1863 | This configure script is free software; the Free Software Foundation | ||
1864 | gives unlimited permission to copy, distribute and modify it. | ||
1865 | _ACEOF | ||
1866 | - exit 0 | ||
1867 | + exit | ||
1868 | fi | ||
1869 | -exec 5>config.log | ||
1870 | -cat >&5 <<_ACEOF | ||
1871 | +cat >config.log <<_ACEOF | ||
1872 | This file contains any messages produced by compilers while | ||
1873 | running configure, to aid debugging if configure makes a mistake. | ||
1874 | |||
1875 | It was created by GStreamer Bad Plug-ins $as_me 0.10.3, which was | ||
1876 | -generated by GNU Autoconf 2.59. Invocation command line was | ||
1877 | +generated by GNU Autoconf 2.60. Invocation command line was | ||
1878 | |||
1879 | $ $0 $@ | ||
1880 | |||
1881 | _ACEOF | ||
1882 | +exec 5>>config.log | ||
1883 | { | ||
1884 | cat <<_ASUNAME | ||
1885 | ## --------- ## | ||
1886 | @@ -1433,7 +1920,7 @@ | ||
1887 | /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` | ||
1888 | /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` | ||
1889 | /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` | ||
1890 | -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` | ||
1891 | +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` | ||
1892 | /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` | ||
1893 | /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` | ||
1894 | /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` | ||
1895 | @@ -1447,6 +1934,7 @@ | ||
1896 | test -z "$as_dir" && as_dir=. | ||
1897 | echo "PATH: $as_dir" | ||
1898 | done | ||
1899 | +IFS=$as_save_IFS | ||
1900 | |||
1901 | } >&5 | ||
1902 | |||
1903 | @@ -1468,7 +1956,6 @@ | ||
1904 | ac_configure_args= | ||
1905 | ac_configure_args0= | ||
1906 | ac_configure_args1= | ||
1907 | -ac_sep= | ||
1908 | ac_must_keep_next=false | ||
1909 | for ac_pass in 1 2 | ||
1910 | do | ||
1911 | @@ -1479,7 +1966,7 @@ | ||
1912 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | ||
1913 | | -silent | --silent | --silen | --sile | --sil) | ||
1914 | continue ;; | ||
1915 | - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) | ||
1916 | + *\'*) | ||
1917 | ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
1918 | esac | ||
1919 | case $ac_pass in | ||
1920 | @@ -1501,9 +1988,7 @@ | ||
1921 | -* ) ac_must_keep_next=true ;; | ||
1922 | esac | ||
1923 | fi | ||
1924 | - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" | ||
1925 | - # Get rid of the leading space. | ||
1926 | - ac_sep=" " | ||
1927 | + ac_configure_args="$ac_configure_args '$ac_arg'" | ||
1928 | ;; | ||
1929 | esac | ||
1930 | done | ||
1931 | @@ -1514,8 +1999,8 @@ | ||
1932 | # When interrupted or exit'd, cleanup temporary files, and complete | ||
1933 | # config.log. We remove comments because anyway the quotes in there | ||
1934 | # would cause problems or look ugly. | ||
1935 | -# WARNING: Be sure not to use single quotes in there, as some shells, | ||
1936 | -# such as our DU 5.0 friend, will then `close' the trap. | ||
1937 | +# WARNING: Use '\'' to represent an apostrophe within the trap. | ||
1938 | +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. | ||
1939 | trap 'exit_status=$? | ||
1940 | # Save into config.log some information that might help in debugging. | ||
1941 | { | ||
1942 | @@ -1528,20 +2013,34 @@ | ||
1943 | _ASBOX | ||
1944 | echo | ||
1945 | # The following way of writing the cache mishandles newlines in values, | ||
1946 | -{ | ||
1947 | +( | ||
1948 | + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do | ||
1949 | + eval ac_val=\$$ac_var | ||
1950 | + case $ac_val in #( | ||
1951 | + *${as_nl}*) | ||
1952 | + case $ac_var in #( | ||
1953 | + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 | ||
1954 | +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; | ||
1955 | + esac | ||
1956 | + case $ac_var in #( | ||
1957 | + _ | IFS | as_nl) ;; #( | ||
1958 | + *) $as_unset $ac_var ;; | ||
1959 | + esac ;; | ||
1960 | + esac | ||
1961 | + done | ||
1962 | (set) 2>&1 | | ||
1963 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in | ||
1964 | - *ac_space=\ *) | ||
1965 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( | ||
1966 | + *${as_nl}ac_space=\ *) | ||
1967 | sed -n \ | ||
1968 | - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; | ||
1969 | - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" | ||
1970 | - ;; | ||
1971 | + "s/'\''/'\''\\\\'\'''\''/g; | ||
1972 | + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" | ||
1973 | + ;; #( | ||
1974 | *) | ||
1975 | - sed -n \ | ||
1976 | - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
1977 | + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" | ||
1978 | ;; | ||
1979 | - esac; | ||
1980 | -} | ||
1981 | + esac | | ||
1982 | + sort | ||
1983 | +) | ||
1984 | echo | ||
1985 | |||
1986 | cat <<\_ASBOX | ||
1987 | @@ -1552,22 +2051,28 @@ | ||
1988 | echo | ||
1989 | for ac_var in $ac_subst_vars | ||
1990 | do | ||
1991 | - eval ac_val=$`echo $ac_var` | ||
1992 | - echo "$ac_var='"'"'$ac_val'"'"'" | ||
1993 | + eval ac_val=\$$ac_var | ||
1994 | + case $ac_val in | ||
1995 | + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | ||
1996 | + esac | ||
1997 | + echo "$ac_var='\''$ac_val'\''" | ||
1998 | done | sort | ||
1999 | echo | ||
2000 | |||
2001 | if test -n "$ac_subst_files"; then | ||
2002 | cat <<\_ASBOX | ||
2003 | -## ------------- ## | ||
2004 | -## Output files. ## | ||
2005 | -## ------------- ## | ||
2006 | +## ------------------- ## | ||
2007 | +## File substitutions. ## | ||
2008 | +## ------------------- ## | ||
2009 | _ASBOX | ||
2010 | echo | ||
2011 | for ac_var in $ac_subst_files | ||
2012 | do | ||
2013 | - eval ac_val=$`echo $ac_var` | ||
2014 | - echo "$ac_var='"'"'$ac_val'"'"'" | ||
2015 | + eval ac_val=\$$ac_var | ||
2016 | + case $ac_val in | ||
2017 | + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | ||
2018 | + esac | ||
2019 | + echo "$ac_var='\''$ac_val'\''" | ||
2020 | done | sort | ||
2021 | echo | ||
2022 | fi | ||
2023 | @@ -1579,26 +2084,24 @@ | ||
2024 | ## ----------- ## | ||
2025 | _ASBOX | ||
2026 | echo | ||
2027 | - sed "/^$/d" confdefs.h | sort | ||
2028 | + cat confdefs.h | ||
2029 | echo | ||
2030 | fi | ||
2031 | test "$ac_signal" != 0 && | ||
2032 | echo "$as_me: caught signal $ac_signal" | ||
2033 | echo "$as_me: exit $exit_status" | ||
2034 | } >&5 | ||
2035 | - rm -f core *.core && | ||
2036 | - rm -rf conftest* confdefs* conf$$* $ac_clean_files && | ||
2037 | + rm -f core *.core core.conftest.* && | ||
2038 | + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && | ||
2039 | exit $exit_status | ||
2040 | - ' 0 | ||
2041 | +' 0 | ||
2042 | for ac_signal in 1 2 13 15; do | ||
2043 | trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal | ||
2044 | done | ||
2045 | ac_signal=0 | ||
2046 | |||
2047 | # confdefs.h avoids OS command line length limits that DEFS can exceed. | ||
2048 | -rm -rf conftest* confdefs.h | ||
2049 | -# AIX cpp loses on an empty file, so make sure it contains at least a newline. | ||
2050 | -echo >confdefs.h | ||
2051 | +rm -f -r conftest* confdefs.h | ||
2052 | |||
2053 | # Predefined preprocessor variables. | ||
2054 | |||
2055 | @@ -1629,14 +2132,17 @@ | ||
2056 | |||
2057 | # Let the site file select an alternate cache file if it wants to. | ||
2058 | # Prefer explicitly selected file to automatically selected ones. | ||
2059 | -if test -z "$CONFIG_SITE"; then | ||
2060 | - if test "x$prefix" != xNONE; then | ||
2061 | - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" | ||
2062 | - else | ||
2063 | - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" | ||
2064 | - fi | ||
2065 | +if test -n "$CONFIG_SITE"; then | ||
2066 | + set x "$CONFIG_SITE" | ||
2067 | +elif test "x$prefix" != xNONE; then | ||
2068 | + set x "$prefix/share/config.site" "$prefix/etc/config.site" | ||
2069 | +else | ||
2070 | + set x "$ac_default_prefix/share/config.site" \ | ||
2071 | + "$ac_default_prefix/etc/config.site" | ||
2072 | fi | ||
2073 | -for ac_site_file in $CONFIG_SITE; do | ||
2074 | +shift | ||
2075 | +for ac_site_file | ||
2076 | +do | ||
2077 | if test -r "$ac_site_file"; then | ||
2078 | { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 | ||
2079 | echo "$as_me: loading site script $ac_site_file" >&6;} | ||
2080 | @@ -1652,8 +2158,8 @@ | ||
2081 | { echo "$as_me:$LINENO: loading cache $cache_file" >&5 | ||
2082 | echo "$as_me: loading cache $cache_file" >&6;} | ||
2083 | case $cache_file in | ||
2084 | - [\\/]* | ?:[\\/]* ) . $cache_file;; | ||
2085 | - *) . ./$cache_file;; | ||
2086 | + [\\/]* | ?:[\\/]* ) . "$cache_file";; | ||
2087 | + *) . "./$cache_file";; | ||
2088 | esac | ||
2089 | fi | ||
2090 | else | ||
2091 | @@ -1665,12 +2171,11 @@ | ||
2092 | # Check that the precious variables saved in the cache have kept the same | ||
2093 | # value. | ||
2094 | ac_cache_corrupted=false | ||
2095 | -for ac_var in `(set) 2>&1 | | ||
2096 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do | ||
2097 | +for ac_var in $ac_precious_vars; do | ||
2098 | eval ac_old_set=\$ac_cv_env_${ac_var}_set | ||
2099 | eval ac_new_set=\$ac_env_${ac_var}_set | ||
2100 | - eval ac_old_val="\$ac_cv_env_${ac_var}_value" | ||
2101 | - eval ac_new_val="\$ac_env_${ac_var}_value" | ||
2102 | + eval ac_old_val=\$ac_cv_env_${ac_var}_value | ||
2103 | + eval ac_new_val=\$ac_env_${ac_var}_value | ||
2104 | case $ac_old_set,$ac_new_set in | ||
2105 | set,) | ||
2106 | { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | ||
2107 | @@ -1695,8 +2200,7 @@ | ||
2108 | # Pass precious variables to config.status. | ||
2109 | if test "$ac_new_set" = set; then | ||
2110 | case $ac_new_val in | ||
2111 | - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) | ||
2112 | - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
2113 | + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
2114 | *) ac_arg=$ac_var=$ac_new_val ;; | ||
2115 | esac | ||
2116 | case " $ac_configure_args " in | ||
2117 | @@ -1713,12 +2217,6 @@ | ||
2118 | { (exit 1); exit 1; }; } | ||
2119 | fi | ||
2120 | |||
2121 | -ac_ext=c | ||
2122 | -ac_cpp='$CPP $CPPFLAGS' | ||
2123 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
2124 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
2125 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
2126 | - | ||
2127 | |||
2128 | |||
2129 | |||
2130 | @@ -1743,34 +2241,45 @@ | ||
2131 | |||
2132 | |||
2133 | |||
2134 | +ac_ext=c | ||
2135 | +ac_cpp='$CPP $CPPFLAGS' | ||
2136 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
2137 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
2138 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
2139 | |||
2140 | |||
2141 | |||
2142 | am__api_version="1.9" | ||
2143 | ac_aux_dir= | ||
2144 | -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do | ||
2145 | - if test -f $ac_dir/install-sh; then | ||
2146 | +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | ||
2147 | + if test -f "$ac_dir/install-sh"; then | ||
2148 | ac_aux_dir=$ac_dir | ||
2149 | ac_install_sh="$ac_aux_dir/install-sh -c" | ||
2150 | break | ||
2151 | - elif test -f $ac_dir/install.sh; then | ||
2152 | + elif test -f "$ac_dir/install.sh"; then | ||
2153 | ac_aux_dir=$ac_dir | ||
2154 | ac_install_sh="$ac_aux_dir/install.sh -c" | ||
2155 | break | ||
2156 | - elif test -f $ac_dir/shtool; then | ||
2157 | + elif test -f "$ac_dir/shtool"; then | ||
2158 | ac_aux_dir=$ac_dir | ||
2159 | ac_install_sh="$ac_aux_dir/shtool install -c" | ||
2160 | break | ||
2161 | fi | ||
2162 | done | ||
2163 | if test -z "$ac_aux_dir"; then | ||
2164 | - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 | ||
2165 | -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} | ||
2166 | + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 | ||
2167 | +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} | ||
2168 | { (exit 1); exit 1; }; } | ||
2169 | fi | ||
2170 | -ac_config_guess="$SHELL $ac_aux_dir/config.guess" | ||
2171 | -ac_config_sub="$SHELL $ac_aux_dir/config.sub" | ||
2172 | -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. | ||
2173 | + | ||
2174 | +# These three variables are undocumented and unsupported, | ||
2175 | +# and are intended to be withdrawn in a future Autoconf release. | ||
2176 | +# They can cause serious problems if a builder's source tree is in a directory | ||
2177 | +# whose full name contains unusual characters. | ||
2178 | +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. | ||
2179 | +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. | ||
2180 | +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. | ||
2181 | + | ||
2182 | |||
2183 | # Find a good install program. We prefer a C program (faster), | ||
2184 | # so one script is as good as another. But avoid the broken or | ||
2185 | @@ -1785,8 +2294,8 @@ | ||
2186 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
2187 | # OS/2's system install, which has a completely different semantic | ||
2188 | # ./install, which can be erroneously created by make from ./install.sh. | ||
2189 | -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | ||
2190 | -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 | ||
2191 | +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | ||
2192 | +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } | ||
2193 | if test -z "$INSTALL"; then | ||
2194 | if test "${ac_cv_path_install+set}" = set; then | ||
2195 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2196 | @@ -1808,7 +2317,7 @@ | ||
2197 | # by default. | ||
2198 | for ac_prog in ginstall scoinst install; do | ||
2199 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2200 | - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then | ||
2201 | + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then | ||
2202 | if test $ac_prog = install && | ||
2203 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2204 | # AIX install. It has an incompatible calling convention. | ||
2205 | @@ -1827,21 +2336,22 @@ | ||
2206 | ;; | ||
2207 | esac | ||
2208 | done | ||
2209 | +IFS=$as_save_IFS | ||
2210 | |||
2211 | |||
2212 | fi | ||
2213 | if test "${ac_cv_path_install+set}" = set; then | ||
2214 | INSTALL=$ac_cv_path_install | ||
2215 | else | ||
2216 | - # As a last resort, use the slow shell script. We don't cache a | ||
2217 | - # path for INSTALL within a source directory, because that will | ||
2218 | + # As a last resort, use the slow shell script. Don't cache a | ||
2219 | + # value for INSTALL within a source directory, because that will | ||
2220 | # break other packages using the cache if that directory is | ||
2221 | - # removed, or if the path is relative. | ||
2222 | + # removed, or if the value is a relative name. | ||
2223 | INSTALL=$ac_install_sh | ||
2224 | fi | ||
2225 | fi | ||
2226 | -echo "$as_me:$LINENO: result: $INSTALL" >&5 | ||
2227 | -echo "${ECHO_T}$INSTALL" >&6 | ||
2228 | +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 | ||
2229 | +echo "${ECHO_T}$INSTALL" >&6; } | ||
2230 | |||
2231 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. | ||
2232 | # It thinks the first close brace ends the variable substitution. | ||
2233 | @@ -1851,8 +2361,8 @@ | ||
2234 | |||
2235 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | ||
2236 | |||
2237 | -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 | ||
2238 | -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 | ||
2239 | +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 | ||
2240 | +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } | ||
2241 | # Just in case | ||
2242 | sleep 1 | ||
2243 | echo timestamp > conftest.file | ||
2244 | @@ -1894,20 +2404,20 @@ | ||
2245 | Check your system clock" >&2;} | ||
2246 | { (exit 1); exit 1; }; } | ||
2247 | fi | ||
2248 | -echo "$as_me:$LINENO: result: yes" >&5 | ||
2249 | -echo "${ECHO_T}yes" >&6 | ||
2250 | +{ echo "$as_me:$LINENO: result: yes" >&5 | ||
2251 | +echo "${ECHO_T}yes" >&6; } | ||
2252 | test "$program_prefix" != NONE && | ||
2253 | - program_transform_name="s,^,$program_prefix,;$program_transform_name" | ||
2254 | + program_transform_name="s&^&$program_prefix&;$program_transform_name" | ||
2255 | # Use a double $ so make ignores it. | ||
2256 | test "$program_suffix" != NONE && | ||
2257 | - program_transform_name="s,\$,$program_suffix,;$program_transform_name" | ||
2258 | + program_transform_name="s&\$&$program_suffix&;$program_transform_name" | ||
2259 | # Double any \ or $. echo might interpret backslashes. | ||
2260 | # By default was `s,x,x', remove it if useless. | ||
2261 | cat <<\_ACEOF >conftest.sed | ||
2262 | s/[\\$]/&&/g;s/;s,x,x,$// | ||
2263 | _ACEOF | ||
2264 | program_transform_name=`echo $program_transform_name | sed -f conftest.sed` | ||
2265 | -rm conftest.sed | ||
2266 | +rm -f conftest.sed | ||
2267 | |||
2268 | # expand $ac_aux_dir to an absolute path | ||
2269 | am_aux_dir=`cd $ac_aux_dir && pwd` | ||
2270 | @@ -1959,8 +2469,8 @@ | ||
2271 | do | ||
2272 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
2273 | set dummy $ac_prog; ac_word=$2 | ||
2274 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2275 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2276 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2277 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2278 | if test "${ac_cv_prog_AWK+set}" = set; then | ||
2279 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2280 | else | ||
2281 | @@ -1973,54 +2483,57 @@ | ||
2282 | IFS=$as_save_IFS | ||
2283 | test -z "$as_dir" && as_dir=. | ||
2284 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2285 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2286 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2287 | ac_cv_prog_AWK="$ac_prog" | ||
2288 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2289 | break 2 | ||
2290 | fi | ||
2291 | done | ||
2292 | done | ||
2293 | +IFS=$as_save_IFS | ||
2294 | |||
2295 | fi | ||
2296 | fi | ||
2297 | AWK=$ac_cv_prog_AWK | ||
2298 | if test -n "$AWK"; then | ||
2299 | - echo "$as_me:$LINENO: result: $AWK" >&5 | ||
2300 | -echo "${ECHO_T}$AWK" >&6 | ||
2301 | + { echo "$as_me:$LINENO: result: $AWK" >&5 | ||
2302 | +echo "${ECHO_T}$AWK" >&6; } | ||
2303 | else | ||
2304 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2305 | -echo "${ECHO_T}no" >&6 | ||
2306 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2307 | +echo "${ECHO_T}no" >&6; } | ||
2308 | fi | ||
2309 | |||
2310 | + | ||
2311 | test -n "$AWK" && break | ||
2312 | done | ||
2313 | |||
2314 | -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | ||
2315 | -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 | ||
2316 | -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` | ||
2317 | -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then | ||
2318 | +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | ||
2319 | +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } | ||
2320 | +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` | ||
2321 | +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then | ||
2322 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2323 | else | ||
2324 | cat >conftest.make <<\_ACEOF | ||
2325 | +SHELL = /bin/sh | ||
2326 | all: | ||
2327 | - @echo 'ac_maketemp="$(MAKE)"' | ||
2328 | + @echo '@@@%%%=$(MAKE)=@@@%%%' | ||
2329 | _ACEOF | ||
2330 | # GNU make sometimes prints "make[1]: Entering...", which would confuse us. | ||
2331 | -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` | ||
2332 | -if test -n "$ac_maketemp"; then | ||
2333 | - eval ac_cv_prog_make_${ac_make}_set=yes | ||
2334 | -else | ||
2335 | - eval ac_cv_prog_make_${ac_make}_set=no | ||
2336 | -fi | ||
2337 | +case `${MAKE-make} -f conftest.make 2>/dev/null` in | ||
2338 | + *@@@%%%=?*=@@@%%%*) | ||
2339 | + eval ac_cv_prog_make_${ac_make}_set=yes;; | ||
2340 | + *) | ||
2341 | + eval ac_cv_prog_make_${ac_make}_set=no;; | ||
2342 | +esac | ||
2343 | rm -f conftest.make | ||
2344 | fi | ||
2345 | -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then | ||
2346 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
2347 | -echo "${ECHO_T}yes" >&6 | ||
2348 | +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then | ||
2349 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
2350 | +echo "${ECHO_T}yes" >&6; } | ||
2351 | SET_MAKE= | ||
2352 | else | ||
2353 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2354 | -echo "${ECHO_T}no" >&6 | ||
2355 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2356 | +echo "${ECHO_T}no" >&6; } | ||
2357 | SET_MAKE="MAKE=${MAKE-make}" | ||
2358 | fi | ||
2359 | |||
2360 | @@ -2091,8 +2604,8 @@ | ||
2361 | if test -n "$ac_tool_prefix"; then | ||
2362 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
2363 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
2364 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2365 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2366 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2367 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2368 | if test "${ac_cv_prog_STRIP+set}" = set; then | ||
2369 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2370 | else | ||
2371 | @@ -2105,32 +2618,34 @@ | ||
2372 | IFS=$as_save_IFS | ||
2373 | test -z "$as_dir" && as_dir=. | ||
2374 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2375 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2376 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2377 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | ||
2378 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2379 | break 2 | ||
2380 | fi | ||
2381 | done | ||
2382 | done | ||
2383 | +IFS=$as_save_IFS | ||
2384 | |||
2385 | fi | ||
2386 | fi | ||
2387 | STRIP=$ac_cv_prog_STRIP | ||
2388 | if test -n "$STRIP"; then | ||
2389 | - echo "$as_me:$LINENO: result: $STRIP" >&5 | ||
2390 | -echo "${ECHO_T}$STRIP" >&6 | ||
2391 | + { echo "$as_me:$LINENO: result: $STRIP" >&5 | ||
2392 | +echo "${ECHO_T}$STRIP" >&6; } | ||
2393 | else | ||
2394 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2395 | -echo "${ECHO_T}no" >&6 | ||
2396 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2397 | +echo "${ECHO_T}no" >&6; } | ||
2398 | fi | ||
2399 | |||
2400 | + | ||
2401 | fi | ||
2402 | if test -z "$ac_cv_prog_STRIP"; then | ||
2403 | ac_ct_STRIP=$STRIP | ||
2404 | # Extract the first word of "strip", so it can be a program name with args. | ||
2405 | set dummy strip; ac_word=$2 | ||
2406 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2407 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2408 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2409 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2410 | if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then | ||
2411 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2412 | else | ||
2413 | @@ -2143,27 +2658,41 @@ | ||
2414 | IFS=$as_save_IFS | ||
2415 | test -z "$as_dir" && as_dir=. | ||
2416 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2417 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2418 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2419 | ac_cv_prog_ac_ct_STRIP="strip" | ||
2420 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2421 | break 2 | ||
2422 | fi | ||
2423 | done | ||
2424 | done | ||
2425 | +IFS=$as_save_IFS | ||
2426 | |||
2427 | - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" | ||
2428 | fi | ||
2429 | fi | ||
2430 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP | ||
2431 | if test -n "$ac_ct_STRIP"; then | ||
2432 | - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | ||
2433 | -echo "${ECHO_T}$ac_ct_STRIP" >&6 | ||
2434 | + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | ||
2435 | +echo "${ECHO_T}$ac_ct_STRIP" >&6; } | ||
2436 | else | ||
2437 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2438 | -echo "${ECHO_T}no" >&6 | ||
2439 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2440 | +echo "${ECHO_T}no" >&6; } | ||
2441 | fi | ||
2442 | |||
2443 | - STRIP=$ac_ct_STRIP | ||
2444 | + if test "x$ac_ct_STRIP" = x; then | ||
2445 | + STRIP=":" | ||
2446 | + else | ||
2447 | + case $cross_compiling:$ac_tool_warned in | ||
2448 | +yes:) | ||
2449 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
2450 | +whose name does not start with the host triplet. If you think this | ||
2451 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
2452 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
2453 | +whose name does not start with the host triplet. If you think this | ||
2454 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
2455 | +ac_tool_warned=yes ;; | ||
2456 | +esac | ||
2457 | + STRIP=$ac_ct_STRIP | ||
2458 | + fi | ||
2459 | else | ||
2460 | STRIP="$ac_cv_prog_STRIP" | ||
2461 | fi | ||
2462 | @@ -2195,20 +2724,20 @@ | ||
2463 | |||
2464 | |||
2465 | |||
2466 | - echo "$as_me:$LINENO: checking nano version" >&5 | ||
2467 | -echo $ECHO_N "checking nano version... $ECHO_C" >&6 | ||
2468 | + { echo "$as_me:$LINENO: checking nano version" >&5 | ||
2469 | +echo $ECHO_N "checking nano version... $ECHO_C" >&6; } | ||
2470 | |||
2471 | NANO=$(echo 0.10.3 | cut -d'.' -f4) | ||
2472 | |||
2473 | if test x"$NANO" = x || test "x$NANO" = "x0" ; then | ||
2474 | - echo "$as_me:$LINENO: result: 0 (release)" >&5 | ||
2475 | -echo "${ECHO_T}0 (release)" >&6 | ||
2476 | + { echo "$as_me:$LINENO: result: 0 (release)" >&5 | ||
2477 | +echo "${ECHO_T}0 (release)" >&6; } | ||
2478 | NANO=0 | ||
2479 | PACKAGE_VERSION_RELEASE=1 | ||
2480 | GST_CVS="no" | ||
2481 | else | ||
2482 | - echo "$as_me:$LINENO: result: $NANO" >&5 | ||
2483 | -echo "${ECHO_T}$NANO" >&6 | ||
2484 | + { echo "$as_me:$LINENO: result: $NANO" >&5 | ||
2485 | +echo "${ECHO_T}$NANO" >&6; } | ||
2486 | PACKAGE_VERSION_RELEASE=0.`date +%Y%m%d.%H%M%S` | ||
2487 | GST_CVS="yes" | ||
2488 | fi | ||
2489 | @@ -2219,20 +2748,20 @@ | ||
2490 | |||
2491 | |||
2492 | |||
2493 | - ac_config_headers="$ac_config_headers config.h" | ||
2494 | +ac_config_headers="$ac_config_headers config.h" | ||
2495 | |||
2496 | |||
2497 | -echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 | ||
2498 | -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 | ||
2499 | - # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. | ||
2500 | +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 | ||
2501 | +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } | ||
2502 | + # Check whether --enable-maintainer-mode was given. | ||
2503 | if test "${enable_maintainer_mode+set}" = set; then | ||
2504 | - enableval="$enable_maintainer_mode" | ||
2505 | - USE_MAINTAINER_MODE=$enableval | ||
2506 | + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval | ||
2507 | else | ||
2508 | USE_MAINTAINER_MODE=no | ||
2509 | -fi; | ||
2510 | - echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 | ||
2511 | -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 | ||
2512 | +fi | ||
2513 | + | ||
2514 | + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 | ||
2515 | +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } | ||
2516 | |||
2517 | |||
2518 | if test $USE_MAINTAINER_MODE = yes; then | ||
2519 | @@ -2248,57 +2777,86 @@ | ||
2520 | |||
2521 | |||
2522 | # Make sure we can run config.sub. | ||
2523 | -$ac_config_sub sun4 >/dev/null 2>&1 || | ||
2524 | - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 | ||
2525 | -echo "$as_me: error: cannot run $ac_config_sub" >&2;} | ||
2526 | +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | ||
2527 | + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 | ||
2528 | +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} | ||
2529 | { (exit 1); exit 1; }; } | ||
2530 | |||
2531 | -echo "$as_me:$LINENO: checking build system type" >&5 | ||
2532 | -echo $ECHO_N "checking build system type... $ECHO_C" >&6 | ||
2533 | +{ echo "$as_me:$LINENO: checking build system type" >&5 | ||
2534 | +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } | ||
2535 | if test "${ac_cv_build+set}" = set; then | ||
2536 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2537 | else | ||
2538 | - ac_cv_build_alias=$build_alias | ||
2539 | -test -z "$ac_cv_build_alias" && | ||
2540 | - ac_cv_build_alias=`$ac_config_guess` | ||
2541 | -test -z "$ac_cv_build_alias" && | ||
2542 | + ac_build_alias=$build_alias | ||
2543 | +test "x$ac_build_alias" = x && | ||
2544 | + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` | ||
2545 | +test "x$ac_build_alias" = x && | ||
2546 | { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 | ||
2547 | echo "$as_me: error: cannot guess build type; you must specify one" >&2;} | ||
2548 | { (exit 1); exit 1; }; } | ||
2549 | -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || | ||
2550 | - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 | ||
2551 | -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} | ||
2552 | +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || | ||
2553 | + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 | ||
2554 | +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} | ||
2555 | { (exit 1); exit 1; }; } | ||
2556 | |||
2557 | fi | ||
2558 | -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 | ||
2559 | -echo "${ECHO_T}$ac_cv_build" >&6 | ||
2560 | +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 | ||
2561 | +echo "${ECHO_T}$ac_cv_build" >&6; } | ||
2562 | +case $ac_cv_build in | ||
2563 | +*-*-*) ;; | ||
2564 | +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 | ||
2565 | +echo "$as_me: error: invalid value of canonical build" >&2;} | ||
2566 | + { (exit 1); exit 1; }; };; | ||
2567 | +esac | ||
2568 | build=$ac_cv_build | ||
2569 | -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | ||
2570 | -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | ||
2571 | -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
2572 | +ac_save_IFS=$IFS; IFS='-' | ||
2573 | +set x $ac_cv_build | ||
2574 | +shift | ||
2575 | +build_cpu=$1 | ||
2576 | +build_vendor=$2 | ||
2577 | +shift; shift | ||
2578 | +# Remember, the first character of IFS is used to create $*, | ||
2579 | +# except with old shells: | ||
2580 | +build_os=$* | ||
2581 | +IFS=$ac_save_IFS | ||
2582 | +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac | ||
2583 | |||
2584 | |||
2585 | -echo "$as_me:$LINENO: checking host system type" >&5 | ||
2586 | -echo $ECHO_N "checking host system type... $ECHO_C" >&6 | ||
2587 | +{ echo "$as_me:$LINENO: checking host system type" >&5 | ||
2588 | +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } | ||
2589 | if test "${ac_cv_host+set}" = set; then | ||
2590 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2591 | else | ||
2592 | - ac_cv_host_alias=$host_alias | ||
2593 | -test -z "$ac_cv_host_alias" && | ||
2594 | - ac_cv_host_alias=$ac_cv_build_alias | ||
2595 | -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || | ||
2596 | - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 | ||
2597 | -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} | ||
2598 | + if test "x$host_alias" = x; then | ||
2599 | + ac_cv_host=$ac_cv_build | ||
2600 | +else | ||
2601 | + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || | ||
2602 | + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 | ||
2603 | +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} | ||
2604 | { (exit 1); exit 1; }; } | ||
2605 | +fi | ||
2606 | |||
2607 | fi | ||
2608 | -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 | ||
2609 | -echo "${ECHO_T}$ac_cv_host" >&6 | ||
2610 | +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 | ||
2611 | +echo "${ECHO_T}$ac_cv_host" >&6; } | ||
2612 | +case $ac_cv_host in | ||
2613 | +*-*-*) ;; | ||
2614 | +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 | ||
2615 | +echo "$as_me: error: invalid value of canonical host" >&2;} | ||
2616 | + { (exit 1); exit 1; }; };; | ||
2617 | +esac | ||
2618 | host=$ac_cv_host | ||
2619 | -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | ||
2620 | -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | ||
2621 | -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
2622 | +ac_save_IFS=$IFS; IFS='-' | ||
2623 | +set x $ac_cv_host | ||
2624 | +shift | ||
2625 | +host_cpu=$1 | ||
2626 | +host_vendor=$2 | ||
2627 | +shift; shift | ||
2628 | +# Remember, the first character of IFS is used to create $*, | ||
2629 | +# except with old shells: | ||
2630 | +host_os=$* | ||
2631 | +IFS=$ac_save_IFS | ||
2632 | +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac | ||
2633 | |||
2634 | |||
2635 | |||
2636 | @@ -2307,10 +2865,9 @@ | ||
2637 | |||
2638 | |||
2639 | |||
2640 | -# Check whether --enable-shared or --disable-shared was given. | ||
2641 | +# Check whether --enable-shared was given. | ||
2642 | if test "${enable_shared+set}" = set; then | ||
2643 | - enableval="$enable_shared" | ||
2644 | - p=${PACKAGE-default} | ||
2645 | + enableval=$enable_shared; p=${PACKAGE-default} | ||
2646 | case $enableval in | ||
2647 | yes) enable_shared=yes ;; | ||
2648 | no) enable_shared=no ;; | ||
2649 | @@ -2329,12 +2886,12 @@ | ||
2650 | esac | ||
2651 | else | ||
2652 | enable_shared=yes | ||
2653 | -fi; | ||
2654 | +fi | ||
2655 | + | ||
2656 | |||
2657 | -# Check whether --enable-static or --disable-static was given. | ||
2658 | +# Check whether --enable-static was given. | ||
2659 | if test "${enable_static+set}" = set; then | ||
2660 | - enableval="$enable_static" | ||
2661 | - p=${PACKAGE-default} | ||
2662 | + enableval=$enable_static; p=${PACKAGE-default} | ||
2663 | case $enableval in | ||
2664 | yes) enable_static=yes ;; | ||
2665 | no) enable_static=no ;; | ||
2666 | @@ -2353,12 +2910,12 @@ | ||
2667 | esac | ||
2668 | else | ||
2669 | enable_static=yes | ||
2670 | -fi; | ||
2671 | +fi | ||
2672 | + | ||
2673 | |||
2674 | -# Check whether --enable-fast-install or --disable-fast-install was given. | ||
2675 | +# Check whether --enable-fast-install was given. | ||
2676 | if test "${enable_fast_install+set}" = set; then | ||
2677 | - enableval="$enable_fast_install" | ||
2678 | - p=${PACKAGE-default} | ||
2679 | + enableval=$enable_fast_install; p=${PACKAGE-default} | ||
2680 | case $enableval in | ||
2681 | yes) enable_fast_install=yes ;; | ||
2682 | no) enable_fast_install=no ;; | ||
2683 | @@ -2377,11 +2934,12 @@ | ||
2684 | esac | ||
2685 | else | ||
2686 | enable_fast_install=yes | ||
2687 | -fi; | ||
2688 | +fi | ||
2689 | + | ||
2690 | |||
2691 | DEPDIR="${am__leading_dot}deps" | ||
2692 | |||
2693 | - ac_config_commands="$ac_config_commands depfiles" | ||
2694 | +ac_config_commands="$ac_config_commands depfiles" | ||
2695 | |||
2696 | |||
2697 | am_make=${MAKE-make} | ||
2698 | @@ -2391,8 +2949,8 @@ | ||
2699 | .PHONY: am__doit | ||
2700 | END | ||
2701 | # If we don't find an include directive, just comment out the code. | ||
2702 | -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 | ||
2703 | -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 | ||
2704 | +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 | ||
2705 | +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } | ||
2706 | am__include="#" | ||
2707 | am__quote= | ||
2708 | _am_result=none | ||
2709 | @@ -2419,15 +2977,15 @@ | ||
2710 | fi | ||
2711 | |||
2712 | |||
2713 | -echo "$as_me:$LINENO: result: $_am_result" >&5 | ||
2714 | -echo "${ECHO_T}$_am_result" >&6 | ||
2715 | +{ echo "$as_me:$LINENO: result: $_am_result" >&5 | ||
2716 | +echo "${ECHO_T}$_am_result" >&6; } | ||
2717 | rm -f confinc confmf | ||
2718 | |||
2719 | -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. | ||
2720 | +# Check whether --enable-dependency-tracking was given. | ||
2721 | if test "${enable_dependency_tracking+set}" = set; then | ||
2722 | - enableval="$enable_dependency_tracking" | ||
2723 | + enableval=$enable_dependency_tracking; | ||
2724 | +fi | ||
2725 | |||
2726 | -fi; | ||
2727 | if test "x$enable_dependency_tracking" != xno; then | ||
2728 | am_depcomp="$ac_aux_dir/depcomp" | ||
2729 | AMDEPBACKSLASH='\' | ||
2730 | @@ -2452,8 +3010,8 @@ | ||
2731 | if test -n "$ac_tool_prefix"; then | ||
2732 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | ||
2733 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 | ||
2734 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2735 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2736 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2737 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2738 | if test "${ac_cv_prog_CC+set}" = set; then | ||
2739 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2740 | else | ||
2741 | @@ -2466,32 +3024,34 @@ | ||
2742 | IFS=$as_save_IFS | ||
2743 | test -z "$as_dir" && as_dir=. | ||
2744 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2745 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2746 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2747 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | ||
2748 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2749 | break 2 | ||
2750 | fi | ||
2751 | done | ||
2752 | done | ||
2753 | +IFS=$as_save_IFS | ||
2754 | |||
2755 | fi | ||
2756 | fi | ||
2757 | CC=$ac_cv_prog_CC | ||
2758 | if test -n "$CC"; then | ||
2759 | - echo "$as_me:$LINENO: result: $CC" >&5 | ||
2760 | -echo "${ECHO_T}$CC" >&6 | ||
2761 | + { echo "$as_me:$LINENO: result: $CC" >&5 | ||
2762 | +echo "${ECHO_T}$CC" >&6; } | ||
2763 | else | ||
2764 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2765 | -echo "${ECHO_T}no" >&6 | ||
2766 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2767 | +echo "${ECHO_T}no" >&6; } | ||
2768 | fi | ||
2769 | |||
2770 | + | ||
2771 | fi | ||
2772 | if test -z "$ac_cv_prog_CC"; then | ||
2773 | ac_ct_CC=$CC | ||
2774 | # Extract the first word of "gcc", so it can be a program name with args. | ||
2775 | set dummy gcc; ac_word=$2 | ||
2776 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2777 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2778 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2779 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2780 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
2781 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2782 | else | ||
2783 | @@ -2504,36 +3064,51 @@ | ||
2784 | IFS=$as_save_IFS | ||
2785 | test -z "$as_dir" && as_dir=. | ||
2786 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2787 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2788 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2789 | ac_cv_prog_ac_ct_CC="gcc" | ||
2790 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2791 | break 2 | ||
2792 | fi | ||
2793 | done | ||
2794 | done | ||
2795 | +IFS=$as_save_IFS | ||
2796 | |||
2797 | fi | ||
2798 | fi | ||
2799 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
2800 | if test -n "$ac_ct_CC"; then | ||
2801 | - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
2802 | -echo "${ECHO_T}$ac_ct_CC" >&6 | ||
2803 | + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
2804 | +echo "${ECHO_T}$ac_ct_CC" >&6; } | ||
2805 | else | ||
2806 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2807 | -echo "${ECHO_T}no" >&6 | ||
2808 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2809 | +echo "${ECHO_T}no" >&6; } | ||
2810 | fi | ||
2811 | |||
2812 | - CC=$ac_ct_CC | ||
2813 | + if test "x$ac_ct_CC" = x; then | ||
2814 | + CC="" | ||
2815 | + else | ||
2816 | + case $cross_compiling:$ac_tool_warned in | ||
2817 | +yes:) | ||
2818 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
2819 | +whose name does not start with the host triplet. If you think this | ||
2820 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
2821 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
2822 | +whose name does not start with the host triplet. If you think this | ||
2823 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
2824 | +ac_tool_warned=yes ;; | ||
2825 | +esac | ||
2826 | + CC=$ac_ct_CC | ||
2827 | + fi | ||
2828 | else | ||
2829 | CC="$ac_cv_prog_CC" | ||
2830 | fi | ||
2831 | |||
2832 | if test -z "$CC"; then | ||
2833 | - if test -n "$ac_tool_prefix"; then | ||
2834 | - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | ||
2835 | + if test -n "$ac_tool_prefix"; then | ||
2836 | + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | ||
2837 | set dummy ${ac_tool_prefix}cc; ac_word=$2 | ||
2838 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2839 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2840 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2841 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2842 | if test "${ac_cv_prog_CC+set}" = set; then | ||
2843 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2844 | else | ||
2845 | @@ -2546,74 +3121,34 @@ | ||
2846 | IFS=$as_save_IFS | ||
2847 | test -z "$as_dir" && as_dir=. | ||
2848 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2849 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2850 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2851 | ac_cv_prog_CC="${ac_tool_prefix}cc" | ||
2852 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2853 | break 2 | ||
2854 | fi | ||
2855 | done | ||
2856 | done | ||
2857 | +IFS=$as_save_IFS | ||
2858 | |||
2859 | fi | ||
2860 | fi | ||
2861 | CC=$ac_cv_prog_CC | ||
2862 | if test -n "$CC"; then | ||
2863 | - echo "$as_me:$LINENO: result: $CC" >&5 | ||
2864 | -echo "${ECHO_T}$CC" >&6 | ||
2865 | -else | ||
2866 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2867 | -echo "${ECHO_T}no" >&6 | ||
2868 | -fi | ||
2869 | - | ||
2870 | -fi | ||
2871 | -if test -z "$ac_cv_prog_CC"; then | ||
2872 | - ac_ct_CC=$CC | ||
2873 | - # Extract the first word of "cc", so it can be a program name with args. | ||
2874 | -set dummy cc; ac_word=$2 | ||
2875 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2876 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2877 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
2878 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2879 | -else | ||
2880 | - if test -n "$ac_ct_CC"; then | ||
2881 | - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | ||
2882 | -else | ||
2883 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2884 | -for as_dir in $PATH | ||
2885 | -do | ||
2886 | - IFS=$as_save_IFS | ||
2887 | - test -z "$as_dir" && as_dir=. | ||
2888 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2889 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2890 | - ac_cv_prog_ac_ct_CC="cc" | ||
2891 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2892 | - break 2 | ||
2893 | - fi | ||
2894 | -done | ||
2895 | -done | ||
2896 | - | ||
2897 | -fi | ||
2898 | -fi | ||
2899 | -ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
2900 | -if test -n "$ac_ct_CC"; then | ||
2901 | - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
2902 | -echo "${ECHO_T}$ac_ct_CC" >&6 | ||
2903 | + { echo "$as_me:$LINENO: result: $CC" >&5 | ||
2904 | +echo "${ECHO_T}$CC" >&6; } | ||
2905 | else | ||
2906 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2907 | -echo "${ECHO_T}no" >&6 | ||
2908 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2909 | +echo "${ECHO_T}no" >&6; } | ||
2910 | fi | ||
2911 | |||
2912 | - CC=$ac_ct_CC | ||
2913 | -else | ||
2914 | - CC="$ac_cv_prog_CC" | ||
2915 | -fi | ||
2916 | |||
2917 | + fi | ||
2918 | fi | ||
2919 | if test -z "$CC"; then | ||
2920 | # Extract the first word of "cc", so it can be a program name with args. | ||
2921 | set dummy cc; ac_word=$2 | ||
2922 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2923 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2924 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2925 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2926 | if test "${ac_cv_prog_CC+set}" = set; then | ||
2927 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2928 | else | ||
2929 | @@ -2627,7 +3162,7 @@ | ||
2930 | IFS=$as_save_IFS | ||
2931 | test -z "$as_dir" && as_dir=. | ||
2932 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2933 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2934 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2935 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | ||
2936 | ac_prog_rejected=yes | ||
2937 | continue | ||
2938 | @@ -2638,6 +3173,7 @@ | ||
2939 | fi | ||
2940 | done | ||
2941 | done | ||
2942 | +IFS=$as_save_IFS | ||
2943 | |||
2944 | if test $ac_prog_rejected = yes; then | ||
2945 | # We found a bogon in the path, so make sure we never use it. | ||
2946 | @@ -2655,22 +3191,23 @@ | ||
2947 | fi | ||
2948 | CC=$ac_cv_prog_CC | ||
2949 | if test -n "$CC"; then | ||
2950 | - echo "$as_me:$LINENO: result: $CC" >&5 | ||
2951 | -echo "${ECHO_T}$CC" >&6 | ||
2952 | + { echo "$as_me:$LINENO: result: $CC" >&5 | ||
2953 | +echo "${ECHO_T}$CC" >&6; } | ||
2954 | else | ||
2955 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2956 | -echo "${ECHO_T}no" >&6 | ||
2957 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
2958 | +echo "${ECHO_T}no" >&6; } | ||
2959 | fi | ||
2960 | |||
2961 | + | ||
2962 | fi | ||
2963 | if test -z "$CC"; then | ||
2964 | if test -n "$ac_tool_prefix"; then | ||
2965 | - for ac_prog in cl | ||
2966 | + for ac_prog in cl.exe | ||
2967 | do | ||
2968 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
2969 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
2970 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2971 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2972 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2973 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2974 | if test "${ac_cv_prog_CC+set}" = set; then | ||
2975 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2976 | else | ||
2977 | @@ -2683,36 +3220,38 @@ | ||
2978 | IFS=$as_save_IFS | ||
2979 | test -z "$as_dir" && as_dir=. | ||
2980 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2981 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2982 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2983 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | ||
2984 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2985 | break 2 | ||
2986 | fi | ||
2987 | done | ||
2988 | done | ||
2989 | +IFS=$as_save_IFS | ||
2990 | |||
2991 | fi | ||
2992 | fi | ||
2993 | CC=$ac_cv_prog_CC | ||
2994 | if test -n "$CC"; then | ||
2995 | - echo "$as_me:$LINENO: result: $CC" >&5 | ||
2996 | -echo "${ECHO_T}$CC" >&6 | ||
2997 | + { echo "$as_me:$LINENO: result: $CC" >&5 | ||
2998 | +echo "${ECHO_T}$CC" >&6; } | ||
2999 | else | ||
3000 | - echo "$as_me:$LINENO: result: no" >&5 | ||
3001 | -echo "${ECHO_T}no" >&6 | ||
3002 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
3003 | +echo "${ECHO_T}no" >&6; } | ||
3004 | fi | ||
3005 | |||
3006 | + | ||
3007 | test -n "$CC" && break | ||
3008 | done | ||
3009 | fi | ||
3010 | if test -z "$CC"; then | ||
3011 | ac_ct_CC=$CC | ||
3012 | - for ac_prog in cl | ||
3013 | + for ac_prog in cl.exe | ||
3014 | do | ||
3015 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
3016 | set dummy $ac_prog; ac_word=$2 | ||
3017 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
3018 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
3019 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
3020 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
3021 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
3022 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3023 | else | ||
3024 | @@ -2725,29 +3264,45 @@ | ||
3025 | IFS=$as_save_IFS | ||
3026 | test -z "$as_dir" && as_dir=. | ||
3027 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3028 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3029 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
3030 | ac_cv_prog_ac_ct_CC="$ac_prog" | ||
3031 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3032 | break 2 | ||
3033 | fi | ||
3034 | done | ||
3035 | done | ||
3036 | +IFS=$as_save_IFS | ||
3037 | |||
3038 | fi | ||
3039 | fi | ||
3040 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
3041 | if test -n "$ac_ct_CC"; then | ||
3042 | - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
3043 | -echo "${ECHO_T}$ac_ct_CC" >&6 | ||
3044 | + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
3045 | +echo "${ECHO_T}$ac_ct_CC" >&6; } | ||
3046 | else | ||
3047 | - echo "$as_me:$LINENO: result: no" >&5 | ||
3048 | -echo "${ECHO_T}no" >&6 | ||
3049 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
3050 | +echo "${ECHO_T}no" >&6; } | ||
3051 | fi | ||
3052 | |||
3053 | + | ||
3054 | test -n "$ac_ct_CC" && break | ||
3055 | done | ||
3056 | |||
3057 | - CC=$ac_ct_CC | ||
3058 | + if test "x$ac_ct_CC" = x; then | ||
3059 | + CC="" | ||
3060 | + else | ||
3061 | + case $cross_compiling:$ac_tool_warned in | ||
3062 | +yes:) | ||
3063 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
3064 | +whose name does not start with the host triplet. If you think this | ||
3065 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
3066 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
3067 | +whose name does not start with the host triplet. If you think this | ||
3068 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
3069 | +ac_tool_warned=yes ;; | ||
3070 | +esac | ||
3071 | + CC=$ac_ct_CC | ||
3072 | + fi | ||
3073 | fi | ||
3074 | |||
3075 | fi | ||
3076 | @@ -2760,21 +3315,35 @@ | ||
3077 | { (exit 1); exit 1; }; } | ||
3078 | |||
3079 | # Provide some information about the compiler. | ||
3080 | -echo "$as_me:$LINENO:" \ | ||
3081 | - "checking for C compiler version" >&5 | ||
3082 | +echo "$as_me:$LINENO: checking for C compiler version" >&5 | ||
3083 | ac_compiler=`set X $ac_compile; echo $2` | ||
3084 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 | ||
3085 | - (eval $ac_compiler --version </dev/null >&5) 2>&5 | ||
3086 | +{ (ac_try="$ac_compiler --version >&5" | ||
3087 | +case "(($ac_try" in | ||
3088 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3089 | + *) ac_try_echo=$ac_try;; | ||
3090 | +esac | ||
3091 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3092 | + (eval "$ac_compiler --version >&5") 2>&5 | ||
3093 | ac_status=$? | ||
3094 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3095 | (exit $ac_status); } | ||
3096 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 | ||
3097 | - (eval $ac_compiler -v </dev/null >&5) 2>&5 | ||
3098 | +{ (ac_try="$ac_compiler -v >&5" | ||
3099 | +case "(($ac_try" in | ||
3100 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3101 | + *) ac_try_echo=$ac_try;; | ||
3102 | +esac | ||
3103 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3104 | + (eval "$ac_compiler -v >&5") 2>&5 | ||
3105 | ac_status=$? | ||
3106 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3107 | (exit $ac_status); } | ||
3108 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 | ||
3109 | - (eval $ac_compiler -V </dev/null >&5) 2>&5 | ||
3110 | +{ (ac_try="$ac_compiler -V >&5" | ||
3111 | +case "(($ac_try" in | ||
3112 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3113 | + *) ac_try_echo=$ac_try;; | ||
3114 | +esac | ||
3115 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3116 | + (eval "$ac_compiler -V >&5") 2>&5 | ||
3117 | ac_status=$? | ||
3118 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3119 | (exit $ac_status); } | ||
3120 | @@ -2799,46 +3368,70 @@ | ||
3121 | # Try to create an executable without -o first, disregard a.out. | ||
3122 | # It will help us diagnose broken compilers, and finding out an intuition | ||
3123 | # of exeext. | ||
3124 | -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | ||
3125 | -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 | ||
3126 | +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | ||
3127 | +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } | ||
3128 | ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | ||
3129 | -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 | ||
3130 | - (eval $ac_link_default) 2>&5 | ||
3131 | +# | ||
3132 | +# List of possible output files, starting from the most likely. | ||
3133 | +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) | ||
3134 | +# only as a last resort. b.out is created by i960 compilers. | ||
3135 | +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' | ||
3136 | +# | ||
3137 | +# The IRIX 6 linker writes into existing files which may not be | ||
3138 | +# executable, retaining their permissions. Remove them first so a | ||
3139 | +# subsequent execution test works. | ||
3140 | +ac_rmfiles= | ||
3141 | +for ac_file in $ac_files | ||
3142 | +do | ||
3143 | + case $ac_file in | ||
3144 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; | ||
3145 | + * ) ac_rmfiles="$ac_rmfiles $ac_file";; | ||
3146 | + esac | ||
3147 | +done | ||
3148 | +rm -f $ac_rmfiles | ||
3149 | + | ||
3150 | +if { (ac_try="$ac_link_default" | ||
3151 | +case "(($ac_try" in | ||
3152 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3153 | + *) ac_try_echo=$ac_try;; | ||
3154 | +esac | ||
3155 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3156 | + (eval "$ac_link_default") 2>&5 | ||
3157 | ac_status=$? | ||
3158 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3159 | (exit $ac_status); }; then | ||
3160 | - # Find the output, starting from the most likely. This scheme is | ||
3161 | -# not robust to junk in `.', hence go to wildcards (a.*) only as a last | ||
3162 | -# resort. | ||
3163 | - | ||
3164 | -# Be careful to initialize this variable, since it used to be cached. | ||
3165 | -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. | ||
3166 | -ac_cv_exeext= | ||
3167 | -# b.out is created by i960 compilers. | ||
3168 | -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out | ||
3169 | + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. | ||
3170 | +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' | ||
3171 | +# in a Makefile. We should not override ac_cv_exeext if it was cached, | ||
3172 | +# so that the user can short-circuit this test for compilers unknown to | ||
3173 | +# Autoconf. | ||
3174 | +for ac_file in $ac_files | ||
3175 | do | ||
3176 | test -f "$ac_file" || continue | ||
3177 | case $ac_file in | ||
3178 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) | ||
3179 | - ;; | ||
3180 | - conftest.$ac_ext ) | ||
3181 | - # This is the source file. | ||
3182 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) | ||
3183 | ;; | ||
3184 | [ab].out ) | ||
3185 | # We found the default executable, but exeext='' is most | ||
3186 | # certainly right. | ||
3187 | break;; | ||
3188 | *.* ) | ||
3189 | - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
3190 | - # FIXME: I believe we export ac_cv_exeext for Libtool, | ||
3191 | - # but it would be cool to find out if it's true. Does anybody | ||
3192 | - # maintain Libtool? --akim. | ||
3193 | - export ac_cv_exeext | ||
3194 | + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; | ||
3195 | + then :; else | ||
3196 | + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
3197 | + fi | ||
3198 | + # We set ac_cv_exeext here because the later test for it is not | ||
3199 | + # safe: cross compilers may not add the suffix if given an `-o' | ||
3200 | + # argument, so we may need to know it at that point already. | ||
3201 | + # Even if this section looks crufty: it has the advantage of | ||
3202 | + # actually working. | ||
3203 | break;; | ||
3204 | * ) | ||
3205 | break;; | ||
3206 | esac | ||
3207 | done | ||
3208 | +test "$ac_cv_exeext" = no && ac_cv_exeext= | ||
3209 | + | ||
3210 | else | ||
3211 | echo "$as_me: failed program was:" >&5 | ||
3212 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3213 | @@ -2851,19 +3444,23 @@ | ||
3214 | fi | ||
3215 | |||
3216 | ac_exeext=$ac_cv_exeext | ||
3217 | -echo "$as_me:$LINENO: result: $ac_file" >&5 | ||
3218 | -echo "${ECHO_T}$ac_file" >&6 | ||
3219 | +{ echo "$as_me:$LINENO: result: $ac_file" >&5 | ||
3220 | +echo "${ECHO_T}$ac_file" >&6; } | ||
3221 | |||
3222 | -# Check the compiler produces executables we can run. If not, either | ||
3223 | +# Check that the compiler produces executables we can run. If not, either | ||
3224 | # the compiler is broken, or we cross compile. | ||
3225 | -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 | ||
3226 | -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 | ||
3227 | +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 | ||
3228 | +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } | ||
3229 | # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 | ||
3230 | # If not cross compiling, check that we can run a simple program. | ||
3231 | if test "$cross_compiling" != yes; then | ||
3232 | if { ac_try='./$ac_file' | ||
3233 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3234 | - (eval $ac_try) 2>&5 | ||
3235 | + { (case "(($ac_try" in | ||
3236 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3237 | + *) ac_try_echo=$ac_try;; | ||
3238 | +esac | ||
3239 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3240 | + (eval "$ac_try") 2>&5 | ||
3241 | ac_status=$? | ||
3242 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3243 | (exit $ac_status); }; }; then | ||
3244 | @@ -2882,22 +3479,27 @@ | ||
3245 | fi | ||
3246 | fi | ||
3247 | fi | ||
3248 | -echo "$as_me:$LINENO: result: yes" >&5 | ||
3249 | -echo "${ECHO_T}yes" >&6 | ||
3250 | +{ echo "$as_me:$LINENO: result: yes" >&5 | ||
3251 | +echo "${ECHO_T}yes" >&6; } | ||
3252 | |||
3253 | rm -f a.out a.exe conftest$ac_cv_exeext b.out | ||
3254 | ac_clean_files=$ac_clean_files_save | ||
3255 | -# Check the compiler produces executables we can run. If not, either | ||
3256 | +# Check that the compiler produces executables we can run. If not, either | ||
3257 | # the compiler is broken, or we cross compile. | ||
3258 | -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 | ||
3259 | -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 | ||
3260 | -echo "$as_me:$LINENO: result: $cross_compiling" >&5 | ||
3261 | -echo "${ECHO_T}$cross_compiling" >&6 | ||
3262 | - | ||
3263 | -echo "$as_me:$LINENO: checking for suffix of executables" >&5 | ||
3264 | -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 | ||
3265 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3266 | - (eval $ac_link) 2>&5 | ||
3267 | +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 | ||
3268 | +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } | ||
3269 | +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 | ||
3270 | +echo "${ECHO_T}$cross_compiling" >&6; } | ||
3271 | + | ||
3272 | +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 | ||
3273 | +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } | ||
3274 | +if { (ac_try="$ac_link" | ||
3275 | +case "(($ac_try" in | ||
3276 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3277 | + *) ac_try_echo=$ac_try;; | ||
3278 | +esac | ||
3279 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3280 | + (eval "$ac_link") 2>&5 | ||
3281 | ac_status=$? | ||
3282 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3283 | (exit $ac_status); }; then | ||
3284 | @@ -2908,9 +3510,8 @@ | ||
3285 | for ac_file in conftest.exe conftest conftest.*; do | ||
3286 | test -f "$ac_file" || continue | ||
3287 | case $ac_file in | ||
3288 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; | ||
3289 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; | ||
3290 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
3291 | - export ac_cv_exeext | ||
3292 | break;; | ||
3293 | * ) break;; | ||
3294 | esac | ||
3295 | @@ -2924,14 +3525,14 @@ | ||
3296 | fi | ||
3297 | |||
3298 | rm -f conftest$ac_cv_exeext | ||
3299 | -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 | ||
3300 | -echo "${ECHO_T}$ac_cv_exeext" >&6 | ||
3301 | +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 | ||
3302 | +echo "${ECHO_T}$ac_cv_exeext" >&6; } | ||
3303 | |||
3304 | rm -f conftest.$ac_ext | ||
3305 | EXEEXT=$ac_cv_exeext | ||
3306 | ac_exeext=$EXEEXT | ||
3307 | -echo "$as_me:$LINENO: checking for suffix of object files" >&5 | ||
3308 | -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 | ||
3309 | +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 | ||
3310 | +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } | ||
3311 | if test "${ac_cv_objext+set}" = set; then | ||
3312 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3313 | else | ||
3314 | @@ -2951,14 +3552,20 @@ | ||
3315 | } | ||
3316 | _ACEOF | ||
3317 | rm -f conftest.o conftest.obj | ||
3318 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3319 | - (eval $ac_compile) 2>&5 | ||
3320 | +if { (ac_try="$ac_compile" | ||
3321 | +case "(($ac_try" in | ||
3322 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3323 | + *) ac_try_echo=$ac_try;; | ||
3324 | +esac | ||
3325 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3326 | + (eval "$ac_compile") 2>&5 | ||
3327 | ac_status=$? | ||
3328 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3329 | (exit $ac_status); }; then | ||
3330 | - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do | ||
3331 | + for ac_file in conftest.o conftest.obj conftest.*; do | ||
3332 | + test -f "$ac_file" || continue; | ||
3333 | case $ac_file in | ||
3334 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; | ||
3335 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; | ||
3336 | *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` | ||
3337 | break;; | ||
3338 | esac | ||
3339 | @@ -2976,12 +3583,12 @@ | ||
3340 | |||
3341 | rm -f conftest.$ac_cv_objext conftest.$ac_ext | ||
3342 | fi | ||
3343 | -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 | ||
3344 | -echo "${ECHO_T}$ac_cv_objext" >&6 | ||
3345 | +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 | ||
3346 | +echo "${ECHO_T}$ac_cv_objext" >&6; } | ||
3347 | OBJEXT=$ac_cv_objext | ||
3348 | ac_objext=$OBJEXT | ||
3349 | -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | ||
3350 | -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 | ||
3351 | +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | ||
3352 | +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } | ||
3353 | if test "${ac_cv_c_compiler_gnu+set}" = set; then | ||
3354 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3355 | else | ||
3356 | @@ -3004,23 +3611,36 @@ | ||
3357 | } | ||
3358 | _ACEOF | ||
3359 | rm -f conftest.$ac_objext | ||
3360 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3361 | - (eval $ac_compile) 2>conftest.er1 | ||
3362 | +if { (ac_try="$ac_compile" | ||
3363 | +case "(($ac_try" in | ||
3364 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3365 | + *) ac_try_echo=$ac_try;; | ||
3366 | +esac | ||
3367 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3368 | + (eval "$ac_compile") 2>conftest.er1 | ||
3369 | ac_status=$? | ||
3370 | grep -v '^ *+' conftest.er1 >conftest.err | ||
3371 | rm -f conftest.er1 | ||
3372 | cat conftest.err >&5 | ||
3373 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3374 | (exit $ac_status); } && | ||
3375 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3376 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3377 | - (eval $ac_try) 2>&5 | ||
3378 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3379 | + { (case "(($ac_try" in | ||
3380 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3381 | + *) ac_try_echo=$ac_try;; | ||
3382 | +esac | ||
3383 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3384 | + (eval "$ac_try") 2>&5 | ||
3385 | ac_status=$? | ||
3386 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3387 | (exit $ac_status); }; } && | ||
3388 | { ac_try='test -s conftest.$ac_objext' | ||
3389 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3390 | - (eval $ac_try) 2>&5 | ||
3391 | + { (case "(($ac_try" in | ||
3392 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3393 | + *) ac_try_echo=$ac_try;; | ||
3394 | +esac | ||
3395 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3396 | + (eval "$ac_try") 2>&5 | ||
3397 | ac_status=$? | ||
3398 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3399 | (exit $ac_status); }; }; then | ||
3400 | @@ -3029,24 +3649,28 @@ | ||
3401 | echo "$as_me: failed program was:" >&5 | ||
3402 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3403 | |||
3404 | -ac_compiler_gnu=no | ||
3405 | + ac_compiler_gnu=no | ||
3406 | fi | ||
3407 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3408 | + | ||
3409 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3410 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | ||
3411 | |||
3412 | fi | ||
3413 | -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | ||
3414 | -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 | ||
3415 | +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | ||
3416 | +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } | ||
3417 | GCC=`test $ac_compiler_gnu = yes && echo yes` | ||
3418 | ac_test_CFLAGS=${CFLAGS+set} | ||
3419 | ac_save_CFLAGS=$CFLAGS | ||
3420 | -CFLAGS="-g" | ||
3421 | -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | ||
3422 | -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 | ||
3423 | +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | ||
3424 | +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } | ||
3425 | if test "${ac_cv_prog_cc_g+set}" = set; then | ||
3426 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3427 | else | ||
3428 | - cat >conftest.$ac_ext <<_ACEOF | ||
3429 | + ac_save_c_werror_flag=$ac_c_werror_flag | ||
3430 | + ac_c_werror_flag=yes | ||
3431 | + ac_cv_prog_cc_g=no | ||
3432 | + CFLAGS="-g" | ||
3433 | + cat >conftest.$ac_ext <<_ACEOF | ||
3434 | /* confdefs.h. */ | ||
3435 | _ACEOF | ||
3436 | cat confdefs.h >>conftest.$ac_ext | ||
3437 | @@ -3062,23 +3686,147 @@ | ||
3438 | } | ||
3439 | _ACEOF | ||
3440 | rm -f conftest.$ac_objext | ||
3441 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3442 | - (eval $ac_compile) 2>conftest.er1 | ||
3443 | +if { (ac_try="$ac_compile" | ||
3444 | +case "(($ac_try" in | ||
3445 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3446 | + *) ac_try_echo=$ac_try;; | ||
3447 | +esac | ||
3448 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3449 | + (eval "$ac_compile") 2>conftest.er1 | ||
3450 | + ac_status=$? | ||
3451 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3452 | + rm -f conftest.er1 | ||
3453 | + cat conftest.err >&5 | ||
3454 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3455 | + (exit $ac_status); } && | ||
3456 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3457 | + { (case "(($ac_try" in | ||
3458 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3459 | + *) ac_try_echo=$ac_try;; | ||
3460 | +esac | ||
3461 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3462 | + (eval "$ac_try") 2>&5 | ||
3463 | + ac_status=$? | ||
3464 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3465 | + (exit $ac_status); }; } && | ||
3466 | + { ac_try='test -s conftest.$ac_objext' | ||
3467 | + { (case "(($ac_try" in | ||
3468 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3469 | + *) ac_try_echo=$ac_try;; | ||
3470 | +esac | ||
3471 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3472 | + (eval "$ac_try") 2>&5 | ||
3473 | + ac_status=$? | ||
3474 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3475 | + (exit $ac_status); }; }; then | ||
3476 | + ac_cv_prog_cc_g=yes | ||
3477 | +else | ||
3478 | + echo "$as_me: failed program was:" >&5 | ||
3479 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3480 | + | ||
3481 | + CFLAGS="" | ||
3482 | + cat >conftest.$ac_ext <<_ACEOF | ||
3483 | +/* confdefs.h. */ | ||
3484 | +_ACEOF | ||
3485 | +cat confdefs.h >>conftest.$ac_ext | ||
3486 | +cat >>conftest.$ac_ext <<_ACEOF | ||
3487 | +/* end confdefs.h. */ | ||
3488 | + | ||
3489 | +int | ||
3490 | +main () | ||
3491 | +{ | ||
3492 | + | ||
3493 | + ; | ||
3494 | + return 0; | ||
3495 | +} | ||
3496 | +_ACEOF | ||
3497 | +rm -f conftest.$ac_objext | ||
3498 | +if { (ac_try="$ac_compile" | ||
3499 | +case "(($ac_try" in | ||
3500 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3501 | + *) ac_try_echo=$ac_try;; | ||
3502 | +esac | ||
3503 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3504 | + (eval "$ac_compile") 2>conftest.er1 | ||
3505 | + ac_status=$? | ||
3506 | + grep -v '^ *+' conftest.er1 >conftest.err | ||
3507 | + rm -f conftest.er1 | ||
3508 | + cat conftest.err >&5 | ||
3509 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3510 | + (exit $ac_status); } && | ||
3511 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3512 | + { (case "(($ac_try" in | ||
3513 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3514 | + *) ac_try_echo=$ac_try;; | ||
3515 | +esac | ||
3516 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3517 | + (eval "$ac_try") 2>&5 | ||
3518 | + ac_status=$? | ||
3519 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3520 | + (exit $ac_status); }; } && | ||
3521 | + { ac_try='test -s conftest.$ac_objext' | ||
3522 | + { (case "(($ac_try" in | ||
3523 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3524 | + *) ac_try_echo=$ac_try;; | ||
3525 | +esac | ||
3526 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3527 | + (eval "$ac_try") 2>&5 | ||
3528 | + ac_status=$? | ||
3529 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3530 | + (exit $ac_status); }; }; then | ||
3531 | + : | ||
3532 | +else | ||
3533 | + echo "$as_me: failed program was:" >&5 | ||
3534 | +sed 's/^/| /' conftest.$ac_ext >&5 | ||
3535 | + | ||
3536 | + ac_c_werror_flag=$ac_save_c_werror_flag | ||
3537 | + CFLAGS="-g" | ||
3538 | + cat >conftest.$ac_ext <<_ACEOF | ||
3539 | +/* confdefs.h. */ | ||
3540 | +_ACEOF | ||
3541 | +cat confdefs.h >>conftest.$ac_ext | ||
3542 | +cat >>conftest.$ac_ext <<_ACEOF | ||
3543 | +/* end confdefs.h. */ | ||
3544 | + | ||
3545 | +int | ||
3546 | +main () | ||
3547 | +{ | ||
3548 | + | ||
3549 | + ; | ||
3550 | + return 0; | ||
3551 | +} | ||
3552 | +_ACEOF | ||
3553 | +rm -f conftest.$ac_objext | ||
3554 | +if { (ac_try="$ac_compile" | ||
3555 | +case "(($ac_try" in | ||
3556 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3557 | + *) ac_try_echo=$ac_try;; | ||
3558 | +esac | ||
3559 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3560 | + (eval "$ac_compile") 2>conftest.er1 | ||
3561 | ac_status=$? | ||
3562 | grep -v '^ *+' conftest.er1 >conftest.err | ||
3563 | rm -f conftest.er1 | ||
3564 | cat conftest.err >&5 | ||
3565 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3566 | (exit $ac_status); } && | ||
3567 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3568 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3569 | - (eval $ac_try) 2>&5 | ||
3570 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3571 | + { (case "(($ac_try" in | ||
3572 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3573 | + *) ac_try_echo=$ac_try;; | ||
3574 | +esac | ||
3575 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3576 | + (eval "$ac_try") 2>&5 | ||
3577 | ac_status=$? | ||
3578 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3579 | (exit $ac_status); }; } && | ||
3580 | { ac_try='test -s conftest.$ac_objext' | ||
3581 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3582 | - (eval $ac_try) 2>&5 | ||
3583 | + { (case "(($ac_try" in | ||
3584 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3585 | + *) ac_try_echo=$ac_try;; | ||
3586 | +esac | ||
3587 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3588 | + (eval "$ac_try") 2>&5 | ||
3589 | ac_status=$? | ||
3590 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3591 | (exit $ac_status); }; }; then | ||
3592 | @@ -3087,12 +3835,20 @@ | ||
3593 | echo "$as_me: failed program was:" >&5 | ||
3594 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3595 | |||
3596 | -ac_cv_prog_cc_g=no | ||
3597 | + | ||
3598 | fi | ||
3599 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3600 | + | ||
3601 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3602 | +fi | ||
3603 | + | ||
3604 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3605 | +fi | ||
3606 | + | ||
3607 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3608 | + ac_c_werror_flag=$ac_save_c_werror_flag | ||
3609 | fi | ||
3610 | -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | ||
3611 | -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 | ||
3612 | +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | ||
3613 | +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } | ||
3614 | if test "$ac_test_CFLAGS" = set; then | ||
3615 | CFLAGS=$ac_save_CFLAGS | ||
3616 | elif test $ac_cv_prog_cc_g = yes; then | ||
3617 | @@ -3108,12 +3864,12 @@ | ||
3618 | CFLAGS= | ||
3619 | fi | ||
3620 | fi | ||
3621 | -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 | ||
3622 | -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 | ||
3623 | -if test "${ac_cv_prog_cc_stdc+set}" = set; then | ||
3624 | +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | ||
3625 | +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } | ||
3626 | +if test "${ac_cv_prog_cc_c89+set}" = set; then | ||
3627 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3628 | else | ||
3629 | - ac_cv_prog_cc_stdc=no | ||
3630 | + ac_cv_prog_cc_c89=no | ||
3631 | ac_save_CC=$CC | ||
3632 | cat >conftest.$ac_ext <<_ACEOF | ||
3633 | /* confdefs.h. */ | ||
3634 | @@ -3147,12 +3903,17 @@ | ||
3635 | /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has | ||
3636 | function prototypes and stuff, but not '\xHH' hex character constants. | ||
3637 | These don't provoke an error unfortunately, instead are silently treated | ||
3638 | - as 'x'. The following induces an error, until -std1 is added to get | ||
3639 | + as 'x'. The following induces an error, until -std is added to get | ||
3640 | proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an | ||
3641 | array size at least. It's necessary to write '\x00'==0 to get something | ||
3642 | - that's true only with -std1. */ | ||
3643 | + that's true only with -std. */ | ||
3644 | int osf4_cc_array ['\x00' == 0 ? 1 : -1]; | ||
3645 | |||
3646 | +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters | ||
3647 | + inside strings and character constants. */ | ||
3648 | +#define FOO(x) 'x' | ||
3649 | +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; | ||
3650 | + | ||
3651 | int test (int i, double x); | ||
3652 | struct s1 {int (*f) (int a);}; | ||
3653 | struct s2 {int (*f) (double a);}; | ||
3654 | @@ -3167,201 +3928,74 @@ | ||
3655 | return 0; | ||
3656 | } | ||
3657 | _ACEOF | ||
3658 | -# Don't try gcc -ansi; that turns off useful extensions and | ||
3659 | -# breaks some systems' header files. | ||
3660 | -# AIX -qlanglvl=ansi | ||
3661 | -# Ultrix and OSF/1 -std1 | ||
3662 | -# HP-UX 10.20 and later -Ae | ||
3663 | -# HP-UX older versions -Aa -D_HPUX_SOURCE | ||
3664 | -# SVR4 -Xc -D__EXTENSIONS__ | ||
3665 | -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | ||
3666 | +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ | ||
3667 | + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | ||
3668 | do | ||
3669 | CC="$ac_save_CC $ac_arg" | ||
3670 | rm -f conftest.$ac_objext | ||
3671 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3672 | - (eval $ac_compile) 2>conftest.er1 | ||
3673 | +if { (ac_try="$ac_compile" | ||
3674 | +case "(($ac_try" in | ||
3675 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3676 | + *) ac_try_echo=$ac_try;; | ||
3677 | +esac | ||
3678 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3679 | + (eval "$ac_compile") 2>conftest.er1 | ||
3680 | ac_status=$? | ||
3681 | grep -v '^ *+' conftest.er1 >conftest.err | ||
3682 | rm -f conftest.er1 | ||
3683 | cat conftest.err >&5 | ||
3684 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3685 | (exit $ac_status); } && | ||
3686 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3687 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3688 | - (eval $ac_try) 2>&5 | ||
3689 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3690 | + { (case "(($ac_try" in | ||
3691 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3692 | + *) ac_try_echo=$ac_try;; | ||
3693 | +esac | ||
3694 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3695 | + (eval "$ac_try") 2>&5 | ||
3696 | ac_status=$? | ||
3697 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3698 | (exit $ac_status); }; } && | ||
3699 | { ac_try='test -s conftest.$ac_objext' | ||
3700 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3701 | - (eval $ac_try) 2>&5 | ||
3702 | + { (case "(($ac_try" in | ||
3703 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3704 | + *) ac_try_echo=$ac_try;; | ||
3705 | +esac | ||
3706 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3707 | + (eval "$ac_try") 2>&5 | ||
3708 | ac_status=$? | ||
3709 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3710 | (exit $ac_status); }; }; then | ||
3711 | - ac_cv_prog_cc_stdc=$ac_arg | ||
3712 | -break | ||
3713 | + ac_cv_prog_cc_c89=$ac_arg | ||
3714 | else | ||
3715 | echo "$as_me: failed program was:" >&5 | ||
3716 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3717 | |||
3718 | + | ||
3719 | fi | ||
3720 | -rm -f conftest.err conftest.$ac_objext | ||
3721 | + | ||
3722 | +rm -f core conftest.err conftest.$ac_objext | ||
3723 | + test "x$ac_cv_prog_cc_c89" != "xno" && break | ||
3724 | done | ||
3725 | -rm -f conftest.$ac_ext conftest.$ac_objext | ||
3726 | +rm -f conftest.$ac_ext | ||
3727 | CC=$ac_save_CC | ||
3728 | |||
3729 | fi | ||
3730 | - | ||
3731 | -case "x$ac_cv_prog_cc_stdc" in | ||
3732 | - x|xno) | ||
3733 | - echo "$as_me:$LINENO: result: none needed" >&5 | ||
3734 | -echo "${ECHO_T}none needed" >&6 ;; | ||
3735 | +# AC_CACHE_VAL | ||
3736 | +case "x$ac_cv_prog_cc_c89" in | ||
3737 | + x) | ||
3738 | + { echo "$as_me:$LINENO: result: none needed" >&5 | ||
3739 | +echo "${ECHO_T}none needed" >&6; } ;; | ||
3740 | + xno) | ||
3741 | + { echo "$as_me:$LINENO: result: unsupported" >&5 | ||
3742 | +echo "${ECHO_T}unsupported" >&6; } ;; | ||
3743 | *) | ||
3744 | - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 | ||
3745 | -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 | ||
3746 | - CC="$CC $ac_cv_prog_cc_stdc" ;; | ||
3747 | + CC="$CC $ac_cv_prog_cc_c89" | ||
3748 | + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | ||
3749 | +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; | ||
3750 | esac | ||
3751 | |||
3752 | -# Some people use a C++ compiler to compile C. Since we use `exit', | ||
3753 | -# in C++ we need to declare it. In case someone uses the same compiler | ||
3754 | -# for both compiling C and C++ we need to have the C++ compiler decide | ||
3755 | -# the declaration of exit, since it's the most demanding environment. | ||
3756 | -cat >conftest.$ac_ext <<_ACEOF | ||
3757 | -#ifndef __cplusplus | ||
3758 | - choke me | ||
3759 | -#endif | ||
3760 | -_ACEOF | ||
3761 | -rm -f conftest.$ac_objext | ||
3762 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3763 | - (eval $ac_compile) 2>conftest.er1 | ||
3764 | - ac_status=$? | ||
3765 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
3766 | - rm -f conftest.er1 | ||
3767 | - cat conftest.err >&5 | ||
3768 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3769 | - (exit $ac_status); } && | ||
3770 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3771 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3772 | - (eval $ac_try) 2>&5 | ||
3773 | - ac_status=$? | ||
3774 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3775 | - (exit $ac_status); }; } && | ||
3776 | - { ac_try='test -s conftest.$ac_objext' | ||
3777 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3778 | - (eval $ac_try) 2>&5 | ||
3779 | - ac_status=$? | ||
3780 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3781 | - (exit $ac_status); }; }; then | ||
3782 | - for ac_declaration in \ | ||
3783 | - '' \ | ||
3784 | - 'extern "C" void std::exit (int) throw (); using std::exit;' \ | ||
3785 | - 'extern "C" void std::exit (int); using std::exit;' \ | ||
3786 | - 'extern "C" void exit (int) throw ();' \ | ||
3787 | - 'extern "C" void exit (int);' \ | ||
3788 | - 'void exit (int);' | ||
3789 | -do | ||
3790 | - cat >conftest.$ac_ext <<_ACEOF | ||
3791 | -/* confdefs.h. */ | ||
3792 | -_ACEOF | ||
3793 | -cat confdefs.h >>conftest.$ac_ext | ||
3794 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3795 | -/* end confdefs.h. */ | ||
3796 | -$ac_declaration | ||
3797 | -#include <stdlib.h> | ||
3798 | -int | ||
3799 | -main () | ||
3800 | -{ | ||
3801 | -exit (42); | ||
3802 | - ; | ||
3803 | - return 0; | ||
3804 | -} | ||
3805 | -_ACEOF | ||
3806 | -rm -f conftest.$ac_objext | ||
3807 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3808 | - (eval $ac_compile) 2>conftest.er1 | ||
3809 | - ac_status=$? | ||
3810 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
3811 | - rm -f conftest.er1 | ||
3812 | - cat conftest.err >&5 | ||
3813 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3814 | - (exit $ac_status); } && | ||
3815 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3816 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3817 | - (eval $ac_try) 2>&5 | ||
3818 | - ac_status=$? | ||
3819 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3820 | - (exit $ac_status); }; } && | ||
3821 | - { ac_try='test -s conftest.$ac_objext' | ||
3822 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3823 | - (eval $ac_try) 2>&5 | ||
3824 | - ac_status=$? | ||
3825 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3826 | - (exit $ac_status); }; }; then | ||
3827 | - : | ||
3828 | -else | ||
3829 | - echo "$as_me: failed program was:" >&5 | ||
3830 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3831 | - | ||
3832 | -continue | ||
3833 | -fi | ||
3834 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3835 | - cat >conftest.$ac_ext <<_ACEOF | ||
3836 | -/* confdefs.h. */ | ||
3837 | -_ACEOF | ||
3838 | -cat confdefs.h >>conftest.$ac_ext | ||
3839 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3840 | -/* end confdefs.h. */ | ||
3841 | -$ac_declaration | ||
3842 | -int | ||
3843 | -main () | ||
3844 | -{ | ||
3845 | -exit (42); | ||
3846 | - ; | ||
3847 | - return 0; | ||
3848 | -} | ||
3849 | -_ACEOF | ||
3850 | -rm -f conftest.$ac_objext | ||
3851 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3852 | - (eval $ac_compile) 2>conftest.er1 | ||
3853 | - ac_status=$? | ||
3854 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
3855 | - rm -f conftest.er1 | ||
3856 | - cat conftest.err >&5 | ||
3857 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3858 | - (exit $ac_status); } && | ||
3859 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3860 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3861 | - (eval $ac_try) 2>&5 | ||
3862 | - ac_status=$? | ||
3863 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3864 | - (exit $ac_status); }; } && | ||
3865 | - { ac_try='test -s conftest.$ac_objext' | ||
3866 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3867 | - (eval $ac_try) 2>&5 | ||
3868 | - ac_status=$? | ||
3869 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3870 | - (exit $ac_status); }; }; then | ||
3871 | - break | ||
3872 | -else | ||
3873 | - echo "$as_me: failed program was:" >&5 | ||
3874 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3875 | - | ||
3876 | -fi | ||
3877 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3878 | -done | ||
3879 | -rm -f conftest* | ||
3880 | -if test -n "$ac_declaration"; then | ||
3881 | - echo '#ifdef __cplusplus' >>confdefs.h | ||
3882 | - echo $ac_declaration >>confdefs.h | ||
3883 | - echo '#endif' >>confdefs.h | ||
3884 | -fi | ||
3885 | - | ||
3886 | -else | ||
3887 | - echo "$as_me: failed program was:" >&5 | ||
3888 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3889 | |||
3890 | -fi | ||
3891 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3892 | ac_ext=c | ||
3893 | ac_cpp='$CPP $CPPFLAGS' | ||
3894 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
3895 | @@ -3370,8 +4004,8 @@ | ||
3896 | |||
3897 | depcc="$CC" am_compiler_list= | ||
3898 | |||
3899 | -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | ||
3900 | -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 | ||
3901 | +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | ||
3902 | +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } | ||
3903 | if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then | ||
3904 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3905 | else | ||
3906 | @@ -3460,8 +4094,8 @@ | ||
3907 | fi | ||
3908 | |||
3909 | fi | ||
3910 | -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 | ||
3911 | -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 | ||
3912 | +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 | ||
3913 | +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } | ||
3914 | CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type | ||
3915 | |||
3916 | |||
3917 | @@ -3477,8 +4111,8 @@ | ||
3918 | fi | ||
3919 | |||
3920 | |||
3921 | -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 | ||
3922 | -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 | ||
3923 | +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 | ||
3924 | +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } | ||
3925 | if test "${lt_cv_path_SED+set}" = set; then | ||
3926 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3927 | else | ||
3928 | @@ -3531,37 +4165,184 @@ | ||
3929 | fi | ||
3930 | |||
3931 | SED=$lt_cv_path_SED | ||
3932 | -echo "$as_me:$LINENO: result: $SED" >&5 | ||
3933 | -echo "${ECHO_T}$SED" >&6 | ||
3934 | +{ echo "$as_me:$LINENO: result: $SED" >&5 | ||
3935 | +echo "${ECHO_T}$SED" >&6; } | ||
3936 | + | ||
3937 | +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 | ||
3938 | +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } | ||
3939 | +if test "${ac_cv_path_GREP+set}" = set; then | ||
3940 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3941 | +else | ||
3942 | + # Extract the first word of "grep ggrep" to use in msg output | ||
3943 | +if test -z "$GREP"; then | ||
3944 | +set dummy grep ggrep; ac_prog_name=$2 | ||
3945 | +if test "${ac_cv_path_GREP+set}" = set; then | ||
3946 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3947 | +else | ||
3948 | + ac_path_GREP_found=false | ||
3949 | +# Loop through the user's path and test for each of PROGNAME-LIST | ||
3950 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3951 | +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin | ||
3952 | +do | ||
3953 | + IFS=$as_save_IFS | ||
3954 | + test -z "$as_dir" && as_dir=. | ||
3955 | + for ac_prog in grep ggrep; do | ||
3956 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
3957 | + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | ||
3958 | + { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue | ||
3959 | + # Check for GNU ac_path_GREP and select it if it is found. | ||
3960 | + # Check for GNU $ac_path_GREP | ||
3961 | +case `"$ac_path_GREP" --version 2>&1` in | ||
3962 | +*GNU*) | ||
3963 | + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; | ||
3964 | +*) | ||
3965 | + ac_count=0 | ||
3966 | + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" | ||
3967 | + while : | ||
3968 | + do | ||
3969 | + cat "conftest.in" "conftest.in" >"conftest.tmp" | ||
3970 | + mv "conftest.tmp" "conftest.in" | ||
3971 | + cp "conftest.in" "conftest.nl" | ||
3972 | + echo 'GREP' >> "conftest.nl" | ||
3973 | + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break | ||
3974 | + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | ||
3975 | + ac_count=`expr $ac_count + 1` | ||
3976 | + if test $ac_count -gt ${ac_path_GREP_max-0}; then | ||
3977 | + # Best one so far, save it but keep looking for a better one | ||
3978 | + ac_cv_path_GREP="$ac_path_GREP" | ||
3979 | + ac_path_GREP_max=$ac_count | ||
3980 | + fi | ||
3981 | + # 10*(2^10) chars as input seems more than enough | ||
3982 | + test $ac_count -gt 10 && break | ||
3983 | + done | ||
3984 | + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; | ||
3985 | +esac | ||
3986 | + | ||
3987 | |||
3988 | -echo "$as_me:$LINENO: checking for egrep" >&5 | ||
3989 | -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 | ||
3990 | -if test "${ac_cv_prog_egrep+set}" = set; then | ||
3991 | + $ac_path_GREP_found && break 3 | ||
3992 | + done | ||
3993 | +done | ||
3994 | + | ||
3995 | +done | ||
3996 | +IFS=$as_save_IFS | ||
3997 | + | ||
3998 | + | ||
3999 | +fi | ||
4000 | + | ||
4001 | +GREP="$ac_cv_path_GREP" | ||
4002 | +if test -z "$GREP"; then | ||
4003 | + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | ||
4004 | +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | ||
4005 | + { (exit 1); exit 1; }; } | ||
4006 | +fi | ||
4007 | + | ||
4008 | +else | ||
4009 | + ac_cv_path_GREP=$GREP | ||
4010 | +fi | ||
4011 | + | ||
4012 | + | ||
4013 | +fi | ||
4014 | +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 | ||
4015 | +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } | ||
4016 | + GREP="$ac_cv_path_GREP" | ||
4017 | + | ||
4018 | + | ||
4019 | +{ echo "$as_me:$LINENO: checking for egrep" >&5 | ||
4020 | +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } | ||
4021 | +if test "${ac_cv_path_EGREP+set}" = set; then | ||
4022 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4023 | +else | ||
4024 | + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 | ||
4025 | + then ac_cv_path_EGREP="$GREP -E" | ||
4026 | + else | ||
4027 | + # Extract the first word of "egrep" to use in msg output | ||
4028 | +if test -z "$EGREP"; then | ||
4029 | +set dummy egrep; ac_prog_name=$2 | ||
4030 | +if test "${ac_cv_path_EGREP+set}" = set; then | ||
4031 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4032 | else | ||
4033 | - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 | ||
4034 | - then ac_cv_prog_egrep='grep -E' | ||
4035 | - else ac_cv_prog_egrep='egrep' | ||
4036 | + ac_path_EGREP_found=false | ||
4037 | +# Loop through the user's path and test for each of PROGNAME-LIST | ||
4038 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4039 | +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin | ||
4040 | +do | ||
4041 | + IFS=$as_save_IFS | ||
4042 | + test -z "$as_dir" && as_dir=. | ||
4043 | + for ac_prog in egrep; do | ||
4044 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
4045 | + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | ||
4046 | + { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue | ||
4047 | + # Check for GNU ac_path_EGREP and select it if it is found. | ||
4048 | + # Check for GNU $ac_path_EGREP | ||
4049 | +case `"$ac_path_EGREP" --version 2>&1` in | ||
4050 | +*GNU*) | ||
4051 | + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; | ||
4052 | +*) | ||
4053 | + ac_count=0 | ||
4054 | + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" | ||
4055 | + while : | ||
4056 | + do | ||
4057 | + cat "conftest.in" "conftest.in" >"conftest.tmp" | ||
4058 | + mv "conftest.tmp" "conftest.in" | ||
4059 | + cp "conftest.in" "conftest.nl" | ||
4060 | + echo 'EGREP' >> "conftest.nl" | ||
4061 | + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break | ||
4062 | + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | ||
4063 | + ac_count=`expr $ac_count + 1` | ||
4064 | + if test $ac_count -gt ${ac_path_EGREP_max-0}; then | ||
4065 | + # Best one so far, save it but keep looking for a better one | ||
4066 | + ac_cv_path_EGREP="$ac_path_EGREP" | ||
4067 | + ac_path_EGREP_max=$ac_count | ||
4068 | fi | ||
4069 | + # 10*(2^10) chars as input seems more than enough | ||
4070 | + test $ac_count -gt 10 && break | ||
4071 | + done | ||
4072 | + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; | ||
4073 | +esac | ||
4074 | + | ||
4075 | + | ||
4076 | + $ac_path_EGREP_found && break 3 | ||
4077 | + done | ||
4078 | +done | ||
4079 | + | ||
4080 | +done | ||
4081 | +IFS=$as_save_IFS | ||
4082 | + | ||
4083 | + | ||
4084 | +fi | ||
4085 | + | ||
4086 | +EGREP="$ac_cv_path_EGREP" | ||
4087 | +if test -z "$EGREP"; then | ||
4088 | + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | ||
4089 | +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | ||
4090 | + { (exit 1); exit 1; }; } | ||
4091 | +fi | ||
4092 | + | ||
4093 | +else | ||
4094 | + ac_cv_path_EGREP=$EGREP | ||
4095 | +fi | ||
4096 | + | ||
4097 | + | ||
4098 | + fi | ||
4099 | fi | ||
4100 | -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 | ||
4101 | -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 | ||
4102 | - EGREP=$ac_cv_prog_egrep | ||
4103 | +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 | ||
4104 | +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } | ||
4105 | + EGREP="$ac_cv_path_EGREP" | ||
4106 | |||
4107 | |||
4108 | |||
4109 | -# Check whether --with-gnu-ld or --without-gnu-ld was given. | ||
4110 | +# Check whether --with-gnu-ld was given. | ||
4111 | if test "${with_gnu_ld+set}" = set; then | ||
4112 | - withval="$with_gnu_ld" | ||
4113 | - test "$withval" = no || with_gnu_ld=yes | ||
4114 | + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | ||
4115 | else | ||
4116 | with_gnu_ld=no | ||
4117 | -fi; | ||
4118 | +fi | ||
4119 | + | ||
4120 | ac_prog=ld | ||
4121 | if test "$GCC" = yes; then | ||
4122 | # Check if gcc -print-prog-name=ld gives a path. | ||
4123 | - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 | ||
4124 | -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 | ||
4125 | + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 | ||
4126 | +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } | ||
4127 | case $host in | ||
4128 | *-*-mingw*) | ||
4129 | # gcc leaves a trailing carriage return which upsets mingw | ||
4130 | @@ -3590,11 +4371,11 @@ | ||
4131 | ;; | ||
4132 | esac | ||
4133 | elif test "$with_gnu_ld" = yes; then | ||
4134 | - echo "$as_me:$LINENO: checking for GNU ld" >&5 | ||
4135 | -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 | ||
4136 | + { echo "$as_me:$LINENO: checking for GNU ld" >&5 | ||
4137 | +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } | ||
4138 | else | ||
4139 | - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | ||
4140 | -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 | ||
4141 | + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | ||
4142 | +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } | ||
4143 | fi | ||
4144 | if test "${lt_cv_path_LD+set}" = set; then | ||
4145 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4146 | @@ -3627,17 +4408,17 @@ | ||
4147 | |||
4148 | LD="$lt_cv_path_LD" | ||
4149 | if test -n "$LD"; then | ||
4150 | - echo "$as_me:$LINENO: result: $LD" >&5 | ||
4151 | -echo "${ECHO_T}$LD" >&6 | ||
4152 | + { echo "$as_me:$LINENO: result: $LD" >&5 | ||
4153 | +echo "${ECHO_T}$LD" >&6; } | ||
4154 | else | ||
4155 | - echo "$as_me:$LINENO: result: no" >&5 | ||
4156 | -echo "${ECHO_T}no" >&6 | ||
4157 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
4158 | +echo "${ECHO_T}no" >&6; } | ||
4159 | fi | ||
4160 | test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 | ||
4161 | echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} | ||
4162 | { (exit 1); exit 1; }; } | ||
4163 | -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | ||
4164 | -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 | ||
4165 | +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | ||
4166 | +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } | ||
4167 | if test "${lt_cv_prog_gnu_ld+set}" = set; then | ||
4168 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4169 | else | ||
4170 | @@ -3651,20 +4432,20 @@ | ||
4171 | ;; | ||
4172 | esac | ||
4173 | fi | ||
4174 | -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 | ||
4175 | -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 | ||
4176 | +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 | ||
4177 | +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } | ||
4178 | with_gnu_ld=$lt_cv_prog_gnu_ld | ||
4179 | |||
4180 | |||
4181 | -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 | ||
4182 | -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 | ||
4183 | +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 | ||
4184 | +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } | ||
4185 | if test "${lt_cv_ld_reload_flag+set}" = set; then | ||
4186 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4187 | else | ||
4188 | lt_cv_ld_reload_flag='-r' | ||
4189 | fi | ||
4190 | -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 | ||
4191 | -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 | ||
4192 | +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 | ||
4193 | +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } | ||
4194 | reload_flag=$lt_cv_ld_reload_flag | ||
4195 | case $reload_flag in | ||
4196 | "" | " "*) ;; | ||
4197 | @@ -3681,8 +4462,8 @@ | ||
4198 | ;; | ||
4199 | esac | ||
4200 | |||
4201 | -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 | ||
4202 | -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 | ||
4203 | +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 | ||
4204 | +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } | ||
4205 | if test "${lt_cv_path_NM+set}" = set; then | ||
4206 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4207 | else | ||
4208 | @@ -3730,23 +4511,23 @@ | ||
4209 | test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm | ||
4210 | fi | ||
4211 | fi | ||
4212 | -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 | ||
4213 | -echo "${ECHO_T}$lt_cv_path_NM" >&6 | ||
4214 | +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 | ||
4215 | +echo "${ECHO_T}$lt_cv_path_NM" >&6; } | ||
4216 | NM="$lt_cv_path_NM" | ||
4217 | |||
4218 | -echo "$as_me:$LINENO: checking whether ln -s works" >&5 | ||
4219 | -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 | ||
4220 | +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 | ||
4221 | +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } | ||
4222 | LN_S=$as_ln_s | ||
4223 | if test "$LN_S" = "ln -s"; then | ||
4224 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
4225 | -echo "${ECHO_T}yes" >&6 | ||
4226 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
4227 | +echo "${ECHO_T}yes" >&6; } | ||
4228 | else | ||
4229 | - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 | ||
4230 | -echo "${ECHO_T}no, using $LN_S" >&6 | ||
4231 | + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 | ||
4232 | +echo "${ECHO_T}no, using $LN_S" >&6; } | ||
4233 | fi | ||
4234 | |||
4235 | -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 | ||
4236 | -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 | ||
4237 | +{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 | ||
4238 | +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } | ||
4239 | if test "${lt_cv_deplibs_check_method+set}" = set; then | ||
4240 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4241 | else | ||
4242 | @@ -3796,7 +4577,7 @@ | ||
4243 | lt_cv_deplibs_check_method=pass_all | ||
4244 | ;; | ||
4245 | |||
4246 | -freebsd* | kfreebsd*-gnu | dragonfly*) | ||
4247 | +freebsd* | dragonfly*) | ||
4248 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | ||
4249 | case $host_cpu in | ||
4250 | i*86 ) | ||
4251 | @@ -3850,11 +4631,11 @@ | ||
4252 | ;; | ||
4253 | |||
4254 | # This must be Linux ELF. | ||
4255 | -linux*) | ||
4256 | +linux* | k*bsd*-gnu) | ||
4257 | lt_cv_deplibs_check_method=pass_all | ||
4258 | ;; | ||
4259 | |||
4260 | -netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | ||
4261 | +netbsd* | netbsdelf*-gnu) | ||
4262 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | ||
4263 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | ||
4264 | else | ||
4265 | @@ -3921,8 +4702,8 @@ | ||
4266 | esac | ||
4267 | |||
4268 | fi | ||
4269 | -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 | ||
4270 | -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 | ||
4271 | +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 | ||
4272 | +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } | ||
4273 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
4274 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
4275 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
4276 | @@ -3940,11 +4721,11 @@ | ||
4277 | compiler=$CC | ||
4278 | |||
4279 | |||
4280 | -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. | ||
4281 | +# Check whether --enable-libtool-lock was given. | ||
4282 | if test "${enable_libtool_lock+set}" = set; then | ||
4283 | - enableval="$enable_libtool_lock" | ||
4284 | + enableval=$enable_libtool_lock; | ||
4285 | +fi | ||
4286 | |||
4287 | -fi; | ||
4288 | test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes | ||
4289 | |||
4290 | # Some flags need to be propagated to the compiler or linker for good | ||
4291 | @@ -3971,7 +4752,7 @@ | ||
4292 | ;; | ||
4293 | *-*-irix6*) | ||
4294 | # Find out which ABI we are using. | ||
4295 | - echo '#line 3974 "configure"' > conftest.$ac_ext | ||
4296 | + echo '#line 4755 "configure"' > conftest.$ac_ext | ||
4297 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4298 | (eval $ac_compile) 2>&5 | ||
4299 | ac_status=$? | ||
4300 | @@ -4056,8 +4837,8 @@ | ||
4301 | # On SCO OpenServer 5, we need -belf to get full-featured binaries. | ||
4302 | SAVE_CFLAGS="$CFLAGS" | ||
4303 | CFLAGS="$CFLAGS -belf" | ||
4304 | - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 | ||
4305 | -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 | ||
4306 | + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 | ||
4307 | +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } | ||
4308 | if test "${lt_cv_cc_needs_belf+set}" = set; then | ||
4309 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4310 | else | ||
4311 | @@ -4083,23 +4864,36 @@ | ||
4312 | } | ||
4313 | _ACEOF | ||
4314 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
4315 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
4316 | - (eval $ac_link) 2>conftest.er1 | ||
4317 | +if { (ac_try="$ac_link" | ||
4318 | +case "(($ac_try" in | ||
4319 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4320 | + *) ac_try_echo=$ac_try;; | ||
4321 | +esac | ||
4322 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4323 | + (eval "$ac_link") 2>conftest.er1 | ||
4324 | ac_status=$? | ||
4325 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4326 | rm -f conftest.er1 | ||
4327 | cat conftest.err >&5 | ||
4328 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4329 | (exit $ac_status); } && | ||
4330 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4331 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4332 | - (eval $ac_try) 2>&5 | ||
4333 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4334 | + { (case "(($ac_try" in | ||
4335 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4336 | + *) ac_try_echo=$ac_try;; | ||
4337 | +esac | ||
4338 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4339 | + (eval "$ac_try") 2>&5 | ||
4340 | ac_status=$? | ||
4341 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4342 | (exit $ac_status); }; } && | ||
4343 | { ac_try='test -s conftest$ac_exeext' | ||
4344 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4345 | - (eval $ac_try) 2>&5 | ||
4346 | + { (case "(($ac_try" in | ||
4347 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4348 | + *) ac_try_echo=$ac_try;; | ||
4349 | +esac | ||
4350 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4351 | + (eval "$ac_try") 2>&5 | ||
4352 | ac_status=$? | ||
4353 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4354 | (exit $ac_status); }; }; then | ||
4355 | @@ -4108,9 +4902,10 @@ | ||
4356 | echo "$as_me: failed program was:" >&5 | ||
4357 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
4358 | |||
4359 | -lt_cv_cc_needs_belf=no | ||
4360 | + lt_cv_cc_needs_belf=no | ||
4361 | fi | ||
4362 | -rm -f conftest.err conftest.$ac_objext \ | ||
4363 | + | ||
4364 | +rm -f core conftest.err conftest.$ac_objext \ | ||
4365 | conftest$ac_exeext conftest.$ac_ext | ||
4366 | ac_ext=c | ||
4367 | ac_cpp='$CPP $CPPFLAGS' | ||
4368 | @@ -4119,8 +4914,8 @@ | ||
4369 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
4370 | |||
4371 | fi | ||
4372 | -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 | ||
4373 | -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 | ||
4374 | +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 | ||
4375 | +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } | ||
4376 | if test x"$lt_cv_cc_needs_belf" != x"yes"; then | ||
4377 | # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf | ||
4378 | CFLAGS="$SAVE_CFLAGS" | ||
4379 | @@ -4157,8 +4952,8 @@ | ||
4380 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
4381 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
4382 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
4383 | -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 | ||
4384 | -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 | ||
4385 | +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 | ||
4386 | +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } | ||
4387 | # On Suns, sometimes $CPP names a directory. | ||
4388 | if test -n "$CPP" && test -d "$CPP"; then | ||
4389 | CPP= | ||
4390 | @@ -4192,8 +4987,13 @@ | ||
4391 | #endif | ||
4392 | Syntax error | ||
4393 | _ACEOF | ||
4394 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
4395 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
4396 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
4397 | +case "(($ac_try" in | ||
4398 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4399 | + *) ac_try_echo=$ac_try;; | ||
4400 | +esac | ||
4401 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4402 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4403 | ac_status=$? | ||
4404 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4405 | rm -f conftest.er1 | ||
4406 | @@ -4218,9 +5018,10 @@ | ||
4407 | # Broken: fails on valid input. | ||
4408 | continue | ||
4409 | fi | ||
4410 | + | ||
4411 | rm -f conftest.err conftest.$ac_ext | ||
4412 | |||
4413 | - # OK, works on sane cases. Now check whether non-existent headers | ||
4414 | + # OK, works on sane cases. Now check whether nonexistent headers | ||
4415 | # can be detected and how. | ||
4416 | cat >conftest.$ac_ext <<_ACEOF | ||
4417 | /* confdefs.h. */ | ||
4418 | @@ -4230,8 +5031,13 @@ | ||
4419 | /* end confdefs.h. */ | ||
4420 | #include <ac_nonexistent.h> | ||
4421 | _ACEOF | ||
4422 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
4423 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
4424 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
4425 | +case "(($ac_try" in | ||
4426 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4427 | + *) ac_try_echo=$ac_try;; | ||
4428 | +esac | ||
4429 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4430 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4431 | ac_status=$? | ||
4432 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4433 | rm -f conftest.er1 | ||
4434 | @@ -4258,6 +5064,7 @@ | ||
4435 | ac_preproc_ok=: | ||
4436 | break | ||
4437 | fi | ||
4438 | + | ||
4439 | rm -f conftest.err conftest.$ac_ext | ||
4440 | |||
4441 | done | ||
4442 | @@ -4275,8 +5082,8 @@ | ||
4443 | else | ||
4444 | ac_cv_prog_CPP=$CPP | ||
4445 | fi | ||
4446 | -echo "$as_me:$LINENO: result: $CPP" >&5 | ||
4447 | -echo "${ECHO_T}$CPP" >&6 | ||
4448 | +{ echo "$as_me:$LINENO: result: $CPP" >&5 | ||
4449 | +echo "${ECHO_T}$CPP" >&6; } | ||
4450 | ac_preproc_ok=false | ||
4451 | for ac_c_preproc_warn_flag in '' yes | ||
4452 | do | ||
4453 | @@ -4299,8 +5106,13 @@ | ||
4454 | #endif | ||
4455 | Syntax error | ||
4456 | _ACEOF | ||
4457 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
4458 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
4459 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
4460 | +case "(($ac_try" in | ||
4461 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4462 | + *) ac_try_echo=$ac_try;; | ||
4463 | +esac | ||
4464 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4465 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4466 | ac_status=$? | ||
4467 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4468 | rm -f conftest.er1 | ||
4469 | @@ -4325,9 +5137,10 @@ | ||
4470 | # Broken: fails on valid input. | ||
4471 | continue | ||
4472 | fi | ||
4473 | + | ||
4474 | rm -f conftest.err conftest.$ac_ext | ||
4475 | |||
4476 | - # OK, works on sane cases. Now check whether non-existent headers | ||
4477 | + # OK, works on sane cases. Now check whether nonexistent headers | ||
4478 | # can be detected and how. | ||
4479 | cat >conftest.$ac_ext <<_ACEOF | ||
4480 | /* confdefs.h. */ | ||
4481 | @@ -4337,8 +5150,13 @@ | ||
4482 | /* end confdefs.h. */ | ||
4483 | #include <ac_nonexistent.h> | ||
4484 | _ACEOF | ||
4485 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
4486 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
4487 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
4488 | +case "(($ac_try" in | ||
4489 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4490 | + *) ac_try_echo=$ac_try;; | ||
4491 | +esac | ||
4492 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4493 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4494 | ac_status=$? | ||
4495 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4496 | rm -f conftest.er1 | ||
4497 | @@ -4365,6 +5183,7 @@ | ||
4498 | ac_preproc_ok=: | ||
4499 | break | ||
4500 | fi | ||
4501 | + | ||
4502 | rm -f conftest.err conftest.$ac_ext | ||
4503 | |||
4504 | done | ||
4505 | @@ -4387,8 +5206,8 @@ | ||
4506 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
4507 | |||
4508 | |||
4509 | -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | ||
4510 | -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 | ||
4511 | +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | ||
4512 | +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } | ||
4513 | if test "${ac_cv_header_stdc+set}" = set; then | ||
4514 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4515 | else | ||
4516 | @@ -4412,23 +5231,36 @@ | ||
4517 | } | ||
4518 | _ACEOF | ||
4519 | rm -f conftest.$ac_objext | ||
4520 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4521 | - (eval $ac_compile) 2>conftest.er1 | ||
4522 | +if { (ac_try="$ac_compile" | ||
4523 | +case "(($ac_try" in | ||
4524 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4525 | + *) ac_try_echo=$ac_try;; | ||
4526 | +esac | ||
4527 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4528 | + (eval "$ac_compile") 2>conftest.er1 | ||
4529 | ac_status=$? | ||
4530 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4531 | rm -f conftest.er1 | ||
4532 | cat conftest.err >&5 | ||
4533 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4534 | (exit $ac_status); } && | ||
4535 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4536 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4537 | - (eval $ac_try) 2>&5 | ||
4538 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4539 | + { (case "(($ac_try" in | ||
4540 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4541 | + *) ac_try_echo=$ac_try;; | ||
4542 | +esac | ||
4543 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4544 | + (eval "$ac_try") 2>&5 | ||
4545 | ac_status=$? | ||
4546 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4547 | (exit $ac_status); }; } && | ||
4548 | { ac_try='test -s conftest.$ac_objext' | ||
4549 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4550 | - (eval $ac_try) 2>&5 | ||
4551 | + { (case "(($ac_try" in | ||
4552 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4553 | + *) ac_try_echo=$ac_try;; | ||
4554 | +esac | ||
4555 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4556 | + (eval "$ac_try") 2>&5 | ||
4557 | ac_status=$? | ||
4558 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4559 | (exit $ac_status); }; }; then | ||
4560 | @@ -4437,9 +5269,10 @@ | ||
4561 | echo "$as_me: failed program was:" >&5 | ||
4562 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
4563 | |||
4564 | -ac_cv_header_stdc=no | ||
4565 | + ac_cv_header_stdc=no | ||
4566 | fi | ||
4567 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4568 | + | ||
4569 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4570 | |||
4571 | if test $ac_cv_header_stdc = yes; then | ||
4572 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
4573 | @@ -4495,6 +5328,7 @@ | ||
4574 | cat >>conftest.$ac_ext <<_ACEOF | ||
4575 | /* end confdefs.h. */ | ||
4576 | #include <ctype.h> | ||
4577 | +#include <stdlib.h> | ||
4578 | #if ((' ' & 0x0FF) == 0x020) | ||
4579 | # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | ||
4580 | # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
4581 | @@ -4514,18 +5348,27 @@ | ||
4582 | for (i = 0; i < 256; i++) | ||
4583 | if (XOR (islower (i), ISLOWER (i)) | ||
4584 | || toupper (i) != TOUPPER (i)) | ||
4585 | - exit(2); | ||
4586 | - exit (0); | ||
4587 | + return 2; | ||
4588 | + return 0; | ||
4589 | } | ||
4590 | _ACEOF | ||
4591 | rm -f conftest$ac_exeext | ||
4592 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
4593 | - (eval $ac_link) 2>&5 | ||
4594 | +if { (ac_try="$ac_link" | ||
4595 | +case "(($ac_try" in | ||
4596 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4597 | + *) ac_try_echo=$ac_try;; | ||
4598 | +esac | ||
4599 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4600 | + (eval "$ac_link") 2>&5 | ||
4601 | ac_status=$? | ||
4602 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4603 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
4604 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4605 | - (eval $ac_try) 2>&5 | ||
4606 | + { (case "(($ac_try" in | ||
4607 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4608 | + *) ac_try_echo=$ac_try;; | ||
4609 | +esac | ||
4610 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4611 | + (eval "$ac_try") 2>&5 | ||
4612 | ac_status=$? | ||
4613 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4614 | (exit $ac_status); }; }; then | ||
4615 | @@ -4538,12 +5381,14 @@ | ||
4616 | ( exit $ac_status ) | ||
4617 | ac_cv_header_stdc=no | ||
4618 | fi | ||
4619 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
4620 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
4621 | fi | ||
4622 | + | ||
4623 | + | ||
4624 | fi | ||
4625 | fi | ||
4626 | -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | ||
4627 | -echo "${ECHO_T}$ac_cv_header_stdc" >&6 | ||
4628 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | ||
4629 | +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } | ||
4630 | if test $ac_cv_header_stdc = yes; then | ||
4631 | |||
4632 | cat >>confdefs.h <<\_ACEOF | ||
4633 | @@ -4566,9 +5411,9 @@ | ||
4634 | inttypes.h stdint.h unistd.h | ||
4635 | do | ||
4636 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
4637 | -echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
4638 | -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
4639 | -if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4640 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
4641 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
4642 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
4643 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4644 | else | ||
4645 | cat >conftest.$ac_ext <<_ACEOF | ||
4646 | @@ -4582,23 +5427,36 @@ | ||
4647 | #include <$ac_header> | ||
4648 | _ACEOF | ||
4649 | rm -f conftest.$ac_objext | ||
4650 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4651 | - (eval $ac_compile) 2>conftest.er1 | ||
4652 | +if { (ac_try="$ac_compile" | ||
4653 | +case "(($ac_try" in | ||
4654 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4655 | + *) ac_try_echo=$ac_try;; | ||
4656 | +esac | ||
4657 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4658 | + (eval "$ac_compile") 2>conftest.er1 | ||
4659 | ac_status=$? | ||
4660 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4661 | rm -f conftest.er1 | ||
4662 | cat conftest.err >&5 | ||
4663 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4664 | (exit $ac_status); } && | ||
4665 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4666 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4667 | - (eval $ac_try) 2>&5 | ||
4668 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4669 | + { (case "(($ac_try" in | ||
4670 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4671 | + *) ac_try_echo=$ac_try;; | ||
4672 | +esac | ||
4673 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4674 | + (eval "$ac_try") 2>&5 | ||
4675 | ac_status=$? | ||
4676 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4677 | (exit $ac_status); }; } && | ||
4678 | { ac_try='test -s conftest.$ac_objext' | ||
4679 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4680 | - (eval $ac_try) 2>&5 | ||
4681 | + { (case "(($ac_try" in | ||
4682 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4683 | + *) ac_try_echo=$ac_try;; | ||
4684 | +esac | ||
4685 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4686 | + (eval "$ac_try") 2>&5 | ||
4687 | ac_status=$? | ||
4688 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4689 | (exit $ac_status); }; }; then | ||
4690 | @@ -4607,12 +5465,14 @@ | ||
4691 | echo "$as_me: failed program was:" >&5 | ||
4692 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
4693 | |||
4694 | -eval "$as_ac_Header=no" | ||
4695 | + eval "$as_ac_Header=no" | ||
4696 | fi | ||
4697 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4698 | + | ||
4699 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4700 | fi | ||
4701 | -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4702 | -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4703 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
4704 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
4705 | +echo "${ECHO_T}$ac_res" >&6; } | ||
4706 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
4707 | cat >>confdefs.h <<_ACEOF | ||
4708 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
4709 | @@ -4627,18 +5487,19 @@ | ||
4710 | for ac_header in dlfcn.h | ||
4711 | do | ||
4712 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
4713 | -if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4714 | - echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
4715 | -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
4716 | -if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4717 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
4718 | + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
4719 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
4720 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
4721 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4722 | fi | ||
4723 | -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4724 | -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4725 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
4726 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
4727 | +echo "${ECHO_T}$ac_res" >&6; } | ||
4728 | else | ||
4729 | # Is the header compilable? | ||
4730 | -echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4731 | -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | ||
4732 | +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | ||
4733 | +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | ||
4734 | cat >conftest.$ac_ext <<_ACEOF | ||
4735 | /* confdefs.h. */ | ||
4736 | _ACEOF | ||
4737 | @@ -4649,23 +5510,36 @@ | ||
4738 | #include <$ac_header> | ||
4739 | _ACEOF | ||
4740 | rm -f conftest.$ac_objext | ||
4741 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4742 | - (eval $ac_compile) 2>conftest.er1 | ||
4743 | +if { (ac_try="$ac_compile" | ||
4744 | +case "(($ac_try" in | ||
4745 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4746 | + *) ac_try_echo=$ac_try;; | ||
4747 | +esac | ||
4748 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4749 | + (eval "$ac_compile") 2>conftest.er1 | ||
4750 | ac_status=$? | ||
4751 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4752 | rm -f conftest.er1 | ||
4753 | cat conftest.err >&5 | ||
4754 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4755 | (exit $ac_status); } && | ||
4756 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4757 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4758 | - (eval $ac_try) 2>&5 | ||
4759 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
4760 | + { (case "(($ac_try" in | ||
4761 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4762 | + *) ac_try_echo=$ac_try;; | ||
4763 | +esac | ||
4764 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4765 | + (eval "$ac_try") 2>&5 | ||
4766 | ac_status=$? | ||
4767 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4768 | (exit $ac_status); }; } && | ||
4769 | { ac_try='test -s conftest.$ac_objext' | ||
4770 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4771 | - (eval $ac_try) 2>&5 | ||
4772 | + { (case "(($ac_try" in | ||
4773 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4774 | + *) ac_try_echo=$ac_try;; | ||
4775 | +esac | ||
4776 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4777 | + (eval "$ac_try") 2>&5 | ||
4778 | ac_status=$? | ||
4779 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4780 | (exit $ac_status); }; }; then | ||
4781 | @@ -4674,15 +5548,16 @@ | ||
4782 | echo "$as_me: failed program was:" >&5 | ||
4783 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
4784 | |||
4785 | -ac_header_compiler=no | ||
4786 | + ac_header_compiler=no | ||
4787 | fi | ||
4788 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4789 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4790 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4791 | + | ||
4792 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4793 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4794 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
4795 | |||
4796 | # Is the header present? | ||
4797 | -echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4798 | -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
4799 | +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
4800 | +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | ||
4801 | cat >conftest.$ac_ext <<_ACEOF | ||
4802 | /* confdefs.h. */ | ||
4803 | _ACEOF | ||
4804 | @@ -4691,8 +5566,13 @@ | ||
4805 | /* end confdefs.h. */ | ||
4806 | #include <$ac_header> | ||
4807 | _ACEOF | ||
4808 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
4809 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
4810 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
4811 | +case "(($ac_try" in | ||
4812 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4813 | + *) ac_try_echo=$ac_try;; | ||
4814 | +esac | ||
4815 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4816 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4817 | ac_status=$? | ||
4818 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4819 | rm -f conftest.er1 | ||
4820 | @@ -4716,9 +5596,10 @@ | ||
4821 | |||
4822 | ac_header_preproc=no | ||
4823 | fi | ||
4824 | + | ||
4825 | rm -f conftest.err conftest.$ac_ext | ||
4826 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
4827 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4828 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
4829 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
4830 | |||
4831 | # So? What about this header? | ||
4832 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
4833 | @@ -4742,25 +5623,24 @@ | ||
4834 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
4835 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
4836 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
4837 | - ( | ||
4838 | - cat <<\_ASBOX | ||
4839 | + ( cat <<\_ASBOX | ||
4840 | ## ------------------------------------------------------------------------ ## | ||
4841 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
4842 | ## ------------------------------------------------------------------------ ## | ||
4843 | _ASBOX | ||
4844 | - ) | | ||
4845 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4846 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
4847 | ;; | ||
4848 | esac | ||
4849 | -echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
4850 | -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
4851 | -if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4852 | +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
4853 | +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | ||
4854 | +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | ||
4855 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4856 | else | ||
4857 | eval "$as_ac_Header=\$ac_header_preproc" | ||
4858 | fi | ||
4859 | -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4860 | -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4861 | +ac_res=`eval echo '${'$as_ac_Header'}'` | ||
4862 | + { echo "$as_me:$LINENO: result: $ac_res" >&5 | ||
4863 | +echo "${ECHO_T}$ac_res" >&6; } | ||
4864 | |||
4865 | fi | ||
4866 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
4867 | @@ -4772,18 +5652,22 @@ | ||
4868 | |||
4869 | done | ||
4870 | |||
4871 | -ac_ext=cc | ||
4872 | +ac_ext=cpp | ||
4873 | ac_cpp='$CXXCPP $CPPFLAGS' | ||
4874 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
4875 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
4876 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
4877 | -if test -n "$ac_tool_prefix"; then | ||
4878 | - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC | ||
4879 | +if test -z "$CXX"; then | ||
4880 | + if test -n "$CCC"; then | ||
4881 | + CXX=$CCC | ||
4882 | + else | ||
4883 | + if test -n "$ac_tool_prefix"; then | ||
4884 | + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC | ||
4885 | do | ||
4886 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
4887 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
4888 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4889 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
4890 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4891 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
4892 | if test "${ac_cv_prog_CXX+set}" = set; then | ||
4893 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4894 | else | ||
4895 | @@ -4796,36 +5680,38 @@ | ||
4896 | IFS=$as_save_IFS | ||
4897 | test -z "$as_dir" && as_dir=. | ||
4898 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
4899 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4900 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
4901 | ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" | ||
4902 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4903 | break 2 | ||
4904 | fi | ||
4905 | done | ||
4906 | done | ||
4907 | +IFS=$as_save_IFS | ||
4908 | |||
4909 | fi | ||
4910 | fi | ||
4911 | CXX=$ac_cv_prog_CXX | ||
4912 | if test -n "$CXX"; then | ||
4913 | - echo "$as_me:$LINENO: result: $CXX" >&5 | ||
4914 | -echo "${ECHO_T}$CXX" >&6 | ||
4915 | + { echo "$as_me:$LINENO: result: $CXX" >&5 | ||
4916 | +echo "${ECHO_T}$CXX" >&6; } | ||
4917 | else | ||
4918 | - echo "$as_me:$LINENO: result: no" >&5 | ||
4919 | -echo "${ECHO_T}no" >&6 | ||
4920 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
4921 | +echo "${ECHO_T}no" >&6; } | ||
4922 | fi | ||
4923 | |||
4924 | + | ||
4925 | test -n "$CXX" && break | ||
4926 | done | ||
4927 | fi | ||
4928 | if test -z "$CXX"; then | ||
4929 | ac_ct_CXX=$CXX | ||
4930 | - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC | ||
4931 | + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC | ||
4932 | do | ||
4933 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
4934 | set dummy $ac_prog; ac_word=$2 | ||
4935 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4936 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
4937 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
4938 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
4939 | if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then | ||
4940 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4941 | else | ||
4942 | @@ -4838,55 +5724,85 @@ | ||
4943 | IFS=$as_save_IFS | ||
4944 | test -z "$as_dir" && as_dir=. | ||
4945 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
4946 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
4947 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
4948 | ac_cv_prog_ac_ct_CXX="$ac_prog" | ||
4949 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
4950 | break 2 | ||
4951 | fi | ||
4952 | done | ||
4953 | done | ||
4954 | +IFS=$as_save_IFS | ||
4955 | |||
4956 | fi | ||
4957 | fi | ||
4958 | ac_ct_CXX=$ac_cv_prog_ac_ct_CXX | ||
4959 | if test -n "$ac_ct_CXX"; then | ||
4960 | - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 | ||
4961 | -echo "${ECHO_T}$ac_ct_CXX" >&6 | ||
4962 | + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 | ||
4963 | +echo "${ECHO_T}$ac_ct_CXX" >&6; } | ||
4964 | else | ||
4965 | - echo "$as_me:$LINENO: result: no" >&5 | ||
4966 | -echo "${ECHO_T}no" >&6 | ||
4967 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
4968 | +echo "${ECHO_T}no" >&6; } | ||
4969 | fi | ||
4970 | |||
4971 | + | ||
4972 | test -n "$ac_ct_CXX" && break | ||
4973 | done | ||
4974 | -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" | ||
4975 | |||
4976 | - CXX=$ac_ct_CXX | ||
4977 | + if test "x$ac_ct_CXX" = x; then | ||
4978 | + CXX="g++" | ||
4979 | + else | ||
4980 | + case $cross_compiling:$ac_tool_warned in | ||
4981 | +yes:) | ||
4982 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
4983 | +whose name does not start with the host triplet. If you think this | ||
4984 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
4985 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
4986 | +whose name does not start with the host triplet. If you think this | ||
4987 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
4988 | +ac_tool_warned=yes ;; | ||
4989 | +esac | ||
4990 | + CXX=$ac_ct_CXX | ||
4991 | + fi | ||
4992 | fi | ||
4993 | |||
4994 | - | ||
4995 | + fi | ||
4996 | +fi | ||
4997 | # Provide some information about the compiler. | ||
4998 | -echo "$as_me:$LINENO:" \ | ||
4999 | - "checking for C++ compiler version" >&5 | ||
5000 | +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 | ||
5001 | ac_compiler=`set X $ac_compile; echo $2` | ||
5002 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 | ||
5003 | - (eval $ac_compiler --version </dev/null >&5) 2>&5 | ||
5004 | +{ (ac_try="$ac_compiler --version >&5" | ||
5005 | +case "(($ac_try" in | ||
5006 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5007 | + *) ac_try_echo=$ac_try;; | ||
5008 | +esac | ||
5009 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5010 | + (eval "$ac_compiler --version >&5") 2>&5 | ||
5011 | ac_status=$? | ||
5012 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5013 | (exit $ac_status); } | ||
5014 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 | ||
5015 | - (eval $ac_compiler -v </dev/null >&5) 2>&5 | ||
5016 | +{ (ac_try="$ac_compiler -v >&5" | ||
5017 | +case "(($ac_try" in | ||
5018 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5019 | + *) ac_try_echo=$ac_try;; | ||
5020 | +esac | ||
5021 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5022 | + (eval "$ac_compiler -v >&5") 2>&5 | ||
5023 | ac_status=$? | ||
5024 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5025 | (exit $ac_status); } | ||
5026 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 | ||
5027 | - (eval $ac_compiler -V </dev/null >&5) 2>&5 | ||
5028 | +{ (ac_try="$ac_compiler -V >&5" | ||
5029 | +case "(($ac_try" in | ||
5030 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5031 | + *) ac_try_echo=$ac_try;; | ||
5032 | +esac | ||
5033 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5034 | + (eval "$ac_compiler -V >&5") 2>&5 | ||
5035 | ac_status=$? | ||
5036 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5037 | (exit $ac_status); } | ||
5038 | |||
5039 | -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 | ||
5040 | -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 | ||
5041 | +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 | ||
5042 | +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } | ||
5043 | if test "${ac_cv_cxx_compiler_gnu+set}" = set; then | ||
5044 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5045 | else | ||
5046 | @@ -4909,23 +5825,36 @@ | ||
5047 | } | ||
5048 | _ACEOF | ||
5049 | rm -f conftest.$ac_objext | ||
5050 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5051 | - (eval $ac_compile) 2>conftest.er1 | ||
5052 | +if { (ac_try="$ac_compile" | ||
5053 | +case "(($ac_try" in | ||
5054 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5055 | + *) ac_try_echo=$ac_try;; | ||
5056 | +esac | ||
5057 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5058 | + (eval "$ac_compile") 2>conftest.er1 | ||
5059 | ac_status=$? | ||
5060 | grep -v '^ *+' conftest.er1 >conftest.err | ||
5061 | rm -f conftest.er1 | ||
5062 | cat conftest.err >&5 | ||
5063 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5064 | (exit $ac_status); } && | ||
5065 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
5066 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5067 | - (eval $ac_try) 2>&5 | ||
5068 | + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
5069 | + { (case "(($ac_try" in | ||
5070 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5071 | + *) ac_try_echo=$ac_try;; | ||
5072 | +esac | ||
5073 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5074 | + (eval "$ac_try") 2>&5 | ||
5075 | ac_status=$? | ||
5076 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5077 | (exit $ac_status); }; } && | ||
5078 | { ac_try='test -s conftest.$ac_objext' | ||
5079 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5080 | - (eval $ac_try) 2>&5 | ||
5081 | + { (case "(($ac_try" in | ||
5082 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5083 | + *) ac_try_echo=$ac_try;; | ||
5084 | +esac | ||
5085 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5086 | + (eval "$ac_try") 2>&5 | ||
5087 | ac_status=$? | ||
5088 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5089 | (exit $ac_status); }; }; then | ||
5090 | @@ -4934,24 +5863,28 @@ | ||
5091 | echo "$as_me: failed program was:" >&5 | ||
5092 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
5093 | |||
5094 | -ac_compiler_gnu=no | ||
5095 | + ac_compiler_gnu=no | ||
5096 | fi | ||
5097 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5098 | + | ||
5099 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5100 | ac_cv_cxx_compiler_gnu=$ac_compiler_gnu | ||
5101 | |||
5102 | fi | ||
5103 | -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 | ||
5104 | -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 | ||
5105 | +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 | ||
5106 | +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } | ||
5107 | GXX=`test $ac_compiler_gnu = yes && echo yes` | ||
5108 | ac_test_CXXFLAGS=${CXXFLAGS+set} | ||
5109 | ac_save_CXXFLAGS=$CXXFLAGS | ||
5110 | -CXXFLAGS="-g" | ||
5111 | -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 | ||
5112 | -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 | ||
5113 | +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 | ||
5114 | +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } | ||
5115 | if test "${ac_cv_prog_cxx_g+set}" = set; then | ||
5116 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5117 | else | ||
5118 | - cat >conftest.$ac_ext <<_ACEOF | ||
5119 | + ac_save_cxx_werror_flag=$ac_cxx_werror_flag | ||
5120 | + ac_cxx_werror_flag=yes | ||
5121 | + ac_cv_prog_cxx_g=no | ||
5122 | + CXXFLAGS="-g" | ||
5123 | + cat >conftest.$ac_ext <<_ACEOF | ||
5124 | /* confdefs.h. */ | ||
5125 | _ACEOF | ||
5126 | cat confdefs.h >>conftest.$ac_ext | ||
5127 | @@ -4967,23 +5900,36 @@ | ||
5128 | } | ||
5129 | _ACEOF | ||
5130 | rm -f conftest.$ac_objext | ||
5131 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5132 | - (eval $ac_compile) 2>conftest.er1 | ||
5133 | +if { (ac_try="$ac_compile" | ||
5134 | +case "(($ac_try" in | ||
5135 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5136 | + *) ac_try_echo=$ac_try;; | ||
5137 | +esac | ||
5138 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5139 | + (eval "$ac_compile") 2>conftest.er1 | ||
5140 | ac_status=$? | ||
5141 | grep -v '^ *+' conftest.er1 >conftest.err | ||
5142 | rm -f conftest.er1 | ||
5143 | cat conftest.err >&5 | ||
5144 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5145 | (exit $ac_status); } && | ||
5146 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
5147 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5148 | - (eval $ac_try) 2>&5 | ||
5149 | + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
5150 | + { (case "(($ac_try" in | ||
5151 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5152 | + *) ac_try_echo=$ac_try;; | ||
5153 | +esac | ||
5154 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5155 | + (eval "$ac_try") 2>&5 | ||
5156 | ac_status=$? | ||
5157 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5158 | (exit $ac_status); }; } && | ||
5159 | { ac_try='test -s conftest.$ac_objext' | ||
5160 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5161 | - (eval $ac_try) 2>&5 | ||
5162 | + { (case "(($ac_try" in | ||
5163 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5164 | + *) ac_try_echo=$ac_try;; | ||
5165 | +esac | ||
5166 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5167 | + (eval "$ac_try") 2>&5 | ||
5168 | ac_status=$? | ||
5169 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5170 | (exit $ac_status); }; }; then | ||
5171 | @@ -4992,69 +5938,53 @@ | ||
5172 | echo "$as_me: failed program was:" >&5 | ||
5173 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
5174 | |||
5175 | -ac_cv_prog_cxx_g=no | ||
5176 | -fi | ||
5177 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5178 | -fi | ||
5179 | -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 | ||
5180 | -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 | ||
5181 | -if test "$ac_test_CXXFLAGS" = set; then | ||
5182 | - CXXFLAGS=$ac_save_CXXFLAGS | ||
5183 | -elif test $ac_cv_prog_cxx_g = yes; then | ||
5184 | - if test "$GXX" = yes; then | ||
5185 | - CXXFLAGS="-g -O2" | ||
5186 | - else | ||
5187 | - CXXFLAGS="-g" | ||
5188 | - fi | ||
5189 | -else | ||
5190 | - if test "$GXX" = yes; then | ||
5191 | - CXXFLAGS="-O2" | ||
5192 | - else | ||
5193 | - CXXFLAGS= | ||
5194 | - fi | ||
5195 | -fi | ||
5196 | -for ac_declaration in \ | ||
5197 | - '' \ | ||
5198 | - 'extern "C" void std::exit (int) throw (); using std::exit;' \ | ||
5199 | - 'extern "C" void std::exit (int); using std::exit;' \ | ||
5200 | - 'extern "C" void exit (int) throw ();' \ | ||
5201 | - 'extern "C" void exit (int);' \ | ||
5202 | - 'void exit (int);' | ||
5203 | -do | ||
5204 | - cat >conftest.$ac_ext <<_ACEOF | ||
5205 | + CXXFLAGS="" | ||
5206 | + cat >conftest.$ac_ext <<_ACEOF | ||
5207 | /* confdefs.h. */ | ||
5208 | _ACEOF | ||
5209 | cat confdefs.h >>conftest.$ac_ext | ||
5210 | cat >>conftest.$ac_ext <<_ACEOF | ||
5211 | /* end confdefs.h. */ | ||
5212 | -$ac_declaration | ||
5213 | -#include <stdlib.h> | ||
5214 | + | ||
5215 | int | ||
5216 | main () | ||
5217 | { | ||
5218 | -exit (42); | ||
5219 | + | ||
5220 | ; | ||
5221 | return 0; | ||
5222 | } | ||
5223 | _ACEOF | ||
5224 | rm -f conftest.$ac_objext | ||
5225 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5226 | - (eval $ac_compile) 2>conftest.er1 | ||
5227 | +if { (ac_try="$ac_compile" | ||
5228 | +case "(($ac_try" in | ||
5229 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5230 | + *) ac_try_echo=$ac_try;; | ||
5231 | +esac | ||
5232 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5233 | + (eval "$ac_compile") 2>conftest.er1 | ||
5234 | ac_status=$? | ||
5235 | grep -v '^ *+' conftest.er1 >conftest.err | ||
5236 | rm -f conftest.er1 | ||
5237 | cat conftest.err >&5 | ||
5238 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5239 | (exit $ac_status); } && | ||
5240 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
5241 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5242 | - (eval $ac_try) 2>&5 | ||
5243 | + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
5244 | + { (case "(($ac_try" in | ||
5245 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5246 | + *) ac_try_echo=$ac_try;; | ||
5247 | +esac | ||
5248 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5249 | + (eval "$ac_try") 2>&5 | ||
5250 | ac_status=$? | ||
5251 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5252 | (exit $ac_status); }; } && | ||
5253 | { ac_try='test -s conftest.$ac_objext' | ||
5254 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5255 | - (eval $ac_try) 2>&5 | ||
5256 | + { (case "(($ac_try" in | ||
5257 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5258 | + *) ac_try_echo=$ac_try;; | ||
5259 | +esac | ||
5260 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5261 | + (eval "$ac_try") 2>&5 | ||
5262 | ac_status=$? | ||
5263 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5264 | (exit $ac_status); }; }; then | ||
5265 | @@ -5063,70 +5993,101 @@ | ||
5266 | echo "$as_me: failed program was:" >&5 | ||
5267 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
5268 | |||
5269 | -continue | ||
5270 | -fi | ||
5271 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5272 | - cat >conftest.$ac_ext <<_ACEOF | ||
5273 | + ac_cxx_werror_flag=$ac_save_cxx_werror_flag | ||
5274 | + CXXFLAGS="-g" | ||
5275 | + cat >conftest.$ac_ext <<_ACEOF | ||
5276 | /* confdefs.h. */ | ||
5277 | _ACEOF | ||
5278 | cat confdefs.h >>conftest.$ac_ext | ||
5279 | cat >>conftest.$ac_ext <<_ACEOF | ||
5280 | /* end confdefs.h. */ | ||
5281 | -$ac_declaration | ||
5282 | + | ||
5283 | int | ||
5284 | main () | ||
5285 | { | ||
5286 | -exit (42); | ||
5287 | + | ||
5288 | ; | ||
5289 | return 0; | ||
5290 | } | ||
5291 | _ACEOF | ||
5292 | rm -f conftest.$ac_objext | ||
5293 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5294 | - (eval $ac_compile) 2>conftest.er1 | ||
5295 | +if { (ac_try="$ac_compile" | ||
5296 | +case "(($ac_try" in | ||
5297 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5298 | + *) ac_try_echo=$ac_try;; | ||
5299 | +esac | ||
5300 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5301 | + (eval "$ac_compile") 2>conftest.er1 | ||
5302 | ac_status=$? | ||
5303 | grep -v '^ *+' conftest.er1 >conftest.err | ||
5304 | rm -f conftest.er1 | ||
5305 | cat conftest.err >&5 | ||
5306 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5307 | (exit $ac_status); } && | ||
5308 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
5309 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5310 | - (eval $ac_try) 2>&5 | ||
5311 | + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
5312 | + { (case "(($ac_try" in | ||
5313 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5314 | + *) ac_try_echo=$ac_try;; | ||
5315 | +esac | ||
5316 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5317 | + (eval "$ac_try") 2>&5 | ||
5318 | ac_status=$? | ||
5319 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5320 | (exit $ac_status); }; } && | ||
5321 | { ac_try='test -s conftest.$ac_objext' | ||
5322 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5323 | - (eval $ac_try) 2>&5 | ||
5324 | + { (case "(($ac_try" in | ||
5325 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5326 | + *) ac_try_echo=$ac_try;; | ||
5327 | +esac | ||
5328 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5329 | + (eval "$ac_try") 2>&5 | ||
5330 | ac_status=$? | ||
5331 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5332 | (exit $ac_status); }; }; then | ||
5333 | - break | ||
5334 | + ac_cv_prog_cxx_g=yes | ||
5335 | else | ||
5336 | echo "$as_me: failed program was:" >&5 | ||
5337 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
5338 | |||
5339 | + | ||
5340 | fi | ||
5341 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5342 | -done | ||
5343 | -rm -f conftest* | ||
5344 | -if test -n "$ac_declaration"; then | ||
5345 | - echo '#ifdef __cplusplus' >>confdefs.h | ||
5346 | - echo $ac_declaration >>confdefs.h | ||
5347 | - echo '#endif' >>confdefs.h | ||
5348 | + | ||
5349 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5350 | fi | ||
5351 | |||
5352 | -ac_ext=cc | ||
5353 | -ac_cpp='$CXXCPP $CPPFLAGS' | ||
5354 | -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
5355 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5356 | +fi | ||
5357 | + | ||
5358 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5359 | + ac_cxx_werror_flag=$ac_save_cxx_werror_flag | ||
5360 | +fi | ||
5361 | +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 | ||
5362 | +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } | ||
5363 | +if test "$ac_test_CXXFLAGS" = set; then | ||
5364 | + CXXFLAGS=$ac_save_CXXFLAGS | ||
5365 | +elif test $ac_cv_prog_cxx_g = yes; then | ||
5366 | + if test "$GXX" = yes; then | ||
5367 | + CXXFLAGS="-g -O2" | ||
5368 | + else | ||
5369 | + CXXFLAGS="-g" | ||
5370 | + fi | ||
5371 | +else | ||
5372 | + if test "$GXX" = yes; then | ||
5373 | + CXXFLAGS="-O2" | ||
5374 | + else | ||
5375 | + CXXFLAGS= | ||
5376 | + fi | ||
5377 | +fi | ||
5378 | +ac_ext=cpp | ||
5379 | +ac_cpp='$CXXCPP $CPPFLAGS' | ||
5380 | +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
5381 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
5382 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
5383 | |||
5384 | depcc="$CXX" am_compiler_list= | ||
5385 | |||
5386 | -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | ||
5387 | -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 | ||
5388 | +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | ||
5389 | +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } | ||
5390 | if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then | ||
5391 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5392 | else | ||
5393 | @@ -5215,8 +6176,8 @@ | ||
5394 | fi | ||
5395 | |||
5396 | fi | ||
5397 | -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 | ||
5398 | -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 | ||
5399 | +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 | ||
5400 | +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } | ||
5401 | CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type | ||
5402 | |||
5403 | |||
5404 | @@ -5237,13 +6198,13 @@ | ||
5405 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | ||
5406 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | ||
5407 | (test "X$CXX" != "Xg++"))) ; then | ||
5408 | - ac_ext=cc | ||
5409 | + ac_ext=cpp | ||
5410 | ac_cpp='$CXXCPP $CPPFLAGS' | ||
5411 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
5412 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
5413 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
5414 | -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 | ||
5415 | -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 | ||
5416 | +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 | ||
5417 | +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } | ||
5418 | if test -z "$CXXCPP"; then | ||
5419 | if test "${ac_cv_prog_CXXCPP+set}" = set; then | ||
5420 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5421 | @@ -5273,8 +6234,13 @@ | ||
5422 | #endif | ||
5423 | Syntax error | ||
5424 | _ACEOF | ||
5425 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
5426 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
5427 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
5428 | +case "(($ac_try" in | ||
5429 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5430 | + *) ac_try_echo=$ac_try;; | ||
5431 | +esac | ||
5432 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5433 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
5434 | ac_status=$? | ||
5435 | grep -v '^ *+' conftest.er1 >conftest.err | ||
5436 | rm -f conftest.er1 | ||
5437 | @@ -5299,9 +6265,10 @@ | ||
5438 | # Broken: fails on valid input. | ||
5439 | continue | ||
5440 | fi | ||
5441 | + | ||
5442 | rm -f conftest.err conftest.$ac_ext | ||
5443 | |||
5444 | - # OK, works on sane cases. Now check whether non-existent headers | ||
5445 | + # OK, works on sane cases. Now check whether nonexistent headers | ||
5446 | # can be detected and how. | ||
5447 | cat >conftest.$ac_ext <<_ACEOF | ||
5448 | /* confdefs.h. */ | ||
5449 | @@ -5311,8 +6278,13 @@ | ||
5450 | /* end confdefs.h. */ | ||
5451 | #include <ac_nonexistent.h> | ||
5452 | _ACEOF | ||
5453 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
5454 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
5455 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
5456 | +case "(($ac_try" in | ||
5457 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5458 | + *) ac_try_echo=$ac_try;; | ||
5459 | +esac | ||
5460 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5461 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
5462 | ac_status=$? | ||
5463 | grep -v '^ *+' conftest.er1 >conftest.err | ||
5464 | rm -f conftest.er1 | ||
5465 | @@ -5339,6 +6311,7 @@ | ||
5466 | ac_preproc_ok=: | ||
5467 | break | ||
5468 | fi | ||
5469 | + | ||
5470 | rm -f conftest.err conftest.$ac_ext | ||
5471 | |||
5472 | done | ||
5473 | @@ -5356,8 +6329,8 @@ | ||
5474 | else | ||
5475 | ac_cv_prog_CXXCPP=$CXXCPP | ||
5476 | fi | ||
5477 | -echo "$as_me:$LINENO: result: $CXXCPP" >&5 | ||
5478 | -echo "${ECHO_T}$CXXCPP" >&6 | ||
5479 | +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 | ||
5480 | +echo "${ECHO_T}$CXXCPP" >&6; } | ||
5481 | ac_preproc_ok=false | ||
5482 | for ac_cxx_preproc_warn_flag in '' yes | ||
5483 | do | ||
5484 | @@ -5380,8 +6353,13 @@ | ||
5485 | #endif | ||
5486 | Syntax error | ||
5487 | _ACEOF | ||
5488 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
5489 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
5490 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
5491 | +case "(($ac_try" in | ||
5492 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5493 | + *) ac_try_echo=$ac_try;; | ||
5494 | +esac | ||
5495 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5496 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
5497 | ac_status=$? | ||
5498 | grep -v '^ *+' conftest.er1 >conftest.err | ||
5499 | rm -f conftest.er1 | ||
5500 | @@ -5406,9 +6384,10 @@ | ||
5501 | # Broken: fails on valid input. | ||
5502 | continue | ||
5503 | fi | ||
5504 | + | ||
5505 | rm -f conftest.err conftest.$ac_ext | ||
5506 | |||
5507 | - # OK, works on sane cases. Now check whether non-existent headers | ||
5508 | + # OK, works on sane cases. Now check whether nonexistent headers | ||
5509 | # can be detected and how. | ||
5510 | cat >conftest.$ac_ext <<_ACEOF | ||
5511 | /* confdefs.h. */ | ||
5512 | @@ -5418,8 +6397,13 @@ | ||
5513 | /* end confdefs.h. */ | ||
5514 | #include <ac_nonexistent.h> | ||
5515 | _ACEOF | ||
5516 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
5517 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
5518 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
5519 | +case "(($ac_try" in | ||
5520 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5521 | + *) ac_try_echo=$ac_try;; | ||
5522 | +esac | ||
5523 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5524 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
5525 | ac_status=$? | ||
5526 | grep -v '^ *+' conftest.er1 >conftest.err | ||
5527 | rm -f conftest.er1 | ||
5528 | @@ -5446,6 +6430,7 @@ | ||
5529 | ac_preproc_ok=: | ||
5530 | break | ||
5531 | fi | ||
5532 | + | ||
5533 | rm -f conftest.err conftest.$ac_ext | ||
5534 | |||
5535 | done | ||
5536 | @@ -5461,7 +6446,7 @@ | ||
5537 | { (exit 1); exit 1; }; } | ||
5538 | fi | ||
5539 | |||
5540 | -ac_ext=cc | ||
5541 | +ac_ext=cpp | ||
5542 | ac_cpp='$CXXCPP $CPPFLAGS' | ||
5543 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
5544 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
5545 | @@ -5475,12 +6460,12 @@ | ||
5546 | ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
5547 | ac_compiler_gnu=$ac_cv_f77_compiler_gnu | ||
5548 | if test -n "$ac_tool_prefix"; then | ||
5549 | - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran | ||
5550 | + for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn | ||
5551 | do | ||
5552 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
5553 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
5554 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
5555 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
5556 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
5557 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
5558 | if test "${ac_cv_prog_F77+set}" = set; then | ||
5559 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5560 | else | ||
5561 | @@ -5493,36 +6478,38 @@ | ||
5562 | IFS=$as_save_IFS | ||
5563 | test -z "$as_dir" && as_dir=. | ||
5564 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
5565 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
5566 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
5567 | ac_cv_prog_F77="$ac_tool_prefix$ac_prog" | ||
5568 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
5569 | break 2 | ||
5570 | fi | ||
5571 | done | ||
5572 | done | ||
5573 | +IFS=$as_save_IFS | ||
5574 | |||
5575 | fi | ||
5576 | fi | ||
5577 | F77=$ac_cv_prog_F77 | ||
5578 | if test -n "$F77"; then | ||
5579 | - echo "$as_me:$LINENO: result: $F77" >&5 | ||
5580 | -echo "${ECHO_T}$F77" >&6 | ||
5581 | + { echo "$as_me:$LINENO: result: $F77" >&5 | ||
5582 | +echo "${ECHO_T}$F77" >&6; } | ||
5583 | else | ||
5584 | - echo "$as_me:$LINENO: result: no" >&5 | ||
5585 | -echo "${ECHO_T}no" >&6 | ||
5586 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
5587 | +echo "${ECHO_T}no" >&6; } | ||
5588 | fi | ||
5589 | |||
5590 | + | ||
5591 | test -n "$F77" && break | ||
5592 | done | ||
5593 | fi | ||
5594 | if test -z "$F77"; then | ||
5595 | ac_ct_F77=$F77 | ||
5596 | - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran | ||
5597 | + for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn | ||
5598 | do | ||
5599 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
5600 | set dummy $ac_prog; ac_word=$2 | ||
5601 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
5602 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
5603 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
5604 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
5605 | if test "${ac_cv_prog_ac_ct_F77+set}" = set; then | ||
5606 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5607 | else | ||
5608 | @@ -5535,48 +6522,78 @@ | ||
5609 | IFS=$as_save_IFS | ||
5610 | test -z "$as_dir" && as_dir=. | ||
5611 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
5612 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
5613 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
5614 | ac_cv_prog_ac_ct_F77="$ac_prog" | ||
5615 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
5616 | break 2 | ||
5617 | fi | ||
5618 | done | ||
5619 | done | ||
5620 | +IFS=$as_save_IFS | ||
5621 | |||
5622 | fi | ||
5623 | fi | ||
5624 | ac_ct_F77=$ac_cv_prog_ac_ct_F77 | ||
5625 | if test -n "$ac_ct_F77"; then | ||
5626 | - echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 | ||
5627 | -echo "${ECHO_T}$ac_ct_F77" >&6 | ||
5628 | + { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 | ||
5629 | +echo "${ECHO_T}$ac_ct_F77" >&6; } | ||
5630 | else | ||
5631 | - echo "$as_me:$LINENO: result: no" >&5 | ||
5632 | -echo "${ECHO_T}no" >&6 | ||
5633 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
5634 | +echo "${ECHO_T}no" >&6; } | ||
5635 | fi | ||
5636 | |||
5637 | + | ||
5638 | test -n "$ac_ct_F77" && break | ||
5639 | done | ||
5640 | |||
5641 | - F77=$ac_ct_F77 | ||
5642 | + if test "x$ac_ct_F77" = x; then | ||
5643 | + F77="" | ||
5644 | + else | ||
5645 | + case $cross_compiling:$ac_tool_warned in | ||
5646 | +yes:) | ||
5647 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
5648 | +whose name does not start with the host triplet. If you think this | ||
5649 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
5650 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
5651 | +whose name does not start with the host triplet. If you think this | ||
5652 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
5653 | +ac_tool_warned=yes ;; | ||
5654 | +esac | ||
5655 | + F77=$ac_ct_F77 | ||
5656 | + fi | ||
5657 | fi | ||
5658 | |||
5659 | |||
5660 | # Provide some information about the compiler. | ||
5661 | -echo "$as_me:5565:" \ | ||
5662 | - "checking for Fortran 77 compiler version" >&5 | ||
5663 | +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 | ||
5664 | ac_compiler=`set X $ac_compile; echo $2` | ||
5665 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 | ||
5666 | - (eval $ac_compiler --version </dev/null >&5) 2>&5 | ||
5667 | +{ (ac_try="$ac_compiler --version >&5" | ||
5668 | +case "(($ac_try" in | ||
5669 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5670 | + *) ac_try_echo=$ac_try;; | ||
5671 | +esac | ||
5672 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5673 | + (eval "$ac_compiler --version >&5") 2>&5 | ||
5674 | ac_status=$? | ||
5675 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5676 | (exit $ac_status); } | ||
5677 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 | ||
5678 | - (eval $ac_compiler -v </dev/null >&5) 2>&5 | ||
5679 | +{ (ac_try="$ac_compiler -v >&5" | ||
5680 | +case "(($ac_try" in | ||
5681 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5682 | + *) ac_try_echo=$ac_try;; | ||
5683 | +esac | ||
5684 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5685 | + (eval "$ac_compiler -v >&5") 2>&5 | ||
5686 | ac_status=$? | ||
5687 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5688 | (exit $ac_status); } | ||
5689 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 | ||
5690 | - (eval $ac_compiler -V </dev/null >&5) 2>&5 | ||
5691 | +{ (ac_try="$ac_compiler -V >&5" | ||
5692 | +case "(($ac_try" in | ||
5693 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5694 | + *) ac_try_echo=$ac_try;; | ||
5695 | +esac | ||
5696 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5697 | + (eval "$ac_compiler -V >&5") 2>&5 | ||
5698 | ac_status=$? | ||
5699 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5700 | (exit $ac_status); } | ||
5701 | @@ -5586,8 +6603,8 @@ | ||
5702 | # input file. (Note that this only needs to work for GNU compilers.) | ||
5703 | ac_save_ext=$ac_ext | ||
5704 | ac_ext=F | ||
5705 | -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 | ||
5706 | -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 | ||
5707 | +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 | ||
5708 | +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } | ||
5709 | if test "${ac_cv_f77_compiler_gnu+set}" = set; then | ||
5710 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5711 | else | ||
5712 | @@ -5600,23 +6617,36 @@ | ||
5713 | end | ||
5714 | _ACEOF | ||
5715 | rm -f conftest.$ac_objext | ||
5716 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5717 | - (eval $ac_compile) 2>conftest.er1 | ||
5718 | +if { (ac_try="$ac_compile" | ||
5719 | +case "(($ac_try" in | ||
5720 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5721 | + *) ac_try_echo=$ac_try;; | ||
5722 | +esac | ||
5723 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5724 | + (eval "$ac_compile") 2>conftest.er1 | ||
5725 | ac_status=$? | ||
5726 | grep -v '^ *+' conftest.er1 >conftest.err | ||
5727 | rm -f conftest.er1 | ||
5728 | cat conftest.err >&5 | ||
5729 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5730 | (exit $ac_status); } && | ||
5731 | - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | ||
5732 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5733 | - (eval $ac_try) 2>&5 | ||
5734 | + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | ||
5735 | + { (case "(($ac_try" in | ||
5736 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5737 | + *) ac_try_echo=$ac_try;; | ||
5738 | +esac | ||
5739 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5740 | + (eval "$ac_try") 2>&5 | ||
5741 | ac_status=$? | ||
5742 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5743 | (exit $ac_status); }; } && | ||
5744 | { ac_try='test -s conftest.$ac_objext' | ||
5745 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5746 | - (eval $ac_try) 2>&5 | ||
5747 | + { (case "(($ac_try" in | ||
5748 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5749 | + *) ac_try_echo=$ac_try;; | ||
5750 | +esac | ||
5751 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5752 | + (eval "$ac_try") 2>&5 | ||
5753 | ac_status=$? | ||
5754 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5755 | (exit $ac_status); }; }; then | ||
5756 | @@ -5625,20 +6655,21 @@ | ||
5757 | echo "$as_me: failed program was:" >&5 | ||
5758 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
5759 | |||
5760 | -ac_compiler_gnu=no | ||
5761 | + ac_compiler_gnu=no | ||
5762 | fi | ||
5763 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5764 | + | ||
5765 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5766 | ac_cv_f77_compiler_gnu=$ac_compiler_gnu | ||
5767 | |||
5768 | fi | ||
5769 | -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 | ||
5770 | -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 | ||
5771 | +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 | ||
5772 | +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } | ||
5773 | ac_ext=$ac_save_ext | ||
5774 | ac_test_FFLAGS=${FFLAGS+set} | ||
5775 | ac_save_FFLAGS=$FFLAGS | ||
5776 | FFLAGS= | ||
5777 | -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 | ||
5778 | -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 | ||
5779 | +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 | ||
5780 | +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } | ||
5781 | if test "${ac_cv_prog_f77_g+set}" = set; then | ||
5782 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5783 | else | ||
5784 | @@ -5649,23 +6680,36 @@ | ||
5785 | end | ||
5786 | _ACEOF | ||
5787 | rm -f conftest.$ac_objext | ||
5788 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
5789 | - (eval $ac_compile) 2>conftest.er1 | ||
5790 | +if { (ac_try="$ac_compile" | ||
5791 | +case "(($ac_try" in | ||
5792 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5793 | + *) ac_try_echo=$ac_try;; | ||
5794 | +esac | ||
5795 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5796 | + (eval "$ac_compile") 2>conftest.er1 | ||
5797 | ac_status=$? | ||
5798 | grep -v '^ *+' conftest.er1 >conftest.err | ||
5799 | rm -f conftest.er1 | ||
5800 | cat conftest.err >&5 | ||
5801 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5802 | (exit $ac_status); } && | ||
5803 | - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | ||
5804 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5805 | - (eval $ac_try) 2>&5 | ||
5806 | + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | ||
5807 | + { (case "(($ac_try" in | ||
5808 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5809 | + *) ac_try_echo=$ac_try;; | ||
5810 | +esac | ||
5811 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5812 | + (eval "$ac_try") 2>&5 | ||
5813 | ac_status=$? | ||
5814 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5815 | (exit $ac_status); }; } && | ||
5816 | { ac_try='test -s conftest.$ac_objext' | ||
5817 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5818 | - (eval $ac_try) 2>&5 | ||
5819 | + { (case "(($ac_try" in | ||
5820 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5821 | + *) ac_try_echo=$ac_try;; | ||
5822 | +esac | ||
5823 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5824 | + (eval "$ac_try") 2>&5 | ||
5825 | ac_status=$? | ||
5826 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5827 | (exit $ac_status); }; }; then | ||
5828 | @@ -5674,13 +6718,14 @@ | ||
5829 | echo "$as_me: failed program was:" >&5 | ||
5830 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
5831 | |||
5832 | -ac_cv_prog_f77_g=no | ||
5833 | + ac_cv_prog_f77_g=no | ||
5834 | fi | ||
5835 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5836 | + | ||
5837 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5838 | |||
5839 | fi | ||
5840 | -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 | ||
5841 | -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 | ||
5842 | +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 | ||
5843 | +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } | ||
5844 | if test "$ac_test_FFLAGS" = set; then | ||
5845 | FFLAGS=$ac_save_FFLAGS | ||
5846 | elif test $ac_cv_prog_f77_g = yes; then | ||
5847 | @@ -5709,8 +6754,8 @@ | ||
5848 | # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! | ||
5849 | |||
5850 | # find the maximum length of command line arguments | ||
5851 | -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 | ||
5852 | -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 | ||
5853 | +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 | ||
5854 | +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } | ||
5855 | if test "${lt_cv_sys_max_cmd_len+set}" = set; then | ||
5856 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5857 | else | ||
5858 | @@ -5818,19 +6863,19 @@ | ||
5859 | fi | ||
5860 | |||
5861 | if test -n $lt_cv_sys_max_cmd_len ; then | ||
5862 | - echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 | ||
5863 | -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 | ||
5864 | + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 | ||
5865 | +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } | ||
5866 | else | ||
5867 | - echo "$as_me:$LINENO: result: none" >&5 | ||
5868 | -echo "${ECHO_T}none" >&6 | ||
5869 | + { echo "$as_me:$LINENO: result: none" >&5 | ||
5870 | +echo "${ECHO_T}none" >&6; } | ||
5871 | fi | ||
5872 | |||
5873 | |||
5874 | |||
5875 | |||
5876 | # Check for command to grab the raw symbol name followed by C symbol from nm. | ||
5877 | -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 | ||
5878 | -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 | ||
5879 | +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 | ||
5880 | +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } | ||
5881 | if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then | ||
5882 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5883 | else | ||
5884 | @@ -5865,7 +6910,7 @@ | ||
5885 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | ||
5886 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" | ||
5887 | ;; | ||
5888 | -linux*) | ||
5889 | +linux* | k*bsd*-gnu) | ||
5890 | if test "$host_cpu" = ia64; then | ||
5891 | symcode='[ABCDGIRSTW]' | ||
5892 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | ||
5893 | @@ -6034,15 +7079,15 @@ | ||
5894 | lt_cv_sys_global_symbol_to_cdecl= | ||
5895 | fi | ||
5896 | if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then | ||
5897 | - echo "$as_me:$LINENO: result: failed" >&5 | ||
5898 | -echo "${ECHO_T}failed" >&6 | ||
5899 | + { echo "$as_me:$LINENO: result: failed" >&5 | ||
5900 | +echo "${ECHO_T}failed" >&6; } | ||
5901 | else | ||
5902 | - echo "$as_me:$LINENO: result: ok" >&5 | ||
5903 | -echo "${ECHO_T}ok" >&6 | ||
5904 | + { echo "$as_me:$LINENO: result: ok" >&5 | ||
5905 | +echo "${ECHO_T}ok" >&6; } | ||
5906 | fi | ||
5907 | |||
5908 | -echo "$as_me:$LINENO: checking for objdir" >&5 | ||
5909 | -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 | ||
5910 | +{ echo "$as_me:$LINENO: checking for objdir" >&5 | ||
5911 | +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } | ||
5912 | if test "${lt_cv_objdir+set}" = set; then | ||
5913 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5914 | else | ||
5915 | @@ -6056,8 +7101,8 @@ | ||
5916 | fi | ||
5917 | rmdir .libs 2>/dev/null | ||
5918 | fi | ||
5919 | -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 | ||
5920 | -echo "${ECHO_T}$lt_cv_objdir" >&6 | ||
5921 | +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 | ||
5922 | +echo "${ECHO_T}$lt_cv_objdir" >&6; } | ||
5923 | objdir=$lt_cv_objdir | ||
5924 | |||
5925 | |||
5926 | @@ -6108,8 +7153,8 @@ | ||
5927 | if test -n "$ac_tool_prefix"; then | ||
5928 | # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
5929 | set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
5930 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
5931 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
5932 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
5933 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
5934 | if test "${ac_cv_prog_AR+set}" = set; then | ||
5935 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5936 | else | ||
5937 | @@ -6122,32 +7167,34 @@ | ||
5938 | IFS=$as_save_IFS | ||
5939 | test -z "$as_dir" && as_dir=. | ||
5940 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
5941 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
5942 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
5943 | ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
5944 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
5945 | break 2 | ||
5946 | fi | ||
5947 | done | ||
5948 | done | ||
5949 | +IFS=$as_save_IFS | ||
5950 | |||
5951 | fi | ||
5952 | fi | ||
5953 | AR=$ac_cv_prog_AR | ||
5954 | if test -n "$AR"; then | ||
5955 | - echo "$as_me:$LINENO: result: $AR" >&5 | ||
5956 | -echo "${ECHO_T}$AR" >&6 | ||
5957 | + { echo "$as_me:$LINENO: result: $AR" >&5 | ||
5958 | +echo "${ECHO_T}$AR" >&6; } | ||
5959 | else | ||
5960 | - echo "$as_me:$LINENO: result: no" >&5 | ||
5961 | -echo "${ECHO_T}no" >&6 | ||
5962 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
5963 | +echo "${ECHO_T}no" >&6; } | ||
5964 | fi | ||
5965 | |||
5966 | + | ||
5967 | fi | ||
5968 | if test -z "$ac_cv_prog_AR"; then | ||
5969 | ac_ct_AR=$AR | ||
5970 | # Extract the first word of "ar", so it can be a program name with args. | ||
5971 | set dummy ar; ac_word=$2 | ||
5972 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
5973 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
5974 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
5975 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
5976 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then | ||
5977 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5978 | else | ||
5979 | @@ -6160,27 +7207,41 @@ | ||
5980 | IFS=$as_save_IFS | ||
5981 | test -z "$as_dir" && as_dir=. | ||
5982 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
5983 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
5984 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
5985 | ac_cv_prog_ac_ct_AR="ar" | ||
5986 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
5987 | break 2 | ||
5988 | fi | ||
5989 | done | ||
5990 | done | ||
5991 | +IFS=$as_save_IFS | ||
5992 | |||
5993 | - test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" | ||
5994 | fi | ||
5995 | fi | ||
5996 | ac_ct_AR=$ac_cv_prog_ac_ct_AR | ||
5997 | if test -n "$ac_ct_AR"; then | ||
5998 | - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 | ||
5999 | -echo "${ECHO_T}$ac_ct_AR" >&6 | ||
6000 | + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 | ||
6001 | +echo "${ECHO_T}$ac_ct_AR" >&6; } | ||
6002 | else | ||
6003 | - echo "$as_me:$LINENO: result: no" >&5 | ||
6004 | -echo "${ECHO_T}no" >&6 | ||
6005 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
6006 | +echo "${ECHO_T}no" >&6; } | ||
6007 | fi | ||
6008 | |||
6009 | - AR=$ac_ct_AR | ||
6010 | + if test "x$ac_ct_AR" = x; then | ||
6011 | + AR="false" | ||
6012 | + else | ||
6013 | + case $cross_compiling:$ac_tool_warned in | ||
6014 | +yes:) | ||
6015 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
6016 | +whose name does not start with the host triplet. If you think this | ||
6017 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
6018 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
6019 | +whose name does not start with the host triplet. If you think this | ||
6020 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
6021 | +ac_tool_warned=yes ;; | ||
6022 | +esac | ||
6023 | + AR=$ac_ct_AR | ||
6024 | + fi | ||
6025 | else | ||
6026 | AR="$ac_cv_prog_AR" | ||
6027 | fi | ||
6028 | @@ -6188,8 +7249,8 @@ | ||
6029 | if test -n "$ac_tool_prefix"; then | ||
6030 | # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. | ||
6031 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 | ||
6032 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6033 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
6034 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6035 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
6036 | if test "${ac_cv_prog_RANLIB+set}" = set; then | ||
6037 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6038 | else | ||
6039 | @@ -6202,32 +7263,34 @@ | ||
6040 | IFS=$as_save_IFS | ||
6041 | test -z "$as_dir" && as_dir=. | ||
6042 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
6043 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
6044 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6045 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | ||
6046 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6047 | break 2 | ||
6048 | fi | ||
6049 | done | ||
6050 | done | ||
6051 | +IFS=$as_save_IFS | ||
6052 | |||
6053 | fi | ||
6054 | fi | ||
6055 | RANLIB=$ac_cv_prog_RANLIB | ||
6056 | if test -n "$RANLIB"; then | ||
6057 | - echo "$as_me:$LINENO: result: $RANLIB" >&5 | ||
6058 | -echo "${ECHO_T}$RANLIB" >&6 | ||
6059 | + { echo "$as_me:$LINENO: result: $RANLIB" >&5 | ||
6060 | +echo "${ECHO_T}$RANLIB" >&6; } | ||
6061 | else | ||
6062 | - echo "$as_me:$LINENO: result: no" >&5 | ||
6063 | -echo "${ECHO_T}no" >&6 | ||
6064 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
6065 | +echo "${ECHO_T}no" >&6; } | ||
6066 | fi | ||
6067 | |||
6068 | + | ||
6069 | fi | ||
6070 | if test -z "$ac_cv_prog_RANLIB"; then | ||
6071 | ac_ct_RANLIB=$RANLIB | ||
6072 | # Extract the first word of "ranlib", so it can be a program name with args. | ||
6073 | set dummy ranlib; ac_word=$2 | ||
6074 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6075 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
6076 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6077 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
6078 | if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then | ||
6079 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6080 | else | ||
6081 | @@ -6240,27 +7303,41 @@ | ||
6082 | IFS=$as_save_IFS | ||
6083 | test -z "$as_dir" && as_dir=. | ||
6084 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
6085 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
6086 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6087 | ac_cv_prog_ac_ct_RANLIB="ranlib" | ||
6088 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6089 | break 2 | ||
6090 | fi | ||
6091 | done | ||
6092 | done | ||
6093 | +IFS=$as_save_IFS | ||
6094 | |||
6095 | - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" | ||
6096 | fi | ||
6097 | fi | ||
6098 | ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB | ||
6099 | if test -n "$ac_ct_RANLIB"; then | ||
6100 | - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 | ||
6101 | -echo "${ECHO_T}$ac_ct_RANLIB" >&6 | ||
6102 | + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 | ||
6103 | +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } | ||
6104 | else | ||
6105 | - echo "$as_me:$LINENO: result: no" >&5 | ||
6106 | -echo "${ECHO_T}no" >&6 | ||
6107 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
6108 | +echo "${ECHO_T}no" >&6; } | ||
6109 | fi | ||
6110 | |||
6111 | - RANLIB=$ac_ct_RANLIB | ||
6112 | + if test "x$ac_ct_RANLIB" = x; then | ||
6113 | + RANLIB=":" | ||
6114 | + else | ||
6115 | + case $cross_compiling:$ac_tool_warned in | ||
6116 | +yes:) | ||
6117 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
6118 | +whose name does not start with the host triplet. If you think this | ||
6119 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
6120 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
6121 | +whose name does not start with the host triplet. If you think this | ||
6122 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
6123 | +ac_tool_warned=yes ;; | ||
6124 | +esac | ||
6125 | + RANLIB=$ac_ct_RANLIB | ||
6126 | + fi | ||
6127 | else | ||
6128 | RANLIB="$ac_cv_prog_RANLIB" | ||
6129 | fi | ||
6130 | @@ -6268,8 +7345,8 @@ | ||
6131 | if test -n "$ac_tool_prefix"; then | ||
6132 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
6133 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
6134 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6135 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
6136 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6137 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
6138 | if test "${ac_cv_prog_STRIP+set}" = set; then | ||
6139 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6140 | else | ||
6141 | @@ -6282,32 +7359,34 @@ | ||
6142 | IFS=$as_save_IFS | ||
6143 | test -z "$as_dir" && as_dir=. | ||
6144 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
6145 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
6146 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6147 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | ||
6148 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6149 | break 2 | ||
6150 | fi | ||
6151 | done | ||
6152 | done | ||
6153 | +IFS=$as_save_IFS | ||
6154 | |||
6155 | fi | ||
6156 | fi | ||
6157 | STRIP=$ac_cv_prog_STRIP | ||
6158 | if test -n "$STRIP"; then | ||
6159 | - echo "$as_me:$LINENO: result: $STRIP" >&5 | ||
6160 | -echo "${ECHO_T}$STRIP" >&6 | ||
6161 | + { echo "$as_me:$LINENO: result: $STRIP" >&5 | ||
6162 | +echo "${ECHO_T}$STRIP" >&6; } | ||
6163 | else | ||
6164 | - echo "$as_me:$LINENO: result: no" >&5 | ||
6165 | -echo "${ECHO_T}no" >&6 | ||
6166 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
6167 | +echo "${ECHO_T}no" >&6; } | ||
6168 | fi | ||
6169 | |||
6170 | + | ||
6171 | fi | ||
6172 | if test -z "$ac_cv_prog_STRIP"; then | ||
6173 | ac_ct_STRIP=$STRIP | ||
6174 | # Extract the first word of "strip", so it can be a program name with args. | ||
6175 | set dummy strip; ac_word=$2 | ||
6176 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6177 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
6178 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
6179 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
6180 | if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then | ||
6181 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6182 | else | ||
6183 | @@ -6320,27 +7399,41 @@ | ||
6184 | IFS=$as_save_IFS | ||
6185 | test -z "$as_dir" && as_dir=. | ||
6186 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
6187 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
6188 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6189 | ac_cv_prog_ac_ct_STRIP="strip" | ||
6190 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6191 | break 2 | ||
6192 | fi | ||
6193 | done | ||
6194 | done | ||
6195 | +IFS=$as_save_IFS | ||
6196 | |||
6197 | - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" | ||
6198 | fi | ||
6199 | fi | ||
6200 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP | ||
6201 | if test -n "$ac_ct_STRIP"; then | ||
6202 | - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | ||
6203 | -echo "${ECHO_T}$ac_ct_STRIP" >&6 | ||
6204 | + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | ||
6205 | +echo "${ECHO_T}$ac_ct_STRIP" >&6; } | ||
6206 | else | ||
6207 | - echo "$as_me:$LINENO: result: no" >&5 | ||
6208 | -echo "${ECHO_T}no" >&6 | ||
6209 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
6210 | +echo "${ECHO_T}no" >&6; } | ||
6211 | fi | ||
6212 | |||
6213 | - STRIP=$ac_ct_STRIP | ||
6214 | + if test "x$ac_ct_STRIP" = x; then | ||
6215 | + STRIP=":" | ||
6216 | + else | ||
6217 | + case $cross_compiling:$ac_tool_warned in | ||
6218 | +yes:) | ||
6219 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
6220 | +whose name does not start with the host triplet. If you think this | ||
6221 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
6222 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
6223 | +whose name does not start with the host triplet. If you think this | ||
6224 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
6225 | +ac_tool_warned=yes ;; | ||
6226 | +esac | ||
6227 | + STRIP=$ac_ct_STRIP | ||
6228 | + fi | ||
6229 | else | ||
6230 | STRIP="$ac_cv_prog_STRIP" | ||
6231 | fi | ||
6232 | @@ -6399,8 +7492,8 @@ | ||
6233 | case $deplibs_check_method in | ||
6234 | file_magic*) | ||
6235 | if test "$file_magic_cmd" = '$MAGIC_CMD'; then | ||
6236 | - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 | ||
6237 | -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 | ||
6238 | + { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 | ||
6239 | +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } | ||
6240 | if test "${lt_cv_path_MAGIC_CMD+set}" = set; then | ||
6241 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6242 | else | ||
6243 | @@ -6452,17 +7545,17 @@ | ||
6244 | |||
6245 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" | ||
6246 | if test -n "$MAGIC_CMD"; then | ||
6247 | - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 | ||
6248 | -echo "${ECHO_T}$MAGIC_CMD" >&6 | ||
6249 | + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 | ||
6250 | +echo "${ECHO_T}$MAGIC_CMD" >&6; } | ||
6251 | else | ||
6252 | - echo "$as_me:$LINENO: result: no" >&5 | ||
6253 | -echo "${ECHO_T}no" >&6 | ||
6254 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
6255 | +echo "${ECHO_T}no" >&6; } | ||
6256 | fi | ||
6257 | |||
6258 | if test -z "$lt_cv_path_MAGIC_CMD"; then | ||
6259 | if test -n "$ac_tool_prefix"; then | ||
6260 | - echo "$as_me:$LINENO: checking for file" >&5 | ||
6261 | -echo $ECHO_N "checking for file... $ECHO_C" >&6 | ||
6262 | + { echo "$as_me:$LINENO: checking for file" >&5 | ||
6263 | +echo $ECHO_N "checking for file... $ECHO_C" >&6; } | ||
6264 | if test "${lt_cv_path_MAGIC_CMD+set}" = set; then | ||
6265 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6266 | else | ||
6267 | @@ -6514,11 +7607,11 @@ | ||
6268 | |||
6269 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" | ||
6270 | if test -n "$MAGIC_CMD"; then | ||
6271 | - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 | ||
6272 | -echo "${ECHO_T}$MAGIC_CMD" >&6 | ||
6273 | + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 | ||
6274 | +echo "${ECHO_T}$MAGIC_CMD" >&6; } | ||
6275 | else | ||
6276 | - echo "$as_me:$LINENO: result: no" >&5 | ||
6277 | -echo "${ECHO_T}no" >&6 | ||
6278 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
6279 | +echo "${ECHO_T}no" >&6; } | ||
6280 | fi | ||
6281 | |||
6282 | else | ||
6283 | @@ -6533,21 +7626,21 @@ | ||
6284 | enable_dlopen=no | ||
6285 | enable_win32_dll=no | ||
6286 | |||
6287 | -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. | ||
6288 | +# Check whether --enable-libtool-lock was given. | ||
6289 | if test "${enable_libtool_lock+set}" = set; then | ||
6290 | - enableval="$enable_libtool_lock" | ||
6291 | + enableval=$enable_libtool_lock; | ||
6292 | +fi | ||
6293 | |||
6294 | -fi; | ||
6295 | test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes | ||
6296 | |||
6297 | |||
6298 | -# Check whether --with-pic or --without-pic was given. | ||
6299 | +# Check whether --with-pic was given. | ||
6300 | if test "${with_pic+set}" = set; then | ||
6301 | - withval="$with_pic" | ||
6302 | - pic_mode="$withval" | ||
6303 | + withval=$with_pic; pic_mode="$withval" | ||
6304 | else | ||
6305 | pic_mode=default | ||
6306 | -fi; | ||
6307 | +fi | ||
6308 | + | ||
6309 | test -z "$pic_mode" && pic_mode=default | ||
6310 | |||
6311 | # Use C for the default configuration in the libtool script | ||
6312 | @@ -6605,8 +7698,8 @@ | ||
6313 | lt_prog_compiler_no_builtin_flag=' -fno-builtin' | ||
6314 | |||
6315 | |||
6316 | -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | ||
6317 | -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 | ||
6318 | +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | ||
6319 | +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } | ||
6320 | if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then | ||
6321 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6322 | else | ||
6323 | @@ -6623,11 +7716,11 @@ | ||
6324 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
6325 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
6326 | -e 's:$: $lt_compiler_flag:'` | ||
6327 | - (eval echo "\"\$as_me:6626: $lt_compile\"" >&5) | ||
6328 | + (eval echo "\"\$as_me:7719: $lt_compile\"" >&5) | ||
6329 | (eval "$lt_compile" 2>conftest.err) | ||
6330 | ac_status=$? | ||
6331 | cat conftest.err >&5 | ||
6332 | - echo "$as_me:6630: \$? = $ac_status" >&5 | ||
6333 | + echo "$as_me:7723: \$? = $ac_status" >&5 | ||
6334 | if (exit $ac_status) && test -s "$ac_outfile"; then | ||
6335 | # The compiler can only warn and ignore the option if not recognized | ||
6336 | # So say no if there are warnings other than the usual output. | ||
6337 | @@ -6640,8 +7733,8 @@ | ||
6338 | $rm conftest* | ||
6339 | |||
6340 | fi | ||
6341 | -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | ||
6342 | -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 | ||
6343 | +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | ||
6344 | +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } | ||
6345 | |||
6346 | if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then | ||
6347 | lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" | ||
6348 | @@ -6655,8 +7748,8 @@ | ||
6349 | lt_prog_compiler_pic= | ||
6350 | lt_prog_compiler_static= | ||
6351 | |||
6352 | -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | ||
6353 | -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | ||
6354 | +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | ||
6355 | +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | ||
6356 | |||
6357 | if test "$GCC" = yes; then | ||
6358 | lt_prog_compiler_wl='-Wl,' | ||
6359 | @@ -6785,7 +7878,7 @@ | ||
6360 | lt_prog_compiler_static='-Bstatic' | ||
6361 | ;; | ||
6362 | |||
6363 | - linux*) | ||
6364 | + linux* | k*bsd*-gnu) | ||
6365 | case $cc_basename in | ||
6366 | icc* | ecc*) | ||
6367 | lt_prog_compiler_wl='-Wl,' | ||
6368 | @@ -6865,16 +7958,16 @@ | ||
6369 | esac | ||
6370 | fi | ||
6371 | |||
6372 | -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 | ||
6373 | -echo "${ECHO_T}$lt_prog_compiler_pic" >&6 | ||
6374 | +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 | ||
6375 | +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } | ||
6376 | |||
6377 | # | ||
6378 | # Check to make sure the PIC flag actually works. | ||
6379 | # | ||
6380 | if test -n "$lt_prog_compiler_pic"; then | ||
6381 | |||
6382 | -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 | ||
6383 | -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 | ||
6384 | +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 | ||
6385 | +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } | ||
6386 | if test "${lt_prog_compiler_pic_works+set}" = set; then | ||
6387 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6388 | else | ||
6389 | @@ -6891,11 +7984,11 @@ | ||
6390 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
6391 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
6392 | -e 's:$: $lt_compiler_flag:'` | ||
6393 | - (eval echo "\"\$as_me:6894: $lt_compile\"" >&5) | ||
6394 | + (eval echo "\"\$as_me:7987: $lt_compile\"" >&5) | ||
6395 | (eval "$lt_compile" 2>conftest.err) | ||
6396 | ac_status=$? | ||
6397 | cat conftest.err >&5 | ||
6398 | - echo "$as_me:6898: \$? = $ac_status" >&5 | ||
6399 | + echo "$as_me:7991: \$? = $ac_status" >&5 | ||
6400 | if (exit $ac_status) && test -s "$ac_outfile"; then | ||
6401 | # The compiler can only warn and ignore the option if not recognized | ||
6402 | # So say no if there are warnings other than the usual output. | ||
6403 | @@ -6908,8 +8001,8 @@ | ||
6404 | $rm conftest* | ||
6405 | |||
6406 | fi | ||
6407 | -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 | ||
6408 | -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 | ||
6409 | +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 | ||
6410 | +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } | ||
6411 | |||
6412 | if test x"$lt_prog_compiler_pic_works" = xyes; then | ||
6413 | case $lt_prog_compiler_pic in | ||
6414 | @@ -6936,8 +8029,8 @@ | ||
6415 | # Check to make sure the static flag actually works. | ||
6416 | # | ||
6417 | wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" | ||
6418 | -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | ||
6419 | -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 | ||
6420 | +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | ||
6421 | +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } | ||
6422 | if test "${lt_prog_compiler_static_works+set}" = set; then | ||
6423 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6424 | else | ||
6425 | @@ -6964,8 +8057,8 @@ | ||
6426 | LDFLAGS="$save_LDFLAGS" | ||
6427 | |||
6428 | fi | ||
6429 | -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 | ||
6430 | -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 | ||
6431 | +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 | ||
6432 | +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } | ||
6433 | |||
6434 | if test x"$lt_prog_compiler_static_works" = xyes; then | ||
6435 | : | ||
6436 | @@ -6974,8 +8067,8 @@ | ||
6437 | fi | ||
6438 | |||
6439 | |||
6440 | -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
6441 | -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 | ||
6442 | +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
6443 | +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } | ||
6444 | if test "${lt_cv_prog_compiler_c_o+set}" = set; then | ||
6445 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6446 | else | ||
6447 | @@ -6995,11 +8088,11 @@ | ||
6448 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
6449 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
6450 | -e 's:$: $lt_compiler_flag:'` | ||
6451 | - (eval echo "\"\$as_me:6998: $lt_compile\"" >&5) | ||
6452 | + (eval echo "\"\$as_me:8091: $lt_compile\"" >&5) | ||
6453 | (eval "$lt_compile" 2>out/conftest.err) | ||
6454 | ac_status=$? | ||
6455 | cat out/conftest.err >&5 | ||
6456 | - echo "$as_me:7002: \$? = $ac_status" >&5 | ||
6457 | + echo "$as_me:8095: \$? = $ac_status" >&5 | ||
6458 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | ||
6459 | then | ||
6460 | # The compiler can only warn and ignore the option if not recognized | ||
6461 | @@ -7021,23 +8114,23 @@ | ||
6462 | $rm conftest* | ||
6463 | |||
6464 | fi | ||
6465 | -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 | ||
6466 | -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 | ||
6467 | +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 | ||
6468 | +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } | ||
6469 | |||
6470 | |||
6471 | hard_links="nottested" | ||
6472 | if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then | ||
6473 | # do not overwrite the value of need_locks provided by the user | ||
6474 | - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | ||
6475 | -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 | ||
6476 | + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | ||
6477 | +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } | ||
6478 | hard_links=yes | ||
6479 | $rm conftest* | ||
6480 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | ||
6481 | touch conftest.a | ||
6482 | ln conftest.a conftest.b 2>&5 || hard_links=no | ||
6483 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | ||
6484 | - echo "$as_me:$LINENO: result: $hard_links" >&5 | ||
6485 | -echo "${ECHO_T}$hard_links" >&6 | ||
6486 | + { echo "$as_me:$LINENO: result: $hard_links" >&5 | ||
6487 | +echo "${ECHO_T}$hard_links" >&6; } | ||
6488 | if test "$hard_links" = no; then | ||
6489 | { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | ||
6490 | echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | ||
6491 | @@ -7047,8 +8140,8 @@ | ||
6492 | need_locks=no | ||
6493 | fi | ||
6494 | |||
6495 | -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
6496 | -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 | ||
6497 | +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
6498 | +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | ||
6499 | |||
6500 | runpath_var= | ||
6501 | allow_undefined_flag= | ||
6502 | @@ -7224,7 +8317,7 @@ | ||
6503 | archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | ||
6504 | ;; | ||
6505 | |||
6506 | - linux*) | ||
6507 | + linux* | k*bsd*-gnu) | ||
6508 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | ||
6509 | tmp_addflag= | ||
6510 | case $cc_basename,$host_cpu in | ||
6511 | @@ -7256,7 +8349,7 @@ | ||
6512 | fi | ||
6513 | ;; | ||
6514 | |||
6515 | - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | ||
6516 | + netbsd* | netbsdelf*-gnu) | ||
6517 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | ||
6518 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
6519 | wlarc= | ||
6520 | @@ -7464,23 +8557,36 @@ | ||
6521 | } | ||
6522 | _ACEOF | ||
6523 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
6524 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6525 | - (eval $ac_link) 2>conftest.er1 | ||
6526 | +if { (ac_try="$ac_link" | ||
6527 | +case "(($ac_try" in | ||
6528 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6529 | + *) ac_try_echo=$ac_try;; | ||
6530 | +esac | ||
6531 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6532 | + (eval "$ac_link") 2>conftest.er1 | ||
6533 | ac_status=$? | ||
6534 | grep -v '^ *+' conftest.er1 >conftest.err | ||
6535 | rm -f conftest.er1 | ||
6536 | cat conftest.err >&5 | ||
6537 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6538 | (exit $ac_status); } && | ||
6539 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6540 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6541 | - (eval $ac_try) 2>&5 | ||
6542 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6543 | + { (case "(($ac_try" in | ||
6544 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6545 | + *) ac_try_echo=$ac_try;; | ||
6546 | +esac | ||
6547 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6548 | + (eval "$ac_try") 2>&5 | ||
6549 | ac_status=$? | ||
6550 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6551 | (exit $ac_status); }; } && | ||
6552 | { ac_try='test -s conftest$ac_exeext' | ||
6553 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6554 | - (eval $ac_try) 2>&5 | ||
6555 | + { (case "(($ac_try" in | ||
6556 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6557 | + *) ac_try_echo=$ac_try;; | ||
6558 | +esac | ||
6559 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6560 | + (eval "$ac_try") 2>&5 | ||
6561 | ac_status=$? | ||
6562 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6563 | (exit $ac_status); }; }; then | ||
6564 | @@ -7494,8 +8600,10 @@ | ||
6565 | echo "$as_me: failed program was:" >&5 | ||
6566 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
6567 | |||
6568 | + | ||
6569 | fi | ||
6570 | -rm -f conftest.err conftest.$ac_objext \ | ||
6571 | + | ||
6572 | +rm -f core conftest.err conftest.$ac_objext \ | ||
6573 | conftest$ac_exeext conftest.$ac_ext | ||
6574 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
6575 | |||
6576 | @@ -7524,23 +8632,36 @@ | ||
6577 | } | ||
6578 | _ACEOF | ||
6579 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
6580 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6581 | - (eval $ac_link) 2>conftest.er1 | ||
6582 | +if { (ac_try="$ac_link" | ||
6583 | +case "(($ac_try" in | ||
6584 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6585 | + *) ac_try_echo=$ac_try;; | ||
6586 | +esac | ||
6587 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6588 | + (eval "$ac_link") 2>conftest.er1 | ||
6589 | ac_status=$? | ||
6590 | grep -v '^ *+' conftest.er1 >conftest.err | ||
6591 | rm -f conftest.er1 | ||
6592 | cat conftest.err >&5 | ||
6593 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6594 | (exit $ac_status); } && | ||
6595 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6596 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6597 | - (eval $ac_try) 2>&5 | ||
6598 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6599 | + { (case "(($ac_try" in | ||
6600 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6601 | + *) ac_try_echo=$ac_try;; | ||
6602 | +esac | ||
6603 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6604 | + (eval "$ac_try") 2>&5 | ||
6605 | ac_status=$? | ||
6606 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6607 | (exit $ac_status); }; } && | ||
6608 | { ac_try='test -s conftest$ac_exeext' | ||
6609 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6610 | - (eval $ac_try) 2>&5 | ||
6611 | + { (case "(($ac_try" in | ||
6612 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6613 | + *) ac_try_echo=$ac_try;; | ||
6614 | +esac | ||
6615 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6616 | + (eval "$ac_try") 2>&5 | ||
6617 | ac_status=$? | ||
6618 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6619 | (exit $ac_status); }; }; then | ||
6620 | @@ -7554,8 +8675,10 @@ | ||
6621 | echo "$as_me: failed program was:" >&5 | ||
6622 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
6623 | |||
6624 | + | ||
6625 | fi | ||
6626 | -rm -f conftest.err conftest.$ac_objext \ | ||
6627 | + | ||
6628 | +rm -f core conftest.err conftest.$ac_objext \ | ||
6629 | conftest$ac_exeext conftest.$ac_ext | ||
6630 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
6631 | |||
6632 | @@ -7693,15 +8816,6 @@ | ||
6633 | hardcode_shlibpath_var=no | ||
6634 | ;; | ||
6635 | |||
6636 | - # GNU/kFreeBSD uses gcc -shared to do shared libraries. | ||
6637 | - kfreebsd*-gnu) | ||
6638 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
6639 | - hardcode_libdir_flag_spec='-R$libdir' | ||
6640 | - hardcode_direct=yes | ||
6641 | - hardcode_shlibpath_var=no | ||
6642 | - link_all_deplibs=no | ||
6643 | - ;; | ||
6644 | - | ||
6645 | hpux9*) | ||
6646 | if test "$GCC" = yes; then | ||
6647 | archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
6648 | @@ -7797,7 +8911,7 @@ | ||
6649 | link_all_deplibs=yes | ||
6650 | ;; | ||
6651 | |||
6652 | - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | ||
6653 | + netbsd* | netbsdelf*-gnu) | ||
6654 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | ||
6655 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | ||
6656 | else | ||
6657 | @@ -8013,8 +9127,8 @@ | ||
6658 | esac | ||
6659 | fi | ||
6660 | |||
6661 | -echo "$as_me:$LINENO: result: $ld_shlibs" >&5 | ||
6662 | -echo "${ECHO_T}$ld_shlibs" >&6 | ||
6663 | +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 | ||
6664 | +echo "${ECHO_T}$ld_shlibs" >&6; } | ||
6665 | test "$ld_shlibs" = no && can_build_shared=no | ||
6666 | |||
6667 | # | ||
6668 | @@ -8034,8 +9148,8 @@ | ||
6669 | # Test whether the compiler implicitly links with -lc since on some | ||
6670 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | ||
6671 | # to ld, don't add -lc before -lgcc. | ||
6672 | - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | ||
6673 | -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 | ||
6674 | + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | ||
6675 | +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } | ||
6676 | $rm conftest* | ||
6677 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext | ||
6678 | |||
6679 | @@ -8072,16 +9186,16 @@ | ||
6680 | cat conftest.err 1>&5 | ||
6681 | fi | ||
6682 | $rm conftest* | ||
6683 | - echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 | ||
6684 | -echo "${ECHO_T}$archive_cmds_need_lc" >&6 | ||
6685 | + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 | ||
6686 | +echo "${ECHO_T}$archive_cmds_need_lc" >&6; } | ||
6687 | ;; | ||
6688 | esac | ||
6689 | fi | ||
6690 | ;; | ||
6691 | esac | ||
6692 | |||
6693 | -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | ||
6694 | -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 | ||
6695 | +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | ||
6696 | +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } | ||
6697 | library_names_spec= | ||
6698 | libname_spec='lib$name' | ||
6699 | soname_spec= | ||
6700 | @@ -8287,18 +9401,6 @@ | ||
6701 | dynamic_linker=no | ||
6702 | ;; | ||
6703 | |||
6704 | -kfreebsd*-gnu) | ||
6705 | - version_type=linux | ||
6706 | - need_lib_prefix=no | ||
6707 | - need_version=no | ||
6708 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
6709 | - soname_spec='${libname}${release}${shared_ext}$major' | ||
6710 | - shlibpath_var=LD_LIBRARY_PATH | ||
6711 | - shlibpath_overrides_runpath=no | ||
6712 | - hardcode_into_libs=yes | ||
6713 | - dynamic_linker='GNU ld.so' | ||
6714 | - ;; | ||
6715 | - | ||
6716 | freebsd* | dragonfly*) | ||
6717 | # DragonFly does not have aout. When/if they implement a new | ||
6718 | # versioning mechanism, adjust this. | ||
6719 | @@ -8454,7 +9556,7 @@ | ||
6720 | ;; | ||
6721 | |||
6722 | # This must be Linux ELF. | ||
6723 | -linux*) | ||
6724 | +linux* | k*bsd*-gnu) | ||
6725 | version_type=linux | ||
6726 | need_lib_prefix=no | ||
6727 | need_version=no | ||
6728 | @@ -8495,18 +9597,6 @@ | ||
6729 | dynamic_linker='NetBSD ld.elf_so' | ||
6730 | ;; | ||
6731 | |||
6732 | -knetbsd*-gnu) | ||
6733 | - version_type=linux | ||
6734 | - need_lib_prefix=no | ||
6735 | - need_version=no | ||
6736 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
6737 | - soname_spec='${libname}${release}${shared_ext}$major' | ||
6738 | - shlibpath_var=LD_LIBRARY_PATH | ||
6739 | - shlibpath_overrides_runpath=no | ||
6740 | - hardcode_into_libs=yes | ||
6741 | - dynamic_linker='GNU ld.so' | ||
6742 | - ;; | ||
6743 | - | ||
6744 | netbsd*) | ||
6745 | version_type=sunos | ||
6746 | need_lib_prefix=no | ||
6747 | @@ -8680,8 +9770,8 @@ | ||
6748 | dynamic_linker=no | ||
6749 | ;; | ||
6750 | esac | ||
6751 | -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | ||
6752 | -echo "${ECHO_T}$dynamic_linker" >&6 | ||
6753 | +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | ||
6754 | +echo "${ECHO_T}$dynamic_linker" >&6; } | ||
6755 | test "$dynamic_linker" = no && can_build_shared=no | ||
6756 | |||
6757 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | ||
6758 | @@ -8689,8 +9779,8 @@ | ||
6759 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | ||
6760 | fi | ||
6761 | |||
6762 | -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | ||
6763 | -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | ||
6764 | +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | ||
6765 | +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } | ||
6766 | hardcode_action= | ||
6767 | if test -n "$hardcode_libdir_flag_spec" || \ | ||
6768 | test -n "$runpath_var" || \ | ||
6769 | @@ -8714,8 +9804,8 @@ | ||
6770 | # directories. | ||
6771 | hardcode_action=unsupported | ||
6772 | fi | ||
6773 | -echo "$as_me:$LINENO: result: $hardcode_action" >&5 | ||
6774 | -echo "${ECHO_T}$hardcode_action" >&6 | ||
6775 | +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 | ||
6776 | +echo "${ECHO_T}$hardcode_action" >&6; } | ||
6777 | |||
6778 | if test "$hardcode_action" = relink; then | ||
6779 | # Fast installation is not supported | ||
6780 | @@ -8728,29 +9818,29 @@ | ||
6781 | |||
6782 | striplib= | ||
6783 | old_striplib= | ||
6784 | -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | ||
6785 | -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 | ||
6786 | +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | ||
6787 | +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } | ||
6788 | if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then | ||
6789 | test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | ||
6790 | test -z "$striplib" && striplib="$STRIP --strip-unneeded" | ||
6791 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
6792 | -echo "${ECHO_T}yes" >&6 | ||
6793 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
6794 | +echo "${ECHO_T}yes" >&6; } | ||
6795 | else | ||
6796 | # FIXME - insert some real tests, host_os isn't really good enough | ||
6797 | case $host_os in | ||
6798 | darwin*) | ||
6799 | if test -n "$STRIP" ; then | ||
6800 | striplib="$STRIP -x" | ||
6801 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
6802 | -echo "${ECHO_T}yes" >&6 | ||
6803 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
6804 | +echo "${ECHO_T}yes" >&6; } | ||
6805 | else | ||
6806 | - echo "$as_me:$LINENO: result: no" >&5 | ||
6807 | -echo "${ECHO_T}no" >&6 | ||
6808 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
6809 | +echo "${ECHO_T}no" >&6; } | ||
6810 | fi | ||
6811 | ;; | ||
6812 | *) | ||
6813 | - echo "$as_me:$LINENO: result: no" >&5 | ||
6814 | -echo "${ECHO_T}no" >&6 | ||
6815 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
6816 | +echo "${ECHO_T}no" >&6; } | ||
6817 | ;; | ||
6818 | esac | ||
6819 | fi | ||
6820 | @@ -8782,8 +9872,8 @@ | ||
6821 | |||
6822 | darwin*) | ||
6823 | # if libdl is installed we need to link against it | ||
6824 | - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | ||
6825 | -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 | ||
6826 | + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | ||
6827 | +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } | ||
6828 | if test "${ac_cv_lib_dl_dlopen+set}" = set; then | ||
6829 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6830 | else | ||
6831 | @@ -8796,39 +9886,52 @@ | ||
6832 | cat >>conftest.$ac_ext <<_ACEOF | ||
6833 | /* end confdefs.h. */ | ||
6834 | |||
6835 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
6836 | +/* Override any GCC internal prototype to avoid an error. | ||
6837 | + Use char because int might match the return type of a GCC | ||
6838 | + builtin and then its argument prototype would still apply. */ | ||
6839 | #ifdef __cplusplus | ||
6840 | extern "C" | ||
6841 | #endif | ||
6842 | -/* We use char because int might match the return type of a gcc2 | ||
6843 | - builtin and then its argument prototype would still apply. */ | ||
6844 | char dlopen (); | ||
6845 | int | ||
6846 | main () | ||
6847 | { | ||
6848 | -dlopen (); | ||
6849 | +return dlopen (); | ||
6850 | ; | ||
6851 | return 0; | ||
6852 | } | ||
6853 | _ACEOF | ||
6854 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
6855 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6856 | - (eval $ac_link) 2>conftest.er1 | ||
6857 | +if { (ac_try="$ac_link" | ||
6858 | +case "(($ac_try" in | ||
6859 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6860 | + *) ac_try_echo=$ac_try;; | ||
6861 | +esac | ||
6862 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6863 | + (eval "$ac_link") 2>conftest.er1 | ||
6864 | ac_status=$? | ||
6865 | grep -v '^ *+' conftest.er1 >conftest.err | ||
6866 | rm -f conftest.er1 | ||
6867 | cat conftest.err >&5 | ||
6868 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6869 | (exit $ac_status); } && | ||
6870 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6871 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6872 | - (eval $ac_try) 2>&5 | ||
6873 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6874 | + { (case "(($ac_try" in | ||
6875 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6876 | + *) ac_try_echo=$ac_try;; | ||
6877 | +esac | ||
6878 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6879 | + (eval "$ac_try") 2>&5 | ||
6880 | ac_status=$? | ||
6881 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6882 | (exit $ac_status); }; } && | ||
6883 | { ac_try='test -s conftest$ac_exeext' | ||
6884 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6885 | - (eval $ac_try) 2>&5 | ||
6886 | + { (case "(($ac_try" in | ||
6887 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6888 | + *) ac_try_echo=$ac_try;; | ||
6889 | +esac | ||
6890 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6891 | + (eval "$ac_try") 2>&5 | ||
6892 | ac_status=$? | ||
6893 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6894 | (exit $ac_status); }; }; then | ||
6895 | @@ -8837,14 +9940,15 @@ | ||
6896 | echo "$as_me: failed program was:" >&5 | ||
6897 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
6898 | |||
6899 | -ac_cv_lib_dl_dlopen=no | ||
6900 | + ac_cv_lib_dl_dlopen=no | ||
6901 | fi | ||
6902 | -rm -f conftest.err conftest.$ac_objext \ | ||
6903 | + | ||
6904 | +rm -f core conftest.err conftest.$ac_objext \ | ||
6905 | conftest$ac_exeext conftest.$ac_ext | ||
6906 | LIBS=$ac_check_lib_save_LIBS | ||
6907 | fi | ||
6908 | -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | ||
6909 | -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 | ||
6910 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | ||
6911 | +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } | ||
6912 | if test $ac_cv_lib_dl_dlopen = yes; then | ||
6913 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" | ||
6914 | else | ||
6915 | @@ -8858,8 +9962,8 @@ | ||
6916 | ;; | ||
6917 | |||
6918 | *) | ||
6919 | - echo "$as_me:$LINENO: checking for shl_load" >&5 | ||
6920 | -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 | ||
6921 | + { echo "$as_me:$LINENO: checking for shl_load" >&5 | ||
6922 | +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } | ||
6923 | if test "${ac_cv_func_shl_load+set}" = set; then | ||
6924 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6925 | else | ||
6926 | @@ -8886,52 +9990,59 @@ | ||
6927 | |||
6928 | #undef shl_load | ||
6929 | |||
6930 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
6931 | +/* Override any GCC internal prototype to avoid an error. | ||
6932 | + Use char because int might match the return type of a GCC | ||
6933 | + builtin and then its argument prototype would still apply. */ | ||
6934 | #ifdef __cplusplus | ||
6935 | extern "C" | ||
6936 | -{ | ||
6937 | #endif | ||
6938 | -/* We use char because int might match the return type of a gcc2 | ||
6939 | - builtin and then its argument prototype would still apply. */ | ||
6940 | char shl_load (); | ||
6941 | /* The GNU C library defines this for functions which it implements | ||
6942 | to always fail with ENOSYS. Some functions are actually named | ||
6943 | something starting with __ and the normal name is an alias. */ | ||
6944 | -#if defined (__stub_shl_load) || defined (__stub___shl_load) | ||
6945 | +#if defined __stub_shl_load || defined __stub___shl_load | ||
6946 | choke me | ||
6947 | -#else | ||
6948 | -char (*f) () = shl_load; | ||
6949 | -#endif | ||
6950 | -#ifdef __cplusplus | ||
6951 | -} | ||
6952 | #endif | ||
6953 | |||
6954 | int | ||
6955 | main () | ||
6956 | { | ||
6957 | -return f != shl_load; | ||
6958 | +return shl_load (); | ||
6959 | ; | ||
6960 | return 0; | ||
6961 | } | ||
6962 | _ACEOF | ||
6963 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
6964 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6965 | - (eval $ac_link) 2>conftest.er1 | ||
6966 | +if { (ac_try="$ac_link" | ||
6967 | +case "(($ac_try" in | ||
6968 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6969 | + *) ac_try_echo=$ac_try;; | ||
6970 | +esac | ||
6971 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6972 | + (eval "$ac_link") 2>conftest.er1 | ||
6973 | ac_status=$? | ||
6974 | grep -v '^ *+' conftest.er1 >conftest.err | ||
6975 | rm -f conftest.er1 | ||
6976 | cat conftest.err >&5 | ||
6977 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6978 | (exit $ac_status); } && | ||
6979 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6980 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6981 | - (eval $ac_try) 2>&5 | ||
6982 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
6983 | + { (case "(($ac_try" in | ||
6984 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6985 | + *) ac_try_echo=$ac_try;; | ||
6986 | +esac | ||
6987 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6988 | + (eval "$ac_try") 2>&5 | ||
6989 | ac_status=$? | ||
6990 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6991 | (exit $ac_status); }; } && | ||
6992 | { ac_try='test -s conftest$ac_exeext' | ||
6993 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6994 | - (eval $ac_try) 2>&5 | ||
6995 | + { (case "(($ac_try" in | ||
6996 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6997 | + *) ac_try_echo=$ac_try;; | ||
6998 | +esac | ||
6999 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7000 | + (eval "$ac_try") 2>&5 | ||
7001 | ac_status=$? | ||
7002 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7003 | (exit $ac_status); }; }; then | ||
7004 | @@ -8940,18 +10051,19 @@ | ||
7005 | echo "$as_me: failed program was:" >&5 | ||
7006 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7007 | |||
7008 | -ac_cv_func_shl_load=no | ||
7009 | + ac_cv_func_shl_load=no | ||
7010 | fi | ||
7011 | -rm -f conftest.err conftest.$ac_objext \ | ||
7012 | + | ||
7013 | +rm -f core conftest.err conftest.$ac_objext \ | ||
7014 | conftest$ac_exeext conftest.$ac_ext | ||
7015 | fi | ||
7016 | -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 | ||
7017 | -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 | ||
7018 | +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 | ||
7019 | +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } | ||
7020 | if test $ac_cv_func_shl_load = yes; then | ||
7021 | lt_cv_dlopen="shl_load" | ||
7022 | else | ||
7023 | - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 | ||
7024 | -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 | ||
7025 | + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 | ||
7026 | +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } | ||
7027 | if test "${ac_cv_lib_dld_shl_load+set}" = set; then | ||
7028 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7029 | else | ||
7030 | @@ -8964,39 +10076,52 @@ | ||
7031 | cat >>conftest.$ac_ext <<_ACEOF | ||
7032 | /* end confdefs.h. */ | ||
7033 | |||
7034 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
7035 | +/* Override any GCC internal prototype to avoid an error. | ||
7036 | + Use char because int might match the return type of a GCC | ||
7037 | + builtin and then its argument prototype would still apply. */ | ||
7038 | #ifdef __cplusplus | ||
7039 | extern "C" | ||
7040 | #endif | ||
7041 | -/* We use char because int might match the return type of a gcc2 | ||
7042 | - builtin and then its argument prototype would still apply. */ | ||
7043 | char shl_load (); | ||
7044 | int | ||
7045 | main () | ||
7046 | { | ||
7047 | -shl_load (); | ||
7048 | +return shl_load (); | ||
7049 | ; | ||
7050 | return 0; | ||
7051 | } | ||
7052 | _ACEOF | ||
7053 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7054 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7055 | - (eval $ac_link) 2>conftest.er1 | ||
7056 | +if { (ac_try="$ac_link" | ||
7057 | +case "(($ac_try" in | ||
7058 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7059 | + *) ac_try_echo=$ac_try;; | ||
7060 | +esac | ||
7061 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7062 | + (eval "$ac_link") 2>conftest.er1 | ||
7063 | ac_status=$? | ||
7064 | grep -v '^ *+' conftest.er1 >conftest.err | ||
7065 | rm -f conftest.er1 | ||
7066 | cat conftest.err >&5 | ||
7067 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7068 | (exit $ac_status); } && | ||
7069 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7070 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7071 | - (eval $ac_try) 2>&5 | ||
7072 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7073 | + { (case "(($ac_try" in | ||
7074 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7075 | + *) ac_try_echo=$ac_try;; | ||
7076 | +esac | ||
7077 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7078 | + (eval "$ac_try") 2>&5 | ||
7079 | ac_status=$? | ||
7080 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7081 | (exit $ac_status); }; } && | ||
7082 | { ac_try='test -s conftest$ac_exeext' | ||
7083 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7084 | - (eval $ac_try) 2>&5 | ||
7085 | + { (case "(($ac_try" in | ||
7086 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7087 | + *) ac_try_echo=$ac_try;; | ||
7088 | +esac | ||
7089 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7090 | + (eval "$ac_try") 2>&5 | ||
7091 | ac_status=$? | ||
7092 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7093 | (exit $ac_status); }; }; then | ||
7094 | @@ -9005,19 +10130,20 @@ | ||
7095 | echo "$as_me: failed program was:" >&5 | ||
7096 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7097 | |||
7098 | -ac_cv_lib_dld_shl_load=no | ||
7099 | + ac_cv_lib_dld_shl_load=no | ||
7100 | fi | ||
7101 | -rm -f conftest.err conftest.$ac_objext \ | ||
7102 | + | ||
7103 | +rm -f core conftest.err conftest.$ac_objext \ | ||
7104 | conftest$ac_exeext conftest.$ac_ext | ||
7105 | LIBS=$ac_check_lib_save_LIBS | ||
7106 | fi | ||
7107 | -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 | ||
7108 | -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 | ||
7109 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 | ||
7110 | +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } | ||
7111 | if test $ac_cv_lib_dld_shl_load = yes; then | ||
7112 | lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" | ||
7113 | else | ||
7114 | - echo "$as_me:$LINENO: checking for dlopen" >&5 | ||
7115 | -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 | ||
7116 | + { echo "$as_me:$LINENO: checking for dlopen" >&5 | ||
7117 | +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } | ||
7118 | if test "${ac_cv_func_dlopen+set}" = set; then | ||
7119 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7120 | else | ||
7121 | @@ -9044,52 +10170,59 @@ | ||
7122 | |||
7123 | #undef dlopen | ||
7124 | |||
7125 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
7126 | +/* Override any GCC internal prototype to avoid an error. | ||
7127 | + Use char because int might match the return type of a GCC | ||
7128 | + builtin and then its argument prototype would still apply. */ | ||
7129 | #ifdef __cplusplus | ||
7130 | extern "C" | ||
7131 | -{ | ||
7132 | #endif | ||
7133 | -/* We use char because int might match the return type of a gcc2 | ||
7134 | - builtin and then its argument prototype would still apply. */ | ||
7135 | char dlopen (); | ||
7136 | /* The GNU C library defines this for functions which it implements | ||
7137 | to always fail with ENOSYS. Some functions are actually named | ||
7138 | something starting with __ and the normal name is an alias. */ | ||
7139 | -#if defined (__stub_dlopen) || defined (__stub___dlopen) | ||
7140 | +#if defined __stub_dlopen || defined __stub___dlopen | ||
7141 | choke me | ||
7142 | -#else | ||
7143 | -char (*f) () = dlopen; | ||
7144 | -#endif | ||
7145 | -#ifdef __cplusplus | ||
7146 | -} | ||
7147 | #endif | ||
7148 | |||
7149 | int | ||
7150 | main () | ||
7151 | { | ||
7152 | -return f != dlopen; | ||
7153 | +return dlopen (); | ||
7154 | ; | ||
7155 | return 0; | ||
7156 | } | ||
7157 | _ACEOF | ||
7158 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7159 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7160 | - (eval $ac_link) 2>conftest.er1 | ||
7161 | +if { (ac_try="$ac_link" | ||
7162 | +case "(($ac_try" in | ||
7163 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7164 | + *) ac_try_echo=$ac_try;; | ||
7165 | +esac | ||
7166 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7167 | + (eval "$ac_link") 2>conftest.er1 | ||
7168 | ac_status=$? | ||
7169 | grep -v '^ *+' conftest.er1 >conftest.err | ||
7170 | rm -f conftest.er1 | ||
7171 | cat conftest.err >&5 | ||
7172 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7173 | (exit $ac_status); } && | ||
7174 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7175 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7176 | - (eval $ac_try) 2>&5 | ||
7177 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7178 | + { (case "(($ac_try" in | ||
7179 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7180 | + *) ac_try_echo=$ac_try;; | ||
7181 | +esac | ||
7182 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7183 | + (eval "$ac_try") 2>&5 | ||
7184 | ac_status=$? | ||
7185 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7186 | (exit $ac_status); }; } && | ||
7187 | { ac_try='test -s conftest$ac_exeext' | ||
7188 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7189 | - (eval $ac_try) 2>&5 | ||
7190 | + { (case "(($ac_try" in | ||
7191 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7192 | + *) ac_try_echo=$ac_try;; | ||
7193 | +esac | ||
7194 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7195 | + (eval "$ac_try") 2>&5 | ||
7196 | ac_status=$? | ||
7197 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7198 | (exit $ac_status); }; }; then | ||
7199 | @@ -9098,18 +10231,19 @@ | ||
7200 | echo "$as_me: failed program was:" >&5 | ||
7201 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7202 | |||
7203 | -ac_cv_func_dlopen=no | ||
7204 | + ac_cv_func_dlopen=no | ||
7205 | fi | ||
7206 | -rm -f conftest.err conftest.$ac_objext \ | ||
7207 | + | ||
7208 | +rm -f core conftest.err conftest.$ac_objext \ | ||
7209 | conftest$ac_exeext conftest.$ac_ext | ||
7210 | fi | ||
7211 | -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 | ||
7212 | -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 | ||
7213 | +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 | ||
7214 | +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } | ||
7215 | if test $ac_cv_func_dlopen = yes; then | ||
7216 | lt_cv_dlopen="dlopen" | ||
7217 | else | ||
7218 | - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | ||
7219 | -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 | ||
7220 | + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | ||
7221 | +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } | ||
7222 | if test "${ac_cv_lib_dl_dlopen+set}" = set; then | ||
7223 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7224 | else | ||
7225 | @@ -9122,39 +10256,52 @@ | ||
7226 | cat >>conftest.$ac_ext <<_ACEOF | ||
7227 | /* end confdefs.h. */ | ||
7228 | |||
7229 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
7230 | +/* Override any GCC internal prototype to avoid an error. | ||
7231 | + Use char because int might match the return type of a GCC | ||
7232 | + builtin and then its argument prototype would still apply. */ | ||
7233 | #ifdef __cplusplus | ||
7234 | extern "C" | ||
7235 | #endif | ||
7236 | -/* We use char because int might match the return type of a gcc2 | ||
7237 | - builtin and then its argument prototype would still apply. */ | ||
7238 | char dlopen (); | ||
7239 | int | ||
7240 | main () | ||
7241 | { | ||
7242 | -dlopen (); | ||
7243 | +return dlopen (); | ||
7244 | ; | ||
7245 | return 0; | ||
7246 | } | ||
7247 | _ACEOF | ||
7248 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7249 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7250 | - (eval $ac_link) 2>conftest.er1 | ||
7251 | +if { (ac_try="$ac_link" | ||
7252 | +case "(($ac_try" in | ||
7253 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7254 | + *) ac_try_echo=$ac_try;; | ||
7255 | +esac | ||
7256 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7257 | + (eval "$ac_link") 2>conftest.er1 | ||
7258 | ac_status=$? | ||
7259 | grep -v '^ *+' conftest.er1 >conftest.err | ||
7260 | rm -f conftest.er1 | ||
7261 | cat conftest.err >&5 | ||
7262 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7263 | (exit $ac_status); } && | ||
7264 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7265 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7266 | - (eval $ac_try) 2>&5 | ||
7267 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7268 | + { (case "(($ac_try" in | ||
7269 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7270 | + *) ac_try_echo=$ac_try;; | ||
7271 | +esac | ||
7272 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7273 | + (eval "$ac_try") 2>&5 | ||
7274 | ac_status=$? | ||
7275 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7276 | (exit $ac_status); }; } && | ||
7277 | { ac_try='test -s conftest$ac_exeext' | ||
7278 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7279 | - (eval $ac_try) 2>&5 | ||
7280 | + { (case "(($ac_try" in | ||
7281 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7282 | + *) ac_try_echo=$ac_try;; | ||
7283 | +esac | ||
7284 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7285 | + (eval "$ac_try") 2>&5 | ||
7286 | ac_status=$? | ||
7287 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7288 | (exit $ac_status); }; }; then | ||
7289 | @@ -9163,19 +10310,20 @@ | ||
7290 | echo "$as_me: failed program was:" >&5 | ||
7291 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7292 | |||
7293 | -ac_cv_lib_dl_dlopen=no | ||
7294 | + ac_cv_lib_dl_dlopen=no | ||
7295 | fi | ||
7296 | -rm -f conftest.err conftest.$ac_objext \ | ||
7297 | + | ||
7298 | +rm -f core conftest.err conftest.$ac_objext \ | ||
7299 | conftest$ac_exeext conftest.$ac_ext | ||
7300 | LIBS=$ac_check_lib_save_LIBS | ||
7301 | fi | ||
7302 | -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | ||
7303 | -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 | ||
7304 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | ||
7305 | +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } | ||
7306 | if test $ac_cv_lib_dl_dlopen = yes; then | ||
7307 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" | ||
7308 | else | ||
7309 | - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 | ||
7310 | -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 | ||
7311 | + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 | ||
7312 | +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } | ||
7313 | if test "${ac_cv_lib_svld_dlopen+set}" = set; then | ||
7314 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7315 | else | ||
7316 | @@ -9188,39 +10336,52 @@ | ||
7317 | cat >>conftest.$ac_ext <<_ACEOF | ||
7318 | /* end confdefs.h. */ | ||
7319 | |||
7320 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
7321 | +/* Override any GCC internal prototype to avoid an error. | ||
7322 | + Use char because int might match the return type of a GCC | ||
7323 | + builtin and then its argument prototype would still apply. */ | ||
7324 | #ifdef __cplusplus | ||
7325 | extern "C" | ||
7326 | #endif | ||
7327 | -/* We use char because int might match the return type of a gcc2 | ||
7328 | - builtin and then its argument prototype would still apply. */ | ||
7329 | char dlopen (); | ||
7330 | int | ||
7331 | main () | ||
7332 | { | ||
7333 | -dlopen (); | ||
7334 | +return dlopen (); | ||
7335 | ; | ||
7336 | return 0; | ||
7337 | } | ||
7338 | _ACEOF | ||
7339 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7340 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7341 | - (eval $ac_link) 2>conftest.er1 | ||
7342 | +if { (ac_try="$ac_link" | ||
7343 | +case "(($ac_try" in | ||
7344 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7345 | + *) ac_try_echo=$ac_try;; | ||
7346 | +esac | ||
7347 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7348 | + (eval "$ac_link") 2>conftest.er1 | ||
7349 | ac_status=$? | ||
7350 | grep -v '^ *+' conftest.er1 >conftest.err | ||
7351 | rm -f conftest.er1 | ||
7352 | cat conftest.err >&5 | ||
7353 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7354 | (exit $ac_status); } && | ||
7355 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7356 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7357 | - (eval $ac_try) 2>&5 | ||
7358 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7359 | + { (case "(($ac_try" in | ||
7360 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7361 | + *) ac_try_echo=$ac_try;; | ||
7362 | +esac | ||
7363 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7364 | + (eval "$ac_try") 2>&5 | ||
7365 | ac_status=$? | ||
7366 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7367 | (exit $ac_status); }; } && | ||
7368 | { ac_try='test -s conftest$ac_exeext' | ||
7369 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7370 | - (eval $ac_try) 2>&5 | ||
7371 | + { (case "(($ac_try" in | ||
7372 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7373 | + *) ac_try_echo=$ac_try;; | ||
7374 | +esac | ||
7375 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7376 | + (eval "$ac_try") 2>&5 | ||
7377 | ac_status=$? | ||
7378 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7379 | (exit $ac_status); }; }; then | ||
7380 | @@ -9229,19 +10390,20 @@ | ||
7381 | echo "$as_me: failed program was:" >&5 | ||
7382 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7383 | |||
7384 | -ac_cv_lib_svld_dlopen=no | ||
7385 | + ac_cv_lib_svld_dlopen=no | ||
7386 | fi | ||
7387 | -rm -f conftest.err conftest.$ac_objext \ | ||
7388 | + | ||
7389 | +rm -f core conftest.err conftest.$ac_objext \ | ||
7390 | conftest$ac_exeext conftest.$ac_ext | ||
7391 | LIBS=$ac_check_lib_save_LIBS | ||
7392 | fi | ||
7393 | -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 | ||
7394 | -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 | ||
7395 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 | ||
7396 | +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } | ||
7397 | if test $ac_cv_lib_svld_dlopen = yes; then | ||
7398 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" | ||
7399 | else | ||
7400 | - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 | ||
7401 | -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 | ||
7402 | + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 | ||
7403 | +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } | ||
7404 | if test "${ac_cv_lib_dld_dld_link+set}" = set; then | ||
7405 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7406 | else | ||
7407 | @@ -9254,39 +10416,52 @@ | ||
7408 | cat >>conftest.$ac_ext <<_ACEOF | ||
7409 | /* end confdefs.h. */ | ||
7410 | |||
7411 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
7412 | +/* Override any GCC internal prototype to avoid an error. | ||
7413 | + Use char because int might match the return type of a GCC | ||
7414 | + builtin and then its argument prototype would still apply. */ | ||
7415 | #ifdef __cplusplus | ||
7416 | extern "C" | ||
7417 | #endif | ||
7418 | -/* We use char because int might match the return type of a gcc2 | ||
7419 | - builtin and then its argument prototype would still apply. */ | ||
7420 | char dld_link (); | ||
7421 | int | ||
7422 | main () | ||
7423 | { | ||
7424 | -dld_link (); | ||
7425 | +return dld_link (); | ||
7426 | ; | ||
7427 | return 0; | ||
7428 | } | ||
7429 | _ACEOF | ||
7430 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7431 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7432 | - (eval $ac_link) 2>conftest.er1 | ||
7433 | +if { (ac_try="$ac_link" | ||
7434 | +case "(($ac_try" in | ||
7435 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7436 | + *) ac_try_echo=$ac_try;; | ||
7437 | +esac | ||
7438 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7439 | + (eval "$ac_link") 2>conftest.er1 | ||
7440 | ac_status=$? | ||
7441 | grep -v '^ *+' conftest.er1 >conftest.err | ||
7442 | rm -f conftest.er1 | ||
7443 | cat conftest.err >&5 | ||
7444 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7445 | (exit $ac_status); } && | ||
7446 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7447 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7448 | - (eval $ac_try) 2>&5 | ||
7449 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
7450 | + { (case "(($ac_try" in | ||
7451 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7452 | + *) ac_try_echo=$ac_try;; | ||
7453 | +esac | ||
7454 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7455 | + (eval "$ac_try") 2>&5 | ||
7456 | ac_status=$? | ||
7457 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7458 | (exit $ac_status); }; } && | ||
7459 | { ac_try='test -s conftest$ac_exeext' | ||
7460 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7461 | - (eval $ac_try) 2>&5 | ||
7462 | + { (case "(($ac_try" in | ||
7463 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7464 | + *) ac_try_echo=$ac_try;; | ||
7465 | +esac | ||
7466 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7467 | + (eval "$ac_try") 2>&5 | ||
7468 | ac_status=$? | ||
7469 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7470 | (exit $ac_status); }; }; then | ||
7471 | @@ -9295,14 +10470,15 @@ | ||
7472 | echo "$as_me: failed program was:" >&5 | ||
7473 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7474 | |||
7475 | -ac_cv_lib_dld_dld_link=no | ||
7476 | + ac_cv_lib_dld_dld_link=no | ||
7477 | fi | ||
7478 | -rm -f conftest.err conftest.$ac_objext \ | ||
7479 | + | ||
7480 | +rm -f core conftest.err conftest.$ac_objext \ | ||
7481 | conftest$ac_exeext conftest.$ac_ext | ||
7482 | LIBS=$ac_check_lib_save_LIBS | ||
7483 | fi | ||
7484 | -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 | ||
7485 | -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 | ||
7486 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 | ||
7487 | +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } | ||
7488 | if test $ac_cv_lib_dld_dld_link = yes; then | ||
7489 | lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" | ||
7490 | fi | ||
7491 | @@ -9342,8 +10518,8 @@ | ||
7492 | save_LIBS="$LIBS" | ||
7493 | LIBS="$lt_cv_dlopen_libs $LIBS" | ||
7494 | |||
7495 | - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 | ||
7496 | -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 | ||
7497 | + { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 | ||
7498 | +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } | ||
7499 | if test "${lt_cv_dlopen_self+set}" = set; then | ||
7500 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7501 | else | ||
7502 | @@ -9353,7 +10529,7 @@ | ||
7503 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
7504 | lt_status=$lt_dlunknown | ||
7505 | cat > conftest.$ac_ext <<EOF | ||
7506 | -#line 9356 "configure" | ||
7507 | +#line 10532 "configure" | ||
7508 | #include "confdefs.h" | ||
7509 | |||
7510 | #if HAVE_DLFCN_H | ||
7511 | @@ -9437,13 +10613,13 @@ | ||
7512 | |||
7513 | |||
7514 | fi | ||
7515 | -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 | ||
7516 | -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 | ||
7517 | +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 | ||
7518 | +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } | ||
7519 | |||
7520 | if test "x$lt_cv_dlopen_self" = xyes; then | ||
7521 | wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" | ||
7522 | - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 | ||
7523 | -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 | ||
7524 | + { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 | ||
7525 | +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } | ||
7526 | if test "${lt_cv_dlopen_self_static+set}" = set; then | ||
7527 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7528 | else | ||
7529 | @@ -9453,7 +10629,7 @@ | ||
7530 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
7531 | lt_status=$lt_dlunknown | ||
7532 | cat > conftest.$ac_ext <<EOF | ||
7533 | -#line 9456 "configure" | ||
7534 | +#line 10632 "configure" | ||
7535 | #include "confdefs.h" | ||
7536 | |||
7537 | #if HAVE_DLFCN_H | ||
7538 | @@ -9537,8 +10713,8 @@ | ||
7539 | |||
7540 | |||
7541 | fi | ||
7542 | -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 | ||
7543 | -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 | ||
7544 | +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 | ||
7545 | +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } | ||
7546 | fi | ||
7547 | |||
7548 | CPPFLAGS="$save_CPPFLAGS" | ||
7549 | @@ -9560,13 +10736,13 @@ | ||
7550 | |||
7551 | |||
7552 | # Report which library types will actually be built | ||
7553 | -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 | ||
7554 | -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 | ||
7555 | -echo "$as_me:$LINENO: result: $can_build_shared" >&5 | ||
7556 | -echo "${ECHO_T}$can_build_shared" >&6 | ||
7557 | +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 | ||
7558 | +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } | ||
7559 | +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 | ||
7560 | +echo "${ECHO_T}$can_build_shared" >&6; } | ||
7561 | |||
7562 | -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 | ||
7563 | -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 | ||
7564 | +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 | ||
7565 | +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } | ||
7566 | test "$can_build_shared" = "no" && enable_shared=no | ||
7567 | |||
7568 | # On AIX, shared libraries and static libraries use the same namespace, and | ||
7569 | @@ -9586,15 +10762,15 @@ | ||
7570 | fi | ||
7571 | ;; | ||
7572 | esac | ||
7573 | -echo "$as_me:$LINENO: result: $enable_shared" >&5 | ||
7574 | -echo "${ECHO_T}$enable_shared" >&6 | ||
7575 | +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 | ||
7576 | +echo "${ECHO_T}$enable_shared" >&6; } | ||
7577 | |||
7578 | -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 | ||
7579 | -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 | ||
7580 | +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 | ||
7581 | +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } | ||
7582 | # Make sure either enable_shared or enable_static is yes. | ||
7583 | test "$enable_shared" = yes || enable_static=yes | ||
7584 | -echo "$as_me:$LINENO: result: $enable_static" >&5 | ||
7585 | -echo "${ECHO_T}$enable_static" >&6 | ||
7586 | +{ echo "$as_me:$LINENO: result: $enable_static" >&5 | ||
7587 | +echo "${ECHO_T}$enable_static" >&6; } | ||
7588 | |||
7589 | # The else clause should only fire when bootstrapping the | ||
7590 | # libtool distribution, otherwise you forgot to ship ltmain.sh | ||
7591 | @@ -10086,11 +11262,11 @@ | ||
7592 | CC="$lt_save_CC" | ||
7593 | |||
7594 | |||
7595 | -# Check whether --with-tags or --without-tags was given. | ||
7596 | +# Check whether --with-tags was given. | ||
7597 | if test "${with_tags+set}" = set; then | ||
7598 | - withval="$with_tags" | ||
7599 | - tagnames="$withval" | ||
7600 | -fi; | ||
7601 | + withval=$with_tags; tagnames="$withval" | ||
7602 | +fi | ||
7603 | + | ||
7604 | |||
7605 | if test -f "$ltmain" && test -n "$tagnames"; then | ||
7606 | if test ! -f "${ofile}"; then | ||
7607 | @@ -10144,7 +11320,7 @@ | ||
7608 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | ||
7609 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | ||
7610 | (test "X$CXX" != "Xg++"))) ; then | ||
7611 | - ac_ext=cc | ||
7612 | + ac_ext=cpp | ||
7613 | ac_cpp='$CXXCPP $CPPFLAGS' | ||
7614 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
7615 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
7616 | @@ -10263,18 +11439,18 @@ | ||
7617 | # Set up default GNU C++ configuration | ||
7618 | |||
7619 | |||
7620 | -# Check whether --with-gnu-ld or --without-gnu-ld was given. | ||
7621 | +# Check whether --with-gnu-ld was given. | ||
7622 | if test "${with_gnu_ld+set}" = set; then | ||
7623 | - withval="$with_gnu_ld" | ||
7624 | - test "$withval" = no || with_gnu_ld=yes | ||
7625 | + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | ||
7626 | else | ||
7627 | with_gnu_ld=no | ||
7628 | -fi; | ||
7629 | +fi | ||
7630 | + | ||
7631 | ac_prog=ld | ||
7632 | if test "$GCC" = yes; then | ||
7633 | # Check if gcc -print-prog-name=ld gives a path. | ||
7634 | - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 | ||
7635 | -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 | ||
7636 | + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 | ||
7637 | +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } | ||
7638 | case $host in | ||
7639 | *-*-mingw*) | ||
7640 | # gcc leaves a trailing carriage return which upsets mingw | ||
7641 | @@ -10303,11 +11479,11 @@ | ||
7642 | ;; | ||
7643 | esac | ||
7644 | elif test "$with_gnu_ld" = yes; then | ||
7645 | - echo "$as_me:$LINENO: checking for GNU ld" >&5 | ||
7646 | -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 | ||
7647 | + { echo "$as_me:$LINENO: checking for GNU ld" >&5 | ||
7648 | +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } | ||
7649 | else | ||
7650 | - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | ||
7651 | -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 | ||
7652 | + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | ||
7653 | +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } | ||
7654 | fi | ||
7655 | if test "${lt_cv_path_LD+set}" = set; then | ||
7656 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7657 | @@ -10340,17 +11516,17 @@ | ||
7658 | |||
7659 | LD="$lt_cv_path_LD" | ||
7660 | if test -n "$LD"; then | ||
7661 | - echo "$as_me:$LINENO: result: $LD" >&5 | ||
7662 | -echo "${ECHO_T}$LD" >&6 | ||
7663 | + { echo "$as_me:$LINENO: result: $LD" >&5 | ||
7664 | +echo "${ECHO_T}$LD" >&6; } | ||
7665 | else | ||
7666 | - echo "$as_me:$LINENO: result: no" >&5 | ||
7667 | -echo "${ECHO_T}no" >&6 | ||
7668 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
7669 | +echo "${ECHO_T}no" >&6; } | ||
7670 | fi | ||
7671 | test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 | ||
7672 | echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} | ||
7673 | { (exit 1); exit 1; }; } | ||
7674 | -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | ||
7675 | -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 | ||
7676 | +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | ||
7677 | +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } | ||
7678 | if test "${lt_cv_prog_gnu_ld+set}" = set; then | ||
7679 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7680 | else | ||
7681 | @@ -10364,8 +11540,8 @@ | ||
7682 | ;; | ||
7683 | esac | ||
7684 | fi | ||
7685 | -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 | ||
7686 | -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 | ||
7687 | +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 | ||
7688 | +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } | ||
7689 | with_gnu_ld=$lt_cv_prog_gnu_ld | ||
7690 | |||
7691 | |||
7692 | @@ -10415,8 +11591,8 @@ | ||
7693 | fi | ||
7694 | |||
7695 | # PORTME: fill in a description of your system's C++ link characteristics | ||
7696 | -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
7697 | -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 | ||
7698 | +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
7699 | +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | ||
7700 | ld_shlibs_CXX=yes | ||
7701 | case $host_os in | ||
7702 | aix3*) | ||
7703 | @@ -10528,23 +11704,36 @@ | ||
7704 | } | ||
7705 | _ACEOF | ||
7706 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7707 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7708 | - (eval $ac_link) 2>conftest.er1 | ||
7709 | +if { (ac_try="$ac_link" | ||
7710 | +case "(($ac_try" in | ||
7711 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7712 | + *) ac_try_echo=$ac_try;; | ||
7713 | +esac | ||
7714 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7715 | + (eval "$ac_link") 2>conftest.er1 | ||
7716 | ac_status=$? | ||
7717 | grep -v '^ *+' conftest.er1 >conftest.err | ||
7718 | rm -f conftest.er1 | ||
7719 | cat conftest.err >&5 | ||
7720 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7721 | (exit $ac_status); } && | ||
7722 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
7723 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7724 | - (eval $ac_try) 2>&5 | ||
7725 | + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
7726 | + { (case "(($ac_try" in | ||
7727 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7728 | + *) ac_try_echo=$ac_try;; | ||
7729 | +esac | ||
7730 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7731 | + (eval "$ac_try") 2>&5 | ||
7732 | ac_status=$? | ||
7733 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7734 | (exit $ac_status); }; } && | ||
7735 | { ac_try='test -s conftest$ac_exeext' | ||
7736 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7737 | - (eval $ac_try) 2>&5 | ||
7738 | + { (case "(($ac_try" in | ||
7739 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7740 | + *) ac_try_echo=$ac_try;; | ||
7741 | +esac | ||
7742 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7743 | + (eval "$ac_try") 2>&5 | ||
7744 | ac_status=$? | ||
7745 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7746 | (exit $ac_status); }; }; then | ||
7747 | @@ -10558,8 +11747,10 @@ | ||
7748 | echo "$as_me: failed program was:" >&5 | ||
7749 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7750 | |||
7751 | + | ||
7752 | fi | ||
7753 | -rm -f conftest.err conftest.$ac_objext \ | ||
7754 | + | ||
7755 | +rm -f core conftest.err conftest.$ac_objext \ | ||
7756 | conftest$ac_exeext conftest.$ac_ext | ||
7757 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
7758 | |||
7759 | @@ -10589,23 +11780,36 @@ | ||
7760 | } | ||
7761 | _ACEOF | ||
7762 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7763 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
7764 | - (eval $ac_link) 2>conftest.er1 | ||
7765 | +if { (ac_try="$ac_link" | ||
7766 | +case "(($ac_try" in | ||
7767 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7768 | + *) ac_try_echo=$ac_try;; | ||
7769 | +esac | ||
7770 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7771 | + (eval "$ac_link") 2>conftest.er1 | ||
7772 | ac_status=$? | ||
7773 | grep -v '^ *+' conftest.er1 >conftest.err | ||
7774 | rm -f conftest.er1 | ||
7775 | cat conftest.err >&5 | ||
7776 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7777 | (exit $ac_status); } && | ||
7778 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
7779 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7780 | - (eval $ac_try) 2>&5 | ||
7781 | + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
7782 | + { (case "(($ac_try" in | ||
7783 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7784 | + *) ac_try_echo=$ac_try;; | ||
7785 | +esac | ||
7786 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7787 | + (eval "$ac_try") 2>&5 | ||
7788 | ac_status=$? | ||
7789 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7790 | (exit $ac_status); }; } && | ||
7791 | { ac_try='test -s conftest$ac_exeext' | ||
7792 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7793 | - (eval $ac_try) 2>&5 | ||
7794 | + { (case "(($ac_try" in | ||
7795 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
7796 | + *) ac_try_echo=$ac_try;; | ||
7797 | +esac | ||
7798 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
7799 | + (eval "$ac_try") 2>&5 | ||
7800 | ac_status=$? | ||
7801 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7802 | (exit $ac_status); }; }; then | ||
7803 | @@ -10619,8 +11823,10 @@ | ||
7804 | echo "$as_me: failed program was:" >&5 | ||
7805 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7806 | |||
7807 | + | ||
7808 | fi | ||
7809 | -rm -f conftest.err conftest.$ac_objext \ | ||
7810 | + | ||
7811 | +rm -f core conftest.err conftest.$ac_objext \ | ||
7812 | conftest$ac_exeext conftest.$ac_ext | ||
7813 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
7814 | |||
7815 | @@ -10768,7 +11974,7 @@ | ||
7816 | freebsd-elf*) | ||
7817 | archive_cmds_need_lc_CXX=no | ||
7818 | ;; | ||
7819 | - freebsd* | kfreebsd*-gnu | dragonfly*) | ||
7820 | + freebsd* | dragonfly*) | ||
7821 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF | ||
7822 | # conventions | ||
7823 | ld_shlibs_CXX=yes | ||
7824 | @@ -10927,7 +12133,7 @@ | ||
7825 | hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' | ||
7826 | hardcode_libdir_separator_CXX=: | ||
7827 | ;; | ||
7828 | - linux*) | ||
7829 | + linux* | k*bsd*-gnu) | ||
7830 | case $cc_basename in | ||
7831 | KCC*) | ||
7832 | # Kuck and Associates, Inc. (KAI) C++ Compiler | ||
7833 | @@ -11029,7 +12235,7 @@ | ||
7834 | ;; | ||
7835 | esac | ||
7836 | ;; | ||
7837 | - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | ||
7838 | + netbsd* | netbsdelf*-gnu) | ||
7839 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | ||
7840 | archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' | ||
7841 | wlarc= | ||
7842 | @@ -11351,8 +12557,8 @@ | ||
7843 | ld_shlibs_CXX=no | ||
7844 | ;; | ||
7845 | esac | ||
7846 | -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 | ||
7847 | -echo "${ECHO_T}$ld_shlibs_CXX" >&6 | ||
7848 | +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 | ||
7849 | +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } | ||
7850 | test "$ld_shlibs_CXX" = no && can_build_shared=no | ||
7851 | |||
7852 | GCC_CXX="$GXX" | ||
7853 | @@ -11491,8 +12697,8 @@ | ||
7854 | lt_prog_compiler_pic_CXX= | ||
7855 | lt_prog_compiler_static_CXX= | ||
7856 | |||
7857 | -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | ||
7858 | -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | ||
7859 | +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | ||
7860 | +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | ||
7861 | |||
7862 | # C++ specific cases for pic, static, wl, etc. | ||
7863 | if test "$GXX" = yes; then | ||
7864 | @@ -11596,7 +12802,7 @@ | ||
7865 | ;; | ||
7866 | esac | ||
7867 | ;; | ||
7868 | - freebsd* | kfreebsd*-gnu | dragonfly*) | ||
7869 | + freebsd* | dragonfly*) | ||
7870 | # FreeBSD uses GNU C++ | ||
7871 | ;; | ||
7872 | hpux9* | hpux10* | hpux11*) | ||
7873 | @@ -11639,7 +12845,7 @@ | ||
7874 | ;; | ||
7875 | esac | ||
7876 | ;; | ||
7877 | - linux*) | ||
7878 | + linux* | k*bsd*-gnu) | ||
7879 | case $cc_basename in | ||
7880 | KCC*) | ||
7881 | # KAI C++ Compiler | ||
7882 | @@ -11682,7 +12888,7 @@ | ||
7883 | ;; | ||
7884 | esac | ||
7885 | ;; | ||
7886 | - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | ||
7887 | + netbsd* | netbsdelf*-gnu) | ||
7888 | ;; | ||
7889 | osf3* | osf4* | osf5*) | ||
7890 | case $cc_basename in | ||
7891 | @@ -11765,16 +12971,16 @@ | ||
7892 | esac | ||
7893 | fi | ||
7894 | |||
7895 | -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 | ||
7896 | -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 | ||
7897 | +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 | ||
7898 | +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } | ||
7899 | |||
7900 | # | ||
7901 | # Check to make sure the PIC flag actually works. | ||
7902 | # | ||
7903 | if test -n "$lt_prog_compiler_pic_CXX"; then | ||
7904 | |||
7905 | -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 | ||
7906 | -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 | ||
7907 | +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 | ||
7908 | +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } | ||
7909 | if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then | ||
7910 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7911 | else | ||
7912 | @@ -11791,11 +12997,11 @@ | ||
7913 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
7914 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
7915 | -e 's:$: $lt_compiler_flag:'` | ||
7916 | - (eval echo "\"\$as_me:11794: $lt_compile\"" >&5) | ||
7917 | + (eval echo "\"\$as_me:13000: $lt_compile\"" >&5) | ||
7918 | (eval "$lt_compile" 2>conftest.err) | ||
7919 | ac_status=$? | ||
7920 | cat conftest.err >&5 | ||
7921 | - echo "$as_me:11798: \$? = $ac_status" >&5 | ||
7922 | + echo "$as_me:13004: \$? = $ac_status" >&5 | ||
7923 | if (exit $ac_status) && test -s "$ac_outfile"; then | ||
7924 | # The compiler can only warn and ignore the option if not recognized | ||
7925 | # So say no if there are warnings other than the usual output. | ||
7926 | @@ -11808,8 +13014,8 @@ | ||
7927 | $rm conftest* | ||
7928 | |||
7929 | fi | ||
7930 | -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 | ||
7931 | -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 | ||
7932 | +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 | ||
7933 | +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } | ||
7934 | |||
7935 | if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then | ||
7936 | case $lt_prog_compiler_pic_CXX in | ||
7937 | @@ -11836,8 +13042,8 @@ | ||
7938 | # Check to make sure the static flag actually works. | ||
7939 | # | ||
7940 | wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" | ||
7941 | -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | ||
7942 | -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 | ||
7943 | +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | ||
7944 | +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } | ||
7945 | if test "${lt_prog_compiler_static_works_CXX+set}" = set; then | ||
7946 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7947 | else | ||
7948 | @@ -11864,8 +13070,8 @@ | ||
7949 | LDFLAGS="$save_LDFLAGS" | ||
7950 | |||
7951 | fi | ||
7952 | -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 | ||
7953 | -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 | ||
7954 | +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 | ||
7955 | +echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } | ||
7956 | |||
7957 | if test x"$lt_prog_compiler_static_works_CXX" = xyes; then | ||
7958 | : | ||
7959 | @@ -11874,8 +13080,8 @@ | ||
7960 | fi | ||
7961 | |||
7962 | |||
7963 | -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
7964 | -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 | ||
7965 | +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
7966 | +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } | ||
7967 | if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then | ||
7968 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7969 | else | ||
7970 | @@ -11895,11 +13101,11 @@ | ||
7971 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
7972 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
7973 | -e 's:$: $lt_compiler_flag:'` | ||
7974 | - (eval echo "\"\$as_me:11898: $lt_compile\"" >&5) | ||
7975 | + (eval echo "\"\$as_me:13104: $lt_compile\"" >&5) | ||
7976 | (eval "$lt_compile" 2>out/conftest.err) | ||
7977 | ac_status=$? | ||
7978 | cat out/conftest.err >&5 | ||
7979 | - echo "$as_me:11902: \$? = $ac_status" >&5 | ||
7980 | + echo "$as_me:13108: \$? = $ac_status" >&5 | ||
7981 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | ||
7982 | then | ||
7983 | # The compiler can only warn and ignore the option if not recognized | ||
7984 | @@ -11921,23 +13127,23 @@ | ||
7985 | $rm conftest* | ||
7986 | |||
7987 | fi | ||
7988 | -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 | ||
7989 | -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 | ||
7990 | +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 | ||
7991 | +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } | ||
7992 | |||
7993 | |||
7994 | hard_links="nottested" | ||
7995 | if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then | ||
7996 | # do not overwrite the value of need_locks provided by the user | ||
7997 | - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | ||
7998 | -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 | ||
7999 | + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | ||
8000 | +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } | ||
8001 | hard_links=yes | ||
8002 | $rm conftest* | ||
8003 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | ||
8004 | touch conftest.a | ||
8005 | ln conftest.a conftest.b 2>&5 || hard_links=no | ||
8006 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | ||
8007 | - echo "$as_me:$LINENO: result: $hard_links" >&5 | ||
8008 | -echo "${ECHO_T}$hard_links" >&6 | ||
8009 | + { echo "$as_me:$LINENO: result: $hard_links" >&5 | ||
8010 | +echo "${ECHO_T}$hard_links" >&6; } | ||
8011 | if test "$hard_links" = no; then | ||
8012 | { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | ||
8013 | echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | ||
8014 | @@ -11947,8 +13153,8 @@ | ||
8015 | need_locks=no | ||
8016 | fi | ||
8017 | |||
8018 | -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
8019 | -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 | ||
8020 | +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
8021 | +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | ||
8022 | |||
8023 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | ||
8024 | case $host_os in | ||
8025 | @@ -11967,10 +13173,7 @@ | ||
8026 | cygwin* | mingw*) | ||
8027 | export_symbols_cmds_CXX='$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' | ||
8028 | ;; | ||
8029 | - kfreebsd*-gnu) | ||
8030 | - link_all_deplibs_CXX=no | ||
8031 | - ;; | ||
8032 | - linux*) | ||
8033 | + linux* | k*bsd*-gnu) | ||
8034 | link_all_deplibs_CXX=no | ||
8035 | ;; | ||
8036 | *) | ||
8037 | @@ -11978,8 +13181,8 @@ | ||
8038 | ;; | ||
8039 | esac | ||
8040 | |||
8041 | -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 | ||
8042 | -echo "${ECHO_T}$ld_shlibs_CXX" >&6 | ||
8043 | +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 | ||
8044 | +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } | ||
8045 | test "$ld_shlibs_CXX" = no && can_build_shared=no | ||
8046 | |||
8047 | # | ||
8048 | @@ -11999,8 +13202,8 @@ | ||
8049 | # Test whether the compiler implicitly links with -lc since on some | ||
8050 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | ||
8051 | # to ld, don't add -lc before -lgcc. | ||
8052 | - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | ||
8053 | -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 | ||
8054 | + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | ||
8055 | +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } | ||
8056 | $rm conftest* | ||
8057 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext | ||
8058 | |||
8059 | @@ -12037,16 +13240,16 @@ | ||
8060 | cat conftest.err 1>&5 | ||
8061 | fi | ||
8062 | $rm conftest* | ||
8063 | - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 | ||
8064 | -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 | ||
8065 | + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 | ||
8066 | +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } | ||
8067 | ;; | ||
8068 | esac | ||
8069 | fi | ||
8070 | ;; | ||
8071 | esac | ||
8072 | |||
8073 | -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | ||
8074 | -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 | ||
8075 | +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | ||
8076 | +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } | ||
8077 | library_names_spec= | ||
8078 | libname_spec='lib$name' | ||
8079 | soname_spec= | ||
8080 | @@ -12252,18 +13455,6 @@ | ||
8081 | dynamic_linker=no | ||
8082 | ;; | ||
8083 | |||
8084 | -kfreebsd*-gnu) | ||
8085 | - version_type=linux | ||
8086 | - need_lib_prefix=no | ||
8087 | - need_version=no | ||
8088 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
8089 | - soname_spec='${libname}${release}${shared_ext}$major' | ||
8090 | - shlibpath_var=LD_LIBRARY_PATH | ||
8091 | - shlibpath_overrides_runpath=no | ||
8092 | - hardcode_into_libs=yes | ||
8093 | - dynamic_linker='GNU ld.so' | ||
8094 | - ;; | ||
8095 | - | ||
8096 | freebsd* | dragonfly*) | ||
8097 | # DragonFly does not have aout. When/if they implement a new | ||
8098 | # versioning mechanism, adjust this. | ||
8099 | @@ -12419,7 +13610,7 @@ | ||
8100 | ;; | ||
8101 | |||
8102 | # This must be Linux ELF. | ||
8103 | -linux*) | ||
8104 | +linux* | k*bsd*-gnu) | ||
8105 | version_type=linux | ||
8106 | need_lib_prefix=no | ||
8107 | need_version=no | ||
8108 | @@ -12460,18 +13651,6 @@ | ||
8109 | dynamic_linker='NetBSD ld.elf_so' | ||
8110 | ;; | ||
8111 | |||
8112 | -knetbsd*-gnu) | ||
8113 | - version_type=linux | ||
8114 | - need_lib_prefix=no | ||
8115 | - need_version=no | ||
8116 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
8117 | - soname_spec='${libname}${release}${shared_ext}$major' | ||
8118 | - shlibpath_var=LD_LIBRARY_PATH | ||
8119 | - shlibpath_overrides_runpath=no | ||
8120 | - hardcode_into_libs=yes | ||
8121 | - dynamic_linker='GNU ld.so' | ||
8122 | - ;; | ||
8123 | - | ||
8124 | netbsd*) | ||
8125 | version_type=sunos | ||
8126 | need_lib_prefix=no | ||
8127 | @@ -12645,8 +13824,8 @@ | ||
8128 | dynamic_linker=no | ||
8129 | ;; | ||
8130 | esac | ||
8131 | -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | ||
8132 | -echo "${ECHO_T}$dynamic_linker" >&6 | ||
8133 | +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | ||
8134 | +echo "${ECHO_T}$dynamic_linker" >&6; } | ||
8135 | test "$dynamic_linker" = no && can_build_shared=no | ||
8136 | |||
8137 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | ||
8138 | @@ -12654,8 +13833,8 @@ | ||
8139 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | ||
8140 | fi | ||
8141 | |||
8142 | -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | ||
8143 | -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | ||
8144 | +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | ||
8145 | +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } | ||
8146 | hardcode_action_CXX= | ||
8147 | if test -n "$hardcode_libdir_flag_spec_CXX" || \ | ||
8148 | test -n "$runpath_var_CXX" || \ | ||
8149 | @@ -12679,8 +13858,8 @@ | ||
8150 | # directories. | ||
8151 | hardcode_action_CXX=unsupported | ||
8152 | fi | ||
8153 | -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 | ||
8154 | -echo "${ECHO_T}$hardcode_action_CXX" >&6 | ||
8155 | +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 | ||
8156 | +echo "${ECHO_T}$hardcode_action_CXX" >&6; } | ||
8157 | |||
8158 | if test "$hardcode_action_CXX" = relink; then | ||
8159 | # Fast installation is not supported | ||
8160 | @@ -13205,13 +14384,13 @@ | ||
8161 | cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` | ||
8162 | |||
8163 | |||
8164 | -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 | ||
8165 | -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 | ||
8166 | -echo "$as_me:$LINENO: result: $can_build_shared" >&5 | ||
8167 | -echo "${ECHO_T}$can_build_shared" >&6 | ||
8168 | +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 | ||
8169 | +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } | ||
8170 | +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 | ||
8171 | +echo "${ECHO_T}$can_build_shared" >&6; } | ||
8172 | |||
8173 | -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 | ||
8174 | -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 | ||
8175 | +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 | ||
8176 | +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } | ||
8177 | test "$can_build_shared" = "no" && enable_shared=no | ||
8178 | |||
8179 | # On AIX, shared libraries and static libraries use the same namespace, and | ||
8180 | @@ -13230,15 +14409,15 @@ | ||
8181 | fi | ||
8182 | ;; | ||
8183 | esac | ||
8184 | -echo "$as_me:$LINENO: result: $enable_shared" >&5 | ||
8185 | -echo "${ECHO_T}$enable_shared" >&6 | ||
8186 | +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 | ||
8187 | +echo "${ECHO_T}$enable_shared" >&6; } | ||
8188 | |||
8189 | -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 | ||
8190 | -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 | ||
8191 | +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 | ||
8192 | +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } | ||
8193 | # Make sure either enable_shared or enable_static is yes. | ||
8194 | test "$enable_shared" = yes || enable_static=yes | ||
8195 | -echo "$as_me:$LINENO: result: $enable_static" >&5 | ||
8196 | -echo "${ECHO_T}$enable_static" >&6 | ||
8197 | +{ echo "$as_me:$LINENO: result: $enable_static" >&5 | ||
8198 | +echo "${ECHO_T}$enable_static" >&6; } | ||
8199 | |||
8200 | GCC_F77="$G77" | ||
8201 | LD_F77="$LD" | ||
8202 | @@ -13247,8 +14426,8 @@ | ||
8203 | lt_prog_compiler_pic_F77= | ||
8204 | lt_prog_compiler_static_F77= | ||
8205 | |||
8206 | -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | ||
8207 | -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | ||
8208 | +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | ||
8209 | +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | ||
8210 | |||
8211 | if test "$GCC" = yes; then | ||
8212 | lt_prog_compiler_wl_F77='-Wl,' | ||
8213 | @@ -13377,7 +14556,7 @@ | ||
8214 | lt_prog_compiler_static_F77='-Bstatic' | ||
8215 | ;; | ||
8216 | |||
8217 | - linux*) | ||
8218 | + linux* | k*bsd*-gnu) | ||
8219 | case $cc_basename in | ||
8220 | icc* | ecc*) | ||
8221 | lt_prog_compiler_wl_F77='-Wl,' | ||
8222 | @@ -13457,16 +14636,16 @@ | ||
8223 | esac | ||
8224 | fi | ||
8225 | |||
8226 | -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 | ||
8227 | -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 | ||
8228 | +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 | ||
8229 | +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } | ||
8230 | |||
8231 | # | ||
8232 | # Check to make sure the PIC flag actually works. | ||
8233 | # | ||
8234 | if test -n "$lt_prog_compiler_pic_F77"; then | ||
8235 | |||
8236 | -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 | ||
8237 | -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 | ||
8238 | +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 | ||
8239 | +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } | ||
8240 | if test "${lt_prog_compiler_pic_works_F77+set}" = set; then | ||
8241 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8242 | else | ||
8243 | @@ -13483,11 +14662,11 @@ | ||
8244 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
8245 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
8246 | -e 's:$: $lt_compiler_flag:'` | ||
8247 | - (eval echo "\"\$as_me:13486: $lt_compile\"" >&5) | ||
8248 | + (eval echo "\"\$as_me:14665: $lt_compile\"" >&5) | ||
8249 | (eval "$lt_compile" 2>conftest.err) | ||
8250 | ac_status=$? | ||
8251 | cat conftest.err >&5 | ||
8252 | - echo "$as_me:13490: \$? = $ac_status" >&5 | ||
8253 | + echo "$as_me:14669: \$? = $ac_status" >&5 | ||
8254 | if (exit $ac_status) && test -s "$ac_outfile"; then | ||
8255 | # The compiler can only warn and ignore the option if not recognized | ||
8256 | # So say no if there are warnings other than the usual output. | ||
8257 | @@ -13500,8 +14679,8 @@ | ||
8258 | $rm conftest* | ||
8259 | |||
8260 | fi | ||
8261 | -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 | ||
8262 | -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 | ||
8263 | +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 | ||
8264 | +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } | ||
8265 | |||
8266 | if test x"$lt_prog_compiler_pic_works_F77" = xyes; then | ||
8267 | case $lt_prog_compiler_pic_F77 in | ||
8268 | @@ -13528,8 +14707,8 @@ | ||
8269 | # Check to make sure the static flag actually works. | ||
8270 | # | ||
8271 | wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" | ||
8272 | -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | ||
8273 | -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 | ||
8274 | +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | ||
8275 | +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } | ||
8276 | if test "${lt_prog_compiler_static_works_F77+set}" = set; then | ||
8277 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8278 | else | ||
8279 | @@ -13556,8 +14735,8 @@ | ||
8280 | LDFLAGS="$save_LDFLAGS" | ||
8281 | |||
8282 | fi | ||
8283 | -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 | ||
8284 | -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 | ||
8285 | +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 | ||
8286 | +echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } | ||
8287 | |||
8288 | if test x"$lt_prog_compiler_static_works_F77" = xyes; then | ||
8289 | : | ||
8290 | @@ -13566,8 +14745,8 @@ | ||
8291 | fi | ||
8292 | |||
8293 | |||
8294 | -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
8295 | -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 | ||
8296 | +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
8297 | +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } | ||
8298 | if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then | ||
8299 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8300 | else | ||
8301 | @@ -13587,11 +14766,11 @@ | ||
8302 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
8303 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
8304 | -e 's:$: $lt_compiler_flag:'` | ||
8305 | - (eval echo "\"\$as_me:13590: $lt_compile\"" >&5) | ||
8306 | + (eval echo "\"\$as_me:14769: $lt_compile\"" >&5) | ||
8307 | (eval "$lt_compile" 2>out/conftest.err) | ||
8308 | ac_status=$? | ||
8309 | cat out/conftest.err >&5 | ||
8310 | - echo "$as_me:13594: \$? = $ac_status" >&5 | ||
8311 | + echo "$as_me:14773: \$? = $ac_status" >&5 | ||
8312 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | ||
8313 | then | ||
8314 | # The compiler can only warn and ignore the option if not recognized | ||
8315 | @@ -13613,23 +14792,23 @@ | ||
8316 | $rm conftest* | ||
8317 | |||
8318 | fi | ||
8319 | -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 | ||
8320 | -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 | ||
8321 | +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 | ||
8322 | +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } | ||
8323 | |||
8324 | |||
8325 | hard_links="nottested" | ||
8326 | if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then | ||
8327 | # do not overwrite the value of need_locks provided by the user | ||
8328 | - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | ||
8329 | -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 | ||
8330 | + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | ||
8331 | +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } | ||
8332 | hard_links=yes | ||
8333 | $rm conftest* | ||
8334 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | ||
8335 | touch conftest.a | ||
8336 | ln conftest.a conftest.b 2>&5 || hard_links=no | ||
8337 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | ||
8338 | - echo "$as_me:$LINENO: result: $hard_links" >&5 | ||
8339 | -echo "${ECHO_T}$hard_links" >&6 | ||
8340 | + { echo "$as_me:$LINENO: result: $hard_links" >&5 | ||
8341 | +echo "${ECHO_T}$hard_links" >&6; } | ||
8342 | if test "$hard_links" = no; then | ||
8343 | { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | ||
8344 | echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | ||
8345 | @@ -13639,8 +14818,8 @@ | ||
8346 | need_locks=no | ||
8347 | fi | ||
8348 | |||
8349 | -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
8350 | -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 | ||
8351 | +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
8352 | +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | ||
8353 | |||
8354 | runpath_var= | ||
8355 | allow_undefined_flag_F77= | ||
8356 | @@ -13816,7 +14995,7 @@ | ||
8357 | archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | ||
8358 | ;; | ||
8359 | |||
8360 | - linux*) | ||
8361 | + linux* | k*bsd*-gnu) | ||
8362 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | ||
8363 | tmp_addflag= | ||
8364 | case $cc_basename,$host_cpu in | ||
8365 | @@ -13848,7 +15027,7 @@ | ||
8366 | fi | ||
8367 | ;; | ||
8368 | |||
8369 | - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | ||
8370 | + netbsd* | netbsdelf*-gnu) | ||
8371 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | ||
8372 | archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
8373 | wlarc= | ||
8374 | @@ -14046,23 +15225,36 @@ | ||
8375 | end | ||
8376 | _ACEOF | ||
8377 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8378 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
8379 | - (eval $ac_link) 2>conftest.er1 | ||
8380 | +if { (ac_try="$ac_link" | ||
8381 | +case "(($ac_try" in | ||
8382 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8383 | + *) ac_try_echo=$ac_try;; | ||
8384 | +esac | ||
8385 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8386 | + (eval "$ac_link") 2>conftest.er1 | ||
8387 | ac_status=$? | ||
8388 | grep -v '^ *+' conftest.er1 >conftest.err | ||
8389 | rm -f conftest.er1 | ||
8390 | cat conftest.err >&5 | ||
8391 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8392 | (exit $ac_status); } && | ||
8393 | - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | ||
8394 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8395 | - (eval $ac_try) 2>&5 | ||
8396 | + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | ||
8397 | + { (case "(($ac_try" in | ||
8398 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8399 | + *) ac_try_echo=$ac_try;; | ||
8400 | +esac | ||
8401 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8402 | + (eval "$ac_try") 2>&5 | ||
8403 | ac_status=$? | ||
8404 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8405 | (exit $ac_status); }; } && | ||
8406 | { ac_try='test -s conftest$ac_exeext' | ||
8407 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8408 | - (eval $ac_try) 2>&5 | ||
8409 | + { (case "(($ac_try" in | ||
8410 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8411 | + *) ac_try_echo=$ac_try;; | ||
8412 | +esac | ||
8413 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8414 | + (eval "$ac_try") 2>&5 | ||
8415 | ac_status=$? | ||
8416 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8417 | (exit $ac_status); }; }; then | ||
8418 | @@ -14076,8 +15268,10 @@ | ||
8419 | echo "$as_me: failed program was:" >&5 | ||
8420 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
8421 | |||
8422 | + | ||
8423 | fi | ||
8424 | -rm -f conftest.err conftest.$ac_objext \ | ||
8425 | + | ||
8426 | +rm -f core conftest.err conftest.$ac_objext \ | ||
8427 | conftest$ac_exeext conftest.$ac_ext | ||
8428 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8429 | |||
8430 | @@ -14096,23 +15290,36 @@ | ||
8431 | end | ||
8432 | _ACEOF | ||
8433 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8434 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
8435 | - (eval $ac_link) 2>conftest.er1 | ||
8436 | +if { (ac_try="$ac_link" | ||
8437 | +case "(($ac_try" in | ||
8438 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8439 | + *) ac_try_echo=$ac_try;; | ||
8440 | +esac | ||
8441 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8442 | + (eval "$ac_link") 2>conftest.er1 | ||
8443 | ac_status=$? | ||
8444 | grep -v '^ *+' conftest.er1 >conftest.err | ||
8445 | rm -f conftest.er1 | ||
8446 | cat conftest.err >&5 | ||
8447 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8448 | (exit $ac_status); } && | ||
8449 | - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | ||
8450 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8451 | - (eval $ac_try) 2>&5 | ||
8452 | + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | ||
8453 | + { (case "(($ac_try" in | ||
8454 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8455 | + *) ac_try_echo=$ac_try;; | ||
8456 | +esac | ||
8457 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8458 | + (eval "$ac_try") 2>&5 | ||
8459 | ac_status=$? | ||
8460 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8461 | (exit $ac_status); }; } && | ||
8462 | { ac_try='test -s conftest$ac_exeext' | ||
8463 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8464 | - (eval $ac_try) 2>&5 | ||
8465 | + { (case "(($ac_try" in | ||
8466 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8467 | + *) ac_try_echo=$ac_try;; | ||
8468 | +esac | ||
8469 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8470 | + (eval "$ac_try") 2>&5 | ||
8471 | ac_status=$? | ||
8472 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8473 | (exit $ac_status); }; }; then | ||
8474 | @@ -14126,8 +15333,10 @@ | ||
8475 | echo "$as_me: failed program was:" >&5 | ||
8476 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
8477 | |||
8478 | + | ||
8479 | fi | ||
8480 | -rm -f conftest.err conftest.$ac_objext \ | ||
8481 | + | ||
8482 | +rm -f core conftest.err conftest.$ac_objext \ | ||
8483 | conftest$ac_exeext conftest.$ac_ext | ||
8484 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8485 | |||
8486 | @@ -14265,15 +15474,6 @@ | ||
8487 | hardcode_shlibpath_var_F77=no | ||
8488 | ;; | ||
8489 | |||
8490 | - # GNU/kFreeBSD uses gcc -shared to do shared libraries. | ||
8491 | - kfreebsd*-gnu) | ||
8492 | - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
8493 | - hardcode_libdir_flag_spec_F77='-R$libdir' | ||
8494 | - hardcode_direct_F77=yes | ||
8495 | - hardcode_shlibpath_var_F77=no | ||
8496 | - link_all_deplibs_F77=no | ||
8497 | - ;; | ||
8498 | - | ||
8499 | hpux9*) | ||
8500 | if test "$GCC" = yes; then | ||
8501 | archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
8502 | @@ -14369,7 +15569,7 @@ | ||
8503 | link_all_deplibs_F77=yes | ||
8504 | ;; | ||
8505 | |||
8506 | - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | ||
8507 | + netbsd* | netbsdelf*-gnu) | ||
8508 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | ||
8509 | archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | ||
8510 | else | ||
8511 | @@ -14585,8 +15785,8 @@ | ||
8512 | esac | ||
8513 | fi | ||
8514 | |||
8515 | -echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 | ||
8516 | -echo "${ECHO_T}$ld_shlibs_F77" >&6 | ||
8517 | +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 | ||
8518 | +echo "${ECHO_T}$ld_shlibs_F77" >&6; } | ||
8519 | test "$ld_shlibs_F77" = no && can_build_shared=no | ||
8520 | |||
8521 | # | ||
8522 | @@ -14606,8 +15806,8 @@ | ||
8523 | # Test whether the compiler implicitly links with -lc since on some | ||
8524 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | ||
8525 | # to ld, don't add -lc before -lgcc. | ||
8526 | - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | ||
8527 | -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 | ||
8528 | + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | ||
8529 | +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } | ||
8530 | $rm conftest* | ||
8531 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext | ||
8532 | |||
8533 | @@ -14644,16 +15844,16 @@ | ||
8534 | cat conftest.err 1>&5 | ||
8535 | fi | ||
8536 | $rm conftest* | ||
8537 | - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 | ||
8538 | -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 | ||
8539 | + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 | ||
8540 | +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } | ||
8541 | ;; | ||
8542 | esac | ||
8543 | fi | ||
8544 | ;; | ||
8545 | esac | ||
8546 | |||
8547 | -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | ||
8548 | -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 | ||
8549 | +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | ||
8550 | +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } | ||
8551 | library_names_spec= | ||
8552 | libname_spec='lib$name' | ||
8553 | soname_spec= | ||
8554 | @@ -14859,18 +16059,6 @@ | ||
8555 | dynamic_linker=no | ||
8556 | ;; | ||
8557 | |||
8558 | -kfreebsd*-gnu) | ||
8559 | - version_type=linux | ||
8560 | - need_lib_prefix=no | ||
8561 | - need_version=no | ||
8562 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
8563 | - soname_spec='${libname}${release}${shared_ext}$major' | ||
8564 | - shlibpath_var=LD_LIBRARY_PATH | ||
8565 | - shlibpath_overrides_runpath=no | ||
8566 | - hardcode_into_libs=yes | ||
8567 | - dynamic_linker='GNU ld.so' | ||
8568 | - ;; | ||
8569 | - | ||
8570 | freebsd* | dragonfly*) | ||
8571 | # DragonFly does not have aout. When/if they implement a new | ||
8572 | # versioning mechanism, adjust this. | ||
8573 | @@ -15026,7 +16214,7 @@ | ||
8574 | ;; | ||
8575 | |||
8576 | # This must be Linux ELF. | ||
8577 | -linux*) | ||
8578 | +linux* | k*bsd*-gnu) | ||
8579 | version_type=linux | ||
8580 | need_lib_prefix=no | ||
8581 | need_version=no | ||
8582 | @@ -15067,18 +16255,6 @@ | ||
8583 | dynamic_linker='NetBSD ld.elf_so' | ||
8584 | ;; | ||
8585 | |||
8586 | -knetbsd*-gnu) | ||
8587 | - version_type=linux | ||
8588 | - need_lib_prefix=no | ||
8589 | - need_version=no | ||
8590 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
8591 | - soname_spec='${libname}${release}${shared_ext}$major' | ||
8592 | - shlibpath_var=LD_LIBRARY_PATH | ||
8593 | - shlibpath_overrides_runpath=no | ||
8594 | - hardcode_into_libs=yes | ||
8595 | - dynamic_linker='GNU ld.so' | ||
8596 | - ;; | ||
8597 | - | ||
8598 | netbsd*) | ||
8599 | version_type=sunos | ||
8600 | need_lib_prefix=no | ||
8601 | @@ -15252,8 +16428,8 @@ | ||
8602 | dynamic_linker=no | ||
8603 | ;; | ||
8604 | esac | ||
8605 | -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | ||
8606 | -echo "${ECHO_T}$dynamic_linker" >&6 | ||
8607 | +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | ||
8608 | +echo "${ECHO_T}$dynamic_linker" >&6; } | ||
8609 | test "$dynamic_linker" = no && can_build_shared=no | ||
8610 | |||
8611 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | ||
8612 | @@ -15261,8 +16437,8 @@ | ||
8613 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | ||
8614 | fi | ||
8615 | |||
8616 | -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | ||
8617 | -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | ||
8618 | +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | ||
8619 | +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } | ||
8620 | hardcode_action_F77= | ||
8621 | if test -n "$hardcode_libdir_flag_spec_F77" || \ | ||
8622 | test -n "$runpath_var_F77" || \ | ||
8623 | @@ -15286,8 +16462,8 @@ | ||
8624 | # directories. | ||
8625 | hardcode_action_F77=unsupported | ||
8626 | fi | ||
8627 | -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 | ||
8628 | -echo "${ECHO_T}$hardcode_action_F77" >&6 | ||
8629 | +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 | ||
8630 | +echo "${ECHO_T}$hardcode_action_F77" >&6; } | ||
8631 | |||
8632 | if test "$hardcode_action_F77" = relink; then | ||
8633 | # Fast installation is not supported | ||
8634 | @@ -15724,7 +16900,6 @@ | ||
8635 | if test -n "$GCJ" && test "X$GCJ" != "Xno"; then | ||
8636 | |||
8637 | |||
8638 | - | ||
8639 | # Source file extension for Java test sources. | ||
8640 | ac_ext=java | ||
8641 | |||
8642 | @@ -15792,8 +16967,8 @@ | ||
8643 | lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' | ||
8644 | |||
8645 | |||
8646 | -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | ||
8647 | -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 | ||
8648 | +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | ||
8649 | +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } | ||
8650 | if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then | ||
8651 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8652 | else | ||
8653 | @@ -15810,11 +16985,11 @@ | ||
8654 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
8655 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
8656 | -e 's:$: $lt_compiler_flag:'` | ||
8657 | - (eval echo "\"\$as_me:15813: $lt_compile\"" >&5) | ||
8658 | + (eval echo "\"\$as_me:16988: $lt_compile\"" >&5) | ||
8659 | (eval "$lt_compile" 2>conftest.err) | ||
8660 | ac_status=$? | ||
8661 | cat conftest.err >&5 | ||
8662 | - echo "$as_me:15817: \$? = $ac_status" >&5 | ||
8663 | + echo "$as_me:16992: \$? = $ac_status" >&5 | ||
8664 | if (exit $ac_status) && test -s "$ac_outfile"; then | ||
8665 | # The compiler can only warn and ignore the option if not recognized | ||
8666 | # So say no if there are warnings other than the usual output. | ||
8667 | @@ -15827,8 +17002,8 @@ | ||
8668 | $rm conftest* | ||
8669 | |||
8670 | fi | ||
8671 | -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | ||
8672 | -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 | ||
8673 | +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | ||
8674 | +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } | ||
8675 | |||
8676 | if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then | ||
8677 | lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" | ||
8678 | @@ -15842,8 +17017,8 @@ | ||
8679 | lt_prog_compiler_pic_GCJ= | ||
8680 | lt_prog_compiler_static_GCJ= | ||
8681 | |||
8682 | -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | ||
8683 | -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | ||
8684 | +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | ||
8685 | +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | ||
8686 | |||
8687 | if test "$GCC" = yes; then | ||
8688 | lt_prog_compiler_wl_GCJ='-Wl,' | ||
8689 | @@ -15972,7 +17147,7 @@ | ||
8690 | lt_prog_compiler_static_GCJ='-Bstatic' | ||
8691 | ;; | ||
8692 | |||
8693 | - linux*) | ||
8694 | + linux* | k*bsd*-gnu) | ||
8695 | case $cc_basename in | ||
8696 | icc* | ecc*) | ||
8697 | lt_prog_compiler_wl_GCJ='-Wl,' | ||
8698 | @@ -16052,16 +17227,16 @@ | ||
8699 | esac | ||
8700 | fi | ||
8701 | |||
8702 | -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 | ||
8703 | -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 | ||
8704 | +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 | ||
8705 | +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } | ||
8706 | |||
8707 | # | ||
8708 | # Check to make sure the PIC flag actually works. | ||
8709 | # | ||
8710 | if test -n "$lt_prog_compiler_pic_GCJ"; then | ||
8711 | |||
8712 | -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 | ||
8713 | -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 | ||
8714 | +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 | ||
8715 | +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } | ||
8716 | if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then | ||
8717 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8718 | else | ||
8719 | @@ -16078,11 +17253,11 @@ | ||
8720 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
8721 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
8722 | -e 's:$: $lt_compiler_flag:'` | ||
8723 | - (eval echo "\"\$as_me:16081: $lt_compile\"" >&5) | ||
8724 | + (eval echo "\"\$as_me:17256: $lt_compile\"" >&5) | ||
8725 | (eval "$lt_compile" 2>conftest.err) | ||
8726 | ac_status=$? | ||
8727 | cat conftest.err >&5 | ||
8728 | - echo "$as_me:16085: \$? = $ac_status" >&5 | ||
8729 | + echo "$as_me:17260: \$? = $ac_status" >&5 | ||
8730 | if (exit $ac_status) && test -s "$ac_outfile"; then | ||
8731 | # The compiler can only warn and ignore the option if not recognized | ||
8732 | # So say no if there are warnings other than the usual output. | ||
8733 | @@ -16095,8 +17270,8 @@ | ||
8734 | $rm conftest* | ||
8735 | |||
8736 | fi | ||
8737 | -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 | ||
8738 | -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 | ||
8739 | +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 | ||
8740 | +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } | ||
8741 | |||
8742 | if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then | ||
8743 | case $lt_prog_compiler_pic_GCJ in | ||
8744 | @@ -16123,8 +17298,8 @@ | ||
8745 | # Check to make sure the static flag actually works. | ||
8746 | # | ||
8747 | wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" | ||
8748 | -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | ||
8749 | -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 | ||
8750 | +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | ||
8751 | +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } | ||
8752 | if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then | ||
8753 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8754 | else | ||
8755 | @@ -16151,8 +17326,8 @@ | ||
8756 | LDFLAGS="$save_LDFLAGS" | ||
8757 | |||
8758 | fi | ||
8759 | -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 | ||
8760 | -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 | ||
8761 | +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 | ||
8762 | +echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } | ||
8763 | |||
8764 | if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then | ||
8765 | : | ||
8766 | @@ -16161,8 +17336,8 @@ | ||
8767 | fi | ||
8768 | |||
8769 | |||
8770 | -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
8771 | -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 | ||
8772 | +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | ||
8773 | +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } | ||
8774 | if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then | ||
8775 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8776 | else | ||
8777 | @@ -16182,11 +17357,11 @@ | ||
8778 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | ||
8779 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | ||
8780 | -e 's:$: $lt_compiler_flag:'` | ||
8781 | - (eval echo "\"\$as_me:16185: $lt_compile\"" >&5) | ||
8782 | + (eval echo "\"\$as_me:17360: $lt_compile\"" >&5) | ||
8783 | (eval "$lt_compile" 2>out/conftest.err) | ||
8784 | ac_status=$? | ||
8785 | cat out/conftest.err >&5 | ||
8786 | - echo "$as_me:16189: \$? = $ac_status" >&5 | ||
8787 | + echo "$as_me:17364: \$? = $ac_status" >&5 | ||
8788 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | ||
8789 | then | ||
8790 | # The compiler can only warn and ignore the option if not recognized | ||
8791 | @@ -16208,23 +17383,23 @@ | ||
8792 | $rm conftest* | ||
8793 | |||
8794 | fi | ||
8795 | -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 | ||
8796 | -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 | ||
8797 | +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 | ||
8798 | +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } | ||
8799 | |||
8800 | |||
8801 | hard_links="nottested" | ||
8802 | if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then | ||
8803 | # do not overwrite the value of need_locks provided by the user | ||
8804 | - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | ||
8805 | -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 | ||
8806 | + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | ||
8807 | +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } | ||
8808 | hard_links=yes | ||
8809 | $rm conftest* | ||
8810 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | ||
8811 | touch conftest.a | ||
8812 | ln conftest.a conftest.b 2>&5 || hard_links=no | ||
8813 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | ||
8814 | - echo "$as_me:$LINENO: result: $hard_links" >&5 | ||
8815 | -echo "${ECHO_T}$hard_links" >&6 | ||
8816 | + { echo "$as_me:$LINENO: result: $hard_links" >&5 | ||
8817 | +echo "${ECHO_T}$hard_links" >&6; } | ||
8818 | if test "$hard_links" = no; then | ||
8819 | { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | ||
8820 | echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | ||
8821 | @@ -16234,8 +17409,8 @@ | ||
8822 | need_locks=no | ||
8823 | fi | ||
8824 | |||
8825 | -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
8826 | -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 | ||
8827 | +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | ||
8828 | +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | ||
8829 | |||
8830 | runpath_var= | ||
8831 | allow_undefined_flag_GCJ= | ||
8832 | @@ -16411,7 +17586,7 @@ | ||
8833 | archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | ||
8834 | ;; | ||
8835 | |||
8836 | - linux*) | ||
8837 | + linux* | k*bsd*-gnu) | ||
8838 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | ||
8839 | tmp_addflag= | ||
8840 | case $cc_basename,$host_cpu in | ||
8841 | @@ -16443,7 +17618,7 @@ | ||
8842 | fi | ||
8843 | ;; | ||
8844 | |||
8845 | - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | ||
8846 | + netbsd* | netbsdelf*-gnu) | ||
8847 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | ||
8848 | archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
8849 | wlarc= | ||
8850 | @@ -16651,23 +17826,36 @@ | ||
8851 | } | ||
8852 | _ACEOF | ||
8853 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8854 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
8855 | - (eval $ac_link) 2>conftest.er1 | ||
8856 | +if { (ac_try="$ac_link" | ||
8857 | +case "(($ac_try" in | ||
8858 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8859 | + *) ac_try_echo=$ac_try;; | ||
8860 | +esac | ||
8861 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8862 | + (eval "$ac_link") 2>conftest.er1 | ||
8863 | ac_status=$? | ||
8864 | grep -v '^ *+' conftest.er1 >conftest.err | ||
8865 | rm -f conftest.er1 | ||
8866 | cat conftest.err >&5 | ||
8867 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8868 | (exit $ac_status); } && | ||
8869 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8870 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8871 | - (eval $ac_try) 2>&5 | ||
8872 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8873 | + { (case "(($ac_try" in | ||
8874 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8875 | + *) ac_try_echo=$ac_try;; | ||
8876 | +esac | ||
8877 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8878 | + (eval "$ac_try") 2>&5 | ||
8879 | ac_status=$? | ||
8880 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8881 | (exit $ac_status); }; } && | ||
8882 | { ac_try='test -s conftest$ac_exeext' | ||
8883 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8884 | - (eval $ac_try) 2>&5 | ||
8885 | + { (case "(($ac_try" in | ||
8886 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8887 | + *) ac_try_echo=$ac_try;; | ||
8888 | +esac | ||
8889 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8890 | + (eval "$ac_try") 2>&5 | ||
8891 | ac_status=$? | ||
8892 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8893 | (exit $ac_status); }; }; then | ||
8894 | @@ -16681,8 +17869,10 @@ | ||
8895 | echo "$as_me: failed program was:" >&5 | ||
8896 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
8897 | |||
8898 | + | ||
8899 | fi | ||
8900 | -rm -f conftest.err conftest.$ac_objext \ | ||
8901 | + | ||
8902 | +rm -f core conftest.err conftest.$ac_objext \ | ||
8903 | conftest$ac_exeext conftest.$ac_ext | ||
8904 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8905 | |||
8906 | @@ -16711,23 +17901,36 @@ | ||
8907 | } | ||
8908 | _ACEOF | ||
8909 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8910 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
8911 | - (eval $ac_link) 2>conftest.er1 | ||
8912 | +if { (ac_try="$ac_link" | ||
8913 | +case "(($ac_try" in | ||
8914 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8915 | + *) ac_try_echo=$ac_try;; | ||
8916 | +esac | ||
8917 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8918 | + (eval "$ac_link") 2>conftest.er1 | ||
8919 | ac_status=$? | ||
8920 | grep -v '^ *+' conftest.er1 >conftest.err | ||
8921 | rm -f conftest.er1 | ||
8922 | cat conftest.err >&5 | ||
8923 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8924 | (exit $ac_status); } && | ||
8925 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8926 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8927 | - (eval $ac_try) 2>&5 | ||
8928 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
8929 | + { (case "(($ac_try" in | ||
8930 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8931 | + *) ac_try_echo=$ac_try;; | ||
8932 | +esac | ||
8933 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8934 | + (eval "$ac_try") 2>&5 | ||
8935 | ac_status=$? | ||
8936 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8937 | (exit $ac_status); }; } && | ||
8938 | { ac_try='test -s conftest$ac_exeext' | ||
8939 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8940 | - (eval $ac_try) 2>&5 | ||
8941 | + { (case "(($ac_try" in | ||
8942 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8943 | + *) ac_try_echo=$ac_try;; | ||
8944 | +esac | ||
8945 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8946 | + (eval "$ac_try") 2>&5 | ||
8947 | ac_status=$? | ||
8948 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8949 | (exit $ac_status); }; }; then | ||
8950 | @@ -16741,8 +17944,10 @@ | ||
8951 | echo "$as_me: failed program was:" >&5 | ||
8952 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
8953 | |||
8954 | + | ||
8955 | fi | ||
8956 | -rm -f conftest.err conftest.$ac_objext \ | ||
8957 | + | ||
8958 | +rm -f core conftest.err conftest.$ac_objext \ | ||
8959 | conftest$ac_exeext conftest.$ac_ext | ||
8960 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
8961 | |||
8962 | @@ -16880,15 +18085,6 @@ | ||
8963 | hardcode_shlibpath_var_GCJ=no | ||
8964 | ;; | ||
8965 | |||
8966 | - # GNU/kFreeBSD uses gcc -shared to do shared libraries. | ||
8967 | - kfreebsd*-gnu) | ||
8968 | - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
8969 | - hardcode_libdir_flag_spec_GCJ='-R$libdir' | ||
8970 | - hardcode_direct_GCJ=yes | ||
8971 | - hardcode_shlibpath_var_GCJ=no | ||
8972 | - link_all_deplibs_GCJ=no | ||
8973 | - ;; | ||
8974 | - | ||
8975 | hpux9*) | ||
8976 | if test "$GCC" = yes; then | ||
8977 | archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
8978 | @@ -16984,7 +18180,7 @@ | ||
8979 | link_all_deplibs_GCJ=yes | ||
8980 | ;; | ||
8981 | |||
8982 | - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | ||
8983 | + netbsd* | netbsdelf*-gnu) | ||
8984 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | ||
8985 | archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | ||
8986 | else | ||
8987 | @@ -17200,8 +18396,8 @@ | ||
8988 | esac | ||
8989 | fi | ||
8990 | |||
8991 | -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 | ||
8992 | -echo "${ECHO_T}$ld_shlibs_GCJ" >&6 | ||
8993 | +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 | ||
8994 | +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } | ||
8995 | test "$ld_shlibs_GCJ" = no && can_build_shared=no | ||
8996 | |||
8997 | # | ||
8998 | @@ -17221,8 +18417,8 @@ | ||
8999 | # Test whether the compiler implicitly links with -lc since on some | ||
9000 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | ||
9001 | # to ld, don't add -lc before -lgcc. | ||
9002 | - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | ||
9003 | -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 | ||
9004 | + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | ||
9005 | +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } | ||
9006 | $rm conftest* | ||
9007 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext | ||
9008 | |||
9009 | @@ -17259,16 +18455,16 @@ | ||
9010 | cat conftest.err 1>&5 | ||
9011 | fi | ||
9012 | $rm conftest* | ||
9013 | - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 | ||
9014 | -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 | ||
9015 | + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 | ||
9016 | +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } | ||
9017 | ;; | ||
9018 | esac | ||
9019 | fi | ||
9020 | ;; | ||
9021 | esac | ||
9022 | |||
9023 | -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | ||
9024 | -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 | ||
9025 | +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | ||
9026 | +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } | ||
9027 | library_names_spec= | ||
9028 | libname_spec='lib$name' | ||
9029 | soname_spec= | ||
9030 | @@ -17474,18 +18670,6 @@ | ||
9031 | dynamic_linker=no | ||
9032 | ;; | ||
9033 | |||
9034 | -kfreebsd*-gnu) | ||
9035 | - version_type=linux | ||
9036 | - need_lib_prefix=no | ||
9037 | - need_version=no | ||
9038 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
9039 | - soname_spec='${libname}${release}${shared_ext}$major' | ||
9040 | - shlibpath_var=LD_LIBRARY_PATH | ||
9041 | - shlibpath_overrides_runpath=no | ||
9042 | - hardcode_into_libs=yes | ||
9043 | - dynamic_linker='GNU ld.so' | ||
9044 | - ;; | ||
9045 | - | ||
9046 | freebsd* | dragonfly*) | ||
9047 | # DragonFly does not have aout. When/if they implement a new | ||
9048 | # versioning mechanism, adjust this. | ||
9049 | @@ -17641,7 +18825,7 @@ | ||
9050 | ;; | ||
9051 | |||
9052 | # This must be Linux ELF. | ||
9053 | -linux*) | ||
9054 | +linux* | k*bsd*-gnu) | ||
9055 | version_type=linux | ||
9056 | need_lib_prefix=no | ||
9057 | need_version=no | ||
9058 | @@ -17682,20 +18866,8 @@ | ||
9059 | dynamic_linker='NetBSD ld.elf_so' | ||
9060 | ;; | ||
9061 | |||
9062 | -knetbsd*-gnu) | ||
9063 | - version_type=linux | ||
9064 | - need_lib_prefix=no | ||
9065 | - need_version=no | ||
9066 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
9067 | - soname_spec='${libname}${release}${shared_ext}$major' | ||
9068 | - shlibpath_var=LD_LIBRARY_PATH | ||
9069 | - shlibpath_overrides_runpath=no | ||
9070 | - hardcode_into_libs=yes | ||
9071 | - dynamic_linker='GNU ld.so' | ||
9072 | - ;; | ||
9073 | - | ||
9074 | -netbsd*) | ||
9075 | - version_type=sunos | ||
9076 | +netbsd*) | ||
9077 | + version_type=sunos | ||
9078 | need_lib_prefix=no | ||
9079 | need_version=no | ||
9080 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | ||
9081 | @@ -17867,8 +19039,8 @@ | ||
9082 | dynamic_linker=no | ||
9083 | ;; | ||
9084 | esac | ||
9085 | -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | ||
9086 | -echo "${ECHO_T}$dynamic_linker" >&6 | ||
9087 | +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | ||
9088 | +echo "${ECHO_T}$dynamic_linker" >&6; } | ||
9089 | test "$dynamic_linker" = no && can_build_shared=no | ||
9090 | |||
9091 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | ||
9092 | @@ -17876,8 +19048,8 @@ | ||
9093 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | ||
9094 | fi | ||
9095 | |||
9096 | -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | ||
9097 | -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | ||
9098 | +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | ||
9099 | +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } | ||
9100 | hardcode_action_GCJ= | ||
9101 | if test -n "$hardcode_libdir_flag_spec_GCJ" || \ | ||
9102 | test -n "$runpath_var_GCJ" || \ | ||
9103 | @@ -17901,8 +19073,8 @@ | ||
9104 | # directories. | ||
9105 | hardcode_action_GCJ=unsupported | ||
9106 | fi | ||
9107 | -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 | ||
9108 | -echo "${ECHO_T}$hardcode_action_GCJ" >&6 | ||
9109 | +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 | ||
9110 | +echo "${ECHO_T}$hardcode_action_GCJ" >&6; } | ||
9111 | |||
9112 | if test "$hardcode_action_GCJ" = relink; then | ||
9113 | # Fast installation is not supported | ||
9114 | @@ -18338,7 +19510,6 @@ | ||
9115 | RC) | ||
9116 | |||
9117 | |||
9118 | - | ||
9119 | # Source file extension for RC test sources. | ||
9120 | ac_ext=rc | ||
9121 | |||
9122 | @@ -18876,10 +20047,9 @@ | ||
9123 | |||
9124 | |||
9125 | |||
9126 | -# Check whether --with-autoconf or --without-autoconf was given. | ||
9127 | +# Check whether --with-autoconf was given. | ||
9128 | if test "${with_autoconf+set}" = set; then | ||
9129 | - withval="$with_autoconf" | ||
9130 | - | ||
9131 | + withval=$with_autoconf; | ||
9132 | unset AUTOCONF | ||
9133 | |||
9134 | AUTOCONF=${AUTOCONF-"${am_missing_run}${withval}"} | ||
9135 | @@ -18887,13 +20057,13 @@ | ||
9136 | { echo "$as_me:$LINENO: Using $AUTOCONF as autoconf" >&5 | ||
9137 | echo "$as_me: Using $AUTOCONF as autoconf" >&6;} | ||
9138 | |||
9139 | -fi; | ||
9140 | +fi | ||
9141 | + | ||
9142 | |||
9143 | |||
9144 | -# Check whether --with-autoheader or --without-autoheader was given. | ||
9145 | +# Check whether --with-autoheader was given. | ||
9146 | if test "${with_autoheader+set}" = set; then | ||
9147 | - withval="$with_autoheader" | ||
9148 | - | ||
9149 | + withval=$with_autoheader; | ||
9150 | unset AUTOHEADER | ||
9151 | |||
9152 | AUTOHEADER=${AUTOHEADER-"${am_missing_run}${withval}"} | ||
9153 | @@ -18901,13 +20071,13 @@ | ||
9154 | { echo "$as_me:$LINENO: Using $AUTOHEADER as autoheader" >&5 | ||
9155 | echo "$as_me: Using $AUTOHEADER as autoheader" >&6;} | ||
9156 | |||
9157 | -fi; | ||
9158 | +fi | ||
9159 | |||
9160 | |||
9161 | -# Check whether --with-automake or --without-automake was given. | ||
9162 | -if test "${with_automake+set}" = set; then | ||
9163 | - withval="$with_automake" | ||
9164 | |||
9165 | +# Check whether --with-automake was given. | ||
9166 | +if test "${with_automake+set}" = set; then | ||
9167 | + withval=$with_automake; | ||
9168 | unset AUTOMAKE | ||
9169 | |||
9170 | AUTOMAKE=${AUTOMAKE-"${am_missing_run}${withval}"} | ||
9171 | @@ -18915,13 +20085,13 @@ | ||
9172 | { echo "$as_me:$LINENO: Using $AUTOMAKE as automake" >&5 | ||
9173 | echo "$as_me: Using $AUTOMAKE as automake" >&6;} | ||
9174 | |||
9175 | -fi; | ||
9176 | +fi | ||
9177 | + | ||
9178 | |||
9179 | |||
9180 | -# Check whether --with-aclocal or --without-aclocal was given. | ||
9181 | +# Check whether --with-aclocal was given. | ||
9182 | if test "${with_aclocal+set}" = set; then | ||
9183 | - withval="$with_aclocal" | ||
9184 | - | ||
9185 | + withval=$with_aclocal; | ||
9186 | unset ACLOCAL | ||
9187 | |||
9188 | ACLOCAL=${ACLOCAL-"${am_missing_run}${withval}"} | ||
9189 | @@ -18929,7 +20099,8 @@ | ||
9190 | { echo "$as_me:$LINENO: Using $ACLOCAL as aclocal" >&5 | ||
9191 | echo "$as_me: Using $ACLOCAL as aclocal" >&6;} | ||
9192 | |||
9193 | -fi; | ||
9194 | +fi | ||
9195 | + | ||
9196 | |||
9197 | |||
9198 | ACLOCAL_AMFLAGS="-I m4 -I common/m4" | ||
9199 | @@ -18951,8 +20122,8 @@ | ||
9200 | |||
9201 | # Extract the first word of "msgfmt", so it can be a program name with args. | ||
9202 | set dummy msgfmt; ac_word=$2 | ||
9203 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9204 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
9205 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9206 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
9207 | if test "${ac_cv_path_MSGFMT+set}" = set; then | ||
9208 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9209 | else | ||
9210 | @@ -18979,17 +20150,17 @@ | ||
9211 | fi | ||
9212 | MSGFMT="$ac_cv_path_MSGFMT" | ||
9213 | if test "$MSGFMT" != ":"; then | ||
9214 | - echo "$as_me:$LINENO: result: $MSGFMT" >&5 | ||
9215 | -echo "${ECHO_T}$MSGFMT" >&6 | ||
9216 | + { echo "$as_me:$LINENO: result: $MSGFMT" >&5 | ||
9217 | +echo "${ECHO_T}$MSGFMT" >&6; } | ||
9218 | else | ||
9219 | - echo "$as_me:$LINENO: result: no" >&5 | ||
9220 | -echo "${ECHO_T}no" >&6 | ||
9221 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
9222 | +echo "${ECHO_T}no" >&6; } | ||
9223 | fi | ||
9224 | |||
9225 | # Extract the first word of "gmsgfmt", so it can be a program name with args. | ||
9226 | set dummy gmsgfmt; ac_word=$2 | ||
9227 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9228 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
9229 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9230 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
9231 | if test "${ac_cv_path_GMSGFMT+set}" = set; then | ||
9232 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9233 | else | ||
9234 | @@ -19004,33 +20175,34 @@ | ||
9235 | IFS=$as_save_IFS | ||
9236 | test -z "$as_dir" && as_dir=. | ||
9237 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
9238 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
9239 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
9240 | ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" | ||
9241 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
9242 | break 2 | ||
9243 | fi | ||
9244 | done | ||
9245 | done | ||
9246 | +IFS=$as_save_IFS | ||
9247 | |||
9248 | test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" | ||
9249 | ;; | ||
9250 | esac | ||
9251 | fi | ||
9252 | GMSGFMT=$ac_cv_path_GMSGFMT | ||
9253 | - | ||
9254 | if test -n "$GMSGFMT"; then | ||
9255 | - echo "$as_me:$LINENO: result: $GMSGFMT" >&5 | ||
9256 | -echo "${ECHO_T}$GMSGFMT" >&6 | ||
9257 | + { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 | ||
9258 | +echo "${ECHO_T}$GMSGFMT" >&6; } | ||
9259 | else | ||
9260 | - echo "$as_me:$LINENO: result: no" >&5 | ||
9261 | -echo "${ECHO_T}no" >&6 | ||
9262 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
9263 | +echo "${ECHO_T}no" >&6; } | ||
9264 | fi | ||
9265 | |||
9266 | |||
9267 | + | ||
9268 | # Extract the first word of "xgettext", so it can be a program name with args. | ||
9269 | set dummy xgettext; ac_word=$2 | ||
9270 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9271 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
9272 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9273 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
9274 | if test "${ac_cv_path_XGETTEXT+set}" = set; then | ||
9275 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9276 | else | ||
9277 | @@ -19057,19 +20229,19 @@ | ||
9278 | fi | ||
9279 | XGETTEXT="$ac_cv_path_XGETTEXT" | ||
9280 | if test "$XGETTEXT" != ":"; then | ||
9281 | - echo "$as_me:$LINENO: result: $XGETTEXT" >&5 | ||
9282 | -echo "${ECHO_T}$XGETTEXT" >&6 | ||
9283 | + { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 | ||
9284 | +echo "${ECHO_T}$XGETTEXT" >&6; } | ||
9285 | else | ||
9286 | - echo "$as_me:$LINENO: result: no" >&5 | ||
9287 | -echo "${ECHO_T}no" >&6 | ||
9288 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
9289 | +echo "${ECHO_T}no" >&6; } | ||
9290 | fi | ||
9291 | |||
9292 | rm -f messages.po | ||
9293 | |||
9294 | # Extract the first word of "msgmerge", so it can be a program name with args. | ||
9295 | set dummy msgmerge; ac_word=$2 | ||
9296 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9297 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
9298 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9299 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
9300 | if test "${ac_cv_path_MSGMERGE+set}" = set; then | ||
9301 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9302 | else | ||
9303 | @@ -19095,11 +20267,11 @@ | ||
9304 | fi | ||
9305 | MSGMERGE="$ac_cv_path_MSGMERGE" | ||
9306 | if test "$MSGMERGE" != ":"; then | ||
9307 | - echo "$as_me:$LINENO: result: $MSGMERGE" >&5 | ||
9308 | -echo "${ECHO_T}$MSGMERGE" >&6 | ||
9309 | + { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 | ||
9310 | +echo "${ECHO_T}$MSGMERGE" >&6; } | ||
9311 | else | ||
9312 | - echo "$as_me:$LINENO: result: no" >&5 | ||
9313 | -echo "${ECHO_T}no" >&6 | ||
9314 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
9315 | +echo "${ECHO_T}no" >&6; } | ||
9316 | fi | ||
9317 | |||
9318 | |||
9319 | @@ -19109,8 +20281,8 @@ | ||
9320 | : ; | ||
9321 | else | ||
9322 | GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` | ||
9323 | - echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 | ||
9324 | -echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6 | ||
9325 | + { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 | ||
9326 | +echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; } | ||
9327 | GMSGFMT=":" | ||
9328 | fi | ||
9329 | fi | ||
9330 | @@ -19120,14 +20292,14 @@ | ||
9331 | (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then | ||
9332 | : ; | ||
9333 | else | ||
9334 | - echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 | ||
9335 | -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 | ||
9336 | + { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 | ||
9337 | +echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } | ||
9338 | XGETTEXT=":" | ||
9339 | fi | ||
9340 | rm -f messages.po | ||
9341 | fi | ||
9342 | |||
9343 | - ac_config_commands="$ac_config_commands default-1" | ||
9344 | + ac_config_commands="$ac_config_commands default-1" | ||
9345 | |||
9346 | |||
9347 | |||
9348 | @@ -19147,18 +20319,18 @@ | ||
9349 | prefix="$acl_save_prefix" | ||
9350 | |||
9351 | |||
9352 | -# Check whether --with-gnu-ld or --without-gnu-ld was given. | ||
9353 | +# Check whether --with-gnu-ld was given. | ||
9354 | if test "${with_gnu_ld+set}" = set; then | ||
9355 | - withval="$with_gnu_ld" | ||
9356 | - test "$withval" = no || with_gnu_ld=yes | ||
9357 | + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | ||
9358 | else | ||
9359 | with_gnu_ld=no | ||
9360 | -fi; | ||
9361 | +fi | ||
9362 | + | ||
9363 | ac_prog=ld | ||
9364 | if test "$GCC" = yes; then | ||
9365 | # Check if gcc -print-prog-name=ld gives a path. | ||
9366 | - echo "$as_me:$LINENO: checking for ld used by GCC" >&5 | ||
9367 | -echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 | ||
9368 | + { echo "$as_me:$LINENO: checking for ld used by GCC" >&5 | ||
9369 | +echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; } | ||
9370 | case $host in | ||
9371 | *-*-mingw*) | ||
9372 | # gcc leaves a trailing carriage return which upsets mingw | ||
9373 | @@ -19187,11 +20359,11 @@ | ||
9374 | ;; | ||
9375 | esac | ||
9376 | elif test "$with_gnu_ld" = yes; then | ||
9377 | - echo "$as_me:$LINENO: checking for GNU ld" >&5 | ||
9378 | -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 | ||
9379 | + { echo "$as_me:$LINENO: checking for GNU ld" >&5 | ||
9380 | +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } | ||
9381 | else | ||
9382 | - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | ||
9383 | -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 | ||
9384 | + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | ||
9385 | +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } | ||
9386 | fi | ||
9387 | if test "${acl_cv_path_LD+set}" = set; then | ||
9388 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9389 | @@ -19220,17 +20392,17 @@ | ||
9390 | |||
9391 | LD="$acl_cv_path_LD" | ||
9392 | if test -n "$LD"; then | ||
9393 | - echo "$as_me:$LINENO: result: $LD" >&5 | ||
9394 | -echo "${ECHO_T}$LD" >&6 | ||
9395 | + { echo "$as_me:$LINENO: result: $LD" >&5 | ||
9396 | +echo "${ECHO_T}$LD" >&6; } | ||
9397 | else | ||
9398 | - echo "$as_me:$LINENO: result: no" >&5 | ||
9399 | -echo "${ECHO_T}no" >&6 | ||
9400 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
9401 | +echo "${ECHO_T}no" >&6; } | ||
9402 | fi | ||
9403 | test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 | ||
9404 | echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} | ||
9405 | { (exit 1); exit 1; }; } | ||
9406 | -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | ||
9407 | -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 | ||
9408 | +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | ||
9409 | +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } | ||
9410 | if test "${acl_cv_prog_gnu_ld+set}" = set; then | ||
9411 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9412 | else | ||
9413 | @@ -19241,14 +20413,14 @@ | ||
9414 | acl_cv_prog_gnu_ld=no | ||
9415 | fi | ||
9416 | fi | ||
9417 | -echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 | ||
9418 | -echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 | ||
9419 | +{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 | ||
9420 | +echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; } | ||
9421 | with_gnu_ld=$acl_cv_prog_gnu_ld | ||
9422 | |||
9423 | |||
9424 | |||
9425 | - echo "$as_me:$LINENO: checking for shared library run path origin" >&5 | ||
9426 | -echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6 | ||
9427 | + { echo "$as_me:$LINENO: checking for shared library run path origin" >&5 | ||
9428 | +echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; } | ||
9429 | if test "${acl_cv_rpath+set}" = set; then | ||
9430 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9431 | else | ||
9432 | @@ -19260,8 +20432,8 @@ | ||
9433 | acl_cv_rpath=done | ||
9434 | |||
9435 | fi | ||
9436 | -echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 | ||
9437 | -echo "${ECHO_T}$acl_cv_rpath" >&6 | ||
9438 | +{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 | ||
9439 | +echo "${ECHO_T}$acl_cv_rpath" >&6; } | ||
9440 | wl="$acl_cv_wl" | ||
9441 | libext="$acl_cv_libext" | ||
9442 | shlibext="$acl_cv_shlibext" | ||
9443 | @@ -19271,13 +20443,13 @@ | ||
9444 | hardcode_minus_L="$acl_cv_hardcode_minus_L" | ||
9445 | sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" | ||
9446 | sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" | ||
9447 | - # Check whether --enable-rpath or --disable-rpath was given. | ||
9448 | + # Check whether --enable-rpath was given. | ||
9449 | if test "${enable_rpath+set}" = set; then | ||
9450 | - enableval="$enable_rpath" | ||
9451 | - : | ||
9452 | + enableval=$enable_rpath; : | ||
9453 | else | ||
9454 | enable_rpath=yes | ||
9455 | -fi; | ||
9456 | +fi | ||
9457 | + | ||
9458 | |||
9459 | |||
9460 | |||
9461 | @@ -19299,10 +20471,9 @@ | ||
9462 | prefix="$acl_save_prefix" | ||
9463 | |||
9464 | |||
9465 | -# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. | ||
9466 | +# Check whether --with-libiconv-prefix was given. | ||
9467 | if test "${with_libiconv_prefix+set}" = set; then | ||
9468 | - withval="$with_libiconv_prefix" | ||
9469 | - | ||
9470 | + withval=$with_libiconv_prefix; | ||
9471 | if test "X$withval" = "Xno"; then | ||
9472 | use_additional=no | ||
9473 | else | ||
9474 | @@ -19325,7 +20496,8 @@ | ||
9475 | fi | ||
9476 | fi | ||
9477 | |||
9478 | -fi; | ||
9479 | +fi | ||
9480 | + | ||
9481 | LIBICONV= | ||
9482 | LTLIBICONV= | ||
9483 | INCICONV= | ||
9484 | @@ -19677,17 +20849,17 @@ | ||
9485 | |||
9486 | |||
9487 | |||
9488 | - echo "$as_me:$LINENO: checking whether NLS is requested" >&5 | ||
9489 | -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 | ||
9490 | - # Check whether --enable-nls or --disable-nls was given. | ||
9491 | + { echo "$as_me:$LINENO: checking whether NLS is requested" >&5 | ||
9492 | +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; } | ||
9493 | + # Check whether --enable-nls was given. | ||
9494 | if test "${enable_nls+set}" = set; then | ||
9495 | - enableval="$enable_nls" | ||
9496 | - USE_NLS=$enableval | ||
9497 | + enableval=$enable_nls; USE_NLS=$enableval | ||
9498 | else | ||
9499 | USE_NLS=yes | ||
9500 | -fi; | ||
9501 | - echo "$as_me:$LINENO: result: $USE_NLS" >&5 | ||
9502 | -echo "${ECHO_T}$USE_NLS" >&6 | ||
9503 | +fi | ||
9504 | + | ||
9505 | + { echo "$as_me:$LINENO: result: $USE_NLS" >&5 | ||
9506 | +echo "${ECHO_T}$USE_NLS" >&6; } | ||
9507 | |||
9508 | |||
9509 | |||
9510 | @@ -19703,8 +20875,8 @@ | ||
9511 | |||
9512 | |||
9513 | |||
9514 | - echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 | ||
9515 | -echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 | ||
9516 | + { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 | ||
9517 | +echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; } | ||
9518 | if test "${gt_cv_func_gnugettext1_libc+set}" = set; then | ||
9519 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9520 | else | ||
9521 | @@ -19727,23 +20899,36 @@ | ||
9522 | } | ||
9523 | _ACEOF | ||
9524 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9525 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
9526 | - (eval $ac_link) 2>conftest.er1 | ||
9527 | +if { (ac_try="$ac_link" | ||
9528 | +case "(($ac_try" in | ||
9529 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9530 | + *) ac_try_echo=$ac_try;; | ||
9531 | +esac | ||
9532 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9533 | + (eval "$ac_link") 2>conftest.er1 | ||
9534 | ac_status=$? | ||
9535 | grep -v '^ *+' conftest.er1 >conftest.err | ||
9536 | rm -f conftest.er1 | ||
9537 | cat conftest.err >&5 | ||
9538 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9539 | (exit $ac_status); } && | ||
9540 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
9541 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9542 | - (eval $ac_try) 2>&5 | ||
9543 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
9544 | + { (case "(($ac_try" in | ||
9545 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9546 | + *) ac_try_echo=$ac_try;; | ||
9547 | +esac | ||
9548 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9549 | + (eval "$ac_try") 2>&5 | ||
9550 | ac_status=$? | ||
9551 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9552 | (exit $ac_status); }; } && | ||
9553 | { ac_try='test -s conftest$ac_exeext' | ||
9554 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9555 | - (eval $ac_try) 2>&5 | ||
9556 | + { (case "(($ac_try" in | ||
9557 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9558 | + *) ac_try_echo=$ac_try;; | ||
9559 | +esac | ||
9560 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9561 | + (eval "$ac_try") 2>&5 | ||
9562 | ac_status=$? | ||
9563 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9564 | (exit $ac_status); }; }; then | ||
9565 | @@ -19752,13 +20937,14 @@ | ||
9566 | echo "$as_me: failed program was:" >&5 | ||
9567 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
9568 | |||
9569 | -gt_cv_func_gnugettext1_libc=no | ||
9570 | + gt_cv_func_gnugettext1_libc=no | ||
9571 | fi | ||
9572 | -rm -f conftest.err conftest.$ac_objext \ | ||
9573 | + | ||
9574 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9575 | conftest$ac_exeext conftest.$ac_ext | ||
9576 | fi | ||
9577 | -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 | ||
9578 | -echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 | ||
9579 | +{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 | ||
9580 | +echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; } | ||
9581 | |||
9582 | if test "$gt_cv_func_gnugettext1_libc" != "yes"; then | ||
9583 | |||
9584 | @@ -19791,8 +20977,8 @@ | ||
9585 | done | ||
9586 | |||
9587 | |||
9588 | - echo "$as_me:$LINENO: checking for iconv" >&5 | ||
9589 | -echo $ECHO_N "checking for iconv... $ECHO_C" >&6 | ||
9590 | + { echo "$as_me:$LINENO: checking for iconv" >&5 | ||
9591 | +echo $ECHO_N "checking for iconv... $ECHO_C" >&6; } | ||
9592 | if test "${am_cv_func_iconv+set}" = set; then | ||
9593 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9594 | else | ||
9595 | @@ -19818,23 +21004,36 @@ | ||
9596 | } | ||
9597 | _ACEOF | ||
9598 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9599 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
9600 | - (eval $ac_link) 2>conftest.er1 | ||
9601 | +if { (ac_try="$ac_link" | ||
9602 | +case "(($ac_try" in | ||
9603 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9604 | + *) ac_try_echo=$ac_try;; | ||
9605 | +esac | ||
9606 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9607 | + (eval "$ac_link") 2>conftest.er1 | ||
9608 | ac_status=$? | ||
9609 | grep -v '^ *+' conftest.er1 >conftest.err | ||
9610 | rm -f conftest.er1 | ||
9611 | cat conftest.err >&5 | ||
9612 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9613 | (exit $ac_status); } && | ||
9614 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
9615 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9616 | - (eval $ac_try) 2>&5 | ||
9617 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
9618 | + { (case "(($ac_try" in | ||
9619 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9620 | + *) ac_try_echo=$ac_try;; | ||
9621 | +esac | ||
9622 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9623 | + (eval "$ac_try") 2>&5 | ||
9624 | ac_status=$? | ||
9625 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9626 | (exit $ac_status); }; } && | ||
9627 | { ac_try='test -s conftest$ac_exeext' | ||
9628 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9629 | - (eval $ac_try) 2>&5 | ||
9630 | + { (case "(($ac_try" in | ||
9631 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9632 | + *) ac_try_echo=$ac_try;; | ||
9633 | +esac | ||
9634 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9635 | + (eval "$ac_try") 2>&5 | ||
9636 | ac_status=$? | ||
9637 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9638 | (exit $ac_status); }; }; then | ||
9639 | @@ -19843,8 +21042,10 @@ | ||
9640 | echo "$as_me: failed program was:" >&5 | ||
9641 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
9642 | |||
9643 | + | ||
9644 | fi | ||
9645 | -rm -f conftest.err conftest.$ac_objext \ | ||
9646 | + | ||
9647 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9648 | conftest$ac_exeext conftest.$ac_ext | ||
9649 | if test "$am_cv_func_iconv" != yes; then | ||
9650 | am_save_LIBS="$LIBS" | ||
9651 | @@ -19868,23 +21069,36 @@ | ||
9652 | } | ||
9653 | _ACEOF | ||
9654 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9655 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
9656 | - (eval $ac_link) 2>conftest.er1 | ||
9657 | +if { (ac_try="$ac_link" | ||
9658 | +case "(($ac_try" in | ||
9659 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9660 | + *) ac_try_echo=$ac_try;; | ||
9661 | +esac | ||
9662 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9663 | + (eval "$ac_link") 2>conftest.er1 | ||
9664 | ac_status=$? | ||
9665 | grep -v '^ *+' conftest.er1 >conftest.err | ||
9666 | rm -f conftest.er1 | ||
9667 | cat conftest.err >&5 | ||
9668 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9669 | (exit $ac_status); } && | ||
9670 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
9671 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9672 | - (eval $ac_try) 2>&5 | ||
9673 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
9674 | + { (case "(($ac_try" in | ||
9675 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9676 | + *) ac_try_echo=$ac_try;; | ||
9677 | +esac | ||
9678 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9679 | + (eval "$ac_try") 2>&5 | ||
9680 | ac_status=$? | ||
9681 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9682 | (exit $ac_status); }; } && | ||
9683 | { ac_try='test -s conftest$ac_exeext' | ||
9684 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9685 | - (eval $ac_try) 2>&5 | ||
9686 | + { (case "(($ac_try" in | ||
9687 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9688 | + *) ac_try_echo=$ac_try;; | ||
9689 | +esac | ||
9690 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9691 | + (eval "$ac_try") 2>&5 | ||
9692 | ac_status=$? | ||
9693 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9694 | (exit $ac_status); }; }; then | ||
9695 | @@ -19894,15 +21108,17 @@ | ||
9696 | echo "$as_me: failed program was:" >&5 | ||
9697 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
9698 | |||
9699 | + | ||
9700 | fi | ||
9701 | -rm -f conftest.err conftest.$ac_objext \ | ||
9702 | + | ||
9703 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9704 | conftest$ac_exeext conftest.$ac_ext | ||
9705 | LIBS="$am_save_LIBS" | ||
9706 | fi | ||
9707 | |||
9708 | fi | ||
9709 | -echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 | ||
9710 | -echo "${ECHO_T}$am_cv_func_iconv" >&6 | ||
9711 | +{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 | ||
9712 | +echo "${ECHO_T}$am_cv_func_iconv" >&6; } | ||
9713 | if test "$am_cv_func_iconv" = yes; then | ||
9714 | |||
9715 | cat >>confdefs.h <<\_ACEOF | ||
9716 | @@ -19911,10 +21127,10 @@ | ||
9717 | |||
9718 | fi | ||
9719 | if test "$am_cv_lib_iconv" = yes; then | ||
9720 | - echo "$as_me:$LINENO: checking how to link with libiconv" >&5 | ||
9721 | -echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6 | ||
9722 | - echo "$as_me:$LINENO: result: $LIBICONV" >&5 | ||
9723 | -echo "${ECHO_T}$LIBICONV" >&6 | ||
9724 | + { echo "$as_me:$LINENO: checking how to link with libiconv" >&5 | ||
9725 | +echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; } | ||
9726 | + { echo "$as_me:$LINENO: result: $LIBICONV" >&5 | ||
9727 | +echo "${ECHO_T}$LIBICONV" >&6; } | ||
9728 | else | ||
9729 | CPPFLAGS="$am_save_CPPFLAGS" | ||
9730 | LIBICONV= | ||
9731 | @@ -19940,10 +21156,9 @@ | ||
9732 | prefix="$acl_save_prefix" | ||
9733 | |||
9734 | |||
9735 | -# Check whether --with-libintl-prefix or --without-libintl-prefix was given. | ||
9736 | +# Check whether --with-libintl-prefix was given. | ||
9737 | if test "${with_libintl_prefix+set}" = set; then | ||
9738 | - withval="$with_libintl_prefix" | ||
9739 | - | ||
9740 | + withval=$with_libintl_prefix; | ||
9741 | if test "X$withval" = "Xno"; then | ||
9742 | use_additional=no | ||
9743 | else | ||
9744 | @@ -19966,7 +21181,8 @@ | ||
9745 | fi | ||
9746 | fi | ||
9747 | |||
9748 | -fi; | ||
9749 | +fi | ||
9750 | + | ||
9751 | LIBINTL= | ||
9752 | LTLIBINTL= | ||
9753 | INCINTL= | ||
9754 | @@ -20302,8 +21518,8 @@ | ||
9755 | done | ||
9756 | fi | ||
9757 | |||
9758 | - echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 | ||
9759 | -echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6 | ||
9760 | + { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 | ||
9761 | +echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; } | ||
9762 | if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then | ||
9763 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9764 | else | ||
9765 | @@ -20334,23 +21550,36 @@ | ||
9766 | } | ||
9767 | _ACEOF | ||
9768 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9769 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
9770 | - (eval $ac_link) 2>conftest.er1 | ||
9771 | +if { (ac_try="$ac_link" | ||
9772 | +case "(($ac_try" in | ||
9773 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9774 | + *) ac_try_echo=$ac_try;; | ||
9775 | +esac | ||
9776 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9777 | + (eval "$ac_link") 2>conftest.er1 | ||
9778 | ac_status=$? | ||
9779 | grep -v '^ *+' conftest.er1 >conftest.err | ||
9780 | rm -f conftest.er1 | ||
9781 | cat conftest.err >&5 | ||
9782 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9783 | (exit $ac_status); } && | ||
9784 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
9785 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9786 | - (eval $ac_try) 2>&5 | ||
9787 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
9788 | + { (case "(($ac_try" in | ||
9789 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9790 | + *) ac_try_echo=$ac_try;; | ||
9791 | +esac | ||
9792 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9793 | + (eval "$ac_try") 2>&5 | ||
9794 | ac_status=$? | ||
9795 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9796 | (exit $ac_status); }; } && | ||
9797 | { ac_try='test -s conftest$ac_exeext' | ||
9798 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9799 | - (eval $ac_try) 2>&5 | ||
9800 | + { (case "(($ac_try" in | ||
9801 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9802 | + *) ac_try_echo=$ac_try;; | ||
9803 | +esac | ||
9804 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9805 | + (eval "$ac_try") 2>&5 | ||
9806 | ac_status=$? | ||
9807 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9808 | (exit $ac_status); }; }; then | ||
9809 | @@ -20359,9 +21588,10 @@ | ||
9810 | echo "$as_me: failed program was:" >&5 | ||
9811 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
9812 | |||
9813 | -gt_cv_func_gnugettext1_libintl=no | ||
9814 | + gt_cv_func_gnugettext1_libintl=no | ||
9815 | fi | ||
9816 | -rm -f conftest.err conftest.$ac_objext \ | ||
9817 | + | ||
9818 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9819 | conftest$ac_exeext conftest.$ac_ext | ||
9820 | if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then | ||
9821 | LIBS="$LIBS $LIBICONV" | ||
9822 | @@ -20388,23 +21618,36 @@ | ||
9823 | } | ||
9824 | _ACEOF | ||
9825 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9826 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
9827 | - (eval $ac_link) 2>conftest.er1 | ||
9828 | +if { (ac_try="$ac_link" | ||
9829 | +case "(($ac_try" in | ||
9830 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9831 | + *) ac_try_echo=$ac_try;; | ||
9832 | +esac | ||
9833 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9834 | + (eval "$ac_link") 2>conftest.er1 | ||
9835 | ac_status=$? | ||
9836 | grep -v '^ *+' conftest.er1 >conftest.err | ||
9837 | rm -f conftest.er1 | ||
9838 | cat conftest.err >&5 | ||
9839 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9840 | (exit $ac_status); } && | ||
9841 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
9842 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9843 | - (eval $ac_try) 2>&5 | ||
9844 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
9845 | + { (case "(($ac_try" in | ||
9846 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9847 | + *) ac_try_echo=$ac_try;; | ||
9848 | +esac | ||
9849 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9850 | + (eval "$ac_try") 2>&5 | ||
9851 | ac_status=$? | ||
9852 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9853 | (exit $ac_status); }; } && | ||
9854 | { ac_try='test -s conftest$ac_exeext' | ||
9855 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9856 | - (eval $ac_try) 2>&5 | ||
9857 | + { (case "(($ac_try" in | ||
9858 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
9859 | + *) ac_try_echo=$ac_try;; | ||
9860 | +esac | ||
9861 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
9862 | + (eval "$ac_try") 2>&5 | ||
9863 | ac_status=$? | ||
9864 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9865 | (exit $ac_status); }; }; then | ||
9866 | @@ -20416,15 +21659,17 @@ | ||
9867 | echo "$as_me: failed program was:" >&5 | ||
9868 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
9869 | |||
9870 | + | ||
9871 | fi | ||
9872 | -rm -f conftest.err conftest.$ac_objext \ | ||
9873 | + | ||
9874 | +rm -f core conftest.err conftest.$ac_objext \ | ||
9875 | conftest$ac_exeext conftest.$ac_ext | ||
9876 | fi | ||
9877 | CPPFLAGS="$gt_save_CPPFLAGS" | ||
9878 | LIBS="$gt_save_LIBS" | ||
9879 | fi | ||
9880 | -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 | ||
9881 | -echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 | ||
9882 | +{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 | ||
9883 | +echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; } | ||
9884 | fi | ||
9885 | |||
9886 | if test "$gt_cv_func_gnugettext1_libc" = "yes" \ | ||
9887 | @@ -20455,10 +21700,10 @@ | ||
9888 | |||
9889 | if test "$gt_use_preinstalled_gnugettext" = "yes"; then | ||
9890 | if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then | ||
9891 | - echo "$as_me:$LINENO: checking how to link with libintl" >&5 | ||
9892 | -echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6 | ||
9893 | - echo "$as_me:$LINENO: result: $LIBINTL" >&5 | ||
9894 | -echo "${ECHO_T}$LIBINTL" >&6 | ||
9895 | + { echo "$as_me:$LINENO: checking how to link with libintl" >&5 | ||
9896 | +echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; } | ||
9897 | + { echo "$as_me:$LINENO: result: $LIBINTL" >&5 | ||
9898 | +echo "${ECHO_T}$LIBINTL" >&6; } | ||
9899 | |||
9900 | for element in $INCINTL; do | ||
9901 | haveit= | ||
9902 | @@ -20554,10 +21799,9 @@ | ||
9903 | |||
9904 | |||
9905 | |||
9906 | - # Check whether --enable-debug or --disable-debug was given. | ||
9907 | + # Check whether --enable-debug was given. | ||
9908 | if test "${enable_debug+set}" = set; then | ||
9909 | - enableval="$enable_debug" | ||
9910 | - | ||
9911 | + enableval=$enable_debug; | ||
9912 | case "${enableval}" in | ||
9913 | yes) USE_DEBUG=yes ;; | ||
9914 | no) USE_DEBUG=no ;; | ||
9915 | @@ -20568,12 +21812,12 @@ | ||
9916 | |||
9917 | else | ||
9918 | USE_DEBUG=yes | ||
9919 | -fi; | ||
9920 | +fi | ||
9921 | |||
9922 | - # Check whether --enable-profiling or --disable-profiling was given. | ||
9923 | -if test "${enable_profiling+set}" = set; then | ||
9924 | - enableval="$enable_profiling" | ||
9925 | |||
9926 | + # Check whether --enable-profiling was given. | ||
9927 | +if test "${enable_profiling+set}" = set; then | ||
9928 | + enableval=$enable_profiling; | ||
9929 | case "${enableval}" in | ||
9930 | yes) USE_PROFILING=yes ;; | ||
9931 | no) USE_PROFILING=no ;; | ||
9932 | @@ -20584,15 +21828,16 @@ | ||
9933 | |||
9934 | else | ||
9935 | USE_PROFILING=no | ||
9936 | -fi; | ||
9937 | +fi | ||
9938 | + | ||
9939 | |||
9940 | |||
9941 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
9942 | if test -n "$ac_tool_prefix"; then | ||
9943 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
9944 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
9945 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9946 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
9947 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9948 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
9949 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then | ||
9950 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9951 | else | ||
9952 | @@ -20607,34 +21852,35 @@ | ||
9953 | IFS=$as_save_IFS | ||
9954 | test -z "$as_dir" && as_dir=. | ||
9955 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
9956 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
9957 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
9958 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
9959 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
9960 | break 2 | ||
9961 | fi | ||
9962 | done | ||
9963 | done | ||
9964 | +IFS=$as_save_IFS | ||
9965 | |||
9966 | ;; | ||
9967 | esac | ||
9968 | fi | ||
9969 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
9970 | - | ||
9971 | if test -n "$PKG_CONFIG"; then | ||
9972 | - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 | ||
9973 | -echo "${ECHO_T}$PKG_CONFIG" >&6 | ||
9974 | + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 | ||
9975 | +echo "${ECHO_T}$PKG_CONFIG" >&6; } | ||
9976 | else | ||
9977 | - echo "$as_me:$LINENO: result: no" >&5 | ||
9978 | -echo "${ECHO_T}no" >&6 | ||
9979 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
9980 | +echo "${ECHO_T}no" >&6; } | ||
9981 | fi | ||
9982 | |||
9983 | + | ||
9984 | fi | ||
9985 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
9986 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
9987 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
9988 | set dummy pkg-config; ac_word=$2 | ||
9989 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9990 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
9991 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
9992 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
9993 | if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then | ||
9994 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9995 | else | ||
9996 | @@ -20649,28 +21895,42 @@ | ||
9997 | IFS=$as_save_IFS | ||
9998 | test -z "$as_dir" && as_dir=. | ||
9999 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
10000 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
10001 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
10002 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
10003 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
10004 | break 2 | ||
10005 | fi | ||
10006 | done | ||
10007 | done | ||
10008 | +IFS=$as_save_IFS | ||
10009 | |||
10010 | ;; | ||
10011 | esac | ||
10012 | fi | ||
10013 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
10014 | - | ||
10015 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
10016 | - echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 | ||
10017 | -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 | ||
10018 | + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 | ||
10019 | +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } | ||
10020 | else | ||
10021 | - echo "$as_me:$LINENO: result: no" >&5 | ||
10022 | -echo "${ECHO_T}no" >&6 | ||
10023 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
10024 | +echo "${ECHO_T}no" >&6; } | ||
10025 | fi | ||
10026 | |||
10027 | - PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
10028 | + if test "x$ac_pt_PKG_CONFIG" = x; then | ||
10029 | + PKG_CONFIG="" | ||
10030 | + else | ||
10031 | + case $cross_compiling:$ac_tool_warned in | ||
10032 | +yes:) | ||
10033 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
10034 | +whose name does not start with the host triplet. If you think this | ||
10035 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
10036 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
10037 | +whose name does not start with the host triplet. If you think this | ||
10038 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
10039 | +ac_tool_warned=yes ;; | ||
10040 | +esac | ||
10041 | + PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
10042 | + fi | ||
10043 | else | ||
10044 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
10045 | fi | ||
10046 | @@ -20678,23 +21938,22 @@ | ||
10047 | fi | ||
10048 | if test -n "$PKG_CONFIG"; then | ||
10049 | _pkg_min_version=0.9.0 | ||
10050 | - echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
10051 | -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 | ||
10052 | + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
10053 | +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } | ||
10054 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
10055 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
10056 | -echo "${ECHO_T}yes" >&6 | ||
10057 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
10058 | +echo "${ECHO_T}yes" >&6; } | ||
10059 | else | ||
10060 | - echo "$as_me:$LINENO: result: no" >&5 | ||
10061 | -echo "${ECHO_T}no" >&6 | ||
10062 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
10063 | +echo "${ECHO_T}no" >&6; } | ||
10064 | PKG_CONFIG="" | ||
10065 | fi | ||
10066 | |||
10067 | fi | ||
10068 | |||
10069 | - # Check whether --enable-valgrind or --disable-valgrind was given. | ||
10070 | + # Check whether --enable-valgrind was given. | ||
10071 | if test "${enable_valgrind+set}" = set; then | ||
10072 | - enableval="$enable_valgrind" | ||
10073 | - | ||
10074 | + enableval=$enable_valgrind; | ||
10075 | case "${enableval}" in | ||
10076 | yes) USE_VALGRIND="$USE_DEBUG" ;; | ||
10077 | no) USE_VALGRIND=no ;; | ||
10078 | @@ -20705,12 +21964,13 @@ | ||
10079 | |||
10080 | else | ||
10081 | USE_VALGRIND="$USE_DEBUG" | ||
10082 | -fi; VALGRIND_REQ="2.1" | ||
10083 | +fi | ||
10084 | + VALGRIND_REQ="2.1" | ||
10085 | if test "x$USE_VALGRIND" = xyes; then | ||
10086 | |||
10087 | pkg_failed=no | ||
10088 | -echo "$as_me:$LINENO: checking for VALGRIND" >&5 | ||
10089 | -echo $ECHO_N "checking for VALGRIND... $ECHO_C" >&6 | ||
10090 | +{ echo "$as_me:$LINENO: checking for VALGRIND" >&5 | ||
10091 | +echo $ECHO_N "checking for VALGRIND... $ECHO_C" >&6; } | ||
10092 | |||
10093 | if test -n "$PKG_CONFIG"; then | ||
10094 | if test -n "$PKG_CONFIG" && \ | ||
10095 | @@ -20748,20 +22008,20 @@ | ||
10096 | |||
10097 | |||
10098 | USE_VALGRIND="no" | ||
10099 | - echo "$as_me:$LINENO: result: no" >&5 | ||
10100 | -echo "${ECHO_T}no" >&6 | ||
10101 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
10102 | +echo "${ECHO_T}no" >&6; } | ||
10103 | |||
10104 | elif test $pkg_failed = untried; then | ||
10105 | |||
10106 | USE_VALGRIND="no" | ||
10107 | - echo "$as_me:$LINENO: result: no" >&5 | ||
10108 | -echo "${ECHO_T}no" >&6 | ||
10109 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
10110 | +echo "${ECHO_T}no" >&6; } | ||
10111 | |||
10112 | else | ||
10113 | VALGRIND_CFLAGS=$pkg_cv_VALGRIND_CFLAGS | ||
10114 | VALGRIND_LIBS=$pkg_cv_VALGRIND_LIBS | ||
10115 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
10116 | -echo "${ECHO_T}yes" >&6 | ||
10117 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
10118 | +echo "${ECHO_T}yes" >&6; } | ||
10119 | USE_VALGRIND="yes" | ||
10120 | fi | ||
10121 | fi | ||
10122 | @@ -20776,17 +22036,17 @@ | ||
10123 | fi | ||
10124 | |||
10125 | |||
10126 | - # Check whether --enable-gcov or --disable-gcov was given. | ||
10127 | + # Check whether --enable-gcov was given. | ||
10128 | if test "${enable_gcov+set}" = set; then | ||
10129 | - enableval="$enable_gcov" | ||
10130 | - enable_gcov=$enableval | ||
10131 | + enableval=$enable_gcov; enable_gcov=$enableval | ||
10132 | else | ||
10133 | enable_gcov=no | ||
10134 | -fi; | ||
10135 | +fi | ||
10136 | + | ||
10137 | if test x$enable_gcov = xyes ; then | ||
10138 | |||
10139 | - echo "$as_me:$LINENO: checking to see if compiler understands \"-fprofile-arcs\"" >&5 | ||
10140 | -echo $ECHO_N "checking to see if compiler understands \"-fprofile-arcs\"... $ECHO_C" >&6 | ||
10141 | + { echo "$as_me:$LINENO: checking to see if compiler understands \"-fprofile-arcs\"" >&5 | ||
10142 | +echo $ECHO_N "checking to see if compiler understands \"-fprofile-arcs\"... $ECHO_C" >&6; } | ||
10143 | |||
10144 | save_CFLAGS="$CFLAGS" | ||
10145 | CFLAGS="$CFLAGS "-fprofile-arcs"" | ||
10146 | @@ -20807,23 +22067,36 @@ | ||
10147 | } | ||
10148 | _ACEOF | ||
10149 | rm -f conftest.$ac_objext | ||
10150 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
10151 | - (eval $ac_compile) 2>conftest.er1 | ||
10152 | +if { (ac_try="$ac_compile" | ||
10153 | +case "(($ac_try" in | ||
10154 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10155 | + *) ac_try_echo=$ac_try;; | ||
10156 | +esac | ||
10157 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10158 | + (eval "$ac_compile") 2>conftest.er1 | ||
10159 | ac_status=$? | ||
10160 | grep -v '^ *+' conftest.er1 >conftest.err | ||
10161 | rm -f conftest.er1 | ||
10162 | cat conftest.err >&5 | ||
10163 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10164 | (exit $ac_status); } && | ||
10165 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10166 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10167 | - (eval $ac_try) 2>&5 | ||
10168 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10169 | + { (case "(($ac_try" in | ||
10170 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10171 | + *) ac_try_echo=$ac_try;; | ||
10172 | +esac | ||
10173 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10174 | + (eval "$ac_try") 2>&5 | ||
10175 | ac_status=$? | ||
10176 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10177 | (exit $ac_status); }; } && | ||
10178 | { ac_try='test -s conftest.$ac_objext' | ||
10179 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10180 | - (eval $ac_try) 2>&5 | ||
10181 | + { (case "(($ac_try" in | ||
10182 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10183 | + *) ac_try_echo=$ac_try;; | ||
10184 | +esac | ||
10185 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10186 | + (eval "$ac_try") 2>&5 | ||
10187 | ac_status=$? | ||
10188 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10189 | (exit $ac_status); }; }; then | ||
10190 | @@ -20832,9 +22105,10 @@ | ||
10191 | echo "$as_me: failed program was:" >&5 | ||
10192 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
10193 | |||
10194 | -flag_ok=no | ||
10195 | + flag_ok=no | ||
10196 | fi | ||
10197 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10198 | + | ||
10199 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10200 | CFLAGS="$save_CFLAGS" | ||
10201 | |||
10202 | if test "X$flag_ok" = Xyes ; then | ||
10203 | @@ -20844,12 +22118,12 @@ | ||
10204 | true | ||
10205 | true | ||
10206 | fi | ||
10207 | - echo "$as_me:$LINENO: result: $flag_ok" >&5 | ||
10208 | -echo "${ECHO_T}$flag_ok" >&6 | ||
10209 | + { echo "$as_me:$LINENO: result: $flag_ok" >&5 | ||
10210 | +echo "${ECHO_T}$flag_ok" >&6; } | ||
10211 | |||
10212 | |||
10213 | - echo "$as_me:$LINENO: checking to see if compiler understands \"-ftest-coverage\"" >&5 | ||
10214 | -echo $ECHO_N "checking to see if compiler understands \"-ftest-coverage\"... $ECHO_C" >&6 | ||
10215 | + { echo "$as_me:$LINENO: checking to see if compiler understands \"-ftest-coverage\"" >&5 | ||
10216 | +echo $ECHO_N "checking to see if compiler understands \"-ftest-coverage\"... $ECHO_C" >&6; } | ||
10217 | |||
10218 | save_CFLAGS="$CFLAGS" | ||
10219 | CFLAGS="$CFLAGS "-ftest-coverage"" | ||
10220 | @@ -20870,23 +22144,36 @@ | ||
10221 | } | ||
10222 | _ACEOF | ||
10223 | rm -f conftest.$ac_objext | ||
10224 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
10225 | - (eval $ac_compile) 2>conftest.er1 | ||
10226 | +if { (ac_try="$ac_compile" | ||
10227 | +case "(($ac_try" in | ||
10228 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10229 | + *) ac_try_echo=$ac_try;; | ||
10230 | +esac | ||
10231 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10232 | + (eval "$ac_compile") 2>conftest.er1 | ||
10233 | ac_status=$? | ||
10234 | grep -v '^ *+' conftest.er1 >conftest.err | ||
10235 | rm -f conftest.er1 | ||
10236 | cat conftest.err >&5 | ||
10237 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10238 | (exit $ac_status); } && | ||
10239 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10240 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10241 | - (eval $ac_try) 2>&5 | ||
10242 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10243 | + { (case "(($ac_try" in | ||
10244 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10245 | + *) ac_try_echo=$ac_try;; | ||
10246 | +esac | ||
10247 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10248 | + (eval "$ac_try") 2>&5 | ||
10249 | ac_status=$? | ||
10250 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10251 | (exit $ac_status); }; } && | ||
10252 | { ac_try='test -s conftest.$ac_objext' | ||
10253 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10254 | - (eval $ac_try) 2>&5 | ||
10255 | + { (case "(($ac_try" in | ||
10256 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10257 | + *) ac_try_echo=$ac_try;; | ||
10258 | +esac | ||
10259 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10260 | + (eval "$ac_try") 2>&5 | ||
10261 | ac_status=$? | ||
10262 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10263 | (exit $ac_status); }; }; then | ||
10264 | @@ -20895,9 +22182,10 @@ | ||
10265 | echo "$as_me: failed program was:" >&5 | ||
10266 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
10267 | |||
10268 | -flag_ok=no | ||
10269 | + flag_ok=no | ||
10270 | fi | ||
10271 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10272 | + | ||
10273 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10274 | CFLAGS="$save_CFLAGS" | ||
10275 | |||
10276 | if test "X$flag_ok" = Xyes ; then | ||
10277 | @@ -20907,8 +22195,8 @@ | ||
10278 | true | ||
10279 | true | ||
10280 | fi | ||
10281 | - echo "$as_me:$LINENO: result: $flag_ok" >&5 | ||
10282 | -echo "${ECHO_T}$flag_ok" >&6 | ||
10283 | + { echo "$as_me:$LINENO: result: $flag_ok" >&5 | ||
10284 | +echo "${ECHO_T}$flag_ok" >&6; } | ||
10285 | |||
10286 | GCOV_CFLAGS=`echo "$GCOV_CFLAGS" | sed -e 's/-O0-9*//g'` | ||
10287 | |||
10288 | @@ -20931,10 +22219,9 @@ | ||
10289 | |||
10290 | |||
10291 | |||
10292 | - # Check whether --enable-examples or --disable-examples was given. | ||
10293 | + # Check whether --enable-examples was given. | ||
10294 | if test "${enable_examples+set}" = set; then | ||
10295 | - enableval="$enable_examples" | ||
10296 | - | ||
10297 | + enableval=$enable_examples; | ||
10298 | case "${enableval}" in | ||
10299 | yes) BUILD_EXAMPLES=yes ;; | ||
10300 | no) BUILD_EXAMPLES=no ;; | ||
10301 | @@ -20945,7 +22232,8 @@ | ||
10302 | |||
10303 | else | ||
10304 | BUILD_EXAMPLES=yes | ||
10305 | -fi; | ||
10306 | +fi | ||
10307 | + | ||
10308 | |||
10309 | if test "x$BUILD_EXAMPLES" = "xyes"; then | ||
10310 | BUILD_EXAMPLES_TRUE= | ||
10311 | @@ -20959,18 +22247,17 @@ | ||
10312 | |||
10313 | |||
10314 | |||
10315 | -# Check whether --with-pkg-config-path or --without-pkg-config-path was given. | ||
10316 | +# Check whether --with-pkg-config-path was given. | ||
10317 | if test "${with_pkg_config_path+set}" = set; then | ||
10318 | - withval="$with_pkg_config_path" | ||
10319 | - export PKG_CONFIG_PATH=${withval} | ||
10320 | -fi; | ||
10321 | + withval=$with_pkg_config_path; export PKG_CONFIG_PATH=${withval} | ||
10322 | +fi | ||
10323 | |||
10324 | |||
10325 | |||
10326 | -# Check whether --with-package-name or --without-package-name was given. | ||
10327 | -if test "${with_package_name+set}" = set; then | ||
10328 | - withval="$with_package_name" | ||
10329 | |||
10330 | +# Check whether --with-package-name was given. | ||
10331 | +if test "${with_package_name+set}" = set; then | ||
10332 | + withval=$with_package_name; | ||
10333 | case "${withval}" in | ||
10334 | yes) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-package-name" >&5 | ||
10335 | echo "$as_me: error: bad value ${withval} for --with-package-name" >&2;} | ||
10336 | @@ -20997,7 +22284,8 @@ | ||
10337 | fi | ||
10338 | |||
10339 | |||
10340 | -fi; | ||
10341 | +fi | ||
10342 | + | ||
10343 | { echo "$as_me:$LINENO: Using $GST_PACKAGE_NAME as package name" >&5 | ||
10344 | echo "$as_me: Using $GST_PACKAGE_NAME as package name" >&6;} | ||
10345 | |||
10346 | @@ -21009,10 +22297,9 @@ | ||
10347 | |||
10348 | |||
10349 | |||
10350 | -# Check whether --with-package-origin or --without-package-origin was given. | ||
10351 | +# Check whether --with-package-origin was given. | ||
10352 | if test "${with_package_origin+set}" = set; then | ||
10353 | - withval="$with_package_origin" | ||
10354 | - | ||
10355 | + withval=$with_package_origin; | ||
10356 | case "${withval}" in | ||
10357 | yes) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-package-origin" >&5 | ||
10358 | echo "$as_me: error: bad value ${withval} for --with-package-origin" >&2;} | ||
10359 | @@ -21025,7 +22312,8 @@ | ||
10360 | |||
10361 | else | ||
10362 | GST_PACKAGE_ORIGIN="Unknown package origin" | ||
10363 | -fi; | ||
10364 | +fi | ||
10365 | + | ||
10366 | { echo "$as_me:$LINENO: Using $GST_PACKAGE_ORIGIN as package origin" >&5 | ||
10367 | echo "$as_me: Using $GST_PACKAGE_ORIGIN as package origin" >&6;} | ||
10368 | |||
10369 | @@ -21037,10 +22325,9 @@ | ||
10370 | |||
10371 | |||
10372 | |||
10373 | - # Check whether --enable-examples or --disable-examples was given. | ||
10374 | + # Check whether --enable-examples was given. | ||
10375 | if test "${enable_examples+set}" = set; then | ||
10376 | - enableval="$enable_examples" | ||
10377 | - | ||
10378 | + enableval=$enable_examples; | ||
10379 | case "${enableval}" in | ||
10380 | yes) BUILD_EXAMPLES=yes ;; | ||
10381 | no) BUILD_EXAMPLES=no ;; | ||
10382 | @@ -21051,7 +22338,8 @@ | ||
10383 | |||
10384 | else | ||
10385 | BUILD_EXAMPLES=yes | ||
10386 | -fi; | ||
10387 | +fi | ||
10388 | + | ||
10389 | |||
10390 | if test "x$BUILD_EXAMPLES" = "xyes"; then | ||
10391 | BUILD_EXAMPLES_TRUE= | ||
10392 | @@ -21077,10 +22365,9 @@ | ||
10393 | |||
10394 | |||
10395 | |||
10396 | -# Check whether --with-plugins or --without-plugins was given. | ||
10397 | +# Check whether --with-plugins was given. | ||
10398 | if test "${with_plugins+set}" = set; then | ||
10399 | - withval="$with_plugins" | ||
10400 | - | ||
10401 | + withval=$with_plugins; | ||
10402 | for i in `echo $withval | tr , ' '`; do | ||
10403 | if echo $GST_PLUGINS_ALL | grep $i > /dev/null | ||
10404 | then | ||
10405 | @@ -21091,7 +22378,8 @@ | ||
10406 | done | ||
10407 | else | ||
10408 | GST_PLUGINS_SELECTED=$GST_PLUGINS_ALL | ||
10409 | -fi; | ||
10410 | +fi | ||
10411 | + | ||
10412 | |||
10413 | |||
10414 | |||
10415 | @@ -21102,10 +22390,9 @@ | ||
10416 | if test "x$USE_EXTERNAL" = "xno"; then | ||
10417 | NOUSE="yes" | ||
10418 | fi | ||
10419 | -# Check whether --enable-external or --disable-external was given. | ||
10420 | +# Check whether --enable-external was given. | ||
10421 | if test "${enable_external+set}" = set; then | ||
10422 | - enableval="$enable_external" | ||
10423 | - case "${enableval}" in | ||
10424 | + enableval=$enable_external; case "${enableval}" in | ||
10425 | yes) USE_EXTERNAL=yes;; | ||
10426 | no) USE_EXTERNAL=no;; | ||
10427 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-external" >&5 | ||
10428 | @@ -21114,7 +22401,8 @@ | ||
10429 | esac | ||
10430 | else | ||
10431 | USE_EXTERNAL=yes | ||
10432 | -fi; | ||
10433 | +fi | ||
10434 | + | ||
10435 | if test "x$NOUSE" = "xyes"; then | ||
10436 | USE_EXTERNAL="no" | ||
10437 | { echo "$as_me:$LINENO: WARNING: *** pre-configured not to be built" >&5 | ||
10438 | @@ -21201,10 +22489,9 @@ | ||
10439 | if test "x$USE_EXPERIMENTAL" = "xno"; then | ||
10440 | NOUSE="yes" | ||
10441 | fi | ||
10442 | -# Check whether --enable-experimental or --disable-experimental was given. | ||
10443 | +# Check whether --enable-experimental was given. | ||
10444 | if test "${enable_experimental+set}" = set; then | ||
10445 | - enableval="$enable_experimental" | ||
10446 | - case "${enableval}" in | ||
10447 | + enableval=$enable_experimental; case "${enableval}" in | ||
10448 | yes) USE_EXPERIMENTAL=yes;; | ||
10449 | no) USE_EXPERIMENTAL=no;; | ||
10450 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-experimental" >&5 | ||
10451 | @@ -21213,7 +22500,8 @@ | ||
10452 | esac | ||
10453 | else | ||
10454 | USE_EXPERIMENTAL=yes | ||
10455 | -fi; | ||
10456 | +fi | ||
10457 | + | ||
10458 | if test "x$NOUSE" = "xyes"; then | ||
10459 | USE_EXPERIMENTAL="no" | ||
10460 | { echo "$as_me:$LINENO: WARNING: *** pre-configured not to be built" >&5 | ||
10461 | @@ -21388,8 +22676,8 @@ | ||
10462 | ;; | ||
10463 | esac | ||
10464 | |||
10465 | - echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 | ||
10466 | -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 | ||
10467 | + { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 | ||
10468 | +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } | ||
10469 | if test "${ac_cv_c_bigendian+set}" = set; then | ||
10470 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10471 | else | ||
10472 | @@ -21415,23 +22703,36 @@ | ||
10473 | } | ||
10474 | _ACEOF | ||
10475 | rm -f conftest.$ac_objext | ||
10476 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
10477 | - (eval $ac_compile) 2>conftest.er1 | ||
10478 | +if { (ac_try="$ac_compile" | ||
10479 | +case "(($ac_try" in | ||
10480 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10481 | + *) ac_try_echo=$ac_try;; | ||
10482 | +esac | ||
10483 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10484 | + (eval "$ac_compile") 2>conftest.er1 | ||
10485 | ac_status=$? | ||
10486 | grep -v '^ *+' conftest.er1 >conftest.err | ||
10487 | rm -f conftest.er1 | ||
10488 | cat conftest.err >&5 | ||
10489 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10490 | (exit $ac_status); } && | ||
10491 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10492 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10493 | - (eval $ac_try) 2>&5 | ||
10494 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10495 | + { (case "(($ac_try" in | ||
10496 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10497 | + *) ac_try_echo=$ac_try;; | ||
10498 | +esac | ||
10499 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10500 | + (eval "$ac_try") 2>&5 | ||
10501 | ac_status=$? | ||
10502 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10503 | (exit $ac_status); }; } && | ||
10504 | { ac_try='test -s conftest.$ac_objext' | ||
10505 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10506 | - (eval $ac_try) 2>&5 | ||
10507 | + { (case "(($ac_try" in | ||
10508 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10509 | + *) ac_try_echo=$ac_try;; | ||
10510 | +esac | ||
10511 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10512 | + (eval "$ac_try") 2>&5 | ||
10513 | ac_status=$? | ||
10514 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10515 | (exit $ac_status); }; }; then | ||
10516 | @@ -21457,23 +22758,36 @@ | ||
10517 | } | ||
10518 | _ACEOF | ||
10519 | rm -f conftest.$ac_objext | ||
10520 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
10521 | - (eval $ac_compile) 2>conftest.er1 | ||
10522 | +if { (ac_try="$ac_compile" | ||
10523 | +case "(($ac_try" in | ||
10524 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10525 | + *) ac_try_echo=$ac_try;; | ||
10526 | +esac | ||
10527 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10528 | + (eval "$ac_compile") 2>conftest.er1 | ||
10529 | ac_status=$? | ||
10530 | grep -v '^ *+' conftest.er1 >conftest.err | ||
10531 | rm -f conftest.er1 | ||
10532 | cat conftest.err >&5 | ||
10533 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10534 | (exit $ac_status); } && | ||
10535 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10536 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10537 | - (eval $ac_try) 2>&5 | ||
10538 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10539 | + { (case "(($ac_try" in | ||
10540 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10541 | + *) ac_try_echo=$ac_try;; | ||
10542 | +esac | ||
10543 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10544 | + (eval "$ac_try") 2>&5 | ||
10545 | ac_status=$? | ||
10546 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10547 | (exit $ac_status); }; } && | ||
10548 | { ac_try='test -s conftest.$ac_objext' | ||
10549 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10550 | - (eval $ac_try) 2>&5 | ||
10551 | + { (case "(($ac_try" in | ||
10552 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10553 | + *) ac_try_echo=$ac_try;; | ||
10554 | +esac | ||
10555 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10556 | + (eval "$ac_try") 2>&5 | ||
10557 | ac_status=$? | ||
10558 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10559 | (exit $ac_status); }; }; then | ||
10560 | @@ -21482,14 +22796,15 @@ | ||
10561 | echo "$as_me: failed program was:" >&5 | ||
10562 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
10563 | |||
10564 | -ac_cv_c_bigendian=no | ||
10565 | + ac_cv_c_bigendian=no | ||
10566 | fi | ||
10567 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10568 | + | ||
10569 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10570 | else | ||
10571 | echo "$as_me: failed program was:" >&5 | ||
10572 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
10573 | |||
10574 | -# It does not; compile a test program. | ||
10575 | + # It does not; compile a test program. | ||
10576 | if test "$cross_compiling" = yes; then | ||
10577 | # try to guess the endianness by grepping values into an object file | ||
10578 | ac_cv_c_bigendian=unknown | ||
10579 | @@ -21499,11 +22814,11 @@ | ||
10580 | cat confdefs.h >>conftest.$ac_ext | ||
10581 | cat >>conftest.$ac_ext <<_ACEOF | ||
10582 | /* end confdefs.h. */ | ||
10583 | -short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; | ||
10584 | -short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; | ||
10585 | +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; | ||
10586 | +short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; | ||
10587 | void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } | ||
10588 | -short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; | ||
10589 | -short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; | ||
10590 | +short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; | ||
10591 | +short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; | ||
10592 | void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } | ||
10593 | int | ||
10594 | main () | ||
10595 | @@ -21514,23 +22829,36 @@ | ||
10596 | } | ||
10597 | _ACEOF | ||
10598 | rm -f conftest.$ac_objext | ||
10599 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
10600 | - (eval $ac_compile) 2>conftest.er1 | ||
10601 | +if { (ac_try="$ac_compile" | ||
10602 | +case "(($ac_try" in | ||
10603 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10604 | + *) ac_try_echo=$ac_try;; | ||
10605 | +esac | ||
10606 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10607 | + (eval "$ac_compile") 2>conftest.er1 | ||
10608 | ac_status=$? | ||
10609 | grep -v '^ *+' conftest.er1 >conftest.err | ||
10610 | rm -f conftest.er1 | ||
10611 | cat conftest.err >&5 | ||
10612 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10613 | (exit $ac_status); } && | ||
10614 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10615 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10616 | - (eval $ac_try) 2>&5 | ||
10617 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10618 | + { (case "(($ac_try" in | ||
10619 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10620 | + *) ac_try_echo=$ac_try;; | ||
10621 | +esac | ||
10622 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10623 | + (eval "$ac_try") 2>&5 | ||
10624 | ac_status=$? | ||
10625 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10626 | (exit $ac_status); }; } && | ||
10627 | { ac_try='test -s conftest.$ac_objext' | ||
10628 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10629 | - (eval $ac_try) 2>&5 | ||
10630 | + { (case "(($ac_try" in | ||
10631 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10632 | + *) ac_try_echo=$ac_try;; | ||
10633 | +esac | ||
10634 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10635 | + (eval "$ac_try") 2>&5 | ||
10636 | ac_status=$? | ||
10637 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10638 | (exit $ac_status); }; }; then | ||
10639 | @@ -21549,8 +22877,10 @@ | ||
10640 | echo "$as_me: failed program was:" >&5 | ||
10641 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
10642 | |||
10643 | + | ||
10644 | fi | ||
10645 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10646 | + | ||
10647 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10648 | else | ||
10649 | cat >conftest.$ac_ext <<_ACEOF | ||
10650 | /* confdefs.h. */ | ||
10651 | @@ -21558,27 +22888,41 @@ | ||
10652 | cat confdefs.h >>conftest.$ac_ext | ||
10653 | cat >>conftest.$ac_ext <<_ACEOF | ||
10654 | /* end confdefs.h. */ | ||
10655 | +$ac_includes_default | ||
10656 | int | ||
10657 | main () | ||
10658 | { | ||
10659 | + | ||
10660 | /* Are we little or big endian? From Harbison&Steele. */ | ||
10661 | union | ||
10662 | { | ||
10663 | - long l; | ||
10664 | - char c[sizeof (long)]; | ||
10665 | + long int l; | ||
10666 | + char c[sizeof (long int)]; | ||
10667 | } u; | ||
10668 | u.l = 1; | ||
10669 | - exit (u.c[sizeof (long) - 1] == 1); | ||
10670 | + return u.c[sizeof (long int) - 1] == 1; | ||
10671 | + | ||
10672 | + ; | ||
10673 | + return 0; | ||
10674 | } | ||
10675 | _ACEOF | ||
10676 | rm -f conftest$ac_exeext | ||
10677 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
10678 | - (eval $ac_link) 2>&5 | ||
10679 | +if { (ac_try="$ac_link" | ||
10680 | +case "(($ac_try" in | ||
10681 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10682 | + *) ac_try_echo=$ac_try;; | ||
10683 | +esac | ||
10684 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10685 | + (eval "$ac_link") 2>&5 | ||
10686 | ac_status=$? | ||
10687 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10688 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
10689 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10690 | - (eval $ac_try) 2>&5 | ||
10691 | + { (case "(($ac_try" in | ||
10692 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10693 | + *) ac_try_echo=$ac_try;; | ||
10694 | +esac | ||
10695 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10696 | + (eval "$ac_try") 2>&5 | ||
10697 | ac_status=$? | ||
10698 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10699 | (exit $ac_status); }; }; then | ||
10700 | @@ -21591,13 +22935,16 @@ | ||
10701 | ( exit $ac_status ) | ||
10702 | ac_cv_c_bigendian=yes | ||
10703 | fi | ||
10704 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
10705 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
10706 | fi | ||
10707 | + | ||
10708 | + | ||
10709 | fi | ||
10710 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10711 | + | ||
10712 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10713 | fi | ||
10714 | -echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 | ||
10715 | -echo "${ECHO_T}$ac_cv_c_bigendian" >&6 | ||
10716 | +{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 | ||
10717 | +echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } | ||
10718 | case $ac_cv_c_bigendian in | ||
10719 | yes) | ||
10720 | |||
10721 | @@ -21729,8 +23076,8 @@ | ||
10722 | |||
10723 | |||
10724 | |||
10725 | -echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 | ||
10726 | -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 | ||
10727 | +{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 | ||
10728 | +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } | ||
10729 | if test "${ac_cv_c_bigendian+set}" = set; then | ||
10730 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10731 | else | ||
10732 | @@ -21756,23 +23103,36 @@ | ||
10733 | } | ||
10734 | _ACEOF | ||
10735 | rm -f conftest.$ac_objext | ||
10736 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
10737 | - (eval $ac_compile) 2>conftest.er1 | ||
10738 | +if { (ac_try="$ac_compile" | ||
10739 | +case "(($ac_try" in | ||
10740 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10741 | + *) ac_try_echo=$ac_try;; | ||
10742 | +esac | ||
10743 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10744 | + (eval "$ac_compile") 2>conftest.er1 | ||
10745 | ac_status=$? | ||
10746 | grep -v '^ *+' conftest.er1 >conftest.err | ||
10747 | rm -f conftest.er1 | ||
10748 | cat conftest.err >&5 | ||
10749 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10750 | (exit $ac_status); } && | ||
10751 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10752 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10753 | - (eval $ac_try) 2>&5 | ||
10754 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10755 | + { (case "(($ac_try" in | ||
10756 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10757 | + *) ac_try_echo=$ac_try;; | ||
10758 | +esac | ||
10759 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10760 | + (eval "$ac_try") 2>&5 | ||
10761 | ac_status=$? | ||
10762 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10763 | (exit $ac_status); }; } && | ||
10764 | { ac_try='test -s conftest.$ac_objext' | ||
10765 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10766 | - (eval $ac_try) 2>&5 | ||
10767 | + { (case "(($ac_try" in | ||
10768 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10769 | + *) ac_try_echo=$ac_try;; | ||
10770 | +esac | ||
10771 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10772 | + (eval "$ac_try") 2>&5 | ||
10773 | ac_status=$? | ||
10774 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10775 | (exit $ac_status); }; }; then | ||
10776 | @@ -21798,23 +23158,36 @@ | ||
10777 | } | ||
10778 | _ACEOF | ||
10779 | rm -f conftest.$ac_objext | ||
10780 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
10781 | - (eval $ac_compile) 2>conftest.er1 | ||
10782 | +if { (ac_try="$ac_compile" | ||
10783 | +case "(($ac_try" in | ||
10784 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10785 | + *) ac_try_echo=$ac_try;; | ||
10786 | +esac | ||
10787 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10788 | + (eval "$ac_compile") 2>conftest.er1 | ||
10789 | ac_status=$? | ||
10790 | grep -v '^ *+' conftest.er1 >conftest.err | ||
10791 | rm -f conftest.er1 | ||
10792 | cat conftest.err >&5 | ||
10793 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10794 | (exit $ac_status); } && | ||
10795 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10796 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10797 | - (eval $ac_try) 2>&5 | ||
10798 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10799 | + { (case "(($ac_try" in | ||
10800 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10801 | + *) ac_try_echo=$ac_try;; | ||
10802 | +esac | ||
10803 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10804 | + (eval "$ac_try") 2>&5 | ||
10805 | ac_status=$? | ||
10806 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10807 | (exit $ac_status); }; } && | ||
10808 | { ac_try='test -s conftest.$ac_objext' | ||
10809 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10810 | - (eval $ac_try) 2>&5 | ||
10811 | + { (case "(($ac_try" in | ||
10812 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10813 | + *) ac_try_echo=$ac_try;; | ||
10814 | +esac | ||
10815 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10816 | + (eval "$ac_try") 2>&5 | ||
10817 | ac_status=$? | ||
10818 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10819 | (exit $ac_status); }; }; then | ||
10820 | @@ -21823,14 +23196,15 @@ | ||
10821 | echo "$as_me: failed program was:" >&5 | ||
10822 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
10823 | |||
10824 | -ac_cv_c_bigendian=no | ||
10825 | + ac_cv_c_bigendian=no | ||
10826 | fi | ||
10827 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10828 | + | ||
10829 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10830 | else | ||
10831 | echo "$as_me: failed program was:" >&5 | ||
10832 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
10833 | |||
10834 | -# It does not; compile a test program. | ||
10835 | + # It does not; compile a test program. | ||
10836 | if test "$cross_compiling" = yes; then | ||
10837 | # try to guess the endianness by grepping values into an object file | ||
10838 | ac_cv_c_bigendian=unknown | ||
10839 | @@ -21840,11 +23214,11 @@ | ||
10840 | cat confdefs.h >>conftest.$ac_ext | ||
10841 | cat >>conftest.$ac_ext <<_ACEOF | ||
10842 | /* end confdefs.h. */ | ||
10843 | -short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; | ||
10844 | -short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; | ||
10845 | +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; | ||
10846 | +short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; | ||
10847 | void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } | ||
10848 | -short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; | ||
10849 | -short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; | ||
10850 | +short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; | ||
10851 | +short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; | ||
10852 | void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } | ||
10853 | int | ||
10854 | main () | ||
10855 | @@ -21855,23 +23229,36 @@ | ||
10856 | } | ||
10857 | _ACEOF | ||
10858 | rm -f conftest.$ac_objext | ||
10859 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
10860 | - (eval $ac_compile) 2>conftest.er1 | ||
10861 | +if { (ac_try="$ac_compile" | ||
10862 | +case "(($ac_try" in | ||
10863 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10864 | + *) ac_try_echo=$ac_try;; | ||
10865 | +esac | ||
10866 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10867 | + (eval "$ac_compile") 2>conftest.er1 | ||
10868 | ac_status=$? | ||
10869 | grep -v '^ *+' conftest.er1 >conftest.err | ||
10870 | rm -f conftest.er1 | ||
10871 | cat conftest.err >&5 | ||
10872 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10873 | (exit $ac_status); } && | ||
10874 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10875 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10876 | - (eval $ac_try) 2>&5 | ||
10877 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
10878 | + { (case "(($ac_try" in | ||
10879 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10880 | + *) ac_try_echo=$ac_try;; | ||
10881 | +esac | ||
10882 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10883 | + (eval "$ac_try") 2>&5 | ||
10884 | ac_status=$? | ||
10885 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10886 | (exit $ac_status); }; } && | ||
10887 | { ac_try='test -s conftest.$ac_objext' | ||
10888 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10889 | - (eval $ac_try) 2>&5 | ||
10890 | + { (case "(($ac_try" in | ||
10891 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10892 | + *) ac_try_echo=$ac_try;; | ||
10893 | +esac | ||
10894 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10895 | + (eval "$ac_try") 2>&5 | ||
10896 | ac_status=$? | ||
10897 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10898 | (exit $ac_status); }; }; then | ||
10899 | @@ -21890,8 +23277,10 @@ | ||
10900 | echo "$as_me: failed program was:" >&5 | ||
10901 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
10902 | |||
10903 | + | ||
10904 | fi | ||
10905 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10906 | + | ||
10907 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10908 | else | ||
10909 | cat >conftest.$ac_ext <<_ACEOF | ||
10910 | /* confdefs.h. */ | ||
10911 | @@ -21899,27 +23288,41 @@ | ||
10912 | cat confdefs.h >>conftest.$ac_ext | ||
10913 | cat >>conftest.$ac_ext <<_ACEOF | ||
10914 | /* end confdefs.h. */ | ||
10915 | +$ac_includes_default | ||
10916 | int | ||
10917 | main () | ||
10918 | { | ||
10919 | + | ||
10920 | /* Are we little or big endian? From Harbison&Steele. */ | ||
10921 | union | ||
10922 | { | ||
10923 | - long l; | ||
10924 | - char c[sizeof (long)]; | ||
10925 | + long int l; | ||
10926 | + char c[sizeof (long int)]; | ||
10927 | } u; | ||
10928 | u.l = 1; | ||
10929 | - exit (u.c[sizeof (long) - 1] == 1); | ||
10930 | + return u.c[sizeof (long int) - 1] == 1; | ||
10931 | + | ||
10932 | + ; | ||
10933 | + return 0; | ||
10934 | } | ||
10935 | _ACEOF | ||
10936 | rm -f conftest$ac_exeext | ||
10937 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
10938 | - (eval $ac_link) 2>&5 | ||
10939 | +if { (ac_try="$ac_link" | ||
10940 | +case "(($ac_try" in | ||
10941 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10942 | + *) ac_try_echo=$ac_try;; | ||
10943 | +esac | ||
10944 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10945 | + (eval "$ac_link") 2>&5 | ||
10946 | ac_status=$? | ||
10947 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10948 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
10949 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10950 | - (eval $ac_try) 2>&5 | ||
10951 | + { (case "(($ac_try" in | ||
10952 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10953 | + *) ac_try_echo=$ac_try;; | ||
10954 | +esac | ||
10955 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10956 | + (eval "$ac_try") 2>&5 | ||
10957 | ac_status=$? | ||
10958 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10959 | (exit $ac_status); }; }; then | ||
10960 | @@ -21932,13 +23335,16 @@ | ||
10961 | ( exit $ac_status ) | ||
10962 | ac_cv_c_bigendian=yes | ||
10963 | fi | ||
10964 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
10965 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
10966 | fi | ||
10967 | + | ||
10968 | + | ||
10969 | fi | ||
10970 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10971 | + | ||
10972 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10973 | fi | ||
10974 | -echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 | ||
10975 | -echo "${ECHO_T}$ac_cv_c_bigendian" >&6 | ||
10976 | +{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 | ||
10977 | +echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } | ||
10978 | case $ac_cv_c_bigendian in | ||
10979 | yes) | ||
10980 | |||
10981 | @@ -21966,8 +23372,8 @@ | ||
10982 | if test -n "$ac_tool_prefix"; then | ||
10983 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | ||
10984 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 | ||
10985 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
10986 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
10987 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
10988 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
10989 | if test "${ac_cv_prog_CC+set}" = set; then | ||
10990 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10991 | else | ||
10992 | @@ -21980,32 +23386,34 @@ | ||
10993 | IFS=$as_save_IFS | ||
10994 | test -z "$as_dir" && as_dir=. | ||
10995 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
10996 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
10997 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
10998 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | ||
10999 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
11000 | break 2 | ||
11001 | fi | ||
11002 | done | ||
11003 | done | ||
11004 | +IFS=$as_save_IFS | ||
11005 | |||
11006 | fi | ||
11007 | fi | ||
11008 | CC=$ac_cv_prog_CC | ||
11009 | if test -n "$CC"; then | ||
11010 | - echo "$as_me:$LINENO: result: $CC" >&5 | ||
11011 | -echo "${ECHO_T}$CC" >&6 | ||
11012 | + { echo "$as_me:$LINENO: result: $CC" >&5 | ||
11013 | +echo "${ECHO_T}$CC" >&6; } | ||
11014 | else | ||
11015 | - echo "$as_me:$LINENO: result: no" >&5 | ||
11016 | -echo "${ECHO_T}no" >&6 | ||
11017 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
11018 | +echo "${ECHO_T}no" >&6; } | ||
11019 | fi | ||
11020 | |||
11021 | + | ||
11022 | fi | ||
11023 | if test -z "$ac_cv_prog_CC"; then | ||
11024 | ac_ct_CC=$CC | ||
11025 | # Extract the first word of "gcc", so it can be a program name with args. | ||
11026 | set dummy gcc; ac_word=$2 | ||
11027 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11028 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
11029 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11030 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
11031 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
11032 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11033 | else | ||
11034 | @@ -22018,36 +23426,51 @@ | ||
11035 | IFS=$as_save_IFS | ||
11036 | test -z "$as_dir" && as_dir=. | ||
11037 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
11038 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
11039 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
11040 | ac_cv_prog_ac_ct_CC="gcc" | ||
11041 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
11042 | break 2 | ||
11043 | fi | ||
11044 | done | ||
11045 | done | ||
11046 | +IFS=$as_save_IFS | ||
11047 | |||
11048 | fi | ||
11049 | fi | ||
11050 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
11051 | if test -n "$ac_ct_CC"; then | ||
11052 | - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
11053 | -echo "${ECHO_T}$ac_ct_CC" >&6 | ||
11054 | + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
11055 | +echo "${ECHO_T}$ac_ct_CC" >&6; } | ||
11056 | else | ||
11057 | - echo "$as_me:$LINENO: result: no" >&5 | ||
11058 | -echo "${ECHO_T}no" >&6 | ||
11059 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
11060 | +echo "${ECHO_T}no" >&6; } | ||
11061 | fi | ||
11062 | |||
11063 | - CC=$ac_ct_CC | ||
11064 | + if test "x$ac_ct_CC" = x; then | ||
11065 | + CC="" | ||
11066 | + else | ||
11067 | + case $cross_compiling:$ac_tool_warned in | ||
11068 | +yes:) | ||
11069 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
11070 | +whose name does not start with the host triplet. If you think this | ||
11071 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
11072 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
11073 | +whose name does not start with the host triplet. If you think this | ||
11074 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
11075 | +ac_tool_warned=yes ;; | ||
11076 | +esac | ||
11077 | + CC=$ac_ct_CC | ||
11078 | + fi | ||
11079 | else | ||
11080 | CC="$ac_cv_prog_CC" | ||
11081 | fi | ||
11082 | |||
11083 | if test -z "$CC"; then | ||
11084 | - if test -n "$ac_tool_prefix"; then | ||
11085 | - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | ||
11086 | + if test -n "$ac_tool_prefix"; then | ||
11087 | + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | ||
11088 | set dummy ${ac_tool_prefix}cc; ac_word=$2 | ||
11089 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11090 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
11091 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11092 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
11093 | if test "${ac_cv_prog_CC+set}" = set; then | ||
11094 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11095 | else | ||
11096 | @@ -22060,74 +23483,34 @@ | ||
11097 | IFS=$as_save_IFS | ||
11098 | test -z "$as_dir" && as_dir=. | ||
11099 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
11100 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
11101 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
11102 | ac_cv_prog_CC="${ac_tool_prefix}cc" | ||
11103 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
11104 | break 2 | ||
11105 | fi | ||
11106 | done | ||
11107 | done | ||
11108 | +IFS=$as_save_IFS | ||
11109 | |||
11110 | fi | ||
11111 | fi | ||
11112 | CC=$ac_cv_prog_CC | ||
11113 | if test -n "$CC"; then | ||
11114 | - echo "$as_me:$LINENO: result: $CC" >&5 | ||
11115 | -echo "${ECHO_T}$CC" >&6 | ||
11116 | -else | ||
11117 | - echo "$as_me:$LINENO: result: no" >&5 | ||
11118 | -echo "${ECHO_T}no" >&6 | ||
11119 | -fi | ||
11120 | - | ||
11121 | -fi | ||
11122 | -if test -z "$ac_cv_prog_CC"; then | ||
11123 | - ac_ct_CC=$CC | ||
11124 | - # Extract the first word of "cc", so it can be a program name with args. | ||
11125 | -set dummy cc; ac_word=$2 | ||
11126 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11127 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
11128 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
11129 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11130 | -else | ||
11131 | - if test -n "$ac_ct_CC"; then | ||
11132 | - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | ||
11133 | -else | ||
11134 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
11135 | -for as_dir in $PATH | ||
11136 | -do | ||
11137 | - IFS=$as_save_IFS | ||
11138 | - test -z "$as_dir" && as_dir=. | ||
11139 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
11140 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
11141 | - ac_cv_prog_ac_ct_CC="cc" | ||
11142 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
11143 | - break 2 | ||
11144 | - fi | ||
11145 | -done | ||
11146 | -done | ||
11147 | - | ||
11148 | -fi | ||
11149 | -fi | ||
11150 | -ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
11151 | -if test -n "$ac_ct_CC"; then | ||
11152 | - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
11153 | -echo "${ECHO_T}$ac_ct_CC" >&6 | ||
11154 | + { echo "$as_me:$LINENO: result: $CC" >&5 | ||
11155 | +echo "${ECHO_T}$CC" >&6; } | ||
11156 | else | ||
11157 | - echo "$as_me:$LINENO: result: no" >&5 | ||
11158 | -echo "${ECHO_T}no" >&6 | ||
11159 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
11160 | +echo "${ECHO_T}no" >&6; } | ||
11161 | fi | ||
11162 | |||
11163 | - CC=$ac_ct_CC | ||
11164 | -else | ||
11165 | - CC="$ac_cv_prog_CC" | ||
11166 | -fi | ||
11167 | |||
11168 | + fi | ||
11169 | fi | ||
11170 | if test -z "$CC"; then | ||
11171 | # Extract the first word of "cc", so it can be a program name with args. | ||
11172 | set dummy cc; ac_word=$2 | ||
11173 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11174 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
11175 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11176 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
11177 | if test "${ac_cv_prog_CC+set}" = set; then | ||
11178 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11179 | else | ||
11180 | @@ -22141,7 +23524,7 @@ | ||
11181 | IFS=$as_save_IFS | ||
11182 | test -z "$as_dir" && as_dir=. | ||
11183 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
11184 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
11185 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
11186 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | ||
11187 | ac_prog_rejected=yes | ||
11188 | continue | ||
11189 | @@ -22152,6 +23535,7 @@ | ||
11190 | fi | ||
11191 | done | ||
11192 | done | ||
11193 | +IFS=$as_save_IFS | ||
11194 | |||
11195 | if test $ac_prog_rejected = yes; then | ||
11196 | # We found a bogon in the path, so make sure we never use it. | ||
11197 | @@ -22169,22 +23553,23 @@ | ||
11198 | fi | ||
11199 | CC=$ac_cv_prog_CC | ||
11200 | if test -n "$CC"; then | ||
11201 | - echo "$as_me:$LINENO: result: $CC" >&5 | ||
11202 | -echo "${ECHO_T}$CC" >&6 | ||
11203 | + { echo "$as_me:$LINENO: result: $CC" >&5 | ||
11204 | +echo "${ECHO_T}$CC" >&6; } | ||
11205 | else | ||
11206 | - echo "$as_me:$LINENO: result: no" >&5 | ||
11207 | -echo "${ECHO_T}no" >&6 | ||
11208 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
11209 | +echo "${ECHO_T}no" >&6; } | ||
11210 | fi | ||
11211 | |||
11212 | + | ||
11213 | fi | ||
11214 | if test -z "$CC"; then | ||
11215 | if test -n "$ac_tool_prefix"; then | ||
11216 | - for ac_prog in cl | ||
11217 | + for ac_prog in cl.exe | ||
11218 | do | ||
11219 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
11220 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
11221 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11222 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
11223 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11224 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
11225 | if test "${ac_cv_prog_CC+set}" = set; then | ||
11226 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11227 | else | ||
11228 | @@ -22197,36 +23582,38 @@ | ||
11229 | IFS=$as_save_IFS | ||
11230 | test -z "$as_dir" && as_dir=. | ||
11231 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
11232 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
11233 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
11234 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | ||
11235 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
11236 | break 2 | ||
11237 | fi | ||
11238 | done | ||
11239 | done | ||
11240 | +IFS=$as_save_IFS | ||
11241 | |||
11242 | fi | ||
11243 | fi | ||
11244 | CC=$ac_cv_prog_CC | ||
11245 | if test -n "$CC"; then | ||
11246 | - echo "$as_me:$LINENO: result: $CC" >&5 | ||
11247 | -echo "${ECHO_T}$CC" >&6 | ||
11248 | + { echo "$as_me:$LINENO: result: $CC" >&5 | ||
11249 | +echo "${ECHO_T}$CC" >&6; } | ||
11250 | else | ||
11251 | - echo "$as_me:$LINENO: result: no" >&5 | ||
11252 | -echo "${ECHO_T}no" >&6 | ||
11253 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
11254 | +echo "${ECHO_T}no" >&6; } | ||
11255 | fi | ||
11256 | |||
11257 | + | ||
11258 | test -n "$CC" && break | ||
11259 | done | ||
11260 | fi | ||
11261 | if test -z "$CC"; then | ||
11262 | ac_ct_CC=$CC | ||
11263 | - for ac_prog in cl | ||
11264 | + for ac_prog in cl.exe | ||
11265 | do | ||
11266 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
11267 | set dummy $ac_prog; ac_word=$2 | ||
11268 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11269 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
11270 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
11271 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
11272 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
11273 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11274 | else | ||
11275 | @@ -22239,29 +23626,45 @@ | ||
11276 | IFS=$as_save_IFS | ||
11277 | test -z "$as_dir" && as_dir=. | ||
11278 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
11279 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
11280 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
11281 | ac_cv_prog_ac_ct_CC="$ac_prog" | ||
11282 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
11283 | break 2 | ||
11284 | fi | ||
11285 | done | ||
11286 | done | ||
11287 | +IFS=$as_save_IFS | ||
11288 | |||
11289 | fi | ||
11290 | fi | ||
11291 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
11292 | if test -n "$ac_ct_CC"; then | ||
11293 | - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
11294 | -echo "${ECHO_T}$ac_ct_CC" >&6 | ||
11295 | + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
11296 | +echo "${ECHO_T}$ac_ct_CC" >&6; } | ||
11297 | else | ||
11298 | - echo "$as_me:$LINENO: result: no" >&5 | ||
11299 | -echo "${ECHO_T}no" >&6 | ||
11300 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
11301 | +echo "${ECHO_T}no" >&6; } | ||
11302 | fi | ||
11303 | |||
11304 | + | ||
11305 | test -n "$ac_ct_CC" && break | ||
11306 | done | ||
11307 | |||
11308 | - CC=$ac_ct_CC | ||
11309 | + if test "x$ac_ct_CC" = x; then | ||
11310 | + CC="" | ||
11311 | + else | ||
11312 | + case $cross_compiling:$ac_tool_warned in | ||
11313 | +yes:) | ||
11314 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
11315 | +whose name does not start with the host triplet. If you think this | ||
11316 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
11317 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
11318 | +whose name does not start with the host triplet. If you think this | ||
11319 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
11320 | +ac_tool_warned=yes ;; | ||
11321 | +esac | ||
11322 | + CC=$ac_ct_CC | ||
11323 | + fi | ||
11324 | fi | ||
11325 | |||
11326 | fi | ||
11327 | @@ -22274,27 +23677,41 @@ | ||
11328 | { (exit 1); exit 1; }; } | ||
11329 | |||
11330 | # Provide some information about the compiler. | ||
11331 | -echo "$as_me:$LINENO:" \ | ||
11332 | - "checking for C compiler version" >&5 | ||
11333 | +echo "$as_me:$LINENO: checking for C compiler version" >&5 | ||
11334 | ac_compiler=`set X $ac_compile; echo $2` | ||
11335 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 | ||
11336 | - (eval $ac_compiler --version </dev/null >&5) 2>&5 | ||
11337 | +{ (ac_try="$ac_compiler --version >&5" | ||
11338 | +case "(($ac_try" in | ||
11339 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11340 | + *) ac_try_echo=$ac_try;; | ||
11341 | +esac | ||
11342 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11343 | + (eval "$ac_compiler --version >&5") 2>&5 | ||
11344 | ac_status=$? | ||
11345 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11346 | (exit $ac_status); } | ||
11347 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 | ||
11348 | - (eval $ac_compiler -v </dev/null >&5) 2>&5 | ||
11349 | +{ (ac_try="$ac_compiler -v >&5" | ||
11350 | +case "(($ac_try" in | ||
11351 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11352 | + *) ac_try_echo=$ac_try;; | ||
11353 | +esac | ||
11354 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11355 | + (eval "$ac_compiler -v >&5") 2>&5 | ||
11356 | ac_status=$? | ||
11357 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11358 | (exit $ac_status); } | ||
11359 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 | ||
11360 | - (eval $ac_compiler -V </dev/null >&5) 2>&5 | ||
11361 | +{ (ac_try="$ac_compiler -V >&5" | ||
11362 | +case "(($ac_try" in | ||
11363 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11364 | + *) ac_try_echo=$ac_try;; | ||
11365 | +esac | ||
11366 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11367 | + (eval "$ac_compiler -V >&5") 2>&5 | ||
11368 | ac_status=$? | ||
11369 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11370 | (exit $ac_status); } | ||
11371 | |||
11372 | -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | ||
11373 | -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 | ||
11374 | +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | ||
11375 | +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } | ||
11376 | if test "${ac_cv_c_compiler_gnu+set}" = set; then | ||
11377 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11378 | else | ||
11379 | @@ -22317,23 +23734,36 @@ | ||
11380 | } | ||
11381 | _ACEOF | ||
11382 | rm -f conftest.$ac_objext | ||
11383 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
11384 | - (eval $ac_compile) 2>conftest.er1 | ||
11385 | +if { (ac_try="$ac_compile" | ||
11386 | +case "(($ac_try" in | ||
11387 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11388 | + *) ac_try_echo=$ac_try;; | ||
11389 | +esac | ||
11390 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11391 | + (eval "$ac_compile") 2>conftest.er1 | ||
11392 | ac_status=$? | ||
11393 | grep -v '^ *+' conftest.er1 >conftest.err | ||
11394 | rm -f conftest.er1 | ||
11395 | cat conftest.err >&5 | ||
11396 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11397 | (exit $ac_status); } && | ||
11398 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
11399 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11400 | - (eval $ac_try) 2>&5 | ||
11401 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
11402 | + { (case "(($ac_try" in | ||
11403 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11404 | + *) ac_try_echo=$ac_try;; | ||
11405 | +esac | ||
11406 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11407 | + (eval "$ac_try") 2>&5 | ||
11408 | ac_status=$? | ||
11409 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11410 | (exit $ac_status); }; } && | ||
11411 | { ac_try='test -s conftest.$ac_objext' | ||
11412 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11413 | - (eval $ac_try) 2>&5 | ||
11414 | + { (case "(($ac_try" in | ||
11415 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11416 | + *) ac_try_echo=$ac_try;; | ||
11417 | +esac | ||
11418 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11419 | + (eval "$ac_try") 2>&5 | ||
11420 | ac_status=$? | ||
11421 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11422 | (exit $ac_status); }; }; then | ||
11423 | @@ -22342,24 +23772,28 @@ | ||
11424 | echo "$as_me: failed program was:" >&5 | ||
11425 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
11426 | |||
11427 | -ac_compiler_gnu=no | ||
11428 | + ac_compiler_gnu=no | ||
11429 | fi | ||
11430 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11431 | + | ||
11432 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11433 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | ||
11434 | |||
11435 | fi | ||
11436 | -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | ||
11437 | -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 | ||
11438 | +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | ||
11439 | +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } | ||
11440 | GCC=`test $ac_compiler_gnu = yes && echo yes` | ||
11441 | ac_test_CFLAGS=${CFLAGS+set} | ||
11442 | ac_save_CFLAGS=$CFLAGS | ||
11443 | -CFLAGS="-g" | ||
11444 | -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | ||
11445 | -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 | ||
11446 | +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | ||
11447 | +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } | ||
11448 | if test "${ac_cv_prog_cc_g+set}" = set; then | ||
11449 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11450 | else | ||
11451 | - cat >conftest.$ac_ext <<_ACEOF | ||
11452 | + ac_save_c_werror_flag=$ac_c_werror_flag | ||
11453 | + ac_c_werror_flag=yes | ||
11454 | + ac_cv_prog_cc_g=no | ||
11455 | + CFLAGS="-g" | ||
11456 | + cat >conftest.$ac_ext <<_ACEOF | ||
11457 | /* confdefs.h. */ | ||
11458 | _ACEOF | ||
11459 | cat confdefs.h >>conftest.$ac_ext | ||
11460 | @@ -22375,23 +23809,36 @@ | ||
11461 | } | ||
11462 | _ACEOF | ||
11463 | rm -f conftest.$ac_objext | ||
11464 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
11465 | - (eval $ac_compile) 2>conftest.er1 | ||
11466 | +if { (ac_try="$ac_compile" | ||
11467 | +case "(($ac_try" in | ||
11468 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11469 | + *) ac_try_echo=$ac_try;; | ||
11470 | +esac | ||
11471 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11472 | + (eval "$ac_compile") 2>conftest.er1 | ||
11473 | ac_status=$? | ||
11474 | grep -v '^ *+' conftest.er1 >conftest.err | ||
11475 | rm -f conftest.er1 | ||
11476 | cat conftest.err >&5 | ||
11477 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11478 | (exit $ac_status); } && | ||
11479 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
11480 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11481 | - (eval $ac_try) 2>&5 | ||
11482 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
11483 | + { (case "(($ac_try" in | ||
11484 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11485 | + *) ac_try_echo=$ac_try;; | ||
11486 | +esac | ||
11487 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11488 | + (eval "$ac_try") 2>&5 | ||
11489 | ac_status=$? | ||
11490 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11491 | (exit $ac_status); }; } && | ||
11492 | { ac_try='test -s conftest.$ac_objext' | ||
11493 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11494 | - (eval $ac_try) 2>&5 | ||
11495 | + { (case "(($ac_try" in | ||
11496 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11497 | + *) ac_try_echo=$ac_try;; | ||
11498 | +esac | ||
11499 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11500 | + (eval "$ac_try") 2>&5 | ||
11501 | ac_status=$? | ||
11502 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11503 | (exit $ac_status); }; }; then | ||
11504 | @@ -22400,281 +23847,278 @@ | ||
11505 | echo "$as_me: failed program was:" >&5 | ||
11506 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
11507 | |||
11508 | -ac_cv_prog_cc_g=no | ||
11509 | -fi | ||
11510 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11511 | -fi | ||
11512 | -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | ||
11513 | -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 | ||
11514 | -if test "$ac_test_CFLAGS" = set; then | ||
11515 | - CFLAGS=$ac_save_CFLAGS | ||
11516 | -elif test $ac_cv_prog_cc_g = yes; then | ||
11517 | - if test "$GCC" = yes; then | ||
11518 | - CFLAGS="-g -O2" | ||
11519 | - else | ||
11520 | - CFLAGS="-g" | ||
11521 | - fi | ||
11522 | -else | ||
11523 | - if test "$GCC" = yes; then | ||
11524 | - CFLAGS="-O2" | ||
11525 | - else | ||
11526 | - CFLAGS= | ||
11527 | - fi | ||
11528 | -fi | ||
11529 | -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 | ||
11530 | -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 | ||
11531 | -if test "${ac_cv_prog_cc_stdc+set}" = set; then | ||
11532 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11533 | -else | ||
11534 | - ac_cv_prog_cc_stdc=no | ||
11535 | -ac_save_CC=$CC | ||
11536 | -cat >conftest.$ac_ext <<_ACEOF | ||
11537 | + CFLAGS="" | ||
11538 | + cat >conftest.$ac_ext <<_ACEOF | ||
11539 | /* confdefs.h. */ | ||
11540 | _ACEOF | ||
11541 | cat confdefs.h >>conftest.$ac_ext | ||
11542 | cat >>conftest.$ac_ext <<_ACEOF | ||
11543 | /* end confdefs.h. */ | ||
11544 | -#include <stdarg.h> | ||
11545 | -#include <stdio.h> | ||
11546 | -#include <sys/types.h> | ||
11547 | -#include <sys/stat.h> | ||
11548 | -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ | ||
11549 | -struct buf { int x; }; | ||
11550 | -FILE * (*rcsopen) (struct buf *, struct stat *, int); | ||
11551 | -static char *e (p, i) | ||
11552 | - char **p; | ||
11553 | - int i; | ||
11554 | + | ||
11555 | +int | ||
11556 | +main () | ||
11557 | { | ||
11558 | - return p[i]; | ||
11559 | -} | ||
11560 | -static char *f (char * (*g) (char **, int), char **p, ...) | ||
11561 | -{ | ||
11562 | - char *s; | ||
11563 | - va_list v; | ||
11564 | - va_start (v,p); | ||
11565 | - s = g (p, va_arg (v,int)); | ||
11566 | - va_end (v); | ||
11567 | - return s; | ||
11568 | -} | ||
11569 | - | ||
11570 | -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has | ||
11571 | - function prototypes and stuff, but not '\xHH' hex character constants. | ||
11572 | - These don't provoke an error unfortunately, instead are silently treated | ||
11573 | - as 'x'. The following induces an error, until -std1 is added to get | ||
11574 | - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an | ||
11575 | - array size at least. It's necessary to write '\x00'==0 to get something | ||
11576 | - that's true only with -std1. */ | ||
11577 | -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; | ||
11578 | - | ||
11579 | -int test (int i, double x); | ||
11580 | -struct s1 {int (*f) (int a);}; | ||
11581 | -struct s2 {int (*f) (double a);}; | ||
11582 | -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); | ||
11583 | -int argc; | ||
11584 | -char **argv; | ||
11585 | -int | ||
11586 | -main () | ||
11587 | -{ | ||
11588 | -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; | ||
11589 | - ; | ||
11590 | - return 0; | ||
11591 | + | ||
11592 | + ; | ||
11593 | + return 0; | ||
11594 | } | ||
11595 | _ACEOF | ||
11596 | -# Don't try gcc -ansi; that turns off useful extensions and | ||
11597 | -# breaks some systems' header files. | ||
11598 | -# AIX -qlanglvl=ansi | ||
11599 | -# Ultrix and OSF/1 -std1 | ||
11600 | -# HP-UX 10.20 and later -Ae | ||
11601 | -# HP-UX older versions -Aa -D_HPUX_SOURCE | ||
11602 | -# SVR4 -Xc -D__EXTENSIONS__ | ||
11603 | -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | ||
11604 | -do | ||
11605 | - CC="$ac_save_CC $ac_arg" | ||
11606 | - rm -f conftest.$ac_objext | ||
11607 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
11608 | - (eval $ac_compile) 2>conftest.er1 | ||
11609 | +rm -f conftest.$ac_objext | ||
11610 | +if { (ac_try="$ac_compile" | ||
11611 | +case "(($ac_try" in | ||
11612 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11613 | + *) ac_try_echo=$ac_try;; | ||
11614 | +esac | ||
11615 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11616 | + (eval "$ac_compile") 2>conftest.er1 | ||
11617 | ac_status=$? | ||
11618 | grep -v '^ *+' conftest.er1 >conftest.err | ||
11619 | rm -f conftest.er1 | ||
11620 | cat conftest.err >&5 | ||
11621 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11622 | (exit $ac_status); } && | ||
11623 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
11624 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11625 | - (eval $ac_try) 2>&5 | ||
11626 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
11627 | + { (case "(($ac_try" in | ||
11628 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11629 | + *) ac_try_echo=$ac_try;; | ||
11630 | +esac | ||
11631 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11632 | + (eval "$ac_try") 2>&5 | ||
11633 | ac_status=$? | ||
11634 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11635 | (exit $ac_status); }; } && | ||
11636 | { ac_try='test -s conftest.$ac_objext' | ||
11637 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11638 | - (eval $ac_try) 2>&5 | ||
11639 | + { (case "(($ac_try" in | ||
11640 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11641 | + *) ac_try_echo=$ac_try;; | ||
11642 | +esac | ||
11643 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11644 | + (eval "$ac_try") 2>&5 | ||
11645 | ac_status=$? | ||
11646 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11647 | (exit $ac_status); }; }; then | ||
11648 | - ac_cv_prog_cc_stdc=$ac_arg | ||
11649 | -break | ||
11650 | + : | ||
11651 | else | ||
11652 | echo "$as_me: failed program was:" >&5 | ||
11653 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
11654 | |||
11655 | -fi | ||
11656 | -rm -f conftest.err conftest.$ac_objext | ||
11657 | -done | ||
11658 | -rm -f conftest.$ac_ext conftest.$ac_objext | ||
11659 | -CC=$ac_save_CC | ||
11660 | - | ||
11661 | -fi | ||
11662 | - | ||
11663 | -case "x$ac_cv_prog_cc_stdc" in | ||
11664 | - x|xno) | ||
11665 | - echo "$as_me:$LINENO: result: none needed" >&5 | ||
11666 | -echo "${ECHO_T}none needed" >&6 ;; | ||
11667 | - *) | ||
11668 | - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 | ||
11669 | -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 | ||
11670 | - CC="$CC $ac_cv_prog_cc_stdc" ;; | ||
11671 | -esac | ||
11672 | - | ||
11673 | -# Some people use a C++ compiler to compile C. Since we use `exit', | ||
11674 | -# in C++ we need to declare it. In case someone uses the same compiler | ||
11675 | -# for both compiling C and C++ we need to have the C++ compiler decide | ||
11676 | -# the declaration of exit, since it's the most demanding environment. | ||
11677 | -cat >conftest.$ac_ext <<_ACEOF | ||
11678 | -#ifndef __cplusplus | ||
11679 | - choke me | ||
11680 | -#endif | ||
11681 | -_ACEOF | ||
11682 | -rm -f conftest.$ac_objext | ||
11683 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
11684 | - (eval $ac_compile) 2>conftest.er1 | ||
11685 | - ac_status=$? | ||
11686 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
11687 | - rm -f conftest.er1 | ||
11688 | - cat conftest.err >&5 | ||
11689 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11690 | - (exit $ac_status); } && | ||
11691 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
11692 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11693 | - (eval $ac_try) 2>&5 | ||
11694 | - ac_status=$? | ||
11695 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11696 | - (exit $ac_status); }; } && | ||
11697 | - { ac_try='test -s conftest.$ac_objext' | ||
11698 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11699 | - (eval $ac_try) 2>&5 | ||
11700 | - ac_status=$? | ||
11701 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11702 | - (exit $ac_status); }; }; then | ||
11703 | - for ac_declaration in \ | ||
11704 | - '' \ | ||
11705 | - 'extern "C" void std::exit (int) throw (); using std::exit;' \ | ||
11706 | - 'extern "C" void std::exit (int); using std::exit;' \ | ||
11707 | - 'extern "C" void exit (int) throw ();' \ | ||
11708 | - 'extern "C" void exit (int);' \ | ||
11709 | - 'void exit (int);' | ||
11710 | -do | ||
11711 | - cat >conftest.$ac_ext <<_ACEOF | ||
11712 | + ac_c_werror_flag=$ac_save_c_werror_flag | ||
11713 | + CFLAGS="-g" | ||
11714 | + cat >conftest.$ac_ext <<_ACEOF | ||
11715 | /* confdefs.h. */ | ||
11716 | _ACEOF | ||
11717 | cat confdefs.h >>conftest.$ac_ext | ||
11718 | cat >>conftest.$ac_ext <<_ACEOF | ||
11719 | /* end confdefs.h. */ | ||
11720 | -$ac_declaration | ||
11721 | -#include <stdlib.h> | ||
11722 | + | ||
11723 | int | ||
11724 | main () | ||
11725 | { | ||
11726 | -exit (42); | ||
11727 | + | ||
11728 | ; | ||
11729 | return 0; | ||
11730 | } | ||
11731 | _ACEOF | ||
11732 | rm -f conftest.$ac_objext | ||
11733 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
11734 | - (eval $ac_compile) 2>conftest.er1 | ||
11735 | +if { (ac_try="$ac_compile" | ||
11736 | +case "(($ac_try" in | ||
11737 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11738 | + *) ac_try_echo=$ac_try;; | ||
11739 | +esac | ||
11740 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11741 | + (eval "$ac_compile") 2>conftest.er1 | ||
11742 | ac_status=$? | ||
11743 | grep -v '^ *+' conftest.er1 >conftest.err | ||
11744 | rm -f conftest.er1 | ||
11745 | cat conftest.err >&5 | ||
11746 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11747 | (exit $ac_status); } && | ||
11748 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
11749 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11750 | - (eval $ac_try) 2>&5 | ||
11751 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
11752 | + { (case "(($ac_try" in | ||
11753 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11754 | + *) ac_try_echo=$ac_try;; | ||
11755 | +esac | ||
11756 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11757 | + (eval "$ac_try") 2>&5 | ||
11758 | ac_status=$? | ||
11759 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11760 | (exit $ac_status); }; } && | ||
11761 | { ac_try='test -s conftest.$ac_objext' | ||
11762 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11763 | - (eval $ac_try) 2>&5 | ||
11764 | + { (case "(($ac_try" in | ||
11765 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11766 | + *) ac_try_echo=$ac_try;; | ||
11767 | +esac | ||
11768 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11769 | + (eval "$ac_try") 2>&5 | ||
11770 | ac_status=$? | ||
11771 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11772 | (exit $ac_status); }; }; then | ||
11773 | - : | ||
11774 | + ac_cv_prog_cc_g=yes | ||
11775 | else | ||
11776 | echo "$as_me: failed program was:" >&5 | ||
11777 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
11778 | |||
11779 | -continue | ||
11780 | + | ||
11781 | fi | ||
11782 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11783 | - cat >conftest.$ac_ext <<_ACEOF | ||
11784 | + | ||
11785 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11786 | +fi | ||
11787 | + | ||
11788 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11789 | +fi | ||
11790 | + | ||
11791 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11792 | + ac_c_werror_flag=$ac_save_c_werror_flag | ||
11793 | +fi | ||
11794 | +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | ||
11795 | +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } | ||
11796 | +if test "$ac_test_CFLAGS" = set; then | ||
11797 | + CFLAGS=$ac_save_CFLAGS | ||
11798 | +elif test $ac_cv_prog_cc_g = yes; then | ||
11799 | + if test "$GCC" = yes; then | ||
11800 | + CFLAGS="-g -O2" | ||
11801 | + else | ||
11802 | + CFLAGS="-g" | ||
11803 | + fi | ||
11804 | +else | ||
11805 | + if test "$GCC" = yes; then | ||
11806 | + CFLAGS="-O2" | ||
11807 | + else | ||
11808 | + CFLAGS= | ||
11809 | + fi | ||
11810 | +fi | ||
11811 | +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | ||
11812 | +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } | ||
11813 | +if test "${ac_cv_prog_cc_c89+set}" = set; then | ||
11814 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11815 | +else | ||
11816 | + ac_cv_prog_cc_c89=no | ||
11817 | +ac_save_CC=$CC | ||
11818 | +cat >conftest.$ac_ext <<_ACEOF | ||
11819 | /* confdefs.h. */ | ||
11820 | _ACEOF | ||
11821 | cat confdefs.h >>conftest.$ac_ext | ||
11822 | cat >>conftest.$ac_ext <<_ACEOF | ||
11823 | /* end confdefs.h. */ | ||
11824 | -$ac_declaration | ||
11825 | +#include <stdarg.h> | ||
11826 | +#include <stdio.h> | ||
11827 | +#include <sys/types.h> | ||
11828 | +#include <sys/stat.h> | ||
11829 | +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ | ||
11830 | +struct buf { int x; }; | ||
11831 | +FILE * (*rcsopen) (struct buf *, struct stat *, int); | ||
11832 | +static char *e (p, i) | ||
11833 | + char **p; | ||
11834 | + int i; | ||
11835 | +{ | ||
11836 | + return p[i]; | ||
11837 | +} | ||
11838 | +static char *f (char * (*g) (char **, int), char **p, ...) | ||
11839 | +{ | ||
11840 | + char *s; | ||
11841 | + va_list v; | ||
11842 | + va_start (v,p); | ||
11843 | + s = g (p, va_arg (v,int)); | ||
11844 | + va_end (v); | ||
11845 | + return s; | ||
11846 | +} | ||
11847 | + | ||
11848 | +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has | ||
11849 | + function prototypes and stuff, but not '\xHH' hex character constants. | ||
11850 | + These don't provoke an error unfortunately, instead are silently treated | ||
11851 | + as 'x'. The following induces an error, until -std is added to get | ||
11852 | + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an | ||
11853 | + array size at least. It's necessary to write '\x00'==0 to get something | ||
11854 | + that's true only with -std. */ | ||
11855 | +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; | ||
11856 | + | ||
11857 | +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters | ||
11858 | + inside strings and character constants. */ | ||
11859 | +#define FOO(x) 'x' | ||
11860 | +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; | ||
11861 | + | ||
11862 | +int test (int i, double x); | ||
11863 | +struct s1 {int (*f) (int a);}; | ||
11864 | +struct s2 {int (*f) (double a);}; | ||
11865 | +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); | ||
11866 | +int argc; | ||
11867 | +char **argv; | ||
11868 | int | ||
11869 | main () | ||
11870 | { | ||
11871 | -exit (42); | ||
11872 | +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; | ||
11873 | ; | ||
11874 | return 0; | ||
11875 | } | ||
11876 | _ACEOF | ||
11877 | -rm -f conftest.$ac_objext | ||
11878 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
11879 | - (eval $ac_compile) 2>conftest.er1 | ||
11880 | +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ | ||
11881 | + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | ||
11882 | +do | ||
11883 | + CC="$ac_save_CC $ac_arg" | ||
11884 | + rm -f conftest.$ac_objext | ||
11885 | +if { (ac_try="$ac_compile" | ||
11886 | +case "(($ac_try" in | ||
11887 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11888 | + *) ac_try_echo=$ac_try;; | ||
11889 | +esac | ||
11890 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11891 | + (eval "$ac_compile") 2>conftest.er1 | ||
11892 | ac_status=$? | ||
11893 | grep -v '^ *+' conftest.er1 >conftest.err | ||
11894 | rm -f conftest.er1 | ||
11895 | cat conftest.err >&5 | ||
11896 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11897 | (exit $ac_status); } && | ||
11898 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
11899 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11900 | - (eval $ac_try) 2>&5 | ||
11901 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
11902 | + { (case "(($ac_try" in | ||
11903 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11904 | + *) ac_try_echo=$ac_try;; | ||
11905 | +esac | ||
11906 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11907 | + (eval "$ac_try") 2>&5 | ||
11908 | ac_status=$? | ||
11909 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11910 | (exit $ac_status); }; } && | ||
11911 | { ac_try='test -s conftest.$ac_objext' | ||
11912 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11913 | - (eval $ac_try) 2>&5 | ||
11914 | + { (case "(($ac_try" in | ||
11915 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11916 | + *) ac_try_echo=$ac_try;; | ||
11917 | +esac | ||
11918 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11919 | + (eval "$ac_try") 2>&5 | ||
11920 | ac_status=$? | ||
11921 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11922 | (exit $ac_status); }; }; then | ||
11923 | - break | ||
11924 | + ac_cv_prog_cc_c89=$ac_arg | ||
11925 | else | ||
11926 | echo "$as_me: failed program was:" >&5 | ||
11927 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
11928 | |||
11929 | + | ||
11930 | fi | ||
11931 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11932 | + | ||
11933 | +rm -f core conftest.err conftest.$ac_objext | ||
11934 | + test "x$ac_cv_prog_cc_c89" != "xno" && break | ||
11935 | done | ||
11936 | -rm -f conftest* | ||
11937 | -if test -n "$ac_declaration"; then | ||
11938 | - echo '#ifdef __cplusplus' >>confdefs.h | ||
11939 | - echo $ac_declaration >>confdefs.h | ||
11940 | - echo '#endif' >>confdefs.h | ||
11941 | +rm -f conftest.$ac_ext | ||
11942 | +CC=$ac_save_CC | ||
11943 | + | ||
11944 | fi | ||
11945 | +# AC_CACHE_VAL | ||
11946 | +case "x$ac_cv_prog_cc_c89" in | ||
11947 | + x) | ||
11948 | + { echo "$as_me:$LINENO: result: none needed" >&5 | ||
11949 | +echo "${ECHO_T}none needed" >&6; } ;; | ||
11950 | + xno) | ||
11951 | + { echo "$as_me:$LINENO: result: unsupported" >&5 | ||
11952 | +echo "${ECHO_T}unsupported" >&6; } ;; | ||
11953 | + *) | ||
11954 | + CC="$CC $ac_cv_prog_cc_c89" | ||
11955 | + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | ||
11956 | +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; | ||
11957 | +esac | ||
11958 | |||
11959 | -else | ||
11960 | - echo "$as_me: failed program was:" >&5 | ||
11961 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
11962 | |||
11963 | -fi | ||
11964 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11965 | ac_ext=c | ||
11966 | ac_cpp='$CPP $CPPFLAGS' | ||
11967 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
11968 | @@ -22683,8 +24127,8 @@ | ||
11969 | |||
11970 | depcc="$CC" am_compiler_list= | ||
11971 | |||
11972 | -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | ||
11973 | -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 | ||
11974 | +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | ||
11975 | +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } | ||
11976 | if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then | ||
11977 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
11978 | else | ||
11979 | @@ -22773,8 +24217,8 @@ | ||
11980 | fi | ||
11981 | |||
11982 | fi | ||
11983 | -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 | ||
11984 | -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 | ||
11985 | +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 | ||
11986 | +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } | ||
11987 | CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type | ||
11988 | |||
11989 | |||
11990 | @@ -22791,18 +24235,22 @@ | ||
11991 | |||
11992 | |||
11993 | |||
11994 | -ac_ext=cc | ||
11995 | +ac_ext=cpp | ||
11996 | ac_cpp='$CXXCPP $CPPFLAGS' | ||
11997 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
11998 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
11999 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
12000 | -if test -n "$ac_tool_prefix"; then | ||
12001 | - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC | ||
12002 | +if test -z "$CXX"; then | ||
12003 | + if test -n "$CCC"; then | ||
12004 | + CXX=$CCC | ||
12005 | + else | ||
12006 | + if test -n "$ac_tool_prefix"; then | ||
12007 | + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC | ||
12008 | do | ||
12009 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
12010 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
12011 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
12012 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
12013 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
12014 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
12015 | if test "${ac_cv_prog_CXX+set}" = set; then | ||
12016 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12017 | else | ||
12018 | @@ -22815,36 +24263,38 @@ | ||
12019 | IFS=$as_save_IFS | ||
12020 | test -z "$as_dir" && as_dir=. | ||
12021 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
12022 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
12023 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
12024 | ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" | ||
12025 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
12026 | break 2 | ||
12027 | fi | ||
12028 | done | ||
12029 | done | ||
12030 | +IFS=$as_save_IFS | ||
12031 | |||
12032 | fi | ||
12033 | fi | ||
12034 | CXX=$ac_cv_prog_CXX | ||
12035 | if test -n "$CXX"; then | ||
12036 | - echo "$as_me:$LINENO: result: $CXX" >&5 | ||
12037 | -echo "${ECHO_T}$CXX" >&6 | ||
12038 | + { echo "$as_me:$LINENO: result: $CXX" >&5 | ||
12039 | +echo "${ECHO_T}$CXX" >&6; } | ||
12040 | else | ||
12041 | - echo "$as_me:$LINENO: result: no" >&5 | ||
12042 | -echo "${ECHO_T}no" >&6 | ||
12043 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
12044 | +echo "${ECHO_T}no" >&6; } | ||
12045 | fi | ||
12046 | |||
12047 | + | ||
12048 | test -n "$CXX" && break | ||
12049 | done | ||
12050 | fi | ||
12051 | if test -z "$CXX"; then | ||
12052 | ac_ct_CXX=$CXX | ||
12053 | - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC | ||
12054 | + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC | ||
12055 | do | ||
12056 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
12057 | set dummy $ac_prog; ac_word=$2 | ||
12058 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
12059 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
12060 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
12061 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
12062 | if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then | ||
12063 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12064 | else | ||
12065 | @@ -22857,55 +24307,85 @@ | ||
12066 | IFS=$as_save_IFS | ||
12067 | test -z "$as_dir" && as_dir=. | ||
12068 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
12069 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
12070 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
12071 | ac_cv_prog_ac_ct_CXX="$ac_prog" | ||
12072 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
12073 | break 2 | ||
12074 | fi | ||
12075 | done | ||
12076 | done | ||
12077 | +IFS=$as_save_IFS | ||
12078 | |||
12079 | fi | ||
12080 | fi | ||
12081 | ac_ct_CXX=$ac_cv_prog_ac_ct_CXX | ||
12082 | if test -n "$ac_ct_CXX"; then | ||
12083 | - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 | ||
12084 | -echo "${ECHO_T}$ac_ct_CXX" >&6 | ||
12085 | + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 | ||
12086 | +echo "${ECHO_T}$ac_ct_CXX" >&6; } | ||
12087 | else | ||
12088 | - echo "$as_me:$LINENO: result: no" >&5 | ||
12089 | -echo "${ECHO_T}no" >&6 | ||
12090 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
12091 | +echo "${ECHO_T}no" >&6; } | ||
12092 | fi | ||
12093 | |||
12094 | + | ||
12095 | test -n "$ac_ct_CXX" && break | ||
12096 | done | ||
12097 | -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" | ||
12098 | |||
12099 | - CXX=$ac_ct_CXX | ||
12100 | + if test "x$ac_ct_CXX" = x; then | ||
12101 | + CXX="g++" | ||
12102 | + else | ||
12103 | + case $cross_compiling:$ac_tool_warned in | ||
12104 | +yes:) | ||
12105 | +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
12106 | +whose name does not start with the host triplet. If you think this | ||
12107 | +configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
12108 | +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
12109 | +whose name does not start with the host triplet. If you think this | ||
12110 | +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
12111 | +ac_tool_warned=yes ;; | ||
12112 | +esac | ||
12113 | + CXX=$ac_ct_CXX | ||
12114 | + fi | ||
12115 | fi | ||
12116 | |||
12117 | - | ||
12118 | + fi | ||
12119 | +fi | ||
12120 | # Provide some information about the compiler. | ||
12121 | -echo "$as_me:$LINENO:" \ | ||
12122 | - "checking for C++ compiler version" >&5 | ||
12123 | +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 | ||
12124 | ac_compiler=`set X $ac_compile; echo $2` | ||
12125 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 | ||
12126 | - (eval $ac_compiler --version </dev/null >&5) 2>&5 | ||
12127 | +{ (ac_try="$ac_compiler --version >&5" | ||
12128 | +case "(($ac_try" in | ||
12129 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12130 | + *) ac_try_echo=$ac_try;; | ||
12131 | +esac | ||
12132 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12133 | + (eval "$ac_compiler --version >&5") 2>&5 | ||
12134 | ac_status=$? | ||
12135 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12136 | (exit $ac_status); } | ||
12137 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 | ||
12138 | - (eval $ac_compiler -v </dev/null >&5) 2>&5 | ||
12139 | +{ (ac_try="$ac_compiler -v >&5" | ||
12140 | +case "(($ac_try" in | ||
12141 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12142 | + *) ac_try_echo=$ac_try;; | ||
12143 | +esac | ||
12144 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12145 | + (eval "$ac_compiler -v >&5") 2>&5 | ||
12146 | ac_status=$? | ||
12147 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12148 | (exit $ac_status); } | ||
12149 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 | ||
12150 | - (eval $ac_compiler -V </dev/null >&5) 2>&5 | ||
12151 | +{ (ac_try="$ac_compiler -V >&5" | ||
12152 | +case "(($ac_try" in | ||
12153 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12154 | + *) ac_try_echo=$ac_try;; | ||
12155 | +esac | ||
12156 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12157 | + (eval "$ac_compiler -V >&5") 2>&5 | ||
12158 | ac_status=$? | ||
12159 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12160 | (exit $ac_status); } | ||
12161 | |||
12162 | -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 | ||
12163 | -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 | ||
12164 | +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 | ||
12165 | +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } | ||
12166 | if test "${ac_cv_cxx_compiler_gnu+set}" = set; then | ||
12167 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12168 | else | ||
12169 | @@ -22928,23 +24408,36 @@ | ||
12170 | } | ||
12171 | _ACEOF | ||
12172 | rm -f conftest.$ac_objext | ||
12173 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
12174 | - (eval $ac_compile) 2>conftest.er1 | ||
12175 | +if { (ac_try="$ac_compile" | ||
12176 | +case "(($ac_try" in | ||
12177 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12178 | + *) ac_try_echo=$ac_try;; | ||
12179 | +esac | ||
12180 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12181 | + (eval "$ac_compile") 2>conftest.er1 | ||
12182 | ac_status=$? | ||
12183 | grep -v '^ *+' conftest.er1 >conftest.err | ||
12184 | rm -f conftest.er1 | ||
12185 | cat conftest.err >&5 | ||
12186 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12187 | (exit $ac_status); } && | ||
12188 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
12189 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12190 | - (eval $ac_try) 2>&5 | ||
12191 | + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
12192 | + { (case "(($ac_try" in | ||
12193 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12194 | + *) ac_try_echo=$ac_try;; | ||
12195 | +esac | ||
12196 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12197 | + (eval "$ac_try") 2>&5 | ||
12198 | ac_status=$? | ||
12199 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12200 | (exit $ac_status); }; } && | ||
12201 | { ac_try='test -s conftest.$ac_objext' | ||
12202 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12203 | - (eval $ac_try) 2>&5 | ||
12204 | + { (case "(($ac_try" in | ||
12205 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12206 | + *) ac_try_echo=$ac_try;; | ||
12207 | +esac | ||
12208 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12209 | + (eval "$ac_try") 2>&5 | ||
12210 | ac_status=$? | ||
12211 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12212 | (exit $ac_status); }; }; then | ||
12213 | @@ -22953,24 +24446,28 @@ | ||
12214 | echo "$as_me: failed program was:" >&5 | ||
12215 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
12216 | |||
12217 | -ac_compiler_gnu=no | ||
12218 | + ac_compiler_gnu=no | ||
12219 | fi | ||
12220 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12221 | + | ||
12222 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12223 | ac_cv_cxx_compiler_gnu=$ac_compiler_gnu | ||
12224 | |||
12225 | fi | ||
12226 | -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 | ||
12227 | -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 | ||
12228 | +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 | ||
12229 | +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } | ||
12230 | GXX=`test $ac_compiler_gnu = yes && echo yes` | ||
12231 | ac_test_CXXFLAGS=${CXXFLAGS+set} | ||
12232 | ac_save_CXXFLAGS=$CXXFLAGS | ||
12233 | -CXXFLAGS="-g" | ||
12234 | -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 | ||
12235 | -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 | ||
12236 | +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 | ||
12237 | +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } | ||
12238 | if test "${ac_cv_prog_cxx_g+set}" = set; then | ||
12239 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12240 | else | ||
12241 | - cat >conftest.$ac_ext <<_ACEOF | ||
12242 | + ac_save_cxx_werror_flag=$ac_cxx_werror_flag | ||
12243 | + ac_cxx_werror_flag=yes | ||
12244 | + ac_cv_prog_cxx_g=no | ||
12245 | + CXXFLAGS="-g" | ||
12246 | + cat >conftest.$ac_ext <<_ACEOF | ||
12247 | /* confdefs.h. */ | ||
12248 | _ACEOF | ||
12249 | cat confdefs.h >>conftest.$ac_ext | ||
12250 | @@ -22986,23 +24483,36 @@ | ||
12251 | } | ||
12252 | _ACEOF | ||
12253 | rm -f conftest.$ac_objext | ||
12254 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
12255 | - (eval $ac_compile) 2>conftest.er1 | ||
12256 | +if { (ac_try="$ac_compile" | ||
12257 | +case "(($ac_try" in | ||
12258 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12259 | + *) ac_try_echo=$ac_try;; | ||
12260 | +esac | ||
12261 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12262 | + (eval "$ac_compile") 2>conftest.er1 | ||
12263 | ac_status=$? | ||
12264 | grep -v '^ *+' conftest.er1 >conftest.err | ||
12265 | rm -f conftest.er1 | ||
12266 | cat conftest.err >&5 | ||
12267 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12268 | (exit $ac_status); } && | ||
12269 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
12270 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12271 | - (eval $ac_try) 2>&5 | ||
12272 | + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
12273 | + { (case "(($ac_try" in | ||
12274 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12275 | + *) ac_try_echo=$ac_try;; | ||
12276 | +esac | ||
12277 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12278 | + (eval "$ac_try") 2>&5 | ||
12279 | ac_status=$? | ||
12280 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12281 | (exit $ac_status); }; } && | ||
12282 | { ac_try='test -s conftest.$ac_objext' | ||
12283 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12284 | - (eval $ac_try) 2>&5 | ||
12285 | + { (case "(($ac_try" in | ||
12286 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12287 | + *) ac_try_echo=$ac_try;; | ||
12288 | +esac | ||
12289 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12290 | + (eval "$ac_try") 2>&5 | ||
12291 | ac_status=$? | ||
12292 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12293 | (exit $ac_status); }; }; then | ||
12294 | @@ -23011,69 +24521,53 @@ | ||
12295 | echo "$as_me: failed program was:" >&5 | ||
12296 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
12297 | |||
12298 | -ac_cv_prog_cxx_g=no | ||
12299 | -fi | ||
12300 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12301 | -fi | ||
12302 | -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 | ||
12303 | -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 | ||
12304 | -if test "$ac_test_CXXFLAGS" = set; then | ||
12305 | - CXXFLAGS=$ac_save_CXXFLAGS | ||
12306 | -elif test $ac_cv_prog_cxx_g = yes; then | ||
12307 | - if test "$GXX" = yes; then | ||
12308 | - CXXFLAGS="-g -O2" | ||
12309 | - else | ||
12310 | - CXXFLAGS="-g" | ||
12311 | - fi | ||
12312 | -else | ||
12313 | - if test "$GXX" = yes; then | ||
12314 | - CXXFLAGS="-O2" | ||
12315 | - else | ||
12316 | - CXXFLAGS= | ||
12317 | - fi | ||
12318 | -fi | ||
12319 | -for ac_declaration in \ | ||
12320 | - '' \ | ||
12321 | - 'extern "C" void std::exit (int) throw (); using std::exit;' \ | ||
12322 | - 'extern "C" void std::exit (int); using std::exit;' \ | ||
12323 | - 'extern "C" void exit (int) throw ();' \ | ||
12324 | - 'extern "C" void exit (int);' \ | ||
12325 | - 'void exit (int);' | ||
12326 | -do | ||
12327 | - cat >conftest.$ac_ext <<_ACEOF | ||
12328 | + CXXFLAGS="" | ||
12329 | + cat >conftest.$ac_ext <<_ACEOF | ||
12330 | /* confdefs.h. */ | ||
12331 | _ACEOF | ||
12332 | cat confdefs.h >>conftest.$ac_ext | ||
12333 | cat >>conftest.$ac_ext <<_ACEOF | ||
12334 | /* end confdefs.h. */ | ||
12335 | -$ac_declaration | ||
12336 | -#include <stdlib.h> | ||
12337 | + | ||
12338 | int | ||
12339 | main () | ||
12340 | { | ||
12341 | -exit (42); | ||
12342 | + | ||
12343 | ; | ||
12344 | return 0; | ||
12345 | } | ||
12346 | _ACEOF | ||
12347 | rm -f conftest.$ac_objext | ||
12348 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
12349 | - (eval $ac_compile) 2>conftest.er1 | ||
12350 | +if { (ac_try="$ac_compile" | ||
12351 | +case "(($ac_try" in | ||
12352 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12353 | + *) ac_try_echo=$ac_try;; | ||
12354 | +esac | ||
12355 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12356 | + (eval "$ac_compile") 2>conftest.er1 | ||
12357 | ac_status=$? | ||
12358 | grep -v '^ *+' conftest.er1 >conftest.err | ||
12359 | rm -f conftest.er1 | ||
12360 | cat conftest.err >&5 | ||
12361 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12362 | (exit $ac_status); } && | ||
12363 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
12364 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12365 | - (eval $ac_try) 2>&5 | ||
12366 | + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
12367 | + { (case "(($ac_try" in | ||
12368 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12369 | + *) ac_try_echo=$ac_try;; | ||
12370 | +esac | ||
12371 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12372 | + (eval "$ac_try") 2>&5 | ||
12373 | ac_status=$? | ||
12374 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12375 | (exit $ac_status); }; } && | ||
12376 | { ac_try='test -s conftest.$ac_objext' | ||
12377 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12378 | - (eval $ac_try) 2>&5 | ||
12379 | + { (case "(($ac_try" in | ||
12380 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12381 | + *) ac_try_echo=$ac_try;; | ||
12382 | +esac | ||
12383 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12384 | + (eval "$ac_try") 2>&5 | ||
12385 | ac_status=$? | ||
12386 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12387 | (exit $ac_status); }; }; then | ||
12388 | @@ -23082,60 +24576,91 @@ | ||
12389 | echo "$as_me: failed program was:" >&5 | ||
12390 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
12391 | |||
12392 | -continue | ||
12393 | -fi | ||
12394 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12395 | - cat >conftest.$ac_ext <<_ACEOF | ||
12396 | + ac_cxx_werror_flag=$ac_save_cxx_werror_flag | ||
12397 | + CXXFLAGS="-g" | ||
12398 | + cat >conftest.$ac_ext <<_ACEOF | ||
12399 | /* confdefs.h. */ | ||
12400 | _ACEOF | ||
12401 | cat confdefs.h >>conftest.$ac_ext | ||
12402 | cat >>conftest.$ac_ext <<_ACEOF | ||
12403 | /* end confdefs.h. */ | ||
12404 | -$ac_declaration | ||
12405 | + | ||
12406 | int | ||
12407 | main () | ||
12408 | { | ||
12409 | -exit (42); | ||
12410 | + | ||
12411 | ; | ||
12412 | return 0; | ||
12413 | } | ||
12414 | _ACEOF | ||
12415 | rm -f conftest.$ac_objext | ||
12416 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
12417 | - (eval $ac_compile) 2>conftest.er1 | ||
12418 | +if { (ac_try="$ac_compile" | ||
12419 | +case "(($ac_try" in | ||
12420 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12421 | + *) ac_try_echo=$ac_try;; | ||
12422 | +esac | ||
12423 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12424 | + (eval "$ac_compile") 2>conftest.er1 | ||
12425 | ac_status=$? | ||
12426 | grep -v '^ *+' conftest.er1 >conftest.err | ||
12427 | rm -f conftest.er1 | ||
12428 | cat conftest.err >&5 | ||
12429 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12430 | (exit $ac_status); } && | ||
12431 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
12432 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12433 | - (eval $ac_try) 2>&5 | ||
12434 | + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
12435 | + { (case "(($ac_try" in | ||
12436 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12437 | + *) ac_try_echo=$ac_try;; | ||
12438 | +esac | ||
12439 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12440 | + (eval "$ac_try") 2>&5 | ||
12441 | ac_status=$? | ||
12442 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12443 | (exit $ac_status); }; } && | ||
12444 | { ac_try='test -s conftest.$ac_objext' | ||
12445 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12446 | - (eval $ac_try) 2>&5 | ||
12447 | + { (case "(($ac_try" in | ||
12448 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12449 | + *) ac_try_echo=$ac_try;; | ||
12450 | +esac | ||
12451 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12452 | + (eval "$ac_try") 2>&5 | ||
12453 | ac_status=$? | ||
12454 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12455 | (exit $ac_status); }; }; then | ||
12456 | - break | ||
12457 | + ac_cv_prog_cxx_g=yes | ||
12458 | else | ||
12459 | echo "$as_me: failed program was:" >&5 | ||
12460 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
12461 | |||
12462 | + | ||
12463 | fi | ||
12464 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12465 | -done | ||
12466 | -rm -f conftest* | ||
12467 | -if test -n "$ac_declaration"; then | ||
12468 | - echo '#ifdef __cplusplus' >>confdefs.h | ||
12469 | - echo $ac_declaration >>confdefs.h | ||
12470 | - echo '#endif' >>confdefs.h | ||
12471 | + | ||
12472 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12473 | +fi | ||
12474 | + | ||
12475 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12476 | fi | ||
12477 | |||
12478 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12479 | + ac_cxx_werror_flag=$ac_save_cxx_werror_flag | ||
12480 | +fi | ||
12481 | +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 | ||
12482 | +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } | ||
12483 | +if test "$ac_test_CXXFLAGS" = set; then | ||
12484 | + CXXFLAGS=$ac_save_CXXFLAGS | ||
12485 | +elif test $ac_cv_prog_cxx_g = yes; then | ||
12486 | + if test "$GXX" = yes; then | ||
12487 | + CXXFLAGS="-g -O2" | ||
12488 | + else | ||
12489 | + CXXFLAGS="-g" | ||
12490 | + fi | ||
12491 | +else | ||
12492 | + if test "$GXX" = yes; then | ||
12493 | + CXXFLAGS="-O2" | ||
12494 | + else | ||
12495 | + CXXFLAGS= | ||
12496 | + fi | ||
12497 | +fi | ||
12498 | ac_ext=c | ||
12499 | ac_cpp='$CPP $CPPFLAGS' | ||
12500 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
12501 | @@ -23144,8 +24669,8 @@ | ||
12502 | |||
12503 | depcc="$CXX" am_compiler_list= | ||
12504 | |||
12505 | -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | ||
12506 | -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 | ||
12507 | +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | ||
12508 | +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } | ||
12509 | if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then | ||
12510 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12511 | else | ||
12512 | @@ -23234,8 +24759,8 @@ | ||
12513 | fi | ||
12514 | |||
12515 | fi | ||
12516 | -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 | ||
12517 | -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 | ||
12518 | +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 | ||
12519 | +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } | ||
12520 | CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type | ||
12521 | |||
12522 | |||
12523 | @@ -23253,8 +24778,8 @@ | ||
12524 | |||
12525 | # Extract the first word of "$CXX", so it can be a program name with args. | ||
12526 | set dummy $CXX; ac_word=$2 | ||
12527 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
12528 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
12529 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
12530 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
12531 | if test "${ac_cv_prog_HAVE_CXX+set}" = set; then | ||
12532 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12533 | else | ||
12534 | @@ -23267,31 +24792,33 @@ | ||
12535 | IFS=$as_save_IFS | ||
12536 | test -z "$as_dir" && as_dir=. | ||
12537 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
12538 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
12539 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
12540 | ac_cv_prog_HAVE_CXX="yes" | ||
12541 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
12542 | break 2 | ||
12543 | fi | ||
12544 | done | ||
12545 | done | ||
12546 | +IFS=$as_save_IFS | ||
12547 | |||
12548 | test -z "$ac_cv_prog_HAVE_CXX" && ac_cv_prog_HAVE_CXX="no" | ||
12549 | fi | ||
12550 | fi | ||
12551 | HAVE_CXX=$ac_cv_prog_HAVE_CXX | ||
12552 | if test -n "$HAVE_CXX"; then | ||
12553 | - echo "$as_me:$LINENO: result: $HAVE_CXX" >&5 | ||
12554 | -echo "${ECHO_T}$HAVE_CXX" >&6 | ||
12555 | + { echo "$as_me:$LINENO: result: $HAVE_CXX" >&5 | ||
12556 | +echo "${ECHO_T}$HAVE_CXX" >&6; } | ||
12557 | else | ||
12558 | - echo "$as_me:$LINENO: result: no" >&5 | ||
12559 | -echo "${ECHO_T}no" >&6 | ||
12560 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
12561 | +echo "${ECHO_T}no" >&6; } | ||
12562 | fi | ||
12563 | |||
12564 | |||
12565 | + | ||
12566 | # Extract the first word of "valgrind", so it can be a program name with args. | ||
12567 | set dummy valgrind; ac_word=$2 | ||
12568 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
12569 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
12570 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
12571 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
12572 | if test "${ac_cv_path_VALGRIND_PATH+set}" = set; then | ||
12573 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12574 | else | ||
12575 | @@ -23306,30 +24833,31 @@ | ||
12576 | IFS=$as_save_IFS | ||
12577 | test -z "$as_dir" && as_dir=. | ||
12578 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
12579 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
12580 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
12581 | ac_cv_path_VALGRIND_PATH="$as_dir/$ac_word$ac_exec_ext" | ||
12582 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
12583 | break 2 | ||
12584 | fi | ||
12585 | done | ||
12586 | done | ||
12587 | +IFS=$as_save_IFS | ||
12588 | |||
12589 | test -z "$ac_cv_path_VALGRIND_PATH" && ac_cv_path_VALGRIND_PATH="no" | ||
12590 | ;; | ||
12591 | esac | ||
12592 | fi | ||
12593 | VALGRIND_PATH=$ac_cv_path_VALGRIND_PATH | ||
12594 | - | ||
12595 | if test -n "$VALGRIND_PATH"; then | ||
12596 | - echo "$as_me:$LINENO: result: $VALGRIND_PATH" >&5 | ||
12597 | -echo "${ECHO_T}$VALGRIND_PATH" >&6 | ||
12598 | + { echo "$as_me:$LINENO: result: $VALGRIND_PATH" >&5 | ||
12599 | +echo "${ECHO_T}$VALGRIND_PATH" >&6; } | ||
12600 | else | ||
12601 | - echo "$as_me:$LINENO: result: no" >&5 | ||
12602 | -echo "${ECHO_T}no" >&6 | ||
12603 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
12604 | +echo "${ECHO_T}no" >&6; } | ||
12605 | fi | ||
12606 | |||
12607 | |||
12608 | |||
12609 | + | ||
12610 | if test ! "x$VALGRIND_PATH" = "xno"; then | ||
12611 | HAVE_VALGRIND_TRUE= | ||
12612 | HAVE_VALGRIND_FALSE='#' | ||
12613 | @@ -23341,31 +24869,31 @@ | ||
12614 | |||
12615 | |||
12616 | |||
12617 | -# Check whether --with-html-dir or --without-html-dir was given. | ||
12618 | +# Check whether --with-html-dir was given. | ||
12619 | if test "${with_html_dir+set}" = set; then | ||
12620 | - withval="$with_html_dir" | ||
12621 | - | ||
12622 | + withval=$with_html_dir; | ||
12623 | else | ||
12624 | with_html_dir='${datadir}/gtk-doc/html' | ||
12625 | -fi; | ||
12626 | +fi | ||
12627 | + | ||
12628 | HTML_DIR="$with_html_dir" | ||
12629 | |||
12630 | |||
12631 | - # Check whether --enable-gtk-doc or --disable-gtk-doc was given. | ||
12632 | + # Check whether --enable-gtk-doc was given. | ||
12633 | if test "${enable_gtk_doc+set}" = set; then | ||
12634 | - enableval="$enable_gtk_doc" | ||
12635 | - | ||
12636 | + enableval=$enable_gtk_doc; | ||
12637 | else | ||
12638 | enable_gtk_doc=no | ||
12639 | -fi; | ||
12640 | +fi | ||
12641 | + | ||
12642 | |||
12643 | have_gtk_doc=no | ||
12644 | if test x$enable_gtk_doc = xyes; then | ||
12645 | if test -z "$PKG_CONFIG"; then | ||
12646 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
12647 | set dummy pkg-config; ac_word=$2 | ||
12648 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
12649 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
12650 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
12651 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
12652 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then | ||
12653 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12654 | else | ||
12655 | @@ -23380,28 +24908,29 @@ | ||
12656 | IFS=$as_save_IFS | ||
12657 | test -z "$as_dir" && as_dir=. | ||
12658 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
12659 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
12660 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
12661 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
12662 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
12663 | break 2 | ||
12664 | fi | ||
12665 | done | ||
12666 | done | ||
12667 | +IFS=$as_save_IFS | ||
12668 | |||
12669 | test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" | ||
12670 | ;; | ||
12671 | esac | ||
12672 | fi | ||
12673 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
12674 | - | ||
12675 | if test -n "$PKG_CONFIG"; then | ||
12676 | - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 | ||
12677 | -echo "${ECHO_T}$PKG_CONFIG" >&6 | ||
12678 | + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 | ||
12679 | +echo "${ECHO_T}$PKG_CONFIG" >&6; } | ||
12680 | else | ||
12681 | - echo "$as_me:$LINENO: result: no" >&5 | ||
12682 | -echo "${ECHO_T}no" >&6 | ||
12683 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
12684 | +echo "${ECHO_T}no" >&6; } | ||
12685 | fi | ||
12686 | |||
12687 | + | ||
12688 | fi | ||
12689 | if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then | ||
12690 | have_gtk_doc=yes | ||
12691 | @@ -23409,14 +24938,14 @@ | ||
12692 | |||
12693 | gtk_doc_min_version=1.3 | ||
12694 | if test "$have_gtk_doc" = yes; then | ||
12695 | - echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5 | ||
12696 | -echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6 | ||
12697 | + { echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5 | ||
12698 | +echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6; } | ||
12699 | if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then | ||
12700 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
12701 | -echo "${ECHO_T}yes" >&6 | ||
12702 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
12703 | +echo "${ECHO_T}yes" >&6; } | ||
12704 | else | ||
12705 | - echo "$as_me:$LINENO: result: no" >&5 | ||
12706 | -echo "${ECHO_T}no" >&6 | ||
12707 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
12708 | +echo "${ECHO_T}no" >&6; } | ||
12709 | have_gtk_doc=no | ||
12710 | fi | ||
12711 | fi | ||
12712 | @@ -23470,8 +24999,8 @@ | ||
12713 | unset PYTHON | ||
12714 | # Extract the first word of "$python_candidate", so it can be a program name with args. | ||
12715 | set dummy $python_candidate; ac_word=$2 | ||
12716 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
12717 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
12718 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
12719 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
12720 | if test "${ac_cv_path_PYTHON+set}" = set; then | ||
12721 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12722 | else | ||
12723 | @@ -23486,35 +25015,36 @@ | ||
12724 | IFS=$as_save_IFS | ||
12725 | test -z "$as_dir" && as_dir=. | ||
12726 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
12727 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
12728 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
12729 | ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" | ||
12730 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
12731 | break 2 | ||
12732 | fi | ||
12733 | done | ||
12734 | done | ||
12735 | +IFS=$as_save_IFS | ||
12736 | |||
12737 | ;; | ||
12738 | esac | ||
12739 | fi | ||
12740 | PYTHON=$ac_cv_path_PYTHON | ||
12741 | - | ||
12742 | if test -n "$PYTHON"; then | ||
12743 | - echo "$as_me:$LINENO: result: $PYTHON" >&5 | ||
12744 | -echo "${ECHO_T}$PYTHON" >&6 | ||
12745 | + { echo "$as_me:$LINENO: result: $PYTHON" >&5 | ||
12746 | +echo "${ECHO_T}$PYTHON" >&6; } | ||
12747 | else | ||
12748 | - echo "$as_me:$LINENO: result: no" >&5 | ||
12749 | -echo "${ECHO_T}no" >&6 | ||
12750 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
12751 | +echo "${ECHO_T}no" >&6; } | ||
12752 | fi | ||
12753 | + | ||
12754 | 1> /dev/null 2> /dev/null | ||
12755 | |||
12756 | if test "x$PYTHON" = "x"; then continue; fi | ||
12757 | |||
12758 | if $PYTHON -c "$prog" 1>&5 2>&5; then | ||
12759 | - echo "$as_me:$LINENO: checking \"$PYTHON\":" >&5 | ||
12760 | -echo $ECHO_N "checking \"$PYTHON\":... $ECHO_C" >&6 | ||
12761 | - echo "$as_me:$LINENO: result: okay" >&5 | ||
12762 | -echo "${ECHO_T}okay" >&6 | ||
12763 | + { echo "$as_me:$LINENO: checking \"$PYTHON\":" >&5 | ||
12764 | +echo $ECHO_N "checking \"$PYTHON\":... $ECHO_C" >&6; } | ||
12765 | + { echo "$as_me:$LINENO: result: okay" >&5 | ||
12766 | +echo "${ECHO_T}okay" >&6; } | ||
12767 | python_good=true | ||
12768 | break; | ||
12769 | else | ||
12770 | @@ -23529,8 +25059,8 @@ | ||
12771 | PYTHON= | ||
12772 | else | ||
12773 | |||
12774 | - echo "$as_me:$LINENO: checking local Python configuration" >&5 | ||
12775 | -echo $ECHO_N "checking local Python configuration... $ECHO_C" >&6 | ||
12776 | + { echo "$as_me:$LINENO: checking local Python configuration" >&5 | ||
12777 | +echo $ECHO_N "checking local Python configuration... $ECHO_C" >&6; } | ||
12778 | |||
12779 | |||
12780 | |||
12781 | @@ -23566,8 +25096,8 @@ | ||
12782 | |||
12783 | pkgpyexecdir=\${pyexecdir}/$PACKAGE | ||
12784 | |||
12785 | - echo "$as_me:$LINENO: result: looks good" >&5 | ||
12786 | -echo "${ECHO_T}looks good" >&6 | ||
12787 | + { echo "$as_me:$LINENO: result: looks good" >&5 | ||
12788 | +echo "${ECHO_T}looks good" >&6; } | ||
12789 | |||
12790 | fi | ||
12791 | |||
12792 | @@ -23575,8 +25105,8 @@ | ||
12793 | |||
12794 | |||
12795 | # ------ AX CREATE STDINT H ------------------------------------- | ||
12796 | -echo "$as_me:$LINENO: checking for stdint types" >&5 | ||
12797 | -echo $ECHO_N "checking for stdint types... $ECHO_C" >&6 | ||
12798 | +{ echo "$as_me:$LINENO: checking for stdint types" >&5 | ||
12799 | +echo $ECHO_N "checking for stdint types... $ECHO_C" >&6; } | ||
12800 | ac_stdint_h=`echo _stdint.h` | ||
12801 | # try to shortcircuit - if the default include path of the compiler | ||
12802 | # can find a "stdint.h" header then we assume that all compilers can. | ||
12803 | @@ -23603,23 +25133,36 @@ | ||
12804 | } | ||
12805 | _ACEOF | ||
12806 | rm -f conftest.$ac_objext | ||
12807 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
12808 | - (eval $ac_compile) 2>conftest.er1 | ||
12809 | +if { (ac_try="$ac_compile" | ||
12810 | +case "(($ac_try" in | ||
12811 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12812 | + *) ac_try_echo=$ac_try;; | ||
12813 | +esac | ||
12814 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12815 | + (eval "$ac_compile") 2>conftest.er1 | ||
12816 | ac_status=$? | ||
12817 | grep -v '^ *+' conftest.er1 >conftest.err | ||
12818 | rm -f conftest.er1 | ||
12819 | cat conftest.err >&5 | ||
12820 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12821 | (exit $ac_status); } && | ||
12822 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
12823 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12824 | - (eval $ac_try) 2>&5 | ||
12825 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
12826 | + { (case "(($ac_try" in | ||
12827 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12828 | + *) ac_try_echo=$ac_try;; | ||
12829 | +esac | ||
12830 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12831 | + (eval "$ac_try") 2>&5 | ||
12832 | ac_status=$? | ||
12833 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12834 | (exit $ac_status); }; } && | ||
12835 | { ac_try='test -s conftest.$ac_objext' | ||
12836 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12837 | - (eval $ac_try) 2>&5 | ||
12838 | + { (case "(($ac_try" in | ||
12839 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12840 | + *) ac_try_echo=$ac_try;; | ||
12841 | +esac | ||
12842 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12843 | + (eval "$ac_try") 2>&5 | ||
12844 | ac_status=$? | ||
12845 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12846 | (exit $ac_status); }; }; then | ||
12847 | @@ -23629,9 +25172,10 @@ | ||
12848 | echo "$as_me: failed program was:" >&5 | ||
12849 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
12850 | |||
12851 | -ac_cv_header_stdint_t="" | ||
12852 | + ac_cv_header_stdint_t="" | ||
12853 | fi | ||
12854 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12855 | + | ||
12856 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12857 | CXXFLAGS="$old_CXXFLAGS" | ||
12858 | CPPFLAGS="$old_CPPFLAGS" | ||
12859 | CFLAGS="$old_CFLAGS" | ||
12860 | @@ -23640,18 +25184,18 @@ | ||
12861 | |||
12862 | v="... $ac_cv_header_stdint_h" | ||
12863 | if test "$ac_stdint_h" = "stdint.h" ; then | ||
12864 | - echo "$as_me:$LINENO: result: (are you sure you want them in ./stdint.h?)" >&5 | ||
12865 | -echo "${ECHO_T}(are you sure you want them in ./stdint.h?)" >&6 | ||
12866 | + { echo "$as_me:$LINENO: result: (are you sure you want them in ./stdint.h?)" >&5 | ||
12867 | +echo "${ECHO_T}(are you sure you want them in ./stdint.h?)" >&6; } | ||
12868 | elif test "$ac_stdint_h" = "inttypes.h" ; then | ||
12869 | - echo "$as_me:$LINENO: result: (are you sure you want them in ./inttypes.h?)" >&5 | ||
12870 | -echo "${ECHO_T}(are you sure you want them in ./inttypes.h?)" >&6 | ||
12871 | + { echo "$as_me:$LINENO: result: (are you sure you want them in ./inttypes.h?)" >&5 | ||
12872 | +echo "${ECHO_T}(are you sure you want them in ./inttypes.h?)" >&6; } | ||
12873 | elif test "_$ac_cv_header_stdint_t" = "_" ; then | ||
12874 | - echo "$as_me:$LINENO: result: (putting them into $ac_stdint_h)$v" >&5 | ||
12875 | -echo "${ECHO_T}(putting them into $ac_stdint_h)$v" >&6 | ||
12876 | + { echo "$as_me:$LINENO: result: (putting them into $ac_stdint_h)$v" >&5 | ||
12877 | +echo "${ECHO_T}(putting them into $ac_stdint_h)$v" >&6; } | ||
12878 | else | ||
12879 | ac_cv_header_stdint="$ac_cv_header_stdint_t" | ||
12880 | - echo "$as_me:$LINENO: result: $ac_cv_header_stdint (shortcircuit)" >&5 | ||
12881 | -echo "${ECHO_T}$ac_cv_header_stdint (shortcircuit)" >&6 | ||
12882 | + { echo "$as_me:$LINENO: result: $ac_cv_header_stdint (shortcircuit)" >&5 | ||
12883 | +echo "${ECHO_T}$ac_cv_header_stdint (shortcircuit)" >&6; } | ||
12884 | fi | ||
12885 | |||
12886 | if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit.. | ||
12887 | @@ -23660,20 +25204,20 @@ | ||
12888 | inttype_headers=`echo | sed -e 's/,/ /g'` | ||
12889 | |||
12890 | ac_cv_stdint_result="(no helpful system typedefs seen)" | ||
12891 | -echo "$as_me:$LINENO: checking for stdint uintptr_t" >&5 | ||
12892 | -echo $ECHO_N "checking for stdint uintptr_t... $ECHO_C" >&6 | ||
12893 | +{ echo "$as_me:$LINENO: checking for stdint uintptr_t" >&5 | ||
12894 | +echo $ECHO_N "checking for stdint uintptr_t... $ECHO_C" >&6; } | ||
12895 | if test "${ac_cv_header_stdint_x+set}" = set; then | ||
12896 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12897 | else | ||
12898 | |||
12899 | ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h) | ||
12900 | - echo "$as_me:$LINENO: result: (..)" >&5 | ||
12901 | -echo "${ECHO_T}(..)" >&6 | ||
12902 | + { echo "$as_me:$LINENO: result: (..)" >&5 | ||
12903 | +echo "${ECHO_T}(..)" >&6; } | ||
12904 | for i in stdint.h inttypes.h sys/inttypes.h $inttype_headers ; do | ||
12905 | unset ac_cv_type_uintptr_t | ||
12906 | unset ac_cv_type_uint64_t | ||
12907 | - echo "$as_me:$LINENO: checking for uintptr_t" >&5 | ||
12908 | -echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6 | ||
12909 | + { echo "$as_me:$LINENO: checking for uintptr_t" >&5 | ||
12910 | +echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6; } | ||
12911 | if test "${ac_cv_type_uintptr_t+set}" = set; then | ||
12912 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
12913 | else | ||
12914 | @@ -23685,35 +25229,49 @@ | ||
12915 | /* end confdefs.h. */ | ||
12916 | #include <$i> | ||
12917 | |||
12918 | +typedef uintptr_t ac__type_new_; | ||
12919 | int | ||
12920 | main () | ||
12921 | { | ||
12922 | -if ((uintptr_t *) 0) | ||
12923 | +if ((ac__type_new_ *) 0) | ||
12924 | return 0; | ||
12925 | -if (sizeof (uintptr_t)) | ||
12926 | +if (sizeof (ac__type_new_)) | ||
12927 | return 0; | ||
12928 | ; | ||
12929 | return 0; | ||
12930 | } | ||
12931 | _ACEOF | ||
12932 | rm -f conftest.$ac_objext | ||
12933 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
12934 | - (eval $ac_compile) 2>conftest.er1 | ||
12935 | +if { (ac_try="$ac_compile" | ||
12936 | +case "(($ac_try" in | ||
12937 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12938 | + *) ac_try_echo=$ac_try;; | ||
12939 | +esac | ||
12940 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12941 | + (eval "$ac_compile") 2>conftest.er1 | ||
12942 | ac_status=$? | ||
12943 | grep -v '^ *+' conftest.er1 >conftest.err | ||
12944 | rm -f conftest.er1 | ||
12945 | cat conftest.err >&5 | ||
12946 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12947 | (exit $ac_status); } && | ||
12948 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
12949 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12950 | - (eval $ac_try) 2>&5 | ||
12951 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
12952 | + { (case "(($ac_try" in | ||
12953 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12954 | + *) ac_try_echo=$ac_try;; | ||
12955 | +esac | ||
12956 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12957 | + (eval "$ac_try") 2>&5 | ||
12958 | ac_status=$? | ||
12959 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12960 | (exit $ac_status); }; } && | ||
12961 | { ac_try='test -s conftest.$ac_objext' | ||
12962 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12963 | - (eval $ac_try) 2>&5 | ||
12964 | + { (case "(($ac_try" in | ||
12965 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
12966 | + *) ac_try_echo=$ac_try;; | ||
12967 | +esac | ||
12968 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
12969 | + (eval "$ac_try") 2>&5 | ||
12970 | ac_status=$? | ||
12971 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12972 | (exit $ac_status); }; }; then | ||
12973 | @@ -23722,20 +25280,21 @@ | ||
12974 | echo "$as_me: failed program was:" >&5 | ||
12975 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
12976 | |||
12977 | -ac_cv_type_uintptr_t=no | ||
12978 | + ac_cv_type_uintptr_t=no | ||
12979 | fi | ||
12980 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12981 | + | ||
12982 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
12983 | fi | ||
12984 | -echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5 | ||
12985 | -echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6 | ||
12986 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5 | ||
12987 | +echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6; } | ||
12988 | if test $ac_cv_type_uintptr_t = yes; then | ||
12989 | ac_cv_header_stdint_x=$i | ||
12990 | else | ||
12991 | continue | ||
12992 | fi | ||
12993 | |||
12994 | - echo "$as_me:$LINENO: checking for uint64_t" >&5 | ||
12995 | -echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6 | ||
12996 | + { echo "$as_me:$LINENO: checking for uint64_t" >&5 | ||
12997 | +echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6; } | ||
12998 | if test "${ac_cv_type_uint64_t+set}" = set; then | ||
12999 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
13000 | else | ||
13001 | @@ -23747,35 +25306,49 @@ | ||
13002 | /* end confdefs.h. */ | ||
13003 | #include<$i> | ||
13004 | |||
13005 | +typedef uint64_t ac__type_new_; | ||
13006 | int | ||
13007 | main () | ||
13008 | { | ||
13009 | -if ((uint64_t *) 0) | ||
13010 | +if ((ac__type_new_ *) 0) | ||
13011 | return 0; | ||
13012 | -if (sizeof (uint64_t)) | ||
13013 | +if (sizeof (ac__type_new_)) | ||
13014 | return 0; | ||
13015 | ; | ||
13016 | return 0; | ||
13017 | } | ||
13018 | _ACEOF | ||
13019 | rm -f conftest.$ac_objext | ||
13020 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
13021 | - (eval $ac_compile) 2>conftest.er1 | ||
13022 | +if { (ac_try="$ac_compile" | ||
13023 | +case "(($ac_try" in | ||
13024 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13025 | + *) ac_try_echo=$ac_try;; | ||
13026 | +esac | ||
13027 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13028 | + (eval "$ac_compile") 2>conftest.er1 | ||
13029 | ac_status=$? | ||
13030 | grep -v '^ *+' conftest.er1 >conftest.err | ||
13031 | rm -f conftest.er1 | ||
13032 | cat conftest.err >&5 | ||
13033 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13034 | (exit $ac_status); } && | ||
13035 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13036 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13037 | - (eval $ac_try) 2>&5 | ||
13038 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13039 | + { (case "(($ac_try" in | ||
13040 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13041 | + *) ac_try_echo=$ac_try;; | ||
13042 | +esac | ||
13043 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13044 | + (eval "$ac_try") 2>&5 | ||
13045 | ac_status=$? | ||
13046 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13047 | (exit $ac_status); }; } && | ||
13048 | { ac_try='test -s conftest.$ac_objext' | ||
13049 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13050 | - (eval $ac_try) 2>&5 | ||
13051 | + { (case "(($ac_try" in | ||
13052 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13053 | + *) ac_try_echo=$ac_try;; | ||
13054 | +esac | ||
13055 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13056 | + (eval "$ac_try") 2>&5 | ||
13057 | ac_status=$? | ||
13058 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13059 | (exit $ac_status); }; }; then | ||
13060 | @@ -23784,12 +25357,13 @@ | ||
13061 | echo "$as_me: failed program was:" >&5 | ||
13062 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
13063 | |||
13064 | -ac_cv_type_uint64_t=no | ||
13065 | + ac_cv_type_uint64_t=no | ||
13066 | fi | ||
13067 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13068 | + | ||
13069 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13070 | fi | ||
13071 | -echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5 | ||
13072 | -echo "${ECHO_T}$ac_cv_type_uint64_t" >&6 | ||
13073 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5 | ||
13074 | +echo "${ECHO_T}$ac_cv_type_uint64_t" >&6; } | ||
13075 | if test $ac_cv_type_uint64_t = yes; then | ||
13076 | and64="/uint64_t" | ||
13077 | else | ||
13078 | @@ -23799,28 +25373,28 @@ | ||
13079 | ac_cv_stdint_result="(seen uintptr_t$and64 in $i)" | ||
13080 | break; | ||
13081 | done | ||
13082 | - echo "$as_me:$LINENO: checking for stdint uintptr_t" >&5 | ||
13083 | -echo $ECHO_N "checking for stdint uintptr_t... $ECHO_C" >&6 | ||
13084 | + { echo "$as_me:$LINENO: checking for stdint uintptr_t" >&5 | ||
13085 | +echo $ECHO_N "checking for stdint uintptr_t... $ECHO_C" >&6; } | ||
13086 | |||
13087 | fi | ||
13088 | -echo "$as_me:$LINENO: result: $ac_cv_header_stdint_x" >&5 | ||
13089 | -echo "${ECHO_T}$ac_cv_header_stdint_x" >&6 | ||
13090 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_x" >&5 | ||
13091 | +echo "${ECHO_T}$ac_cv_header_stdint_x" >&6; } | ||
13092 | |||
13093 | if test "_$ac_cv_header_stdint_x" = "_" ; then | ||
13094 | -echo "$as_me:$LINENO: checking for stdint uint32_t" >&5 | ||
13095 | -echo $ECHO_N "checking for stdint uint32_t... $ECHO_C" >&6 | ||
13096 | +{ echo "$as_me:$LINENO: checking for stdint uint32_t" >&5 | ||
13097 | +echo $ECHO_N "checking for stdint uint32_t... $ECHO_C" >&6; } | ||
13098 | if test "${ac_cv_header_stdint_o+set}" = set; then | ||
13099 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
13100 | else | ||
13101 | |||
13102 | ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h) | ||
13103 | - echo "$as_me:$LINENO: result: (..)" >&5 | ||
13104 | -echo "${ECHO_T}(..)" >&6 | ||
13105 | + { echo "$as_me:$LINENO: result: (..)" >&5 | ||
13106 | +echo "${ECHO_T}(..)" >&6; } | ||
13107 | for i in inttypes.h sys/inttypes.h stdint.h $inttype_headers ; do | ||
13108 | unset ac_cv_type_uint32_t | ||
13109 | unset ac_cv_type_uint64_t | ||
13110 | - echo "$as_me:$LINENO: checking for uint32_t" >&5 | ||
13111 | -echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6 | ||
13112 | + { echo "$as_me:$LINENO: checking for uint32_t" >&5 | ||
13113 | +echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; } | ||
13114 | if test "${ac_cv_type_uint32_t+set}" = set; then | ||
13115 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
13116 | else | ||
13117 | @@ -23832,35 +25406,49 @@ | ||
13118 | /* end confdefs.h. */ | ||
13119 | #include <$i> | ||
13120 | |||
13121 | +typedef uint32_t ac__type_new_; | ||
13122 | int | ||
13123 | main () | ||
13124 | { | ||
13125 | -if ((uint32_t *) 0) | ||
13126 | +if ((ac__type_new_ *) 0) | ||
13127 | return 0; | ||
13128 | -if (sizeof (uint32_t)) | ||
13129 | +if (sizeof (ac__type_new_)) | ||
13130 | return 0; | ||
13131 | ; | ||
13132 | return 0; | ||
13133 | } | ||
13134 | _ACEOF | ||
13135 | rm -f conftest.$ac_objext | ||
13136 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
13137 | - (eval $ac_compile) 2>conftest.er1 | ||
13138 | +if { (ac_try="$ac_compile" | ||
13139 | +case "(($ac_try" in | ||
13140 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13141 | + *) ac_try_echo=$ac_try;; | ||
13142 | +esac | ||
13143 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13144 | + (eval "$ac_compile") 2>conftest.er1 | ||
13145 | ac_status=$? | ||
13146 | grep -v '^ *+' conftest.er1 >conftest.err | ||
13147 | rm -f conftest.er1 | ||
13148 | cat conftest.err >&5 | ||
13149 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13150 | (exit $ac_status); } && | ||
13151 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13152 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13153 | - (eval $ac_try) 2>&5 | ||
13154 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13155 | + { (case "(($ac_try" in | ||
13156 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13157 | + *) ac_try_echo=$ac_try;; | ||
13158 | +esac | ||
13159 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13160 | + (eval "$ac_try") 2>&5 | ||
13161 | ac_status=$? | ||
13162 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13163 | (exit $ac_status); }; } && | ||
13164 | { ac_try='test -s conftest.$ac_objext' | ||
13165 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13166 | - (eval $ac_try) 2>&5 | ||
13167 | + { (case "(($ac_try" in | ||
13168 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13169 | + *) ac_try_echo=$ac_try;; | ||
13170 | +esac | ||
13171 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13172 | + (eval "$ac_try") 2>&5 | ||
13173 | ac_status=$? | ||
13174 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13175 | (exit $ac_status); }; }; then | ||
13176 | @@ -23869,20 +25457,21 @@ | ||
13177 | echo "$as_me: failed program was:" >&5 | ||
13178 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
13179 | |||
13180 | -ac_cv_type_uint32_t=no | ||
13181 | + ac_cv_type_uint32_t=no | ||
13182 | fi | ||
13183 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13184 | + | ||
13185 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13186 | fi | ||
13187 | -echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5 | ||
13188 | -echo "${ECHO_T}$ac_cv_type_uint32_t" >&6 | ||
13189 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5 | ||
13190 | +echo "${ECHO_T}$ac_cv_type_uint32_t" >&6; } | ||
13191 | if test $ac_cv_type_uint32_t = yes; then | ||
13192 | ac_cv_header_stdint_o=$i | ||
13193 | else | ||
13194 | continue | ||
13195 | fi | ||
13196 | |||
13197 | - echo "$as_me:$LINENO: checking for uint64_t" >&5 | ||
13198 | -echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6 | ||
13199 | + { echo "$as_me:$LINENO: checking for uint64_t" >&5 | ||
13200 | +echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6; } | ||
13201 | if test "${ac_cv_type_uint64_t+set}" = set; then | ||
13202 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
13203 | else | ||
13204 | @@ -23894,35 +25483,49 @@ | ||
13205 | /* end confdefs.h. */ | ||
13206 | #include<$i> | ||
13207 | |||
13208 | +typedef uint64_t ac__type_new_; | ||
13209 | int | ||
13210 | main () | ||
13211 | { | ||
13212 | -if ((uint64_t *) 0) | ||
13213 | +if ((ac__type_new_ *) 0) | ||
13214 | return 0; | ||
13215 | -if (sizeof (uint64_t)) | ||
13216 | +if (sizeof (ac__type_new_)) | ||
13217 | return 0; | ||
13218 | ; | ||
13219 | return 0; | ||
13220 | } | ||
13221 | _ACEOF | ||
13222 | rm -f conftest.$ac_objext | ||
13223 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
13224 | - (eval $ac_compile) 2>conftest.er1 | ||
13225 | +if { (ac_try="$ac_compile" | ||
13226 | +case "(($ac_try" in | ||
13227 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13228 | + *) ac_try_echo=$ac_try;; | ||
13229 | +esac | ||
13230 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13231 | + (eval "$ac_compile") 2>conftest.er1 | ||
13232 | ac_status=$? | ||
13233 | grep -v '^ *+' conftest.er1 >conftest.err | ||
13234 | rm -f conftest.er1 | ||
13235 | cat conftest.err >&5 | ||
13236 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13237 | (exit $ac_status); } && | ||
13238 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13239 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13240 | - (eval $ac_try) 2>&5 | ||
13241 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13242 | + { (case "(($ac_try" in | ||
13243 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13244 | + *) ac_try_echo=$ac_try;; | ||
13245 | +esac | ||
13246 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13247 | + (eval "$ac_try") 2>&5 | ||
13248 | ac_status=$? | ||
13249 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13250 | (exit $ac_status); }; } && | ||
13251 | { ac_try='test -s conftest.$ac_objext' | ||
13252 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13253 | - (eval $ac_try) 2>&5 | ||
13254 | + { (case "(($ac_try" in | ||
13255 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13256 | + *) ac_try_echo=$ac_try;; | ||
13257 | +esac | ||
13258 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13259 | + (eval "$ac_try") 2>&5 | ||
13260 | ac_status=$? | ||
13261 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13262 | (exit $ac_status); }; }; then | ||
13263 | @@ -23931,12 +25534,13 @@ | ||
13264 | echo "$as_me: failed program was:" >&5 | ||
13265 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
13266 | |||
13267 | -ac_cv_type_uint64_t=no | ||
13268 | + ac_cv_type_uint64_t=no | ||
13269 | fi | ||
13270 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13271 | + | ||
13272 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13273 | fi | ||
13274 | -echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5 | ||
13275 | -echo "${ECHO_T}$ac_cv_type_uint64_t" >&6 | ||
13276 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5 | ||
13277 | +echo "${ECHO_T}$ac_cv_type_uint64_t" >&6; } | ||
13278 | if test $ac_cv_type_uint64_t = yes; then | ||
13279 | and64="/uint64_t" | ||
13280 | else | ||
13281 | @@ -23946,30 +25550,30 @@ | ||
13282 | ac_cv_stdint_result="(seen uint32_t$and64 in $i)" | ||
13283 | break; | ||
13284 | done | ||
13285 | - echo "$as_me:$LINENO: checking for stdint uint32_t" >&5 | ||
13286 | -echo $ECHO_N "checking for stdint uint32_t... $ECHO_C" >&6 | ||
13287 | + { echo "$as_me:$LINENO: checking for stdint uint32_t" >&5 | ||
13288 | +echo $ECHO_N "checking for stdint uint32_t... $ECHO_C" >&6; } | ||
13289 | |||
13290 | fi | ||
13291 | -echo "$as_me:$LINENO: result: $ac_cv_header_stdint_o" >&5 | ||
13292 | -echo "${ECHO_T}$ac_cv_header_stdint_o" >&6 | ||
13293 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_o" >&5 | ||
13294 | +echo "${ECHO_T}$ac_cv_header_stdint_o" >&6; } | ||
13295 | fi | ||
13296 | |||
13297 | if test "_$ac_cv_header_stdint_x" = "_" ; then | ||
13298 | if test "_$ac_cv_header_stdint_o" = "_" ; then | ||
13299 | -echo "$as_me:$LINENO: checking for stdint u_int32_t" >&5 | ||
13300 | -echo $ECHO_N "checking for stdint u_int32_t... $ECHO_C" >&6 | ||
13301 | +{ echo "$as_me:$LINENO: checking for stdint u_int32_t" >&5 | ||
13302 | +echo $ECHO_N "checking for stdint u_int32_t... $ECHO_C" >&6; } | ||
13303 | if test "${ac_cv_header_stdint_u+set}" = set; then | ||
13304 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
13305 | else | ||
13306 | |||
13307 | ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h) | ||
13308 | - echo "$as_me:$LINENO: result: (..)" >&5 | ||
13309 | -echo "${ECHO_T}(..)" >&6 | ||
13310 | + { echo "$as_me:$LINENO: result: (..)" >&5 | ||
13311 | +echo "${ECHO_T}(..)" >&6; } | ||
13312 | for i in sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do | ||
13313 | unset ac_cv_type_u_int32_t | ||
13314 | unset ac_cv_type_u_int64_t | ||
13315 | - echo "$as_me:$LINENO: checking for u_int32_t" >&5 | ||
13316 | -echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6 | ||
13317 | + { echo "$as_me:$LINENO: checking for u_int32_t" >&5 | ||
13318 | +echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6; } | ||
13319 | if test "${ac_cv_type_u_int32_t+set}" = set; then | ||
13320 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
13321 | else | ||
13322 | @@ -23981,35 +25585,49 @@ | ||
13323 | /* end confdefs.h. */ | ||
13324 | #include <$i> | ||
13325 | |||
13326 | +typedef u_int32_t ac__type_new_; | ||
13327 | int | ||
13328 | main () | ||
13329 | { | ||
13330 | -if ((u_int32_t *) 0) | ||
13331 | +if ((ac__type_new_ *) 0) | ||
13332 | return 0; | ||
13333 | -if (sizeof (u_int32_t)) | ||
13334 | +if (sizeof (ac__type_new_)) | ||
13335 | return 0; | ||
13336 | ; | ||
13337 | return 0; | ||
13338 | } | ||
13339 | _ACEOF | ||
13340 | rm -f conftest.$ac_objext | ||
13341 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
13342 | - (eval $ac_compile) 2>conftest.er1 | ||
13343 | +if { (ac_try="$ac_compile" | ||
13344 | +case "(($ac_try" in | ||
13345 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13346 | + *) ac_try_echo=$ac_try;; | ||
13347 | +esac | ||
13348 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13349 | + (eval "$ac_compile") 2>conftest.er1 | ||
13350 | ac_status=$? | ||
13351 | grep -v '^ *+' conftest.er1 >conftest.err | ||
13352 | rm -f conftest.er1 | ||
13353 | cat conftest.err >&5 | ||
13354 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13355 | (exit $ac_status); } && | ||
13356 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13357 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13358 | - (eval $ac_try) 2>&5 | ||
13359 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13360 | + { (case "(($ac_try" in | ||
13361 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13362 | + *) ac_try_echo=$ac_try;; | ||
13363 | +esac | ||
13364 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13365 | + (eval "$ac_try") 2>&5 | ||
13366 | ac_status=$? | ||
13367 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13368 | (exit $ac_status); }; } && | ||
13369 | { ac_try='test -s conftest.$ac_objext' | ||
13370 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13371 | - (eval $ac_try) 2>&5 | ||
13372 | + { (case "(($ac_try" in | ||
13373 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13374 | + *) ac_try_echo=$ac_try;; | ||
13375 | +esac | ||
13376 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13377 | + (eval "$ac_try") 2>&5 | ||
13378 | ac_status=$? | ||
13379 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13380 | (exit $ac_status); }; }; then | ||
13381 | @@ -24018,20 +25636,21 @@ | ||
13382 | echo "$as_me: failed program was:" >&5 | ||
13383 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
13384 | |||
13385 | -ac_cv_type_u_int32_t=no | ||
13386 | + ac_cv_type_u_int32_t=no | ||
13387 | fi | ||
13388 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13389 | + | ||
13390 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13391 | fi | ||
13392 | -echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5 | ||
13393 | -echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6 | ||
13394 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5 | ||
13395 | +echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6; } | ||
13396 | if test $ac_cv_type_u_int32_t = yes; then | ||
13397 | ac_cv_header_stdint_u=$i | ||
13398 | else | ||
13399 | continue | ||
13400 | fi | ||
13401 | |||
13402 | - echo "$as_me:$LINENO: checking for u_int64_t" >&5 | ||
13403 | -echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6 | ||
13404 | + { echo "$as_me:$LINENO: checking for u_int64_t" >&5 | ||
13405 | +echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6; } | ||
13406 | if test "${ac_cv_type_u_int64_t+set}" = set; then | ||
13407 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
13408 | else | ||
13409 | @@ -24043,35 +25662,49 @@ | ||
13410 | /* end confdefs.h. */ | ||
13411 | #include<$i> | ||
13412 | |||
13413 | +typedef u_int64_t ac__type_new_; | ||
13414 | int | ||
13415 | main () | ||
13416 | { | ||
13417 | -if ((u_int64_t *) 0) | ||
13418 | +if ((ac__type_new_ *) 0) | ||
13419 | return 0; | ||
13420 | -if (sizeof (u_int64_t)) | ||
13421 | +if (sizeof (ac__type_new_)) | ||
13422 | return 0; | ||
13423 | ; | ||
13424 | return 0; | ||
13425 | } | ||
13426 | _ACEOF | ||
13427 | rm -f conftest.$ac_objext | ||
13428 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
13429 | - (eval $ac_compile) 2>conftest.er1 | ||
13430 | +if { (ac_try="$ac_compile" | ||
13431 | +case "(($ac_try" in | ||
13432 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13433 | + *) ac_try_echo=$ac_try;; | ||
13434 | +esac | ||
13435 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13436 | + (eval "$ac_compile") 2>conftest.er1 | ||
13437 | ac_status=$? | ||
13438 | grep -v '^ *+' conftest.er1 >conftest.err | ||
13439 | rm -f conftest.er1 | ||
13440 | cat conftest.err >&5 | ||
13441 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13442 | (exit $ac_status); } && | ||
13443 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13444 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13445 | - (eval $ac_try) 2>&5 | ||
13446 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13447 | + { (case "(($ac_try" in | ||
13448 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13449 | + *) ac_try_echo=$ac_try;; | ||
13450 | +esac | ||
13451 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13452 | + (eval "$ac_try") 2>&5 | ||
13453 | ac_status=$? | ||
13454 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13455 | (exit $ac_status); }; } && | ||
13456 | { ac_try='test -s conftest.$ac_objext' | ||
13457 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13458 | - (eval $ac_try) 2>&5 | ||
13459 | + { (case "(($ac_try" in | ||
13460 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13461 | + *) ac_try_echo=$ac_try;; | ||
13462 | +esac | ||
13463 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13464 | + (eval "$ac_try") 2>&5 | ||
13465 | ac_status=$? | ||
13466 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13467 | (exit $ac_status); }; }; then | ||
13468 | @@ -24080,12 +25713,13 @@ | ||
13469 | echo "$as_me: failed program was:" >&5 | ||
13470 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
13471 | |||
13472 | -ac_cv_type_u_int64_t=no | ||
13473 | + ac_cv_type_u_int64_t=no | ||
13474 | fi | ||
13475 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13476 | + | ||
13477 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13478 | fi | ||
13479 | -echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5 | ||
13480 | -echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6 | ||
13481 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5 | ||
13482 | +echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6; } | ||
13483 | if test $ac_cv_type_u_int64_t = yes; then | ||
13484 | and64="/u_int64_t" | ||
13485 | else | ||
13486 | @@ -24095,21 +25729,21 @@ | ||
13487 | ac_cv_stdint_result="(seen u_int32_t$and64 in $i)" | ||
13488 | break; | ||
13489 | done | ||
13490 | - echo "$as_me:$LINENO: checking for stdint u_int32_t" >&5 | ||
13491 | -echo $ECHO_N "checking for stdint u_int32_t... $ECHO_C" >&6 | ||
13492 | + { echo "$as_me:$LINENO: checking for stdint u_int32_t" >&5 | ||
13493 | +echo $ECHO_N "checking for stdint u_int32_t... $ECHO_C" >&6; } | ||
13494 | |||
13495 | fi | ||
13496 | -echo "$as_me:$LINENO: result: $ac_cv_header_stdint_u" >&5 | ||
13497 | -echo "${ECHO_T}$ac_cv_header_stdint_u" >&6 | ||
13498 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_u" >&5 | ||
13499 | +echo "${ECHO_T}$ac_cv_header_stdint_u" >&6; } | ||
13500 | fi fi | ||
13501 | |||
13502 | if test "_$ac_cv_header_stdint_x" = "_" ; then | ||
13503 | - echo "$as_me:$LINENO: checking for stdint datatype model" >&5 | ||
13504 | -echo $ECHO_N "checking for stdint datatype model... $ECHO_C" >&6 | ||
13505 | - echo "$as_me:$LINENO: result: (..)" >&5 | ||
13506 | -echo "${ECHO_T}(..)" >&6 | ||
13507 | - echo "$as_me:$LINENO: checking for char" >&5 | ||
13508 | -echo $ECHO_N "checking for char... $ECHO_C" >&6 | ||
13509 | + { echo "$as_me:$LINENO: checking for stdint datatype model" >&5 | ||
13510 | +echo $ECHO_N "checking for stdint datatype model... $ECHO_C" >&6; } | ||
13511 | + { echo "$as_me:$LINENO: result: (..)" >&5 | ||
13512 | +echo "${ECHO_T}(..)" >&6; } | ||
13513 | + { echo "$as_me:$LINENO: checking for char" >&5 | ||
13514 | +echo $ECHO_N "checking for char... $ECHO_C" >&6; } | ||
13515 | if test "${ac_cv_type_char+set}" = set; then | ||
13516 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
13517 | else | ||
13518 | @@ -24120,35 +25754,49 @@ | ||
13519 | cat >>conftest.$ac_ext <<_ACEOF | ||
13520 | /* end confdefs.h. */ | ||
13521 | $ac_includes_default | ||
13522 | +typedef char ac__type_new_; | ||
13523 | int | ||
13524 | main () | ||
13525 | { | ||
13526 | -if ((char *) 0) | ||
13527 | +if ((ac__type_new_ *) 0) | ||
13528 | return 0; | ||
13529 | -if (sizeof (char)) | ||
13530 | +if (sizeof (ac__type_new_)) | ||
13531 | return 0; | ||
13532 | ; | ||
13533 | return 0; | ||
13534 | } | ||
13535 | _ACEOF | ||
13536 | rm -f conftest.$ac_objext | ||
13537 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
13538 | - (eval $ac_compile) 2>conftest.er1 | ||
13539 | +if { (ac_try="$ac_compile" | ||
13540 | +case "(($ac_try" in | ||
13541 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13542 | + *) ac_try_echo=$ac_try;; | ||
13543 | +esac | ||
13544 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13545 | + (eval "$ac_compile") 2>conftest.er1 | ||
13546 | ac_status=$? | ||
13547 | grep -v '^ *+' conftest.er1 >conftest.err | ||
13548 | rm -f conftest.er1 | ||
13549 | cat conftest.err >&5 | ||
13550 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13551 | (exit $ac_status); } && | ||
13552 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13553 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13554 | - (eval $ac_try) 2>&5 | ||
13555 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13556 | + { (case "(($ac_try" in | ||
13557 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13558 | + *) ac_try_echo=$ac_try;; | ||
13559 | +esac | ||
13560 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13561 | + (eval "$ac_try") 2>&5 | ||
13562 | ac_status=$? | ||
13563 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13564 | (exit $ac_status); }; } && | ||
13565 | { ac_try='test -s conftest.$ac_objext' | ||
13566 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13567 | - (eval $ac_try) 2>&5 | ||
13568 | + { (case "(($ac_try" in | ||
13569 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13570 | + *) ac_try_echo=$ac_try;; | ||
13571 | +esac | ||
13572 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13573 | + (eval "$ac_try") 2>&5 | ||
13574 | ac_status=$? | ||
13575 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13576 | (exit $ac_status); }; }; then | ||
13577 | @@ -24157,20 +25805,21 @@ | ||
13578 | echo "$as_me: failed program was:" >&5 | ||
13579 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
13580 | |||
13581 | -ac_cv_type_char=no | ||
13582 | + ac_cv_type_char=no | ||
13583 | fi | ||
13584 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13585 | + | ||
13586 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13587 | fi | ||
13588 | -echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 | ||
13589 | -echo "${ECHO_T}$ac_cv_type_char" >&6 | ||
13590 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 | ||
13591 | +echo "${ECHO_T}$ac_cv_type_char" >&6; } | ||
13592 | |||
13593 | -echo "$as_me:$LINENO: checking size of char" >&5 | ||
13594 | -echo $ECHO_N "checking size of char... $ECHO_C" >&6 | ||
13595 | +{ echo "$as_me:$LINENO: checking size of char" >&5 | ||
13596 | +echo $ECHO_N "checking size of char... $ECHO_C" >&6; } | ||
13597 | if test "${ac_cv_sizeof_char+set}" = set; then | ||
13598 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
13599 | else | ||
13600 | if test "$ac_cv_type_char" = yes; then | ||
13601 | - # The cast to unsigned long works around a bug in the HP C Compiler | ||
13602 | + # The cast to long int works around a bug in the HP C Compiler | ||
13603 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
13604 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
13605 | # This bug is HP SR number 8606223364. | ||
13606 | @@ -24183,10 +25832,11 @@ | ||
13607 | cat >>conftest.$ac_ext <<_ACEOF | ||
13608 | /* end confdefs.h. */ | ||
13609 | $ac_includes_default | ||
13610 | + typedef char ac__type_sizeof_; | ||
13611 | int | ||
13612 | main () | ||
13613 | { | ||
13614 | -static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)]; | ||
13615 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; | ||
13616 | test_array [0] = 0 | ||
13617 | |||
13618 | ; | ||
13619 | @@ -24194,23 +25844,36 @@ | ||
13620 | } | ||
13621 | _ACEOF | ||
13622 | rm -f conftest.$ac_objext | ||
13623 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
13624 | - (eval $ac_compile) 2>conftest.er1 | ||
13625 | +if { (ac_try="$ac_compile" | ||
13626 | +case "(($ac_try" in | ||
13627 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13628 | + *) ac_try_echo=$ac_try;; | ||
13629 | +esac | ||
13630 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13631 | + (eval "$ac_compile") 2>conftest.er1 | ||
13632 | ac_status=$? | ||
13633 | grep -v '^ *+' conftest.er1 >conftest.err | ||
13634 | rm -f conftest.er1 | ||
13635 | cat conftest.err >&5 | ||
13636 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13637 | (exit $ac_status); } && | ||
13638 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13639 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13640 | - (eval $ac_try) 2>&5 | ||
13641 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13642 | + { (case "(($ac_try" in | ||
13643 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13644 | + *) ac_try_echo=$ac_try;; | ||
13645 | +esac | ||
13646 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13647 | + (eval "$ac_try") 2>&5 | ||
13648 | ac_status=$? | ||
13649 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13650 | (exit $ac_status); }; } && | ||
13651 | { ac_try='test -s conftest.$ac_objext' | ||
13652 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13653 | - (eval $ac_try) 2>&5 | ||
13654 | + { (case "(($ac_try" in | ||
13655 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13656 | + *) ac_try_echo=$ac_try;; | ||
13657 | +esac | ||
13658 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13659 | + (eval "$ac_try") 2>&5 | ||
13660 | ac_status=$? | ||
13661 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13662 | (exit $ac_status); }; }; then | ||
13663 | @@ -24223,10 +25886,11 @@ | ||
13664 | cat >>conftest.$ac_ext <<_ACEOF | ||
13665 | /* end confdefs.h. */ | ||
13666 | $ac_includes_default | ||
13667 | + typedef char ac__type_sizeof_; | ||
13668 | int | ||
13669 | main () | ||
13670 | { | ||
13671 | -static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; | ||
13672 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; | ||
13673 | test_array [0] = 0 | ||
13674 | |||
13675 | ; | ||
13676 | @@ -24234,23 +25898,36 @@ | ||
13677 | } | ||
13678 | _ACEOF | ||
13679 | rm -f conftest.$ac_objext | ||
13680 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
13681 | - (eval $ac_compile) 2>conftest.er1 | ||
13682 | +if { (ac_try="$ac_compile" | ||
13683 | +case "(($ac_try" in | ||
13684 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13685 | + *) ac_try_echo=$ac_try;; | ||
13686 | +esac | ||
13687 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13688 | + (eval "$ac_compile") 2>conftest.er1 | ||
13689 | ac_status=$? | ||
13690 | grep -v '^ *+' conftest.er1 >conftest.err | ||
13691 | rm -f conftest.er1 | ||
13692 | cat conftest.err >&5 | ||
13693 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13694 | (exit $ac_status); } && | ||
13695 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13696 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13697 | - (eval $ac_try) 2>&5 | ||
13698 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13699 | + { (case "(($ac_try" in | ||
13700 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13701 | + *) ac_try_echo=$ac_try;; | ||
13702 | +esac | ||
13703 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13704 | + (eval "$ac_try") 2>&5 | ||
13705 | ac_status=$? | ||
13706 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13707 | (exit $ac_status); }; } && | ||
13708 | { ac_try='test -s conftest.$ac_objext' | ||
13709 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13710 | - (eval $ac_try) 2>&5 | ||
13711 | + { (case "(($ac_try" in | ||
13712 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13713 | + *) ac_try_echo=$ac_try;; | ||
13714 | +esac | ||
13715 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13716 | + (eval "$ac_try") 2>&5 | ||
13717 | ac_status=$? | ||
13718 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13719 | (exit $ac_status); }; }; then | ||
13720 | @@ -24259,30 +25936,32 @@ | ||
13721 | echo "$as_me: failed program was:" >&5 | ||
13722 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
13723 | |||
13724 | -ac_lo=`expr $ac_mid + 1` | ||
13725 | - if test $ac_lo -le $ac_mid; then | ||
13726 | - ac_lo= ac_hi= | ||
13727 | - break | ||
13728 | - fi | ||
13729 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
13730 | + ac_lo=`expr $ac_mid + 1` | ||
13731 | + if test $ac_lo -le $ac_mid; then | ||
13732 | + ac_lo= ac_hi= | ||
13733 | + break | ||
13734 | + fi | ||
13735 | + ac_mid=`expr 2 '*' $ac_mid + 1` | ||
13736 | fi | ||
13737 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13738 | + | ||
13739 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13740 | done | ||
13741 | else | ||
13742 | echo "$as_me: failed program was:" >&5 | ||
13743 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
13744 | |||
13745 | -cat >conftest.$ac_ext <<_ACEOF | ||
13746 | + cat >conftest.$ac_ext <<_ACEOF | ||
13747 | /* confdefs.h. */ | ||
13748 | _ACEOF | ||
13749 | cat confdefs.h >>conftest.$ac_ext | ||
13750 | cat >>conftest.$ac_ext <<_ACEOF | ||
13751 | /* end confdefs.h. */ | ||
13752 | $ac_includes_default | ||
13753 | + typedef char ac__type_sizeof_; | ||
13754 | int | ||
13755 | main () | ||
13756 | { | ||
13757 | -static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)]; | ||
13758 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; | ||
13759 | test_array [0] = 0 | ||
13760 | |||
13761 | ; | ||
13762 | @@ -24290,23 +25969,36 @@ | ||
13763 | } | ||
13764 | _ACEOF | ||
13765 | rm -f conftest.$ac_objext | ||
13766 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
13767 | - (eval $ac_compile) 2>conftest.er1 | ||
13768 | +if { (ac_try="$ac_compile" | ||
13769 | +case "(($ac_try" in | ||
13770 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13771 | + *) ac_try_echo=$ac_try;; | ||
13772 | +esac | ||
13773 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13774 | + (eval "$ac_compile") 2>conftest.er1 | ||
13775 | ac_status=$? | ||
13776 | grep -v '^ *+' conftest.er1 >conftest.err | ||
13777 | rm -f conftest.er1 | ||
13778 | cat conftest.err >&5 | ||
13779 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13780 | (exit $ac_status); } && | ||
13781 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13782 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13783 | - (eval $ac_try) 2>&5 | ||
13784 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13785 | + { (case "(($ac_try" in | ||
13786 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13787 | + *) ac_try_echo=$ac_try;; | ||
13788 | +esac | ||
13789 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13790 | + (eval "$ac_try") 2>&5 | ||
13791 | ac_status=$? | ||
13792 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13793 | (exit $ac_status); }; } && | ||
13794 | { ac_try='test -s conftest.$ac_objext' | ||
13795 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13796 | - (eval $ac_try) 2>&5 | ||
13797 | + { (case "(($ac_try" in | ||
13798 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13799 | + *) ac_try_echo=$ac_try;; | ||
13800 | +esac | ||
13801 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13802 | + (eval "$ac_try") 2>&5 | ||
13803 | ac_status=$? | ||
13804 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13805 | (exit $ac_status); }; }; then | ||
13806 | @@ -24319,10 +26011,11 @@ | ||
13807 | cat >>conftest.$ac_ext <<_ACEOF | ||
13808 | /* end confdefs.h. */ | ||
13809 | $ac_includes_default | ||
13810 | + typedef char ac__type_sizeof_; | ||
13811 | int | ||
13812 | main () | ||
13813 | { | ||
13814 | -static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)]; | ||
13815 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; | ||
13816 | test_array [0] = 0 | ||
13817 | |||
13818 | ; | ||
13819 | @@ -24330,23 +26023,36 @@ | ||
13820 | } | ||
13821 | _ACEOF | ||
13822 | rm -f conftest.$ac_objext | ||
13823 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
13824 | - (eval $ac_compile) 2>conftest.er1 | ||
13825 | +if { (ac_try="$ac_compile" | ||
13826 | +case "(($ac_try" in | ||
13827 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13828 | + *) ac_try_echo=$ac_try;; | ||
13829 | +esac | ||
13830 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13831 | + (eval "$ac_compile") 2>conftest.er1 | ||
13832 | ac_status=$? | ||
13833 | grep -v '^ *+' conftest.er1 >conftest.err | ||
13834 | rm -f conftest.er1 | ||
13835 | cat conftest.err >&5 | ||
13836 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13837 | (exit $ac_status); } && | ||
13838 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13839 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13840 | - (eval $ac_try) 2>&5 | ||
13841 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13842 | + { (case "(($ac_try" in | ||
13843 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13844 | + *) ac_try_echo=$ac_try;; | ||
13845 | +esac | ||
13846 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13847 | + (eval "$ac_try") 2>&5 | ||
13848 | ac_status=$? | ||
13849 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13850 | (exit $ac_status); }; } && | ||
13851 | { ac_try='test -s conftest.$ac_objext' | ||
13852 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13853 | - (eval $ac_try) 2>&5 | ||
13854 | + { (case "(($ac_try" in | ||
13855 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13856 | + *) ac_try_echo=$ac_try;; | ||
13857 | +esac | ||
13858 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13859 | + (eval "$ac_try") 2>&5 | ||
13860 | ac_status=$? | ||
13861 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13862 | (exit $ac_status); }; }; then | ||
13863 | @@ -24355,24 +26061,27 @@ | ||
13864 | echo "$as_me: failed program was:" >&5 | ||
13865 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
13866 | |||
13867 | -ac_hi=`expr '(' $ac_mid ')' - 1` | ||
13868 | - if test $ac_mid -le $ac_hi; then | ||
13869 | - ac_lo= ac_hi= | ||
13870 | - break | ||
13871 | - fi | ||
13872 | - ac_mid=`expr 2 '*' $ac_mid` | ||
13873 | + ac_hi=`expr '(' $ac_mid ')' - 1` | ||
13874 | + if test $ac_mid -le $ac_hi; then | ||
13875 | + ac_lo= ac_hi= | ||
13876 | + break | ||
13877 | + fi | ||
13878 | + ac_mid=`expr 2 '*' $ac_mid` | ||
13879 | fi | ||
13880 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13881 | + | ||
13882 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13883 | done | ||
13884 | else | ||
13885 | echo "$as_me: failed program was:" >&5 | ||
13886 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
13887 | |||
13888 | -ac_lo= ac_hi= | ||
13889 | + ac_lo= ac_hi= | ||
13890 | fi | ||
13891 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13892 | + | ||
13893 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13894 | fi | ||
13895 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13896 | + | ||
13897 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13898 | # Binary search between lo and hi bounds. | ||
13899 | while test "x$ac_lo" != "x$ac_hi"; do | ||
13900 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
13901 | @@ -24383,10 +26092,11 @@ | ||
13902 | cat >>conftest.$ac_ext <<_ACEOF | ||
13903 | /* end confdefs.h. */ | ||
13904 | $ac_includes_default | ||
13905 | + typedef char ac__type_sizeof_; | ||
13906 | int | ||
13907 | main () | ||
13908 | { | ||
13909 | -static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; | ||
13910 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; | ||
13911 | test_array [0] = 0 | ||
13912 | |||
13913 | ; | ||
13914 | @@ -24394,23 +26104,36 @@ | ||
13915 | } | ||
13916 | _ACEOF | ||
13917 | rm -f conftest.$ac_objext | ||
13918 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
13919 | - (eval $ac_compile) 2>conftest.er1 | ||
13920 | +if { (ac_try="$ac_compile" | ||
13921 | +case "(($ac_try" in | ||
13922 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13923 | + *) ac_try_echo=$ac_try;; | ||
13924 | +esac | ||
13925 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13926 | + (eval "$ac_compile") 2>conftest.er1 | ||
13927 | ac_status=$? | ||
13928 | grep -v '^ *+' conftest.er1 >conftest.err | ||
13929 | rm -f conftest.er1 | ||
13930 | cat conftest.err >&5 | ||
13931 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13932 | (exit $ac_status); } && | ||
13933 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13934 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13935 | - (eval $ac_try) 2>&5 | ||
13936 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
13937 | + { (case "(($ac_try" in | ||
13938 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13939 | + *) ac_try_echo=$ac_try;; | ||
13940 | +esac | ||
13941 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13942 | + (eval "$ac_try") 2>&5 | ||
13943 | ac_status=$? | ||
13944 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13945 | (exit $ac_status); }; } && | ||
13946 | { ac_try='test -s conftest.$ac_objext' | ||
13947 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13948 | - (eval $ac_try) 2>&5 | ||
13949 | + { (case "(($ac_try" in | ||
13950 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
13951 | + *) ac_try_echo=$ac_try;; | ||
13952 | +esac | ||
13953 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
13954 | + (eval "$ac_try") 2>&5 | ||
13955 | ac_status=$? | ||
13956 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13957 | (exit $ac_status); }; }; then | ||
13958 | @@ -24419,24 +26142,20 @@ | ||
13959 | echo "$as_me: failed program was:" >&5 | ||
13960 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
13961 | |||
13962 | -ac_lo=`expr '(' $ac_mid ')' + 1` | ||
13963 | + ac_lo=`expr '(' $ac_mid ')' + 1` | ||
13964 | fi | ||
13965 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13966 | + | ||
13967 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
13968 | done | ||
13969 | case $ac_lo in | ||
13970 | ?*) ac_cv_sizeof_char=$ac_lo;; | ||
13971 | -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 | ||
13972 | +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char) | ||
13973 | See \`config.log' for more details." >&5 | ||
13974 | -echo "$as_me: error: cannot compute sizeof (char), 77 | ||
13975 | +echo "$as_me: error: cannot compute sizeof (char) | ||
13976 | See \`config.log' for more details." >&2;} | ||
13977 | - { (exit 1); exit 1; }; } ;; | ||
13978 | + { (exit 77); exit 77; }; } ;; | ||
13979 | esac | ||
13980 | else | ||
13981 | - if test "$cross_compiling" = yes; then | ||
13982 | - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 | ||
13983 | -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} | ||
13984 | - { (exit 1); exit 1; }; } | ||
13985 | -else | ||
13986 | cat >conftest.$ac_ext <<_ACEOF | ||
13987 | /* confdefs.h. */ | ||
13988 | _ACEOF | ||
13989 | @@ -24444,8 +26163,9 @@ | ||
13990 | cat >>conftest.$ac_ext <<_ACEOF | ||
13991 | /* end confdefs.h. */ | ||
13992 | $ac_includes_default | ||
13993 | -long longval () { return (long) (sizeof (char)); } | ||
13994 | -unsigned long ulongval () { return (long) (sizeof (char)); } | ||
13995 | + typedef char ac__type_sizeof_; | ||
13996 | +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } | ||
13997 | +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } | ||
13998 | #include <stdio.h> | ||
13999 | #include <stdlib.h> | ||
14000 | int | ||
14001 | @@ -24454,35 +26174,44 @@ | ||
14002 | |||
14003 | FILE *f = fopen ("conftest.val", "w"); | ||
14004 | if (! f) | ||
14005 | - exit (1); | ||
14006 | - if (((long) (sizeof (char))) < 0) | ||
14007 | + return 1; | ||
14008 | + if (((long int) (sizeof (ac__type_sizeof_))) < 0) | ||
14009 | { | ||
14010 | - long i = longval (); | ||
14011 | - if (i != ((long) (sizeof (char)))) | ||
14012 | - exit (1); | ||
14013 | + long int i = longval (); | ||
14014 | + if (i != ((long int) (sizeof (ac__type_sizeof_)))) | ||
14015 | + return 1; | ||
14016 | fprintf (f, "%ld\n", i); | ||
14017 | } | ||
14018 | else | ||
14019 | { | ||
14020 | - unsigned long i = ulongval (); | ||
14021 | - if (i != ((long) (sizeof (char)))) | ||
14022 | - exit (1); | ||
14023 | + unsigned long int i = ulongval (); | ||
14024 | + if (i != ((long int) (sizeof (ac__type_sizeof_)))) | ||
14025 | + return 1; | ||
14026 | fprintf (f, "%lu\n", i); | ||
14027 | } | ||
14028 | - exit (ferror (f) || fclose (f) != 0); | ||
14029 | + return ferror (f) || fclose (f) != 0; | ||
14030 | |||
14031 | ; | ||
14032 | return 0; | ||
14033 | } | ||
14034 | _ACEOF | ||
14035 | rm -f conftest$ac_exeext | ||
14036 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
14037 | - (eval $ac_link) 2>&5 | ||
14038 | +if { (ac_try="$ac_link" | ||
14039 | +case "(($ac_try" in | ||
14040 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14041 | + *) ac_try_echo=$ac_try;; | ||
14042 | +esac | ||
14043 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14044 | + (eval "$ac_link") 2>&5 | ||
14045 | ac_status=$? | ||
14046 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14047 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
14048 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14049 | - (eval $ac_try) 2>&5 | ||
14050 | + { (case "(($ac_try" in | ||
14051 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14052 | + *) ac_try_echo=$ac_try;; | ||
14053 | +esac | ||
14054 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14055 | + (eval "$ac_try") 2>&5 | ||
14056 | ac_status=$? | ||
14057 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14058 | (exit $ac_status); }; }; then | ||
14059 | @@ -24493,29 +26222,28 @@ | ||
14060 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14061 | |||
14062 | ( exit $ac_status ) | ||
14063 | -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 | ||
14064 | +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char) | ||
14065 | See \`config.log' for more details." >&5 | ||
14066 | -echo "$as_me: error: cannot compute sizeof (char), 77 | ||
14067 | +echo "$as_me: error: cannot compute sizeof (char) | ||
14068 | See \`config.log' for more details." >&2;} | ||
14069 | - { (exit 1); exit 1; }; } | ||
14070 | -fi | ||
14071 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
14072 | + { (exit 77); exit 77; }; } | ||
14073 | fi | ||
14074 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
14075 | fi | ||
14076 | rm -f conftest.val | ||
14077 | else | ||
14078 | ac_cv_sizeof_char=0 | ||
14079 | fi | ||
14080 | fi | ||
14081 | -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 | ||
14082 | -echo "${ECHO_T}$ac_cv_sizeof_char" >&6 | ||
14083 | +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 | ||
14084 | +echo "${ECHO_T}$ac_cv_sizeof_char" >&6; } | ||
14085 | cat >>confdefs.h <<_ACEOF | ||
14086 | #define SIZEOF_CHAR $ac_cv_sizeof_char | ||
14087 | _ACEOF | ||
14088 | |||
14089 | |||
14090 | - echo "$as_me:$LINENO: checking for short" >&5 | ||
14091 | -echo $ECHO_N "checking for short... $ECHO_C" >&6 | ||
14092 | + { echo "$as_me:$LINENO: checking for short" >&5 | ||
14093 | +echo $ECHO_N "checking for short... $ECHO_C" >&6; } | ||
14094 | if test "${ac_cv_type_short+set}" = set; then | ||
14095 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
14096 | else | ||
14097 | @@ -24526,35 +26254,49 @@ | ||
14098 | cat >>conftest.$ac_ext <<_ACEOF | ||
14099 | /* end confdefs.h. */ | ||
14100 | $ac_includes_default | ||
14101 | +typedef short ac__type_new_; | ||
14102 | int | ||
14103 | main () | ||
14104 | { | ||
14105 | -if ((short *) 0) | ||
14106 | +if ((ac__type_new_ *) 0) | ||
14107 | return 0; | ||
14108 | -if (sizeof (short)) | ||
14109 | +if (sizeof (ac__type_new_)) | ||
14110 | return 0; | ||
14111 | ; | ||
14112 | return 0; | ||
14113 | } | ||
14114 | _ACEOF | ||
14115 | rm -f conftest.$ac_objext | ||
14116 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14117 | - (eval $ac_compile) 2>conftest.er1 | ||
14118 | +if { (ac_try="$ac_compile" | ||
14119 | +case "(($ac_try" in | ||
14120 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14121 | + *) ac_try_echo=$ac_try;; | ||
14122 | +esac | ||
14123 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14124 | + (eval "$ac_compile") 2>conftest.er1 | ||
14125 | ac_status=$? | ||
14126 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14127 | rm -f conftest.er1 | ||
14128 | cat conftest.err >&5 | ||
14129 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14130 | (exit $ac_status); } && | ||
14131 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14132 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14133 | - (eval $ac_try) 2>&5 | ||
14134 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14135 | + { (case "(($ac_try" in | ||
14136 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14137 | + *) ac_try_echo=$ac_try;; | ||
14138 | +esac | ||
14139 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14140 | + (eval "$ac_try") 2>&5 | ||
14141 | ac_status=$? | ||
14142 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14143 | (exit $ac_status); }; } && | ||
14144 | { ac_try='test -s conftest.$ac_objext' | ||
14145 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14146 | - (eval $ac_try) 2>&5 | ||
14147 | + { (case "(($ac_try" in | ||
14148 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14149 | + *) ac_try_echo=$ac_try;; | ||
14150 | +esac | ||
14151 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14152 | + (eval "$ac_try") 2>&5 | ||
14153 | ac_status=$? | ||
14154 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14155 | (exit $ac_status); }; }; then | ||
14156 | @@ -24563,20 +26305,21 @@ | ||
14157 | echo "$as_me: failed program was:" >&5 | ||
14158 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14159 | |||
14160 | -ac_cv_type_short=no | ||
14161 | + ac_cv_type_short=no | ||
14162 | fi | ||
14163 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14164 | + | ||
14165 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14166 | fi | ||
14167 | -echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 | ||
14168 | -echo "${ECHO_T}$ac_cv_type_short" >&6 | ||
14169 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 | ||
14170 | +echo "${ECHO_T}$ac_cv_type_short" >&6; } | ||
14171 | |||
14172 | -echo "$as_me:$LINENO: checking size of short" >&5 | ||
14173 | -echo $ECHO_N "checking size of short... $ECHO_C" >&6 | ||
14174 | +{ echo "$as_me:$LINENO: checking size of short" >&5 | ||
14175 | +echo $ECHO_N "checking size of short... $ECHO_C" >&6; } | ||
14176 | if test "${ac_cv_sizeof_short+set}" = set; then | ||
14177 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
14178 | else | ||
14179 | if test "$ac_cv_type_short" = yes; then | ||
14180 | - # The cast to unsigned long works around a bug in the HP C Compiler | ||
14181 | + # The cast to long int works around a bug in the HP C Compiler | ||
14182 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
14183 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
14184 | # This bug is HP SR number 8606223364. | ||
14185 | @@ -24589,10 +26332,11 @@ | ||
14186 | cat >>conftest.$ac_ext <<_ACEOF | ||
14187 | /* end confdefs.h. */ | ||
14188 | $ac_includes_default | ||
14189 | + typedef short ac__type_sizeof_; | ||
14190 | int | ||
14191 | main () | ||
14192 | { | ||
14193 | -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; | ||
14194 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; | ||
14195 | test_array [0] = 0 | ||
14196 | |||
14197 | ; | ||
14198 | @@ -24600,23 +26344,36 @@ | ||
14199 | } | ||
14200 | _ACEOF | ||
14201 | rm -f conftest.$ac_objext | ||
14202 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14203 | - (eval $ac_compile) 2>conftest.er1 | ||
14204 | +if { (ac_try="$ac_compile" | ||
14205 | +case "(($ac_try" in | ||
14206 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14207 | + *) ac_try_echo=$ac_try;; | ||
14208 | +esac | ||
14209 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14210 | + (eval "$ac_compile") 2>conftest.er1 | ||
14211 | ac_status=$? | ||
14212 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14213 | rm -f conftest.er1 | ||
14214 | cat conftest.err >&5 | ||
14215 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14216 | (exit $ac_status); } && | ||
14217 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14218 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14219 | - (eval $ac_try) 2>&5 | ||
14220 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14221 | + { (case "(($ac_try" in | ||
14222 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14223 | + *) ac_try_echo=$ac_try;; | ||
14224 | +esac | ||
14225 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14226 | + (eval "$ac_try") 2>&5 | ||
14227 | ac_status=$? | ||
14228 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14229 | (exit $ac_status); }; } && | ||
14230 | { ac_try='test -s conftest.$ac_objext' | ||
14231 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14232 | - (eval $ac_try) 2>&5 | ||
14233 | + { (case "(($ac_try" in | ||
14234 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14235 | + *) ac_try_echo=$ac_try;; | ||
14236 | +esac | ||
14237 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14238 | + (eval "$ac_try") 2>&5 | ||
14239 | ac_status=$? | ||
14240 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14241 | (exit $ac_status); }; }; then | ||
14242 | @@ -24629,10 +26386,11 @@ | ||
14243 | cat >>conftest.$ac_ext <<_ACEOF | ||
14244 | /* end confdefs.h. */ | ||
14245 | $ac_includes_default | ||
14246 | + typedef short ac__type_sizeof_; | ||
14247 | int | ||
14248 | main () | ||
14249 | { | ||
14250 | -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; | ||
14251 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; | ||
14252 | test_array [0] = 0 | ||
14253 | |||
14254 | ; | ||
14255 | @@ -24640,23 +26398,36 @@ | ||
14256 | } | ||
14257 | _ACEOF | ||
14258 | rm -f conftest.$ac_objext | ||
14259 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14260 | - (eval $ac_compile) 2>conftest.er1 | ||
14261 | +if { (ac_try="$ac_compile" | ||
14262 | +case "(($ac_try" in | ||
14263 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14264 | + *) ac_try_echo=$ac_try;; | ||
14265 | +esac | ||
14266 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14267 | + (eval "$ac_compile") 2>conftest.er1 | ||
14268 | ac_status=$? | ||
14269 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14270 | rm -f conftest.er1 | ||
14271 | cat conftest.err >&5 | ||
14272 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14273 | (exit $ac_status); } && | ||
14274 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14275 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14276 | - (eval $ac_try) 2>&5 | ||
14277 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14278 | + { (case "(($ac_try" in | ||
14279 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14280 | + *) ac_try_echo=$ac_try;; | ||
14281 | +esac | ||
14282 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14283 | + (eval "$ac_try") 2>&5 | ||
14284 | ac_status=$? | ||
14285 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14286 | (exit $ac_status); }; } && | ||
14287 | { ac_try='test -s conftest.$ac_objext' | ||
14288 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14289 | - (eval $ac_try) 2>&5 | ||
14290 | + { (case "(($ac_try" in | ||
14291 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14292 | + *) ac_try_echo=$ac_try;; | ||
14293 | +esac | ||
14294 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14295 | + (eval "$ac_try") 2>&5 | ||
14296 | ac_status=$? | ||
14297 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14298 | (exit $ac_status); }; }; then | ||
14299 | @@ -24665,30 +26436,32 @@ | ||
14300 | echo "$as_me: failed program was:" >&5 | ||
14301 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14302 | |||
14303 | -ac_lo=`expr $ac_mid + 1` | ||
14304 | - if test $ac_lo -le $ac_mid; then | ||
14305 | - ac_lo= ac_hi= | ||
14306 | - break | ||
14307 | - fi | ||
14308 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
14309 | + ac_lo=`expr $ac_mid + 1` | ||
14310 | + if test $ac_lo -le $ac_mid; then | ||
14311 | + ac_lo= ac_hi= | ||
14312 | + break | ||
14313 | + fi | ||
14314 | + ac_mid=`expr 2 '*' $ac_mid + 1` | ||
14315 | fi | ||
14316 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14317 | + | ||
14318 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14319 | done | ||
14320 | else | ||
14321 | echo "$as_me: failed program was:" >&5 | ||
14322 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14323 | |||
14324 | -cat >conftest.$ac_ext <<_ACEOF | ||
14325 | + cat >conftest.$ac_ext <<_ACEOF | ||
14326 | /* confdefs.h. */ | ||
14327 | _ACEOF | ||
14328 | cat confdefs.h >>conftest.$ac_ext | ||
14329 | cat >>conftest.$ac_ext <<_ACEOF | ||
14330 | /* end confdefs.h. */ | ||
14331 | $ac_includes_default | ||
14332 | + typedef short ac__type_sizeof_; | ||
14333 | int | ||
14334 | main () | ||
14335 | { | ||
14336 | -static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; | ||
14337 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; | ||
14338 | test_array [0] = 0 | ||
14339 | |||
14340 | ; | ||
14341 | @@ -24696,23 +26469,36 @@ | ||
14342 | } | ||
14343 | _ACEOF | ||
14344 | rm -f conftest.$ac_objext | ||
14345 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14346 | - (eval $ac_compile) 2>conftest.er1 | ||
14347 | +if { (ac_try="$ac_compile" | ||
14348 | +case "(($ac_try" in | ||
14349 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14350 | + *) ac_try_echo=$ac_try;; | ||
14351 | +esac | ||
14352 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14353 | + (eval "$ac_compile") 2>conftest.er1 | ||
14354 | ac_status=$? | ||
14355 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14356 | rm -f conftest.er1 | ||
14357 | cat conftest.err >&5 | ||
14358 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14359 | (exit $ac_status); } && | ||
14360 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14361 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14362 | - (eval $ac_try) 2>&5 | ||
14363 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14364 | + { (case "(($ac_try" in | ||
14365 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14366 | + *) ac_try_echo=$ac_try;; | ||
14367 | +esac | ||
14368 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14369 | + (eval "$ac_try") 2>&5 | ||
14370 | ac_status=$? | ||
14371 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14372 | (exit $ac_status); }; } && | ||
14373 | { ac_try='test -s conftest.$ac_objext' | ||
14374 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14375 | - (eval $ac_try) 2>&5 | ||
14376 | + { (case "(($ac_try" in | ||
14377 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14378 | + *) ac_try_echo=$ac_try;; | ||
14379 | +esac | ||
14380 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14381 | + (eval "$ac_try") 2>&5 | ||
14382 | ac_status=$? | ||
14383 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14384 | (exit $ac_status); }; }; then | ||
14385 | @@ -24725,10 +26511,11 @@ | ||
14386 | cat >>conftest.$ac_ext <<_ACEOF | ||
14387 | /* end confdefs.h. */ | ||
14388 | $ac_includes_default | ||
14389 | + typedef short ac__type_sizeof_; | ||
14390 | int | ||
14391 | main () | ||
14392 | { | ||
14393 | -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; | ||
14394 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; | ||
14395 | test_array [0] = 0 | ||
14396 | |||
14397 | ; | ||
14398 | @@ -24736,23 +26523,36 @@ | ||
14399 | } | ||
14400 | _ACEOF | ||
14401 | rm -f conftest.$ac_objext | ||
14402 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14403 | - (eval $ac_compile) 2>conftest.er1 | ||
14404 | +if { (ac_try="$ac_compile" | ||
14405 | +case "(($ac_try" in | ||
14406 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14407 | + *) ac_try_echo=$ac_try;; | ||
14408 | +esac | ||
14409 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14410 | + (eval "$ac_compile") 2>conftest.er1 | ||
14411 | ac_status=$? | ||
14412 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14413 | rm -f conftest.er1 | ||
14414 | cat conftest.err >&5 | ||
14415 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14416 | (exit $ac_status); } && | ||
14417 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14418 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14419 | - (eval $ac_try) 2>&5 | ||
14420 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14421 | + { (case "(($ac_try" in | ||
14422 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14423 | + *) ac_try_echo=$ac_try;; | ||
14424 | +esac | ||
14425 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14426 | + (eval "$ac_try") 2>&5 | ||
14427 | ac_status=$? | ||
14428 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14429 | (exit $ac_status); }; } && | ||
14430 | { ac_try='test -s conftest.$ac_objext' | ||
14431 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14432 | - (eval $ac_try) 2>&5 | ||
14433 | + { (case "(($ac_try" in | ||
14434 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14435 | + *) ac_try_echo=$ac_try;; | ||
14436 | +esac | ||
14437 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14438 | + (eval "$ac_try") 2>&5 | ||
14439 | ac_status=$? | ||
14440 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14441 | (exit $ac_status); }; }; then | ||
14442 | @@ -24761,24 +26561,27 @@ | ||
14443 | echo "$as_me: failed program was:" >&5 | ||
14444 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14445 | |||
14446 | -ac_hi=`expr '(' $ac_mid ')' - 1` | ||
14447 | - if test $ac_mid -le $ac_hi; then | ||
14448 | - ac_lo= ac_hi= | ||
14449 | - break | ||
14450 | - fi | ||
14451 | - ac_mid=`expr 2 '*' $ac_mid` | ||
14452 | + ac_hi=`expr '(' $ac_mid ')' - 1` | ||
14453 | + if test $ac_mid -le $ac_hi; then | ||
14454 | + ac_lo= ac_hi= | ||
14455 | + break | ||
14456 | + fi | ||
14457 | + ac_mid=`expr 2 '*' $ac_mid` | ||
14458 | fi | ||
14459 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14460 | + | ||
14461 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14462 | done | ||
14463 | else | ||
14464 | echo "$as_me: failed program was:" >&5 | ||
14465 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14466 | |||
14467 | -ac_lo= ac_hi= | ||
14468 | + ac_lo= ac_hi= | ||
14469 | fi | ||
14470 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14471 | + | ||
14472 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14473 | fi | ||
14474 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14475 | + | ||
14476 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14477 | # Binary search between lo and hi bounds. | ||
14478 | while test "x$ac_lo" != "x$ac_hi"; do | ||
14479 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
14480 | @@ -24789,10 +26592,11 @@ | ||
14481 | cat >>conftest.$ac_ext <<_ACEOF | ||
14482 | /* end confdefs.h. */ | ||
14483 | $ac_includes_default | ||
14484 | + typedef short ac__type_sizeof_; | ||
14485 | int | ||
14486 | main () | ||
14487 | { | ||
14488 | -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; | ||
14489 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; | ||
14490 | test_array [0] = 0 | ||
14491 | |||
14492 | ; | ||
14493 | @@ -24800,23 +26604,36 @@ | ||
14494 | } | ||
14495 | _ACEOF | ||
14496 | rm -f conftest.$ac_objext | ||
14497 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14498 | - (eval $ac_compile) 2>conftest.er1 | ||
14499 | +if { (ac_try="$ac_compile" | ||
14500 | +case "(($ac_try" in | ||
14501 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14502 | + *) ac_try_echo=$ac_try;; | ||
14503 | +esac | ||
14504 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14505 | + (eval "$ac_compile") 2>conftest.er1 | ||
14506 | ac_status=$? | ||
14507 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14508 | rm -f conftest.er1 | ||
14509 | cat conftest.err >&5 | ||
14510 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14511 | (exit $ac_status); } && | ||
14512 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14513 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14514 | - (eval $ac_try) 2>&5 | ||
14515 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14516 | + { (case "(($ac_try" in | ||
14517 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14518 | + *) ac_try_echo=$ac_try;; | ||
14519 | +esac | ||
14520 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14521 | + (eval "$ac_try") 2>&5 | ||
14522 | ac_status=$? | ||
14523 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14524 | (exit $ac_status); }; } && | ||
14525 | { ac_try='test -s conftest.$ac_objext' | ||
14526 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14527 | - (eval $ac_try) 2>&5 | ||
14528 | + { (case "(($ac_try" in | ||
14529 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14530 | + *) ac_try_echo=$ac_try;; | ||
14531 | +esac | ||
14532 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14533 | + (eval "$ac_try") 2>&5 | ||
14534 | ac_status=$? | ||
14535 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14536 | (exit $ac_status); }; }; then | ||
14537 | @@ -24825,24 +26642,20 @@ | ||
14538 | echo "$as_me: failed program was:" >&5 | ||
14539 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14540 | |||
14541 | -ac_lo=`expr '(' $ac_mid ')' + 1` | ||
14542 | + ac_lo=`expr '(' $ac_mid ')' + 1` | ||
14543 | fi | ||
14544 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14545 | + | ||
14546 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14547 | done | ||
14548 | case $ac_lo in | ||
14549 | ?*) ac_cv_sizeof_short=$ac_lo;; | ||
14550 | -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 | ||
14551 | +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) | ||
14552 | See \`config.log' for more details." >&5 | ||
14553 | -echo "$as_me: error: cannot compute sizeof (short), 77 | ||
14554 | +echo "$as_me: error: cannot compute sizeof (short) | ||
14555 | See \`config.log' for more details." >&2;} | ||
14556 | - { (exit 1); exit 1; }; } ;; | ||
14557 | + { (exit 77); exit 77; }; } ;; | ||
14558 | esac | ||
14559 | else | ||
14560 | - if test "$cross_compiling" = yes; then | ||
14561 | - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 | ||
14562 | -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} | ||
14563 | - { (exit 1); exit 1; }; } | ||
14564 | -else | ||
14565 | cat >conftest.$ac_ext <<_ACEOF | ||
14566 | /* confdefs.h. */ | ||
14567 | _ACEOF | ||
14568 | @@ -24850,8 +26663,9 @@ | ||
14569 | cat >>conftest.$ac_ext <<_ACEOF | ||
14570 | /* end confdefs.h. */ | ||
14571 | $ac_includes_default | ||
14572 | -long longval () { return (long) (sizeof (short)); } | ||
14573 | -unsigned long ulongval () { return (long) (sizeof (short)); } | ||
14574 | + typedef short ac__type_sizeof_; | ||
14575 | +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } | ||
14576 | +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } | ||
14577 | #include <stdio.h> | ||
14578 | #include <stdlib.h> | ||
14579 | int | ||
14580 | @@ -24860,35 +26674,44 @@ | ||
14581 | |||
14582 | FILE *f = fopen ("conftest.val", "w"); | ||
14583 | if (! f) | ||
14584 | - exit (1); | ||
14585 | - if (((long) (sizeof (short))) < 0) | ||
14586 | + return 1; | ||
14587 | + if (((long int) (sizeof (ac__type_sizeof_))) < 0) | ||
14588 | { | ||
14589 | - long i = longval (); | ||
14590 | - if (i != ((long) (sizeof (short)))) | ||
14591 | - exit (1); | ||
14592 | + long int i = longval (); | ||
14593 | + if (i != ((long int) (sizeof (ac__type_sizeof_)))) | ||
14594 | + return 1; | ||
14595 | fprintf (f, "%ld\n", i); | ||
14596 | } | ||
14597 | else | ||
14598 | { | ||
14599 | - unsigned long i = ulongval (); | ||
14600 | - if (i != ((long) (sizeof (short)))) | ||
14601 | - exit (1); | ||
14602 | + unsigned long int i = ulongval (); | ||
14603 | + if (i != ((long int) (sizeof (ac__type_sizeof_)))) | ||
14604 | + return 1; | ||
14605 | fprintf (f, "%lu\n", i); | ||
14606 | } | ||
14607 | - exit (ferror (f) || fclose (f) != 0); | ||
14608 | + return ferror (f) || fclose (f) != 0; | ||
14609 | |||
14610 | ; | ||
14611 | return 0; | ||
14612 | } | ||
14613 | _ACEOF | ||
14614 | rm -f conftest$ac_exeext | ||
14615 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
14616 | - (eval $ac_link) 2>&5 | ||
14617 | +if { (ac_try="$ac_link" | ||
14618 | +case "(($ac_try" in | ||
14619 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14620 | + *) ac_try_echo=$ac_try;; | ||
14621 | +esac | ||
14622 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14623 | + (eval "$ac_link") 2>&5 | ||
14624 | ac_status=$? | ||
14625 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14626 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
14627 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14628 | - (eval $ac_try) 2>&5 | ||
14629 | + { (case "(($ac_try" in | ||
14630 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14631 | + *) ac_try_echo=$ac_try;; | ||
14632 | +esac | ||
14633 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14634 | + (eval "$ac_try") 2>&5 | ||
14635 | ac_status=$? | ||
14636 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14637 | (exit $ac_status); }; }; then | ||
14638 | @@ -24899,29 +26722,28 @@ | ||
14639 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14640 | |||
14641 | ( exit $ac_status ) | ||
14642 | -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 | ||
14643 | +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short) | ||
14644 | See \`config.log' for more details." >&5 | ||
14645 | -echo "$as_me: error: cannot compute sizeof (short), 77 | ||
14646 | +echo "$as_me: error: cannot compute sizeof (short) | ||
14647 | See \`config.log' for more details." >&2;} | ||
14648 | - { (exit 1); exit 1; }; } | ||
14649 | -fi | ||
14650 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
14651 | + { (exit 77); exit 77; }; } | ||
14652 | fi | ||
14653 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
14654 | fi | ||
14655 | rm -f conftest.val | ||
14656 | else | ||
14657 | ac_cv_sizeof_short=0 | ||
14658 | fi | ||
14659 | fi | ||
14660 | -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 | ||
14661 | -echo "${ECHO_T}$ac_cv_sizeof_short" >&6 | ||
14662 | +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 | ||
14663 | +echo "${ECHO_T}$ac_cv_sizeof_short" >&6; } | ||
14664 | cat >>confdefs.h <<_ACEOF | ||
14665 | #define SIZEOF_SHORT $ac_cv_sizeof_short | ||
14666 | _ACEOF | ||
14667 | |||
14668 | |||
14669 | - echo "$as_me:$LINENO: checking for int" >&5 | ||
14670 | -echo $ECHO_N "checking for int... $ECHO_C" >&6 | ||
14671 | + { echo "$as_me:$LINENO: checking for int" >&5 | ||
14672 | +echo $ECHO_N "checking for int... $ECHO_C" >&6; } | ||
14673 | if test "${ac_cv_type_int+set}" = set; then | ||
14674 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
14675 | else | ||
14676 | @@ -24932,35 +26754,49 @@ | ||
14677 | cat >>conftest.$ac_ext <<_ACEOF | ||
14678 | /* end confdefs.h. */ | ||
14679 | $ac_includes_default | ||
14680 | +typedef int ac__type_new_; | ||
14681 | int | ||
14682 | main () | ||
14683 | { | ||
14684 | -if ((int *) 0) | ||
14685 | +if ((ac__type_new_ *) 0) | ||
14686 | return 0; | ||
14687 | -if (sizeof (int)) | ||
14688 | +if (sizeof (ac__type_new_)) | ||
14689 | return 0; | ||
14690 | ; | ||
14691 | return 0; | ||
14692 | } | ||
14693 | _ACEOF | ||
14694 | rm -f conftest.$ac_objext | ||
14695 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14696 | - (eval $ac_compile) 2>conftest.er1 | ||
14697 | +if { (ac_try="$ac_compile" | ||
14698 | +case "(($ac_try" in | ||
14699 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14700 | + *) ac_try_echo=$ac_try;; | ||
14701 | +esac | ||
14702 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14703 | + (eval "$ac_compile") 2>conftest.er1 | ||
14704 | ac_status=$? | ||
14705 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14706 | rm -f conftest.er1 | ||
14707 | cat conftest.err >&5 | ||
14708 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14709 | (exit $ac_status); } && | ||
14710 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14711 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14712 | - (eval $ac_try) 2>&5 | ||
14713 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14714 | + { (case "(($ac_try" in | ||
14715 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14716 | + *) ac_try_echo=$ac_try;; | ||
14717 | +esac | ||
14718 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14719 | + (eval "$ac_try") 2>&5 | ||
14720 | ac_status=$? | ||
14721 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14722 | (exit $ac_status); }; } && | ||
14723 | { ac_try='test -s conftest.$ac_objext' | ||
14724 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14725 | - (eval $ac_try) 2>&5 | ||
14726 | + { (case "(($ac_try" in | ||
14727 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14728 | + *) ac_try_echo=$ac_try;; | ||
14729 | +esac | ||
14730 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14731 | + (eval "$ac_try") 2>&5 | ||
14732 | ac_status=$? | ||
14733 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14734 | (exit $ac_status); }; }; then | ||
14735 | @@ -24969,20 +26805,21 @@ | ||
14736 | echo "$as_me: failed program was:" >&5 | ||
14737 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14738 | |||
14739 | -ac_cv_type_int=no | ||
14740 | + ac_cv_type_int=no | ||
14741 | fi | ||
14742 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14743 | + | ||
14744 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14745 | fi | ||
14746 | -echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 | ||
14747 | -echo "${ECHO_T}$ac_cv_type_int" >&6 | ||
14748 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 | ||
14749 | +echo "${ECHO_T}$ac_cv_type_int" >&6; } | ||
14750 | |||
14751 | -echo "$as_me:$LINENO: checking size of int" >&5 | ||
14752 | -echo $ECHO_N "checking size of int... $ECHO_C" >&6 | ||
14753 | +{ echo "$as_me:$LINENO: checking size of int" >&5 | ||
14754 | +echo $ECHO_N "checking size of int... $ECHO_C" >&6; } | ||
14755 | if test "${ac_cv_sizeof_int+set}" = set; then | ||
14756 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
14757 | else | ||
14758 | if test "$ac_cv_type_int" = yes; then | ||
14759 | - # The cast to unsigned long works around a bug in the HP C Compiler | ||
14760 | + # The cast to long int works around a bug in the HP C Compiler | ||
14761 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
14762 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
14763 | # This bug is HP SR number 8606223364. | ||
14764 | @@ -24995,10 +26832,11 @@ | ||
14765 | cat >>conftest.$ac_ext <<_ACEOF | ||
14766 | /* end confdefs.h. */ | ||
14767 | $ac_includes_default | ||
14768 | + typedef int ac__type_sizeof_; | ||
14769 | int | ||
14770 | main () | ||
14771 | { | ||
14772 | -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; | ||
14773 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; | ||
14774 | test_array [0] = 0 | ||
14775 | |||
14776 | ; | ||
14777 | @@ -25006,23 +26844,36 @@ | ||
14778 | } | ||
14779 | _ACEOF | ||
14780 | rm -f conftest.$ac_objext | ||
14781 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14782 | - (eval $ac_compile) 2>conftest.er1 | ||
14783 | +if { (ac_try="$ac_compile" | ||
14784 | +case "(($ac_try" in | ||
14785 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14786 | + *) ac_try_echo=$ac_try;; | ||
14787 | +esac | ||
14788 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14789 | + (eval "$ac_compile") 2>conftest.er1 | ||
14790 | ac_status=$? | ||
14791 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14792 | rm -f conftest.er1 | ||
14793 | cat conftest.err >&5 | ||
14794 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14795 | (exit $ac_status); } && | ||
14796 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14797 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14798 | - (eval $ac_try) 2>&5 | ||
14799 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14800 | + { (case "(($ac_try" in | ||
14801 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14802 | + *) ac_try_echo=$ac_try;; | ||
14803 | +esac | ||
14804 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14805 | + (eval "$ac_try") 2>&5 | ||
14806 | ac_status=$? | ||
14807 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14808 | (exit $ac_status); }; } && | ||
14809 | { ac_try='test -s conftest.$ac_objext' | ||
14810 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14811 | - (eval $ac_try) 2>&5 | ||
14812 | + { (case "(($ac_try" in | ||
14813 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14814 | + *) ac_try_echo=$ac_try;; | ||
14815 | +esac | ||
14816 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14817 | + (eval "$ac_try") 2>&5 | ||
14818 | ac_status=$? | ||
14819 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14820 | (exit $ac_status); }; }; then | ||
14821 | @@ -25035,10 +26886,11 @@ | ||
14822 | cat >>conftest.$ac_ext <<_ACEOF | ||
14823 | /* end confdefs.h. */ | ||
14824 | $ac_includes_default | ||
14825 | + typedef int ac__type_sizeof_; | ||
14826 | int | ||
14827 | main () | ||
14828 | { | ||
14829 | -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; | ||
14830 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; | ||
14831 | test_array [0] = 0 | ||
14832 | |||
14833 | ; | ||
14834 | @@ -25046,23 +26898,36 @@ | ||
14835 | } | ||
14836 | _ACEOF | ||
14837 | rm -f conftest.$ac_objext | ||
14838 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14839 | - (eval $ac_compile) 2>conftest.er1 | ||
14840 | +if { (ac_try="$ac_compile" | ||
14841 | +case "(($ac_try" in | ||
14842 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14843 | + *) ac_try_echo=$ac_try;; | ||
14844 | +esac | ||
14845 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14846 | + (eval "$ac_compile") 2>conftest.er1 | ||
14847 | ac_status=$? | ||
14848 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14849 | rm -f conftest.er1 | ||
14850 | cat conftest.err >&5 | ||
14851 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14852 | (exit $ac_status); } && | ||
14853 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14854 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14855 | - (eval $ac_try) 2>&5 | ||
14856 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14857 | + { (case "(($ac_try" in | ||
14858 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14859 | + *) ac_try_echo=$ac_try;; | ||
14860 | +esac | ||
14861 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14862 | + (eval "$ac_try") 2>&5 | ||
14863 | ac_status=$? | ||
14864 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14865 | (exit $ac_status); }; } && | ||
14866 | { ac_try='test -s conftest.$ac_objext' | ||
14867 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14868 | - (eval $ac_try) 2>&5 | ||
14869 | + { (case "(($ac_try" in | ||
14870 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14871 | + *) ac_try_echo=$ac_try;; | ||
14872 | +esac | ||
14873 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14874 | + (eval "$ac_try") 2>&5 | ||
14875 | ac_status=$? | ||
14876 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14877 | (exit $ac_status); }; }; then | ||
14878 | @@ -25071,30 +26936,32 @@ | ||
14879 | echo "$as_me: failed program was:" >&5 | ||
14880 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14881 | |||
14882 | -ac_lo=`expr $ac_mid + 1` | ||
14883 | - if test $ac_lo -le $ac_mid; then | ||
14884 | - ac_lo= ac_hi= | ||
14885 | - break | ||
14886 | - fi | ||
14887 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
14888 | + ac_lo=`expr $ac_mid + 1` | ||
14889 | + if test $ac_lo -le $ac_mid; then | ||
14890 | + ac_lo= ac_hi= | ||
14891 | + break | ||
14892 | + fi | ||
14893 | + ac_mid=`expr 2 '*' $ac_mid + 1` | ||
14894 | fi | ||
14895 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14896 | + | ||
14897 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14898 | done | ||
14899 | else | ||
14900 | echo "$as_me: failed program was:" >&5 | ||
14901 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14902 | |||
14903 | -cat >conftest.$ac_ext <<_ACEOF | ||
14904 | + cat >conftest.$ac_ext <<_ACEOF | ||
14905 | /* confdefs.h. */ | ||
14906 | _ACEOF | ||
14907 | cat confdefs.h >>conftest.$ac_ext | ||
14908 | cat >>conftest.$ac_ext <<_ACEOF | ||
14909 | /* end confdefs.h. */ | ||
14910 | $ac_includes_default | ||
14911 | + typedef int ac__type_sizeof_; | ||
14912 | int | ||
14913 | main () | ||
14914 | { | ||
14915 | -static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; | ||
14916 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; | ||
14917 | test_array [0] = 0 | ||
14918 | |||
14919 | ; | ||
14920 | @@ -25102,23 +26969,36 @@ | ||
14921 | } | ||
14922 | _ACEOF | ||
14923 | rm -f conftest.$ac_objext | ||
14924 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14925 | - (eval $ac_compile) 2>conftest.er1 | ||
14926 | +if { (ac_try="$ac_compile" | ||
14927 | +case "(($ac_try" in | ||
14928 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14929 | + *) ac_try_echo=$ac_try;; | ||
14930 | +esac | ||
14931 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14932 | + (eval "$ac_compile") 2>conftest.er1 | ||
14933 | ac_status=$? | ||
14934 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14935 | rm -f conftest.er1 | ||
14936 | cat conftest.err >&5 | ||
14937 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14938 | (exit $ac_status); } && | ||
14939 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14940 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14941 | - (eval $ac_try) 2>&5 | ||
14942 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14943 | + { (case "(($ac_try" in | ||
14944 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14945 | + *) ac_try_echo=$ac_try;; | ||
14946 | +esac | ||
14947 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14948 | + (eval "$ac_try") 2>&5 | ||
14949 | ac_status=$? | ||
14950 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14951 | (exit $ac_status); }; } && | ||
14952 | { ac_try='test -s conftest.$ac_objext' | ||
14953 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14954 | - (eval $ac_try) 2>&5 | ||
14955 | + { (case "(($ac_try" in | ||
14956 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14957 | + *) ac_try_echo=$ac_try;; | ||
14958 | +esac | ||
14959 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14960 | + (eval "$ac_try") 2>&5 | ||
14961 | ac_status=$? | ||
14962 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14963 | (exit $ac_status); }; }; then | ||
14964 | @@ -25131,10 +27011,11 @@ | ||
14965 | cat >>conftest.$ac_ext <<_ACEOF | ||
14966 | /* end confdefs.h. */ | ||
14967 | $ac_includes_default | ||
14968 | + typedef int ac__type_sizeof_; | ||
14969 | int | ||
14970 | main () | ||
14971 | { | ||
14972 | -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; | ||
14973 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; | ||
14974 | test_array [0] = 0 | ||
14975 | |||
14976 | ; | ||
14977 | @@ -25142,23 +27023,36 @@ | ||
14978 | } | ||
14979 | _ACEOF | ||
14980 | rm -f conftest.$ac_objext | ||
14981 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14982 | - (eval $ac_compile) 2>conftest.er1 | ||
14983 | +if { (ac_try="$ac_compile" | ||
14984 | +case "(($ac_try" in | ||
14985 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
14986 | + *) ac_try_echo=$ac_try;; | ||
14987 | +esac | ||
14988 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
14989 | + (eval "$ac_compile") 2>conftest.er1 | ||
14990 | ac_status=$? | ||
14991 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14992 | rm -f conftest.er1 | ||
14993 | cat conftest.err >&5 | ||
14994 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14995 | (exit $ac_status); } && | ||
14996 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
14997 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14998 | - (eval $ac_try) 2>&5 | ||
14999 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15000 | + { (case "(($ac_try" in | ||
15001 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15002 | + *) ac_try_echo=$ac_try;; | ||
15003 | +esac | ||
15004 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15005 | + (eval "$ac_try") 2>&5 | ||
15006 | ac_status=$? | ||
15007 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15008 | (exit $ac_status); }; } && | ||
15009 | { ac_try='test -s conftest.$ac_objext' | ||
15010 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15011 | - (eval $ac_try) 2>&5 | ||
15012 | + { (case "(($ac_try" in | ||
15013 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15014 | + *) ac_try_echo=$ac_try;; | ||
15015 | +esac | ||
15016 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15017 | + (eval "$ac_try") 2>&5 | ||
15018 | ac_status=$? | ||
15019 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15020 | (exit $ac_status); }; }; then | ||
15021 | @@ -25167,24 +27061,27 @@ | ||
15022 | echo "$as_me: failed program was:" >&5 | ||
15023 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15024 | |||
15025 | -ac_hi=`expr '(' $ac_mid ')' - 1` | ||
15026 | - if test $ac_mid -le $ac_hi; then | ||
15027 | - ac_lo= ac_hi= | ||
15028 | - break | ||
15029 | - fi | ||
15030 | - ac_mid=`expr 2 '*' $ac_mid` | ||
15031 | + ac_hi=`expr '(' $ac_mid ')' - 1` | ||
15032 | + if test $ac_mid -le $ac_hi; then | ||
15033 | + ac_lo= ac_hi= | ||
15034 | + break | ||
15035 | + fi | ||
15036 | + ac_mid=`expr 2 '*' $ac_mid` | ||
15037 | fi | ||
15038 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15039 | + | ||
15040 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15041 | done | ||
15042 | else | ||
15043 | echo "$as_me: failed program was:" >&5 | ||
15044 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15045 | |||
15046 | -ac_lo= ac_hi= | ||
15047 | + ac_lo= ac_hi= | ||
15048 | fi | ||
15049 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15050 | + | ||
15051 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15052 | fi | ||
15053 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15054 | + | ||
15055 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15056 | # Binary search between lo and hi bounds. | ||
15057 | while test "x$ac_lo" != "x$ac_hi"; do | ||
15058 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
15059 | @@ -25195,10 +27092,11 @@ | ||
15060 | cat >>conftest.$ac_ext <<_ACEOF | ||
15061 | /* end confdefs.h. */ | ||
15062 | $ac_includes_default | ||
15063 | + typedef int ac__type_sizeof_; | ||
15064 | int | ||
15065 | main () | ||
15066 | { | ||
15067 | -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; | ||
15068 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; | ||
15069 | test_array [0] = 0 | ||
15070 | |||
15071 | ; | ||
15072 | @@ -25206,23 +27104,36 @@ | ||
15073 | } | ||
15074 | _ACEOF | ||
15075 | rm -f conftest.$ac_objext | ||
15076 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15077 | - (eval $ac_compile) 2>conftest.er1 | ||
15078 | +if { (ac_try="$ac_compile" | ||
15079 | +case "(($ac_try" in | ||
15080 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15081 | + *) ac_try_echo=$ac_try;; | ||
15082 | +esac | ||
15083 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15084 | + (eval "$ac_compile") 2>conftest.er1 | ||
15085 | ac_status=$? | ||
15086 | grep -v '^ *+' conftest.er1 >conftest.err | ||
15087 | rm -f conftest.er1 | ||
15088 | cat conftest.err >&5 | ||
15089 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15090 | (exit $ac_status); } && | ||
15091 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15092 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15093 | - (eval $ac_try) 2>&5 | ||
15094 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15095 | + { (case "(($ac_try" in | ||
15096 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15097 | + *) ac_try_echo=$ac_try;; | ||
15098 | +esac | ||
15099 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15100 | + (eval "$ac_try") 2>&5 | ||
15101 | ac_status=$? | ||
15102 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15103 | (exit $ac_status); }; } && | ||
15104 | { ac_try='test -s conftest.$ac_objext' | ||
15105 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15106 | - (eval $ac_try) 2>&5 | ||
15107 | + { (case "(($ac_try" in | ||
15108 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15109 | + *) ac_try_echo=$ac_try;; | ||
15110 | +esac | ||
15111 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15112 | + (eval "$ac_try") 2>&5 | ||
15113 | ac_status=$? | ||
15114 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15115 | (exit $ac_status); }; }; then | ||
15116 | @@ -25231,24 +27142,20 @@ | ||
15117 | echo "$as_me: failed program was:" >&5 | ||
15118 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15119 | |||
15120 | -ac_lo=`expr '(' $ac_mid ')' + 1` | ||
15121 | + ac_lo=`expr '(' $ac_mid ')' + 1` | ||
15122 | fi | ||
15123 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15124 | + | ||
15125 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15126 | done | ||
15127 | case $ac_lo in | ||
15128 | ?*) ac_cv_sizeof_int=$ac_lo;; | ||
15129 | -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 | ||
15130 | +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) | ||
15131 | See \`config.log' for more details." >&5 | ||
15132 | -echo "$as_me: error: cannot compute sizeof (int), 77 | ||
15133 | +echo "$as_me: error: cannot compute sizeof (int) | ||
15134 | See \`config.log' for more details." >&2;} | ||
15135 | - { (exit 1); exit 1; }; } ;; | ||
15136 | + { (exit 77); exit 77; }; } ;; | ||
15137 | esac | ||
15138 | else | ||
15139 | - if test "$cross_compiling" = yes; then | ||
15140 | - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 | ||
15141 | -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} | ||
15142 | - { (exit 1); exit 1; }; } | ||
15143 | -else | ||
15144 | cat >conftest.$ac_ext <<_ACEOF | ||
15145 | /* confdefs.h. */ | ||
15146 | _ACEOF | ||
15147 | @@ -25256,8 +27163,9 @@ | ||
15148 | cat >>conftest.$ac_ext <<_ACEOF | ||
15149 | /* end confdefs.h. */ | ||
15150 | $ac_includes_default | ||
15151 | -long longval () { return (long) (sizeof (int)); } | ||
15152 | -unsigned long ulongval () { return (long) (sizeof (int)); } | ||
15153 | + typedef int ac__type_sizeof_; | ||
15154 | +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } | ||
15155 | +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } | ||
15156 | #include <stdio.h> | ||
15157 | #include <stdlib.h> | ||
15158 | int | ||
15159 | @@ -25266,35 +27174,44 @@ | ||
15160 | |||
15161 | FILE *f = fopen ("conftest.val", "w"); | ||
15162 | if (! f) | ||
15163 | - exit (1); | ||
15164 | - if (((long) (sizeof (int))) < 0) | ||
15165 | + return 1; | ||
15166 | + if (((long int) (sizeof (ac__type_sizeof_))) < 0) | ||
15167 | { | ||
15168 | - long i = longval (); | ||
15169 | - if (i != ((long) (sizeof (int)))) | ||
15170 | - exit (1); | ||
15171 | + long int i = longval (); | ||
15172 | + if (i != ((long int) (sizeof (ac__type_sizeof_)))) | ||
15173 | + return 1; | ||
15174 | fprintf (f, "%ld\n", i); | ||
15175 | } | ||
15176 | else | ||
15177 | { | ||
15178 | - unsigned long i = ulongval (); | ||
15179 | - if (i != ((long) (sizeof (int)))) | ||
15180 | - exit (1); | ||
15181 | + unsigned long int i = ulongval (); | ||
15182 | + if (i != ((long int) (sizeof (ac__type_sizeof_)))) | ||
15183 | + return 1; | ||
15184 | fprintf (f, "%lu\n", i); | ||
15185 | } | ||
15186 | - exit (ferror (f) || fclose (f) != 0); | ||
15187 | + return ferror (f) || fclose (f) != 0; | ||
15188 | |||
15189 | ; | ||
15190 | return 0; | ||
15191 | } | ||
15192 | _ACEOF | ||
15193 | rm -f conftest$ac_exeext | ||
15194 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
15195 | - (eval $ac_link) 2>&5 | ||
15196 | +if { (ac_try="$ac_link" | ||
15197 | +case "(($ac_try" in | ||
15198 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15199 | + *) ac_try_echo=$ac_try;; | ||
15200 | +esac | ||
15201 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15202 | + (eval "$ac_link") 2>&5 | ||
15203 | ac_status=$? | ||
15204 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15205 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
15206 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15207 | - (eval $ac_try) 2>&5 | ||
15208 | + { (case "(($ac_try" in | ||
15209 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15210 | + *) ac_try_echo=$ac_try;; | ||
15211 | +esac | ||
15212 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15213 | + (eval "$ac_try") 2>&5 | ||
15214 | ac_status=$? | ||
15215 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15216 | (exit $ac_status); }; }; then | ||
15217 | @@ -25305,29 +27222,28 @@ | ||
15218 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15219 | |||
15220 | ( exit $ac_status ) | ||
15221 | -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 | ||
15222 | +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int) | ||
15223 | See \`config.log' for more details." >&5 | ||
15224 | -echo "$as_me: error: cannot compute sizeof (int), 77 | ||
15225 | +echo "$as_me: error: cannot compute sizeof (int) | ||
15226 | See \`config.log' for more details." >&2;} | ||
15227 | - { (exit 1); exit 1; }; } | ||
15228 | -fi | ||
15229 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
15230 | + { (exit 77); exit 77; }; } | ||
15231 | fi | ||
15232 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
15233 | fi | ||
15234 | rm -f conftest.val | ||
15235 | else | ||
15236 | ac_cv_sizeof_int=0 | ||
15237 | fi | ||
15238 | fi | ||
15239 | -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 | ||
15240 | -echo "${ECHO_T}$ac_cv_sizeof_int" >&6 | ||
15241 | +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 | ||
15242 | +echo "${ECHO_T}$ac_cv_sizeof_int" >&6; } | ||
15243 | cat >>confdefs.h <<_ACEOF | ||
15244 | #define SIZEOF_INT $ac_cv_sizeof_int | ||
15245 | _ACEOF | ||
15246 | |||
15247 | |||
15248 | - echo "$as_me:$LINENO: checking for long" >&5 | ||
15249 | -echo $ECHO_N "checking for long... $ECHO_C" >&6 | ||
15250 | + { echo "$as_me:$LINENO: checking for long" >&5 | ||
15251 | +echo $ECHO_N "checking for long... $ECHO_C" >&6; } | ||
15252 | if test "${ac_cv_type_long+set}" = set; then | ||
15253 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
15254 | else | ||
15255 | @@ -25338,35 +27254,49 @@ | ||
15256 | cat >>conftest.$ac_ext <<_ACEOF | ||
15257 | /* end confdefs.h. */ | ||
15258 | $ac_includes_default | ||
15259 | +typedef long ac__type_new_; | ||
15260 | int | ||
15261 | main () | ||
15262 | { | ||
15263 | -if ((long *) 0) | ||
15264 | +if ((ac__type_new_ *) 0) | ||
15265 | return 0; | ||
15266 | -if (sizeof (long)) | ||
15267 | +if (sizeof (ac__type_new_)) | ||
15268 | return 0; | ||
15269 | ; | ||
15270 | return 0; | ||
15271 | } | ||
15272 | _ACEOF | ||
15273 | rm -f conftest.$ac_objext | ||
15274 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15275 | - (eval $ac_compile) 2>conftest.er1 | ||
15276 | +if { (ac_try="$ac_compile" | ||
15277 | +case "(($ac_try" in | ||
15278 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15279 | + *) ac_try_echo=$ac_try;; | ||
15280 | +esac | ||
15281 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15282 | + (eval "$ac_compile") 2>conftest.er1 | ||
15283 | ac_status=$? | ||
15284 | grep -v '^ *+' conftest.er1 >conftest.err | ||
15285 | rm -f conftest.er1 | ||
15286 | cat conftest.err >&5 | ||
15287 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15288 | (exit $ac_status); } && | ||
15289 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15290 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15291 | - (eval $ac_try) 2>&5 | ||
15292 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15293 | + { (case "(($ac_try" in | ||
15294 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15295 | + *) ac_try_echo=$ac_try;; | ||
15296 | +esac | ||
15297 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15298 | + (eval "$ac_try") 2>&5 | ||
15299 | ac_status=$? | ||
15300 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15301 | (exit $ac_status); }; } && | ||
15302 | { ac_try='test -s conftest.$ac_objext' | ||
15303 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15304 | - (eval $ac_try) 2>&5 | ||
15305 | + { (case "(($ac_try" in | ||
15306 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15307 | + *) ac_try_echo=$ac_try;; | ||
15308 | +esac | ||
15309 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15310 | + (eval "$ac_try") 2>&5 | ||
15311 | ac_status=$? | ||
15312 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15313 | (exit $ac_status); }; }; then | ||
15314 | @@ -25375,20 +27305,21 @@ | ||
15315 | echo "$as_me: failed program was:" >&5 | ||
15316 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15317 | |||
15318 | -ac_cv_type_long=no | ||
15319 | + ac_cv_type_long=no | ||
15320 | fi | ||
15321 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15322 | + | ||
15323 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15324 | fi | ||
15325 | -echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 | ||
15326 | -echo "${ECHO_T}$ac_cv_type_long" >&6 | ||
15327 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 | ||
15328 | +echo "${ECHO_T}$ac_cv_type_long" >&6; } | ||
15329 | |||
15330 | -echo "$as_me:$LINENO: checking size of long" >&5 | ||
15331 | -echo $ECHO_N "checking size of long... $ECHO_C" >&6 | ||
15332 | +{ echo "$as_me:$LINENO: checking size of long" >&5 | ||
15333 | +echo $ECHO_N "checking size of long... $ECHO_C" >&6; } | ||
15334 | if test "${ac_cv_sizeof_long+set}" = set; then | ||
15335 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
15336 | else | ||
15337 | if test "$ac_cv_type_long" = yes; then | ||
15338 | - # The cast to unsigned long works around a bug in the HP C Compiler | ||
15339 | + # The cast to long int works around a bug in the HP C Compiler | ||
15340 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
15341 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
15342 | # This bug is HP SR number 8606223364. | ||
15343 | @@ -25401,10 +27332,11 @@ | ||
15344 | cat >>conftest.$ac_ext <<_ACEOF | ||
15345 | /* end confdefs.h. */ | ||
15346 | $ac_includes_default | ||
15347 | + typedef long ac__type_sizeof_; | ||
15348 | int | ||
15349 | main () | ||
15350 | { | ||
15351 | -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; | ||
15352 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; | ||
15353 | test_array [0] = 0 | ||
15354 | |||
15355 | ; | ||
15356 | @@ -25412,23 +27344,36 @@ | ||
15357 | } | ||
15358 | _ACEOF | ||
15359 | rm -f conftest.$ac_objext | ||
15360 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15361 | - (eval $ac_compile) 2>conftest.er1 | ||
15362 | +if { (ac_try="$ac_compile" | ||
15363 | +case "(($ac_try" in | ||
15364 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15365 | + *) ac_try_echo=$ac_try;; | ||
15366 | +esac | ||
15367 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15368 | + (eval "$ac_compile") 2>conftest.er1 | ||
15369 | ac_status=$? | ||
15370 | grep -v '^ *+' conftest.er1 >conftest.err | ||
15371 | rm -f conftest.er1 | ||
15372 | cat conftest.err >&5 | ||
15373 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15374 | (exit $ac_status); } && | ||
15375 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15376 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15377 | - (eval $ac_try) 2>&5 | ||
15378 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15379 | + { (case "(($ac_try" in | ||
15380 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15381 | + *) ac_try_echo=$ac_try;; | ||
15382 | +esac | ||
15383 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15384 | + (eval "$ac_try") 2>&5 | ||
15385 | ac_status=$? | ||
15386 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15387 | (exit $ac_status); }; } && | ||
15388 | { ac_try='test -s conftest.$ac_objext' | ||
15389 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15390 | - (eval $ac_try) 2>&5 | ||
15391 | + { (case "(($ac_try" in | ||
15392 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15393 | + *) ac_try_echo=$ac_try;; | ||
15394 | +esac | ||
15395 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15396 | + (eval "$ac_try") 2>&5 | ||
15397 | ac_status=$? | ||
15398 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15399 | (exit $ac_status); }; }; then | ||
15400 | @@ -25441,10 +27386,11 @@ | ||
15401 | cat >>conftest.$ac_ext <<_ACEOF | ||
15402 | /* end confdefs.h. */ | ||
15403 | $ac_includes_default | ||
15404 | + typedef long ac__type_sizeof_; | ||
15405 | int | ||
15406 | main () | ||
15407 | { | ||
15408 | -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; | ||
15409 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; | ||
15410 | test_array [0] = 0 | ||
15411 | |||
15412 | ; | ||
15413 | @@ -25452,23 +27398,36 @@ | ||
15414 | } | ||
15415 | _ACEOF | ||
15416 | rm -f conftest.$ac_objext | ||
15417 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15418 | - (eval $ac_compile) 2>conftest.er1 | ||
15419 | +if { (ac_try="$ac_compile" | ||
15420 | +case "(($ac_try" in | ||
15421 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15422 | + *) ac_try_echo=$ac_try;; | ||
15423 | +esac | ||
15424 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15425 | + (eval "$ac_compile") 2>conftest.er1 | ||
15426 | ac_status=$? | ||
15427 | grep -v '^ *+' conftest.er1 >conftest.err | ||
15428 | rm -f conftest.er1 | ||
15429 | cat conftest.err >&5 | ||
15430 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15431 | (exit $ac_status); } && | ||
15432 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15433 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15434 | - (eval $ac_try) 2>&5 | ||
15435 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15436 | + { (case "(($ac_try" in | ||
15437 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15438 | + *) ac_try_echo=$ac_try;; | ||
15439 | +esac | ||
15440 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15441 | + (eval "$ac_try") 2>&5 | ||
15442 | ac_status=$? | ||
15443 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15444 | (exit $ac_status); }; } && | ||
15445 | { ac_try='test -s conftest.$ac_objext' | ||
15446 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15447 | - (eval $ac_try) 2>&5 | ||
15448 | + { (case "(($ac_try" in | ||
15449 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15450 | + *) ac_try_echo=$ac_try;; | ||
15451 | +esac | ||
15452 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15453 | + (eval "$ac_try") 2>&5 | ||
15454 | ac_status=$? | ||
15455 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15456 | (exit $ac_status); }; }; then | ||
15457 | @@ -25477,30 +27436,32 @@ | ||
15458 | echo "$as_me: failed program was:" >&5 | ||
15459 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15460 | |||
15461 | -ac_lo=`expr $ac_mid + 1` | ||
15462 | - if test $ac_lo -le $ac_mid; then | ||
15463 | - ac_lo= ac_hi= | ||
15464 | - break | ||
15465 | - fi | ||
15466 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
15467 | + ac_lo=`expr $ac_mid + 1` | ||
15468 | + if test $ac_lo -le $ac_mid; then | ||
15469 | + ac_lo= ac_hi= | ||
15470 | + break | ||
15471 | + fi | ||
15472 | + ac_mid=`expr 2 '*' $ac_mid + 1` | ||
15473 | fi | ||
15474 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15475 | + | ||
15476 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15477 | done | ||
15478 | else | ||
15479 | echo "$as_me: failed program was:" >&5 | ||
15480 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15481 | |||
15482 | -cat >conftest.$ac_ext <<_ACEOF | ||
15483 | + cat >conftest.$ac_ext <<_ACEOF | ||
15484 | /* confdefs.h. */ | ||
15485 | _ACEOF | ||
15486 | cat confdefs.h >>conftest.$ac_ext | ||
15487 | cat >>conftest.$ac_ext <<_ACEOF | ||
15488 | /* end confdefs.h. */ | ||
15489 | $ac_includes_default | ||
15490 | + typedef long ac__type_sizeof_; | ||
15491 | int | ||
15492 | main () | ||
15493 | { | ||
15494 | -static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; | ||
15495 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; | ||
15496 | test_array [0] = 0 | ||
15497 | |||
15498 | ; | ||
15499 | @@ -25508,23 +27469,36 @@ | ||
15500 | } | ||
15501 | _ACEOF | ||
15502 | rm -f conftest.$ac_objext | ||
15503 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15504 | - (eval $ac_compile) 2>conftest.er1 | ||
15505 | +if { (ac_try="$ac_compile" | ||
15506 | +case "(($ac_try" in | ||
15507 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15508 | + *) ac_try_echo=$ac_try;; | ||
15509 | +esac | ||
15510 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15511 | + (eval "$ac_compile") 2>conftest.er1 | ||
15512 | ac_status=$? | ||
15513 | grep -v '^ *+' conftest.er1 >conftest.err | ||
15514 | rm -f conftest.er1 | ||
15515 | cat conftest.err >&5 | ||
15516 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15517 | (exit $ac_status); } && | ||
15518 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15519 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15520 | - (eval $ac_try) 2>&5 | ||
15521 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15522 | + { (case "(($ac_try" in | ||
15523 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15524 | + *) ac_try_echo=$ac_try;; | ||
15525 | +esac | ||
15526 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15527 | + (eval "$ac_try") 2>&5 | ||
15528 | ac_status=$? | ||
15529 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15530 | (exit $ac_status); }; } && | ||
15531 | { ac_try='test -s conftest.$ac_objext' | ||
15532 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15533 | - (eval $ac_try) 2>&5 | ||
15534 | + { (case "(($ac_try" in | ||
15535 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15536 | + *) ac_try_echo=$ac_try;; | ||
15537 | +esac | ||
15538 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15539 | + (eval "$ac_try") 2>&5 | ||
15540 | ac_status=$? | ||
15541 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15542 | (exit $ac_status); }; }; then | ||
15543 | @@ -25537,10 +27511,11 @@ | ||
15544 | cat >>conftest.$ac_ext <<_ACEOF | ||
15545 | /* end confdefs.h. */ | ||
15546 | $ac_includes_default | ||
15547 | + typedef long ac__type_sizeof_; | ||
15548 | int | ||
15549 | main () | ||
15550 | { | ||
15551 | -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; | ||
15552 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; | ||
15553 | test_array [0] = 0 | ||
15554 | |||
15555 | ; | ||
15556 | @@ -25548,23 +27523,36 @@ | ||
15557 | } | ||
15558 | _ACEOF | ||
15559 | rm -f conftest.$ac_objext | ||
15560 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15561 | - (eval $ac_compile) 2>conftest.er1 | ||
15562 | +if { (ac_try="$ac_compile" | ||
15563 | +case "(($ac_try" in | ||
15564 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15565 | + *) ac_try_echo=$ac_try;; | ||
15566 | +esac | ||
15567 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15568 | + (eval "$ac_compile") 2>conftest.er1 | ||
15569 | ac_status=$? | ||
15570 | grep -v '^ *+' conftest.er1 >conftest.err | ||
15571 | rm -f conftest.er1 | ||
15572 | cat conftest.err >&5 | ||
15573 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15574 | (exit $ac_status); } && | ||
15575 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15576 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15577 | - (eval $ac_try) 2>&5 | ||
15578 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15579 | + { (case "(($ac_try" in | ||
15580 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15581 | + *) ac_try_echo=$ac_try;; | ||
15582 | +esac | ||
15583 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15584 | + (eval "$ac_try") 2>&5 | ||
15585 | ac_status=$? | ||
15586 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15587 | (exit $ac_status); }; } && | ||
15588 | { ac_try='test -s conftest.$ac_objext' | ||
15589 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15590 | - (eval $ac_try) 2>&5 | ||
15591 | + { (case "(($ac_try" in | ||
15592 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15593 | + *) ac_try_echo=$ac_try;; | ||
15594 | +esac | ||
15595 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15596 | + (eval "$ac_try") 2>&5 | ||
15597 | ac_status=$? | ||
15598 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15599 | (exit $ac_status); }; }; then | ||
15600 | @@ -25573,24 +27561,27 @@ | ||
15601 | echo "$as_me: failed program was:" >&5 | ||
15602 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15603 | |||
15604 | -ac_hi=`expr '(' $ac_mid ')' - 1` | ||
15605 | - if test $ac_mid -le $ac_hi; then | ||
15606 | - ac_lo= ac_hi= | ||
15607 | - break | ||
15608 | - fi | ||
15609 | - ac_mid=`expr 2 '*' $ac_mid` | ||
15610 | + ac_hi=`expr '(' $ac_mid ')' - 1` | ||
15611 | + if test $ac_mid -le $ac_hi; then | ||
15612 | + ac_lo= ac_hi= | ||
15613 | + break | ||
15614 | + fi | ||
15615 | + ac_mid=`expr 2 '*' $ac_mid` | ||
15616 | fi | ||
15617 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15618 | + | ||
15619 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15620 | done | ||
15621 | else | ||
15622 | echo "$as_me: failed program was:" >&5 | ||
15623 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15624 | |||
15625 | -ac_lo= ac_hi= | ||
15626 | + ac_lo= ac_hi= | ||
15627 | fi | ||
15628 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15629 | + | ||
15630 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15631 | fi | ||
15632 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15633 | + | ||
15634 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15635 | # Binary search between lo and hi bounds. | ||
15636 | while test "x$ac_lo" != "x$ac_hi"; do | ||
15637 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
15638 | @@ -25601,10 +27592,11 @@ | ||
15639 | cat >>conftest.$ac_ext <<_ACEOF | ||
15640 | /* end confdefs.h. */ | ||
15641 | $ac_includes_default | ||
15642 | + typedef long ac__type_sizeof_; | ||
15643 | int | ||
15644 | main () | ||
15645 | { | ||
15646 | -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; | ||
15647 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; | ||
15648 | test_array [0] = 0 | ||
15649 | |||
15650 | ; | ||
15651 | @@ -25612,23 +27604,36 @@ | ||
15652 | } | ||
15653 | _ACEOF | ||
15654 | rm -f conftest.$ac_objext | ||
15655 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15656 | - (eval $ac_compile) 2>conftest.er1 | ||
15657 | +if { (ac_try="$ac_compile" | ||
15658 | +case "(($ac_try" in | ||
15659 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15660 | + *) ac_try_echo=$ac_try;; | ||
15661 | +esac | ||
15662 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15663 | + (eval "$ac_compile") 2>conftest.er1 | ||
15664 | ac_status=$? | ||
15665 | grep -v '^ *+' conftest.er1 >conftest.err | ||
15666 | rm -f conftest.er1 | ||
15667 | cat conftest.err >&5 | ||
15668 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15669 | (exit $ac_status); } && | ||
15670 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15671 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15672 | - (eval $ac_try) 2>&5 | ||
15673 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15674 | + { (case "(($ac_try" in | ||
15675 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15676 | + *) ac_try_echo=$ac_try;; | ||
15677 | +esac | ||
15678 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15679 | + (eval "$ac_try") 2>&5 | ||
15680 | ac_status=$? | ||
15681 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15682 | (exit $ac_status); }; } && | ||
15683 | { ac_try='test -s conftest.$ac_objext' | ||
15684 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15685 | - (eval $ac_try) 2>&5 | ||
15686 | + { (case "(($ac_try" in | ||
15687 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15688 | + *) ac_try_echo=$ac_try;; | ||
15689 | +esac | ||
15690 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15691 | + (eval "$ac_try") 2>&5 | ||
15692 | ac_status=$? | ||
15693 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15694 | (exit $ac_status); }; }; then | ||
15695 | @@ -25637,24 +27642,20 @@ | ||
15696 | echo "$as_me: failed program was:" >&5 | ||
15697 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15698 | |||
15699 | -ac_lo=`expr '(' $ac_mid ')' + 1` | ||
15700 | + ac_lo=`expr '(' $ac_mid ')' + 1` | ||
15701 | fi | ||
15702 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15703 | + | ||
15704 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15705 | done | ||
15706 | case $ac_lo in | ||
15707 | ?*) ac_cv_sizeof_long=$ac_lo;; | ||
15708 | -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 | ||
15709 | +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) | ||
15710 | See \`config.log' for more details." >&5 | ||
15711 | -echo "$as_me: error: cannot compute sizeof (long), 77 | ||
15712 | +echo "$as_me: error: cannot compute sizeof (long) | ||
15713 | See \`config.log' for more details." >&2;} | ||
15714 | - { (exit 1); exit 1; }; } ;; | ||
15715 | + { (exit 77); exit 77; }; } ;; | ||
15716 | esac | ||
15717 | else | ||
15718 | - if test "$cross_compiling" = yes; then | ||
15719 | - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 | ||
15720 | -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} | ||
15721 | - { (exit 1); exit 1; }; } | ||
15722 | -else | ||
15723 | cat >conftest.$ac_ext <<_ACEOF | ||
15724 | /* confdefs.h. */ | ||
15725 | _ACEOF | ||
15726 | @@ -25662,8 +27663,9 @@ | ||
15727 | cat >>conftest.$ac_ext <<_ACEOF | ||
15728 | /* end confdefs.h. */ | ||
15729 | $ac_includes_default | ||
15730 | -long longval () { return (long) (sizeof (long)); } | ||
15731 | -unsigned long ulongval () { return (long) (sizeof (long)); } | ||
15732 | + typedef long ac__type_sizeof_; | ||
15733 | +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } | ||
15734 | +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } | ||
15735 | #include <stdio.h> | ||
15736 | #include <stdlib.h> | ||
15737 | int | ||
15738 | @@ -25672,35 +27674,44 @@ | ||
15739 | |||
15740 | FILE *f = fopen ("conftest.val", "w"); | ||
15741 | if (! f) | ||
15742 | - exit (1); | ||
15743 | - if (((long) (sizeof (long))) < 0) | ||
15744 | + return 1; | ||
15745 | + if (((long int) (sizeof (ac__type_sizeof_))) < 0) | ||
15746 | { | ||
15747 | - long i = longval (); | ||
15748 | - if (i != ((long) (sizeof (long)))) | ||
15749 | - exit (1); | ||
15750 | + long int i = longval (); | ||
15751 | + if (i != ((long int) (sizeof (ac__type_sizeof_)))) | ||
15752 | + return 1; | ||
15753 | fprintf (f, "%ld\n", i); | ||
15754 | } | ||
15755 | else | ||
15756 | { | ||
15757 | - unsigned long i = ulongval (); | ||
15758 | - if (i != ((long) (sizeof (long)))) | ||
15759 | - exit (1); | ||
15760 | + unsigned long int i = ulongval (); | ||
15761 | + if (i != ((long int) (sizeof (ac__type_sizeof_)))) | ||
15762 | + return 1; | ||
15763 | fprintf (f, "%lu\n", i); | ||
15764 | } | ||
15765 | - exit (ferror (f) || fclose (f) != 0); | ||
15766 | + return ferror (f) || fclose (f) != 0; | ||
15767 | |||
15768 | ; | ||
15769 | return 0; | ||
15770 | } | ||
15771 | _ACEOF | ||
15772 | rm -f conftest$ac_exeext | ||
15773 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
15774 | - (eval $ac_link) 2>&5 | ||
15775 | +if { (ac_try="$ac_link" | ||
15776 | +case "(($ac_try" in | ||
15777 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15778 | + *) ac_try_echo=$ac_try;; | ||
15779 | +esac | ||
15780 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15781 | + (eval "$ac_link") 2>&5 | ||
15782 | ac_status=$? | ||
15783 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15784 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
15785 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15786 | - (eval $ac_try) 2>&5 | ||
15787 | + { (case "(($ac_try" in | ||
15788 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15789 | + *) ac_try_echo=$ac_try;; | ||
15790 | +esac | ||
15791 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15792 | + (eval "$ac_try") 2>&5 | ||
15793 | ac_status=$? | ||
15794 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15795 | (exit $ac_status); }; }; then | ||
15796 | @@ -25711,29 +27722,28 @@ | ||
15797 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15798 | |||
15799 | ( exit $ac_status ) | ||
15800 | -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 | ||
15801 | +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long) | ||
15802 | See \`config.log' for more details." >&5 | ||
15803 | -echo "$as_me: error: cannot compute sizeof (long), 77 | ||
15804 | +echo "$as_me: error: cannot compute sizeof (long) | ||
15805 | See \`config.log' for more details." >&2;} | ||
15806 | - { (exit 1); exit 1; }; } | ||
15807 | -fi | ||
15808 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
15809 | + { (exit 77); exit 77; }; } | ||
15810 | fi | ||
15811 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
15812 | fi | ||
15813 | rm -f conftest.val | ||
15814 | else | ||
15815 | ac_cv_sizeof_long=0 | ||
15816 | fi | ||
15817 | fi | ||
15818 | -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 | ||
15819 | -echo "${ECHO_T}$ac_cv_sizeof_long" >&6 | ||
15820 | +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 | ||
15821 | +echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } | ||
15822 | cat >>confdefs.h <<_ACEOF | ||
15823 | #define SIZEOF_LONG $ac_cv_sizeof_long | ||
15824 | _ACEOF | ||
15825 | |||
15826 | |||
15827 | - echo "$as_me:$LINENO: checking for void*" >&5 | ||
15828 | -echo $ECHO_N "checking for void*... $ECHO_C" >&6 | ||
15829 | + { echo "$as_me:$LINENO: checking for void*" >&5 | ||
15830 | +echo $ECHO_N "checking for void*... $ECHO_C" >&6; } | ||
15831 | if test "${ac_cv_type_voidp+set}" = set; then | ||
15832 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
15833 | else | ||
15834 | @@ -25744,35 +27754,49 @@ | ||
15835 | cat >>conftest.$ac_ext <<_ACEOF | ||
15836 | /* end confdefs.h. */ | ||
15837 | $ac_includes_default | ||
15838 | +typedef void* ac__type_new_; | ||
15839 | int | ||
15840 | main () | ||
15841 | { | ||
15842 | -if ((void* *) 0) | ||
15843 | +if ((ac__type_new_ *) 0) | ||
15844 | return 0; | ||
15845 | -if (sizeof (void*)) | ||
15846 | +if (sizeof (ac__type_new_)) | ||
15847 | return 0; | ||
15848 | ; | ||
15849 | return 0; | ||
15850 | } | ||
15851 | _ACEOF | ||
15852 | rm -f conftest.$ac_objext | ||
15853 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15854 | - (eval $ac_compile) 2>conftest.er1 | ||
15855 | +if { (ac_try="$ac_compile" | ||
15856 | +case "(($ac_try" in | ||
15857 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15858 | + *) ac_try_echo=$ac_try;; | ||
15859 | +esac | ||
15860 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15861 | + (eval "$ac_compile") 2>conftest.er1 | ||
15862 | ac_status=$? | ||
15863 | grep -v '^ *+' conftest.er1 >conftest.err | ||
15864 | rm -f conftest.er1 | ||
15865 | cat conftest.err >&5 | ||
15866 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15867 | (exit $ac_status); } && | ||
15868 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15869 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15870 | - (eval $ac_try) 2>&5 | ||
15871 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15872 | + { (case "(($ac_try" in | ||
15873 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15874 | + *) ac_try_echo=$ac_try;; | ||
15875 | +esac | ||
15876 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15877 | + (eval "$ac_try") 2>&5 | ||
15878 | ac_status=$? | ||
15879 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15880 | (exit $ac_status); }; } && | ||
15881 | { ac_try='test -s conftest.$ac_objext' | ||
15882 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15883 | - (eval $ac_try) 2>&5 | ||
15884 | + { (case "(($ac_try" in | ||
15885 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15886 | + *) ac_try_echo=$ac_try;; | ||
15887 | +esac | ||
15888 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15889 | + (eval "$ac_try") 2>&5 | ||
15890 | ac_status=$? | ||
15891 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15892 | (exit $ac_status); }; }; then | ||
15893 | @@ -25781,20 +27805,21 @@ | ||
15894 | echo "$as_me: failed program was:" >&5 | ||
15895 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15896 | |||
15897 | -ac_cv_type_voidp=no | ||
15898 | + ac_cv_type_voidp=no | ||
15899 | fi | ||
15900 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15901 | + | ||
15902 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15903 | fi | ||
15904 | -echo "$as_me:$LINENO: result: $ac_cv_type_voidp" >&5 | ||
15905 | -echo "${ECHO_T}$ac_cv_type_voidp" >&6 | ||
15906 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_voidp" >&5 | ||
15907 | +echo "${ECHO_T}$ac_cv_type_voidp" >&6; } | ||
15908 | |||
15909 | -echo "$as_me:$LINENO: checking size of void*" >&5 | ||
15910 | -echo $ECHO_N "checking size of void*... $ECHO_C" >&6 | ||
15911 | +{ echo "$as_me:$LINENO: checking size of void*" >&5 | ||
15912 | +echo $ECHO_N "checking size of void*... $ECHO_C" >&6; } | ||
15913 | if test "${ac_cv_sizeof_voidp+set}" = set; then | ||
15914 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
15915 | else | ||
15916 | if test "$ac_cv_type_voidp" = yes; then | ||
15917 | - # The cast to unsigned long works around a bug in the HP C Compiler | ||
15918 | + # The cast to long int works around a bug in the HP C Compiler | ||
15919 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
15920 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
15921 | # This bug is HP SR number 8606223364. | ||
15922 | @@ -25807,10 +27832,11 @@ | ||
15923 | cat >>conftest.$ac_ext <<_ACEOF | ||
15924 | /* end confdefs.h. */ | ||
15925 | $ac_includes_default | ||
15926 | + typedef void* ac__type_sizeof_; | ||
15927 | int | ||
15928 | main () | ||
15929 | { | ||
15930 | -static int test_array [1 - 2 * !(((long) (sizeof (void*))) >= 0)]; | ||
15931 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; | ||
15932 | test_array [0] = 0 | ||
15933 | |||
15934 | ; | ||
15935 | @@ -25818,23 +27844,36 @@ | ||
15936 | } | ||
15937 | _ACEOF | ||
15938 | rm -f conftest.$ac_objext | ||
15939 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15940 | - (eval $ac_compile) 2>conftest.er1 | ||
15941 | +if { (ac_try="$ac_compile" | ||
15942 | +case "(($ac_try" in | ||
15943 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15944 | + *) ac_try_echo=$ac_try;; | ||
15945 | +esac | ||
15946 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15947 | + (eval "$ac_compile") 2>conftest.er1 | ||
15948 | ac_status=$? | ||
15949 | grep -v '^ *+' conftest.er1 >conftest.err | ||
15950 | rm -f conftest.er1 | ||
15951 | cat conftest.err >&5 | ||
15952 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15953 | (exit $ac_status); } && | ||
15954 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15955 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15956 | - (eval $ac_try) 2>&5 | ||
15957 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
15958 | + { (case "(($ac_try" in | ||
15959 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15960 | + *) ac_try_echo=$ac_try;; | ||
15961 | +esac | ||
15962 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15963 | + (eval "$ac_try") 2>&5 | ||
15964 | ac_status=$? | ||
15965 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15966 | (exit $ac_status); }; } && | ||
15967 | { ac_try='test -s conftest.$ac_objext' | ||
15968 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15969 | - (eval $ac_try) 2>&5 | ||
15970 | + { (case "(($ac_try" in | ||
15971 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15972 | + *) ac_try_echo=$ac_try;; | ||
15973 | +esac | ||
15974 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15975 | + (eval "$ac_try") 2>&5 | ||
15976 | ac_status=$? | ||
15977 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15978 | (exit $ac_status); }; }; then | ||
15979 | @@ -25847,10 +27886,11 @@ | ||
15980 | cat >>conftest.$ac_ext <<_ACEOF | ||
15981 | /* end confdefs.h. */ | ||
15982 | $ac_includes_default | ||
15983 | + typedef void* ac__type_sizeof_; | ||
15984 | int | ||
15985 | main () | ||
15986 | { | ||
15987 | -static int test_array [1 - 2 * !(((long) (sizeof (void*))) <= $ac_mid)]; | ||
15988 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; | ||
15989 | test_array [0] = 0 | ||
15990 | |||
15991 | ; | ||
15992 | @@ -25858,23 +27898,36 @@ | ||
15993 | } | ||
15994 | _ACEOF | ||
15995 | rm -f conftest.$ac_objext | ||
15996 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15997 | - (eval $ac_compile) 2>conftest.er1 | ||
15998 | +if { (ac_try="$ac_compile" | ||
15999 | +case "(($ac_try" in | ||
16000 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16001 | + *) ac_try_echo=$ac_try;; | ||
16002 | +esac | ||
16003 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16004 | + (eval "$ac_compile") 2>conftest.er1 | ||
16005 | ac_status=$? | ||
16006 | grep -v '^ *+' conftest.er1 >conftest.err | ||
16007 | rm -f conftest.er1 | ||
16008 | cat conftest.err >&5 | ||
16009 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16010 | (exit $ac_status); } && | ||
16011 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16012 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16013 | - (eval $ac_try) 2>&5 | ||
16014 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16015 | + { (case "(($ac_try" in | ||
16016 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16017 | + *) ac_try_echo=$ac_try;; | ||
16018 | +esac | ||
16019 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16020 | + (eval "$ac_try") 2>&5 | ||
16021 | ac_status=$? | ||
16022 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16023 | (exit $ac_status); }; } && | ||
16024 | { ac_try='test -s conftest.$ac_objext' | ||
16025 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16026 | - (eval $ac_try) 2>&5 | ||
16027 | + { (case "(($ac_try" in | ||
16028 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16029 | + *) ac_try_echo=$ac_try;; | ||
16030 | +esac | ||
16031 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16032 | + (eval "$ac_try") 2>&5 | ||
16033 | ac_status=$? | ||
16034 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16035 | (exit $ac_status); }; }; then | ||
16036 | @@ -25883,30 +27936,32 @@ | ||
16037 | echo "$as_me: failed program was:" >&5 | ||
16038 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
16039 | |||
16040 | -ac_lo=`expr $ac_mid + 1` | ||
16041 | - if test $ac_lo -le $ac_mid; then | ||
16042 | - ac_lo= ac_hi= | ||
16043 | - break | ||
16044 | - fi | ||
16045 | - ac_mid=`expr 2 '*' $ac_mid + 1` | ||
16046 | + ac_lo=`expr $ac_mid + 1` | ||
16047 | + if test $ac_lo -le $ac_mid; then | ||
16048 | + ac_lo= ac_hi= | ||
16049 | + break | ||
16050 | + fi | ||
16051 | + ac_mid=`expr 2 '*' $ac_mid + 1` | ||
16052 | fi | ||
16053 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16054 | + | ||
16055 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16056 | done | ||
16057 | else | ||
16058 | echo "$as_me: failed program was:" >&5 | ||
16059 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
16060 | |||
16061 | -cat >conftest.$ac_ext <<_ACEOF | ||
16062 | + cat >conftest.$ac_ext <<_ACEOF | ||
16063 | /* confdefs.h. */ | ||
16064 | _ACEOF | ||
16065 | cat confdefs.h >>conftest.$ac_ext | ||
16066 | cat >>conftest.$ac_ext <<_ACEOF | ||
16067 | /* end confdefs.h. */ | ||
16068 | $ac_includes_default | ||
16069 | + typedef void* ac__type_sizeof_; | ||
16070 | int | ||
16071 | main () | ||
16072 | { | ||
16073 | -static int test_array [1 - 2 * !(((long) (sizeof (void*))) < 0)]; | ||
16074 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; | ||
16075 | test_array [0] = 0 | ||
16076 | |||
16077 | ; | ||
16078 | @@ -25914,23 +27969,36 @@ | ||
16079 | } | ||
16080 | _ACEOF | ||
16081 | rm -f conftest.$ac_objext | ||
16082 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
16083 | - (eval $ac_compile) 2>conftest.er1 | ||
16084 | +if { (ac_try="$ac_compile" | ||
16085 | +case "(($ac_try" in | ||
16086 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16087 | + *) ac_try_echo=$ac_try;; | ||
16088 | +esac | ||
16089 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16090 | + (eval "$ac_compile") 2>conftest.er1 | ||
16091 | ac_status=$? | ||
16092 | grep -v '^ *+' conftest.er1 >conftest.err | ||
16093 | rm -f conftest.er1 | ||
16094 | cat conftest.err >&5 | ||
16095 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16096 | (exit $ac_status); } && | ||
16097 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16098 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16099 | - (eval $ac_try) 2>&5 | ||
16100 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16101 | + { (case "(($ac_try" in | ||
16102 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16103 | + *) ac_try_echo=$ac_try;; | ||
16104 | +esac | ||
16105 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16106 | + (eval "$ac_try") 2>&5 | ||
16107 | ac_status=$? | ||
16108 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16109 | (exit $ac_status); }; } && | ||
16110 | { ac_try='test -s conftest.$ac_objext' | ||
16111 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16112 | - (eval $ac_try) 2>&5 | ||
16113 | + { (case "(($ac_try" in | ||
16114 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16115 | + *) ac_try_echo=$ac_try;; | ||
16116 | +esac | ||
16117 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16118 | + (eval "$ac_try") 2>&5 | ||
16119 | ac_status=$? | ||
16120 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16121 | (exit $ac_status); }; }; then | ||
16122 | @@ -25943,10 +28011,11 @@ | ||
16123 | cat >>conftest.$ac_ext <<_ACEOF | ||
16124 | /* end confdefs.h. */ | ||
16125 | $ac_includes_default | ||
16126 | + typedef void* ac__type_sizeof_; | ||
16127 | int | ||
16128 | main () | ||
16129 | { | ||
16130 | -static int test_array [1 - 2 * !(((long) (sizeof (void*))) >= $ac_mid)]; | ||
16131 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; | ||
16132 | test_array [0] = 0 | ||
16133 | |||
16134 | ; | ||
16135 | @@ -25954,23 +28023,36 @@ | ||
16136 | } | ||
16137 | _ACEOF | ||
16138 | rm -f conftest.$ac_objext | ||
16139 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
16140 | - (eval $ac_compile) 2>conftest.er1 | ||
16141 | +if { (ac_try="$ac_compile" | ||
16142 | +case "(($ac_try" in | ||
16143 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16144 | + *) ac_try_echo=$ac_try;; | ||
16145 | +esac | ||
16146 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16147 | + (eval "$ac_compile") 2>conftest.er1 | ||
16148 | ac_status=$? | ||
16149 | grep -v '^ *+' conftest.er1 >conftest.err | ||
16150 | rm -f conftest.er1 | ||
16151 | cat conftest.err >&5 | ||
16152 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16153 | (exit $ac_status); } && | ||
16154 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16155 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16156 | - (eval $ac_try) 2>&5 | ||
16157 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16158 | + { (case "(($ac_try" in | ||
16159 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16160 | + *) ac_try_echo=$ac_try;; | ||
16161 | +esac | ||
16162 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16163 | + (eval "$ac_try") 2>&5 | ||
16164 | ac_status=$? | ||
16165 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16166 | (exit $ac_status); }; } && | ||
16167 | { ac_try='test -s conftest.$ac_objext' | ||
16168 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16169 | - (eval $ac_try) 2>&5 | ||
16170 | + { (case "(($ac_try" in | ||
16171 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16172 | + *) ac_try_echo=$ac_try;; | ||
16173 | +esac | ||
16174 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16175 | + (eval "$ac_try") 2>&5 | ||
16176 | ac_status=$? | ||
16177 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16178 | (exit $ac_status); }; }; then | ||
16179 | @@ -25979,24 +28061,27 @@ | ||
16180 | echo "$as_me: failed program was:" >&5 | ||
16181 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
16182 | |||
16183 | -ac_hi=`expr '(' $ac_mid ')' - 1` | ||
16184 | - if test $ac_mid -le $ac_hi; then | ||
16185 | - ac_lo= ac_hi= | ||
16186 | - break | ||
16187 | - fi | ||
16188 | - ac_mid=`expr 2 '*' $ac_mid` | ||
16189 | + ac_hi=`expr '(' $ac_mid ')' - 1` | ||
16190 | + if test $ac_mid -le $ac_hi; then | ||
16191 | + ac_lo= ac_hi= | ||
16192 | + break | ||
16193 | + fi | ||
16194 | + ac_mid=`expr 2 '*' $ac_mid` | ||
16195 | fi | ||
16196 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16197 | + | ||
16198 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16199 | done | ||
16200 | else | ||
16201 | echo "$as_me: failed program was:" >&5 | ||
16202 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
16203 | |||
16204 | -ac_lo= ac_hi= | ||
16205 | + ac_lo= ac_hi= | ||
16206 | fi | ||
16207 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16208 | + | ||
16209 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16210 | fi | ||
16211 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16212 | + | ||
16213 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16214 | # Binary search between lo and hi bounds. | ||
16215 | while test "x$ac_lo" != "x$ac_hi"; do | ||
16216 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
16217 | @@ -26007,10 +28092,11 @@ | ||
16218 | cat >>conftest.$ac_ext <<_ACEOF | ||
16219 | /* end confdefs.h. */ | ||
16220 | $ac_includes_default | ||
16221 | + typedef void* ac__type_sizeof_; | ||
16222 | int | ||
16223 | main () | ||
16224 | { | ||
16225 | -static int test_array [1 - 2 * !(((long) (sizeof (void*))) <= $ac_mid)]; | ||
16226 | +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; | ||
16227 | test_array [0] = 0 | ||
16228 | |||
16229 | ; | ||
16230 | @@ -26018,23 +28104,36 @@ | ||
16231 | } | ||
16232 | _ACEOF | ||
16233 | rm -f conftest.$ac_objext | ||
16234 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
16235 | - (eval $ac_compile) 2>conftest.er1 | ||
16236 | +if { (ac_try="$ac_compile" | ||
16237 | +case "(($ac_try" in | ||
16238 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16239 | + *) ac_try_echo=$ac_try;; | ||
16240 | +esac | ||
16241 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16242 | + (eval "$ac_compile") 2>conftest.er1 | ||
16243 | ac_status=$? | ||
16244 | grep -v '^ *+' conftest.er1 >conftest.err | ||
16245 | rm -f conftest.er1 | ||
16246 | cat conftest.err >&5 | ||
16247 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16248 | (exit $ac_status); } && | ||
16249 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16250 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16251 | - (eval $ac_try) 2>&5 | ||
16252 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16253 | + { (case "(($ac_try" in | ||
16254 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16255 | + *) ac_try_echo=$ac_try;; | ||
16256 | +esac | ||
16257 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16258 | + (eval "$ac_try") 2>&5 | ||
16259 | ac_status=$? | ||
16260 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16261 | (exit $ac_status); }; } && | ||
16262 | { ac_try='test -s conftest.$ac_objext' | ||
16263 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16264 | - (eval $ac_try) 2>&5 | ||
16265 | + { (case "(($ac_try" in | ||
16266 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16267 | + *) ac_try_echo=$ac_try;; | ||
16268 | +esac | ||
16269 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16270 | + (eval "$ac_try") 2>&5 | ||
16271 | ac_status=$? | ||
16272 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16273 | (exit $ac_status); }; }; then | ||
16274 | @@ -26043,24 +28142,20 @@ | ||
16275 | echo "$as_me: failed program was:" >&5 | ||
16276 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
16277 | |||
16278 | -ac_lo=`expr '(' $ac_mid ')' + 1` | ||
16279 | + ac_lo=`expr '(' $ac_mid ')' + 1` | ||
16280 | fi | ||
16281 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16282 | + | ||
16283 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16284 | done | ||
16285 | case $ac_lo in | ||
16286 | ?*) ac_cv_sizeof_voidp=$ac_lo;; | ||
16287 | -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*), 77 | ||
16288 | +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*) | ||
16289 | See \`config.log' for more details." >&5 | ||
16290 | -echo "$as_me: error: cannot compute sizeof (void*), 77 | ||
16291 | +echo "$as_me: error: cannot compute sizeof (void*) | ||
16292 | See \`config.log' for more details." >&2;} | ||
16293 | - { (exit 1); exit 1; }; } ;; | ||
16294 | + { (exit 77); exit 77; }; } ;; | ||
16295 | esac | ||
16296 | else | ||
16297 | - if test "$cross_compiling" = yes; then | ||
16298 | - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 | ||
16299 | -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} | ||
16300 | - { (exit 1); exit 1; }; } | ||
16301 | -else | ||
16302 | cat >conftest.$ac_ext <<_ACEOF | ||
16303 | /* confdefs.h. */ | ||
16304 | _ACEOF | ||
16305 | @@ -26068,8 +28163,9 @@ | ||
16306 | cat >>conftest.$ac_ext <<_ACEOF | ||
16307 | /* end confdefs.h. */ | ||
16308 | $ac_includes_default | ||
16309 | -long longval () { return (long) (sizeof (void*)); } | ||
16310 | -unsigned long ulongval () { return (long) (sizeof (void*)); } | ||
16311 | + typedef void* ac__type_sizeof_; | ||
16312 | +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } | ||
16313 | +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } | ||
16314 | #include <stdio.h> | ||
16315 | #include <stdlib.h> | ||
16316 | int | ||
16317 | @@ -26078,35 +28174,44 @@ | ||
16318 | |||
16319 | FILE *f = fopen ("conftest.val", "w"); | ||
16320 | if (! f) | ||
16321 | - exit (1); | ||
16322 | - if (((long) (sizeof (void*))) < 0) | ||
16323 | + return 1; | ||
16324 | + if (((long int) (sizeof (ac__type_sizeof_))) < 0) | ||
16325 | { | ||
16326 | - long i = longval (); | ||
16327 | - if (i != ((long) (sizeof (void*)))) | ||
16328 | - exit (1); | ||
16329 | + long int i = longval (); | ||
16330 | + if (i != ((long int) (sizeof (ac__type_sizeof_)))) | ||
16331 | + return 1; | ||
16332 | fprintf (f, "%ld\n", i); | ||
16333 | } | ||
16334 | else | ||
16335 | { | ||
16336 | - unsigned long i = ulongval (); | ||
16337 | - if (i != ((long) (sizeof (void*)))) | ||
16338 | - exit (1); | ||
16339 | + unsigned long int i = ulongval (); | ||
16340 | + if (i != ((long int) (sizeof (ac__type_sizeof_)))) | ||
16341 | + return 1; | ||
16342 | fprintf (f, "%lu\n", i); | ||
16343 | } | ||
16344 | - exit (ferror (f) || fclose (f) != 0); | ||
16345 | + return ferror (f) || fclose (f) != 0; | ||
16346 | |||
16347 | ; | ||
16348 | return 0; | ||
16349 | } | ||
16350 | _ACEOF | ||
16351 | rm -f conftest$ac_exeext | ||
16352 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
16353 | - (eval $ac_link) 2>&5 | ||
16354 | +if { (ac_try="$ac_link" | ||
16355 | +case "(($ac_try" in | ||
16356 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16357 | + *) ac_try_echo=$ac_try;; | ||
16358 | +esac | ||
16359 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16360 | + (eval "$ac_link") 2>&5 | ||
16361 | ac_status=$? | ||
16362 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16363 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
16364 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16365 | - (eval $ac_try) 2>&5 | ||
16366 | + { (case "(($ac_try" in | ||
16367 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16368 | + *) ac_try_echo=$ac_try;; | ||
16369 | +esac | ||
16370 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16371 | + (eval "$ac_try") 2>&5 | ||
16372 | ac_status=$? | ||
16373 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16374 | (exit $ac_status); }; }; then | ||
16375 | @@ -26117,22 +28222,21 @@ | ||
16376 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
16377 | |||
16378 | ( exit $ac_status ) | ||
16379 | -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void*), 77 | ||
16380 | +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void*) | ||
16381 | See \`config.log' for more details." >&5 | ||
16382 | -echo "$as_me: error: cannot compute sizeof (void*), 77 | ||
16383 | +echo "$as_me: error: cannot compute sizeof (void*) | ||
16384 | See \`config.log' for more details." >&2;} | ||
16385 | - { (exit 1); exit 1; }; } | ||
16386 | -fi | ||
16387 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
16388 | + { (exit 77); exit 77; }; } | ||
16389 | fi | ||
16390 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
16391 | fi | ||
16392 | rm -f conftest.val | ||
16393 | else | ||
16394 | ac_cv_sizeof_voidp=0 | ||
16395 | fi | ||
16396 | fi | ||
16397 | -echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5 | ||
16398 | -echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6 | ||
16399 | +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5 | ||
16400 | +echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6; } | ||
16401 | cat >>confdefs.h <<_ACEOF | ||
16402 | #define SIZEOF_VOIDP $ac_cv_sizeof_voidp | ||
16403 | _ACEOF | ||
16404 | @@ -26160,8 +28264,8 @@ | ||
16405 | 222/*|444/*) name="$name (unusual dsptype)" ;; | ||
16406 | *) name="$name (very unusal model)" ;; | ||
16407 | esac | ||
16408 | - echo "$as_me:$LINENO: result: combined for stdint datatype model... $name" >&5 | ||
16409 | -echo "${ECHO_T}combined for stdint datatype model... $name" >&6 | ||
16410 | + { echo "$as_me:$LINENO: result: combined for stdint datatype model... $name" >&5 | ||
16411 | +echo "${ECHO_T}combined for stdint datatype model... $name" >&6; } | ||
16412 | fi | ||
16413 | |||
16414 | if test "_$ac_cv_header_stdint_x" != "_" ; then | ||
16415 | @@ -26174,14 +28278,14 @@ | ||
16416 | ac_cv_header_stdint="stddef.h" | ||
16417 | fi | ||
16418 | |||
16419 | -echo "$as_me:$LINENO: checking for extra inttypes in chosen header" >&5 | ||
16420 | -echo $ECHO_N "checking for extra inttypes in chosen header... $ECHO_C" >&6 | ||
16421 | -echo "$as_me:$LINENO: result: ($ac_cv_header_stdint)" >&5 | ||
16422 | -echo "${ECHO_T}($ac_cv_header_stdint)" >&6 | ||
16423 | +{ echo "$as_me:$LINENO: checking for extra inttypes in chosen header" >&5 | ||
16424 | +echo $ECHO_N "checking for extra inttypes in chosen header... $ECHO_C" >&6; } | ||
16425 | +{ echo "$as_me:$LINENO: result: ($ac_cv_header_stdint)" >&5 | ||
16426 | +echo "${ECHO_T}($ac_cv_header_stdint)" >&6; } | ||
16427 | unset ac_cv_type_int_least32_t | ||
16428 | unset ac_cv_type_int_fast32_t | ||
16429 | -echo "$as_me:$LINENO: checking for int_least32_t" >&5 | ||
16430 | -echo $ECHO_N "checking for int_least32_t... $ECHO_C" >&6 | ||
16431 | +{ echo "$as_me:$LINENO: checking for int_least32_t" >&5 | ||
16432 | +echo $ECHO_N "checking for int_least32_t... $ECHO_C" >&6; } | ||
16433 | if test "${ac_cv_type_int_least32_t+set}" = set; then | ||
16434 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
16435 | else | ||
16436 | @@ -26193,35 +28297,49 @@ | ||
16437 | /* end confdefs.h. */ | ||
16438 | #include <$ac_cv_header_stdint> | ||
16439 | |||
16440 | +typedef int_least32_t ac__type_new_; | ||
16441 | int | ||
16442 | main () | ||
16443 | { | ||
16444 | -if ((int_least32_t *) 0) | ||
16445 | +if ((ac__type_new_ *) 0) | ||
16446 | return 0; | ||
16447 | -if (sizeof (int_least32_t)) | ||
16448 | +if (sizeof (ac__type_new_)) | ||
16449 | return 0; | ||
16450 | ; | ||
16451 | return 0; | ||
16452 | } | ||
16453 | _ACEOF | ||
16454 | rm -f conftest.$ac_objext | ||
16455 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
16456 | - (eval $ac_compile) 2>conftest.er1 | ||
16457 | +if { (ac_try="$ac_compile" | ||
16458 | +case "(($ac_try" in | ||
16459 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16460 | + *) ac_try_echo=$ac_try;; | ||
16461 | +esac | ||
16462 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16463 | + (eval "$ac_compile") 2>conftest.er1 | ||
16464 | ac_status=$? | ||
16465 | grep -v '^ *+' conftest.er1 >conftest.err | ||
16466 | rm -f conftest.er1 | ||
16467 | cat conftest.err >&5 | ||
16468 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16469 | (exit $ac_status); } && | ||
16470 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16471 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16472 | - (eval $ac_try) 2>&5 | ||
16473 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16474 | + { (case "(($ac_try" in | ||
16475 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16476 | + *) ac_try_echo=$ac_try;; | ||
16477 | +esac | ||
16478 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16479 | + (eval "$ac_try") 2>&5 | ||
16480 | ac_status=$? | ||
16481 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16482 | (exit $ac_status); }; } && | ||
16483 | { ac_try='test -s conftest.$ac_objext' | ||
16484 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16485 | - (eval $ac_try) 2>&5 | ||
16486 | + { (case "(($ac_try" in | ||
16487 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16488 | + *) ac_try_echo=$ac_try;; | ||
16489 | +esac | ||
16490 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16491 | + (eval "$ac_try") 2>&5 | ||
16492 | ac_status=$? | ||
16493 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16494 | (exit $ac_status); }; }; then | ||
16495 | @@ -26230,15 +28348,16 @@ | ||
16496 | echo "$as_me: failed program was:" >&5 | ||
16497 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
16498 | |||
16499 | -ac_cv_type_int_least32_t=no | ||
16500 | + ac_cv_type_int_least32_t=no | ||
16501 | fi | ||
16502 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16503 | + | ||
16504 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16505 | fi | ||
16506 | -echo "$as_me:$LINENO: result: $ac_cv_type_int_least32_t" >&5 | ||
16507 | -echo "${ECHO_T}$ac_cv_type_int_least32_t" >&6 | ||
16508 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_int_least32_t" >&5 | ||
16509 | +echo "${ECHO_T}$ac_cv_type_int_least32_t" >&6; } | ||
16510 | |||
16511 | -echo "$as_me:$LINENO: checking for int_fast32_t" >&5 | ||
16512 | -echo $ECHO_N "checking for int_fast32_t... $ECHO_C" >&6 | ||
16513 | +{ echo "$as_me:$LINENO: checking for int_fast32_t" >&5 | ||
16514 | +echo $ECHO_N "checking for int_fast32_t... $ECHO_C" >&6; } | ||
16515 | if test "${ac_cv_type_int_fast32_t+set}" = set; then | ||
16516 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
16517 | else | ||
16518 | @@ -26250,35 +28369,49 @@ | ||
16519 | /* end confdefs.h. */ | ||
16520 | #include<$ac_cv_header_stdint> | ||
16521 | |||
16522 | +typedef int_fast32_t ac__type_new_; | ||
16523 | int | ||
16524 | main () | ||
16525 | { | ||
16526 | -if ((int_fast32_t *) 0) | ||
16527 | +if ((ac__type_new_ *) 0) | ||
16528 | return 0; | ||
16529 | -if (sizeof (int_fast32_t)) | ||
16530 | +if (sizeof (ac__type_new_)) | ||
16531 | return 0; | ||
16532 | ; | ||
16533 | return 0; | ||
16534 | } | ||
16535 | _ACEOF | ||
16536 | rm -f conftest.$ac_objext | ||
16537 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
16538 | - (eval $ac_compile) 2>conftest.er1 | ||
16539 | +if { (ac_try="$ac_compile" | ||
16540 | +case "(($ac_try" in | ||
16541 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16542 | + *) ac_try_echo=$ac_try;; | ||
16543 | +esac | ||
16544 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16545 | + (eval "$ac_compile") 2>conftest.er1 | ||
16546 | ac_status=$? | ||
16547 | grep -v '^ *+' conftest.er1 >conftest.err | ||
16548 | rm -f conftest.er1 | ||
16549 | cat conftest.err >&5 | ||
16550 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16551 | (exit $ac_status); } && | ||
16552 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16553 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16554 | - (eval $ac_try) 2>&5 | ||
16555 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16556 | + { (case "(($ac_try" in | ||
16557 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16558 | + *) ac_try_echo=$ac_try;; | ||
16559 | +esac | ||
16560 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16561 | + (eval "$ac_try") 2>&5 | ||
16562 | ac_status=$? | ||
16563 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16564 | (exit $ac_status); }; } && | ||
16565 | { ac_try='test -s conftest.$ac_objext' | ||
16566 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16567 | - (eval $ac_try) 2>&5 | ||
16568 | + { (case "(($ac_try" in | ||
16569 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16570 | + *) ac_try_echo=$ac_try;; | ||
16571 | +esac | ||
16572 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16573 | + (eval "$ac_try") 2>&5 | ||
16574 | ac_status=$? | ||
16575 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16576 | (exit $ac_status); }; }; then | ||
16577 | @@ -26287,15 +28420,16 @@ | ||
16578 | echo "$as_me: failed program was:" >&5 | ||
16579 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
16580 | |||
16581 | -ac_cv_type_int_fast32_t=no | ||
16582 | + ac_cv_type_int_fast32_t=no | ||
16583 | fi | ||
16584 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16585 | + | ||
16586 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16587 | fi | ||
16588 | -echo "$as_me:$LINENO: result: $ac_cv_type_int_fast32_t" >&5 | ||
16589 | -echo "${ECHO_T}$ac_cv_type_int_fast32_t" >&6 | ||
16590 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_int_fast32_t" >&5 | ||
16591 | +echo "${ECHO_T}$ac_cv_type_int_fast32_t" >&6; } | ||
16592 | |||
16593 | -echo "$as_me:$LINENO: checking for intmax_t" >&5 | ||
16594 | -echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6 | ||
16595 | +{ echo "$as_me:$LINENO: checking for intmax_t" >&5 | ||
16596 | +echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6; } | ||
16597 | if test "${ac_cv_type_intmax_t+set}" = set; then | ||
16598 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
16599 | else | ||
16600 | @@ -26307,35 +28441,49 @@ | ||
16601 | /* end confdefs.h. */ | ||
16602 | #include <$ac_cv_header_stdint> | ||
16603 | |||
16604 | +typedef intmax_t ac__type_new_; | ||
16605 | int | ||
16606 | main () | ||
16607 | { | ||
16608 | -if ((intmax_t *) 0) | ||
16609 | +if ((ac__type_new_ *) 0) | ||
16610 | return 0; | ||
16611 | -if (sizeof (intmax_t)) | ||
16612 | +if (sizeof (ac__type_new_)) | ||
16613 | return 0; | ||
16614 | ; | ||
16615 | return 0; | ||
16616 | } | ||
16617 | _ACEOF | ||
16618 | rm -f conftest.$ac_objext | ||
16619 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
16620 | - (eval $ac_compile) 2>conftest.er1 | ||
16621 | +if { (ac_try="$ac_compile" | ||
16622 | +case "(($ac_try" in | ||
16623 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16624 | + *) ac_try_echo=$ac_try;; | ||
16625 | +esac | ||
16626 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16627 | + (eval "$ac_compile") 2>conftest.er1 | ||
16628 | ac_status=$? | ||
16629 | grep -v '^ *+' conftest.er1 >conftest.err | ||
16630 | rm -f conftest.er1 | ||
16631 | cat conftest.err >&5 | ||
16632 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16633 | (exit $ac_status); } && | ||
16634 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16635 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16636 | - (eval $ac_try) 2>&5 | ||
16637 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16638 | + { (case "(($ac_try" in | ||
16639 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16640 | + *) ac_try_echo=$ac_try;; | ||
16641 | +esac | ||
16642 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16643 | + (eval "$ac_try") 2>&5 | ||
16644 | ac_status=$? | ||
16645 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16646 | (exit $ac_status); }; } && | ||
16647 | { ac_try='test -s conftest.$ac_objext' | ||
16648 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16649 | - (eval $ac_try) 2>&5 | ||
16650 | + { (case "(($ac_try" in | ||
16651 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16652 | + *) ac_try_echo=$ac_try;; | ||
16653 | +esac | ||
16654 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16655 | + (eval "$ac_try") 2>&5 | ||
16656 | ac_status=$? | ||
16657 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16658 | (exit $ac_status); }; }; then | ||
16659 | @@ -26344,12 +28492,13 @@ | ||
16660 | echo "$as_me: failed program was:" >&5 | ||
16661 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
16662 | |||
16663 | -ac_cv_type_intmax_t=no | ||
16664 | + ac_cv_type_intmax_t=no | ||
16665 | fi | ||
16666 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16667 | + | ||
16668 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
16669 | fi | ||
16670 | -echo "$as_me:$LINENO: result: $ac_cv_type_intmax_t" >&5 | ||
16671 | -echo "${ECHO_T}$ac_cv_type_intmax_t" >&6 | ||
16672 | +{ echo "$as_me:$LINENO: result: $ac_cv_type_intmax_t" >&5 | ||
16673 | +echo "${ECHO_T}$ac_cv_type_intmax_t" >&6; } | ||
16674 | |||
16675 | |||
16676 | fi # shortcircut to system "stdint.h" | ||
16677 | @@ -26360,11 +28509,11 @@ | ||
16678 | ac_cv_stdint_message="using $CC" | ||
16679 | fi | ||
16680 | |||
16681 | -echo "$as_me:$LINENO: result: make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&5 | ||
16682 | -echo "${ECHO_T}make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&6 | ||
16683 | +{ echo "$as_me:$LINENO: result: make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&5 | ||
16684 | +echo "${ECHO_T}make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&6; } | ||
16685 | |||
16686 | # ----------------- DONE inttypes.h checks START header ------------- | ||
16687 | - ac_config_commands="$ac_config_commands $ac_stdint_h" | ||
16688 | +ac_config_commands="$ac_config_commands $ac_stdint_h" | ||
16689 | |||
16690 | |||
16691 | |||
16692 | @@ -26385,8 +28534,8 @@ | ||
16693 | |||
16694 | |||
16695 | pkg_failed=no | ||
16696 | -echo "$as_me:$LINENO: checking for GLIB" >&5 | ||
16697 | -echo $ECHO_N "checking for GLIB... $ECHO_C" >&6 | ||
16698 | +{ echo "$as_me:$LINENO: checking for GLIB" >&5 | ||
16699 | +echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; } | ||
16700 | |||
16701 | if test -n "$PKG_CONFIG"; then | ||
16702 | if test -n "$PKG_CONFIG" && \ | ||
16703 | @@ -26428,8 +28577,8 @@ | ||
16704 | else | ||
16705 | GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS | ||
16706 | GLIB_LIBS=$pkg_cv_GLIB_LIBS | ||
16707 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
16708 | -echo "${ECHO_T}yes" >&6 | ||
16709 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
16710 | +echo "${ECHO_T}yes" >&6; } | ||
16711 | HAVE_GLIB=yes | ||
16712 | fi | ||
16713 | |||
16714 | @@ -26453,8 +28602,8 @@ | ||
16715 | |||
16716 | |||
16717 | pkg_failed=no | ||
16718 | -echo "$as_me:$LINENO: checking for LIBOIL" >&5 | ||
16719 | -echo $ECHO_N "checking for LIBOIL... $ECHO_C" >&6 | ||
16720 | +{ echo "$as_me:$LINENO: checking for LIBOIL" >&5 | ||
16721 | +echo $ECHO_N "checking for LIBOIL... $ECHO_C" >&6; } | ||
16722 | |||
16723 | if test -n "$PKG_CONFIG"; then | ||
16724 | if test -n "$PKG_CONFIG" && \ | ||
16725 | @@ -26496,8 +28645,8 @@ | ||
16726 | else | ||
16727 | LIBOIL_CFLAGS=$pkg_cv_LIBOIL_CFLAGS | ||
16728 | LIBOIL_LIBS=$pkg_cv_LIBOIL_LIBS | ||
16729 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
16730 | -echo "${ECHO_T}yes" >&6 | ||
16731 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
16732 | +echo "${ECHO_T}yes" >&6; } | ||
16733 | HAVE_LIBOIL=yes | ||
16734 | fi | ||
16735 | if test "x${HAVE_LIBOIL}" != xyes ; then | ||
16736 | @@ -26514,8 +28663,8 @@ | ||
16737 | required="yes" | ||
16738 | |||
16739 | pkg_failed=no | ||
16740 | -echo "$as_me:$LINENO: checking for GST" >&5 | ||
16741 | -echo $ECHO_N "checking for GST... $ECHO_C" >&6 | ||
16742 | +{ echo "$as_me:$LINENO: checking for GST" >&5 | ||
16743 | +echo $ECHO_N "checking for GST... $ECHO_C" >&6; } | ||
16744 | |||
16745 | if test -n "$PKG_CONFIG"; then | ||
16746 | if test -n "$PKG_CONFIG" && \ | ||
16747 | @@ -26557,8 +28706,8 @@ | ||
16748 | else | ||
16749 | GST_CFLAGS=$pkg_cv_GST_CFLAGS | ||
16750 | GST_LIBS=$pkg_cv_GST_LIBS | ||
16751 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
16752 | -echo "${ECHO_T}yes" >&6 | ||
16753 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
16754 | +echo "${ECHO_T}yes" >&6; } | ||
16755 | |||
16756 | HAVE_GST="yes" | ||
16757 | |||
16758 | @@ -26599,8 +28748,8 @@ | ||
16759 | required="yes" | ||
16760 | |||
16761 | pkg_failed=no | ||
16762 | -echo "$as_me:$LINENO: checking for GST_BASE" >&5 | ||
16763 | -echo $ECHO_N "checking for GST_BASE... $ECHO_C" >&6 | ||
16764 | +{ echo "$as_me:$LINENO: checking for GST_BASE" >&5 | ||
16765 | +echo $ECHO_N "checking for GST_BASE... $ECHO_C" >&6; } | ||
16766 | |||
16767 | if test -n "$PKG_CONFIG"; then | ||
16768 | if test -n "$PKG_CONFIG" && \ | ||
16769 | @@ -26642,8 +28791,8 @@ | ||
16770 | else | ||
16771 | GST_BASE_CFLAGS=$pkg_cv_GST_BASE_CFLAGS | ||
16772 | GST_BASE_LIBS=$pkg_cv_GST_BASE_LIBS | ||
16773 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
16774 | -echo "${ECHO_T}yes" >&6 | ||
16775 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
16776 | +echo "${ECHO_T}yes" >&6; } | ||
16777 | |||
16778 | HAVE_GST_BASE="yes" | ||
16779 | |||
16780 | @@ -26669,8 +28818,8 @@ | ||
16781 | required=no | ||
16782 | |||
16783 | pkg_failed=no | ||
16784 | -echo "$as_me:$LINENO: checking for GST_CHECK" >&5 | ||
16785 | -echo $ECHO_N "checking for GST_CHECK... $ECHO_C" >&6 | ||
16786 | +{ echo "$as_me:$LINENO: checking for GST_CHECK" >&5 | ||
16787 | +echo $ECHO_N "checking for GST_CHECK... $ECHO_C" >&6; } | ||
16788 | |||
16789 | if test -n "$PKG_CONFIG"; then | ||
16790 | if test -n "$PKG_CONFIG" && \ | ||
16791 | @@ -26712,8 +28861,8 @@ | ||
16792 | else | ||
16793 | GST_CHECK_CFLAGS=$pkg_cv_GST_CHECK_CFLAGS | ||
16794 | GST_CHECK_LIBS=$pkg_cv_GST_CHECK_LIBS | ||
16795 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
16796 | -echo "${ECHO_T}yes" >&6 | ||
16797 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
16798 | +echo "${ECHO_T}yes" >&6; } | ||
16799 | |||
16800 | HAVE_GST_CHECK="yes" | ||
16801 | |||
16802 | @@ -26734,24 +28883,24 @@ | ||
16803 | |||
16804 | |||
16805 | |||
16806 | -# Check whether --with-check or --without-check was given. | ||
16807 | +# Check whether --with-check was given. | ||
16808 | if test "${with_check+set}" = set; then | ||
16809 | - withval="$with_check" | ||
16810 | + withval=$with_check; | ||
16811 | +fi | ||
16812 | |||
16813 | -fi; | ||
16814 | |||
16815 | |||
16816 | -# Check whether --with-checklibname or --without-checklibname was given. | ||
16817 | +# Check whether --with-checklibname was given. | ||
16818 | if test "${with_checklibname+set}" = set; then | ||
16819 | - withval="$with_checklibname" | ||
16820 | + withval=$with_checklibname; | ||
16821 | +fi | ||
16822 | |||
16823 | -fi; | ||
16824 | |||
16825 | min_check_version=0.9.2 | ||
16826 | |||
16827 | if test x$with_check = xno; then | ||
16828 | - echo "$as_me:$LINENO: result: disabled" >&5 | ||
16829 | -echo "${ECHO_T}disabled" >&6 | ||
16830 | + { echo "$as_me:$LINENO: result: disabled" >&5 | ||
16831 | +echo "${ECHO_T}disabled" >&6; } | ||
16832 | HAVE_CHECK=no | ||
16833 | else | ||
16834 | if test "x$with_check" != x; then | ||
16835 | @@ -26778,8 +28927,8 @@ | ||
16836 | CFLAGS="$CFLAGS $CHECK_CFLAGS" | ||
16837 | LIBS="$CHECK_LIBS $LIBS" | ||
16838 | |||
16839 | - echo "$as_me:$LINENO: checking for check named $check_lib_name - version >= $min_check_version" >&5 | ||
16840 | -echo $ECHO_N "checking for check named $check_lib_name - version >= $min_check_version... $ECHO_C" >&6 | ||
16841 | + { echo "$as_me:$LINENO: checking for check named $check_lib_name - version >= $min_check_version" >&5 | ||
16842 | +echo $ECHO_N "checking for check named $check_lib_name - version >= $min_check_version... $ECHO_C" >&6; } | ||
16843 | |||
16844 | rm -f conf.check-test | ||
16845 | no_check= | ||
16846 | @@ -26846,13 +28995,22 @@ | ||
16847 | |||
16848 | _ACEOF | ||
16849 | rm -f conftest$ac_exeext | ||
16850 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
16851 | - (eval $ac_link) 2>&5 | ||
16852 | +if { (ac_try="$ac_link" | ||
16853 | +case "(($ac_try" in | ||
16854 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16855 | + *) ac_try_echo=$ac_try;; | ||
16856 | +esac | ||
16857 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16858 | + (eval "$ac_link") 2>&5 | ||
16859 | ac_status=$? | ||
16860 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16861 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
16862 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16863 | - (eval $ac_try) 2>&5 | ||
16864 | + { (case "(($ac_try" in | ||
16865 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16866 | + *) ac_try_echo=$ac_try;; | ||
16867 | +esac | ||
16868 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16869 | + (eval "$ac_try") 2>&5 | ||
16870 | ac_status=$? | ||
16871 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16872 | (exit $ac_status); }; }; then | ||
16873 | @@ -26865,19 +29023,21 @@ | ||
16874 | ( exit $ac_status ) | ||
16875 | no_check=yes | ||
16876 | fi | ||
16877 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
16878 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
16879 | fi | ||
16880 | |||
16881 | + | ||
16882 | + | ||
16883 | CFLAGS="$ac_save_CFLAGS" | ||
16884 | LIBS="$ac_save_LIBS" | ||
16885 | |||
16886 | if test "x$no_check" = x ; then | ||
16887 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
16888 | -echo "${ECHO_T}yes" >&6 | ||
16889 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
16890 | +echo "${ECHO_T}yes" >&6; } | ||
16891 | have_check=true | ||
16892 | else | ||
16893 | - echo "$as_me:$LINENO: result: no" >&5 | ||
16894 | -echo "${ECHO_T}no" >&6 | ||
16895 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
16896 | +echo "${ECHO_T}no" >&6; } | ||
16897 | if test -f conf.check-test ; then | ||
16898 | : | ||
16899 | else | ||
16900 | @@ -26905,23 +29065,36 @@ | ||
16901 | } | ||
16902 | _ACEOF | ||
16903 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
16904 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
16905 | - (eval $ac_link) 2>conftest.er1 | ||
16906 | +if { (ac_try="$ac_link" | ||
16907 | +case "(($ac_try" in | ||
16908 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16909 | + *) ac_try_echo=$ac_try;; | ||
16910 | +esac | ||
16911 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16912 | + (eval "$ac_link") 2>conftest.er1 | ||
16913 | ac_status=$? | ||
16914 | grep -v '^ *+' conftest.er1 >conftest.err | ||
16915 | rm -f conftest.er1 | ||
16916 | cat conftest.err >&5 | ||
16917 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16918 | (exit $ac_status); } && | ||
16919 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16920 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16921 | - (eval $ac_try) 2>&5 | ||
16922 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
16923 | + { (case "(($ac_try" in | ||
16924 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16925 | + *) ac_try_echo=$ac_try;; | ||
16926 | +esac | ||
16927 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16928 | + (eval "$ac_try") 2>&5 | ||
16929 | ac_status=$? | ||
16930 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16931 | (exit $ac_status); }; } && | ||
16932 | { ac_try='test -s conftest$ac_exeext' | ||
16933 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16934 | - (eval $ac_try) 2>&5 | ||
16935 | + { (case "(($ac_try" in | ||
16936 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16937 | + *) ac_try_echo=$ac_try;; | ||
16938 | +esac | ||
16939 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16940 | + (eval "$ac_try") 2>&5 | ||
16941 | ac_status=$? | ||
16942 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16943 | (exit $ac_status); }; }; then | ||
16944 | @@ -26937,10 +29110,11 @@ | ||
16945 | echo "$as_me: failed program was:" >&5 | ||
16946 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
16947 | |||
16948 | - echo "*** The test program failed to compile or link. See the file config.log for" | ||
16949 | + echo "*** The test program failed to compile or link. See the file config.log for" | ||
16950 | echo "*** the exact error that occured." | ||
16951 | fi | ||
16952 | -rm -f conftest.err conftest.$ac_objext \ | ||
16953 | + | ||
16954 | +rm -f core conftest.err conftest.$ac_objext \ | ||
16955 | conftest$ac_exeext conftest.$ac_ext | ||
16956 | |||
16957 | CFLAGS="$ac_save_CFLAGS" | ||
16958 | @@ -26972,8 +29146,8 @@ | ||
16959 | CFLAGS="$CFLAGS $CHECK_CFLAGS" | ||
16960 | LIBS="$CHECK_LIBS $LIBS" | ||
16961 | |||
16962 | - echo "$as_me:$LINENO: checking for check named $check_lib_name - version >= $min_check_version" >&5 | ||
16963 | -echo $ECHO_N "checking for check named $check_lib_name - version >= $min_check_version... $ECHO_C" >&6 | ||
16964 | + { echo "$as_me:$LINENO: checking for check named $check_lib_name - version >= $min_check_version" >&5 | ||
16965 | +echo $ECHO_N "checking for check named $check_lib_name - version >= $min_check_version... $ECHO_C" >&6; } | ||
16966 | |||
16967 | rm -f conf.check-test | ||
16968 | no_check= | ||
16969 | @@ -27040,13 +29214,22 @@ | ||
16970 | |||
16971 | _ACEOF | ||
16972 | rm -f conftest$ac_exeext | ||
16973 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
16974 | - (eval $ac_link) 2>&5 | ||
16975 | +if { (ac_try="$ac_link" | ||
16976 | +case "(($ac_try" in | ||
16977 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16978 | + *) ac_try_echo=$ac_try;; | ||
16979 | +esac | ||
16980 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16981 | + (eval "$ac_link") 2>&5 | ||
16982 | ac_status=$? | ||
16983 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16984 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
16985 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16986 | - (eval $ac_try) 2>&5 | ||
16987 | + { (case "(($ac_try" in | ||
16988 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
16989 | + *) ac_try_echo=$ac_try;; | ||
16990 | +esac | ||
16991 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
16992 | + (eval "$ac_try") 2>&5 | ||
16993 | ac_status=$? | ||
16994 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16995 | (exit $ac_status); }; }; then | ||
16996 | @@ -27059,19 +29242,21 @@ | ||
16997 | ( exit $ac_status ) | ||
16998 | no_check=yes | ||
16999 | fi | ||
17000 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
17001 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
17002 | fi | ||
17003 | |||
17004 | + | ||
17005 | + | ||
17006 | CFLAGS="$ac_save_CFLAGS" | ||
17007 | LIBS="$ac_save_LIBS" | ||
17008 | |||
17009 | if test "x$no_check" = x ; then | ||
17010 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
17011 | -echo "${ECHO_T}yes" >&6 | ||
17012 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
17013 | +echo "${ECHO_T}yes" >&6; } | ||
17014 | have_check=true | ||
17015 | else | ||
17016 | - echo "$as_me:$LINENO: result: no" >&5 | ||
17017 | -echo "${ECHO_T}no" >&6 | ||
17018 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
17019 | +echo "${ECHO_T}no" >&6; } | ||
17020 | if test -f conf.check-test ; then | ||
17021 | : | ||
17022 | else | ||
17023 | @@ -27099,23 +29284,36 @@ | ||
17024 | } | ||
17025 | _ACEOF | ||
17026 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
17027 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
17028 | - (eval $ac_link) 2>conftest.er1 | ||
17029 | +if { (ac_try="$ac_link" | ||
17030 | +case "(($ac_try" in | ||
17031 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17032 | + *) ac_try_echo=$ac_try;; | ||
17033 | +esac | ||
17034 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17035 | + (eval "$ac_link") 2>conftest.er1 | ||
17036 | ac_status=$? | ||
17037 | grep -v '^ *+' conftest.er1 >conftest.err | ||
17038 | rm -f conftest.er1 | ||
17039 | cat conftest.err >&5 | ||
17040 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17041 | (exit $ac_status); } && | ||
17042 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17043 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17044 | - (eval $ac_try) 2>&5 | ||
17045 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17046 | + { (case "(($ac_try" in | ||
17047 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17048 | + *) ac_try_echo=$ac_try;; | ||
17049 | +esac | ||
17050 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17051 | + (eval "$ac_try") 2>&5 | ||
17052 | ac_status=$? | ||
17053 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17054 | (exit $ac_status); }; } && | ||
17055 | { ac_try='test -s conftest$ac_exeext' | ||
17056 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17057 | - (eval $ac_try) 2>&5 | ||
17058 | + { (case "(($ac_try" in | ||
17059 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17060 | + *) ac_try_echo=$ac_try;; | ||
17061 | +esac | ||
17062 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17063 | + (eval "$ac_try") 2>&5 | ||
17064 | ac_status=$? | ||
17065 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17066 | (exit $ac_status); }; }; then | ||
17067 | @@ -27131,10 +29329,11 @@ | ||
17068 | echo "$as_me: failed program was:" >&5 | ||
17069 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
17070 | |||
17071 | - echo "*** The test program failed to compile or link. See the file config.log for" | ||
17072 | + echo "*** The test program failed to compile or link. See the file config.log for" | ||
17073 | echo "*** the exact error that occured." | ||
17074 | fi | ||
17075 | -rm -f conftest.err conftest.$ac_objext \ | ||
17076 | + | ||
17077 | +rm -f core conftest.err conftest.$ac_objext \ | ||
17078 | conftest$ac_exeext conftest.$ac_ext | ||
17079 | |||
17080 | CFLAGS="$ac_save_CFLAGS" | ||
17081 | @@ -27170,8 +29369,8 @@ | ||
17082 | CFLAGS="$CFLAGS $CHECK_CFLAGS" | ||
17083 | LIBS="$CHECK_LIBS $LIBS" | ||
17084 | |||
17085 | - echo "$as_me:$LINENO: checking for check named $check_lib_name - version >= $min_check_version" >&5 | ||
17086 | -echo $ECHO_N "checking for check named $check_lib_name - version >= $min_check_version... $ECHO_C" >&6 | ||
17087 | + { echo "$as_me:$LINENO: checking for check named $check_lib_name - version >= $min_check_version" >&5 | ||
17088 | +echo $ECHO_N "checking for check named $check_lib_name - version >= $min_check_version... $ECHO_C" >&6; } | ||
17089 | |||
17090 | rm -f conf.check-test | ||
17091 | no_check= | ||
17092 | @@ -27238,13 +29437,22 @@ | ||
17093 | |||
17094 | _ACEOF | ||
17095 | rm -f conftest$ac_exeext | ||
17096 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
17097 | - (eval $ac_link) 2>&5 | ||
17098 | +if { (ac_try="$ac_link" | ||
17099 | +case "(($ac_try" in | ||
17100 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17101 | + *) ac_try_echo=$ac_try;; | ||
17102 | +esac | ||
17103 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17104 | + (eval "$ac_link") 2>&5 | ||
17105 | ac_status=$? | ||
17106 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17107 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
17108 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17109 | - (eval $ac_try) 2>&5 | ||
17110 | + { (case "(($ac_try" in | ||
17111 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17112 | + *) ac_try_echo=$ac_try;; | ||
17113 | +esac | ||
17114 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17115 | + (eval "$ac_try") 2>&5 | ||
17116 | ac_status=$? | ||
17117 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17118 | (exit $ac_status); }; }; then | ||
17119 | @@ -27257,19 +29465,21 @@ | ||
17120 | ( exit $ac_status ) | ||
17121 | no_check=yes | ||
17122 | fi | ||
17123 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
17124 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
17125 | fi | ||
17126 | |||
17127 | + | ||
17128 | + | ||
17129 | CFLAGS="$ac_save_CFLAGS" | ||
17130 | LIBS="$ac_save_LIBS" | ||
17131 | |||
17132 | if test "x$no_check" = x ; then | ||
17133 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
17134 | -echo "${ECHO_T}yes" >&6 | ||
17135 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
17136 | +echo "${ECHO_T}yes" >&6; } | ||
17137 | have_check=true | ||
17138 | else | ||
17139 | - echo "$as_me:$LINENO: result: no" >&5 | ||
17140 | -echo "${ECHO_T}no" >&6 | ||
17141 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
17142 | +echo "${ECHO_T}no" >&6; } | ||
17143 | if test -f conf.check-test ; then | ||
17144 | : | ||
17145 | else | ||
17146 | @@ -27297,23 +29507,36 @@ | ||
17147 | } | ||
17148 | _ACEOF | ||
17149 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
17150 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
17151 | - (eval $ac_link) 2>conftest.er1 | ||
17152 | +if { (ac_try="$ac_link" | ||
17153 | +case "(($ac_try" in | ||
17154 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17155 | + *) ac_try_echo=$ac_try;; | ||
17156 | +esac | ||
17157 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17158 | + (eval "$ac_link") 2>conftest.er1 | ||
17159 | ac_status=$? | ||
17160 | grep -v '^ *+' conftest.er1 >conftest.err | ||
17161 | rm -f conftest.er1 | ||
17162 | cat conftest.err >&5 | ||
17163 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17164 | (exit $ac_status); } && | ||
17165 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17166 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17167 | - (eval $ac_try) 2>&5 | ||
17168 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17169 | + { (case "(($ac_try" in | ||
17170 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17171 | + *) ac_try_echo=$ac_try;; | ||
17172 | +esac | ||
17173 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17174 | + (eval "$ac_try") 2>&5 | ||
17175 | ac_status=$? | ||
17176 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17177 | (exit $ac_status); }; } && | ||
17178 | { ac_try='test -s conftest$ac_exeext' | ||
17179 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17180 | - (eval $ac_try) 2>&5 | ||
17181 | + { (case "(($ac_try" in | ||
17182 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17183 | + *) ac_try_echo=$ac_try;; | ||
17184 | +esac | ||
17185 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17186 | + (eval "$ac_try") 2>&5 | ||
17187 | ac_status=$? | ||
17188 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17189 | (exit $ac_status); }; }; then | ||
17190 | @@ -27329,10 +29552,11 @@ | ||
17191 | echo "$as_me: failed program was:" >&5 | ||
17192 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
17193 | |||
17194 | - echo "*** The test program failed to compile or link. See the file config.log for" | ||
17195 | + echo "*** The test program failed to compile or link. See the file config.log for" | ||
17196 | echo "*** the exact error that occured." | ||
17197 | fi | ||
17198 | -rm -f conftest.err conftest.$ac_objext \ | ||
17199 | + | ||
17200 | +rm -f core conftest.err conftest.$ac_objext \ | ||
17201 | conftest$ac_exeext conftest.$ac_ext | ||
17202 | |||
17203 | CFLAGS="$ac_save_CFLAGS" | ||
17204 | @@ -27377,8 +29601,8 @@ | ||
17205 | required=no | ||
17206 | |||
17207 | pkg_failed=no | ||
17208 | -echo "$as_me:$LINENO: checking for GST_PLUGINS_BASE" >&5 | ||
17209 | -echo $ECHO_N "checking for GST_PLUGINS_BASE... $ECHO_C" >&6 | ||
17210 | +{ echo "$as_me:$LINENO: checking for GST_PLUGINS_BASE" >&5 | ||
17211 | +echo $ECHO_N "checking for GST_PLUGINS_BASE... $ECHO_C" >&6; } | ||
17212 | |||
17213 | if test -n "$PKG_CONFIG"; then | ||
17214 | if test -n "$PKG_CONFIG" && \ | ||
17215 | @@ -27420,8 +29644,8 @@ | ||
17216 | else | ||
17217 | GST_PLUGINS_BASE_CFLAGS=$pkg_cv_GST_PLUGINS_BASE_CFLAGS | ||
17218 | GST_PLUGINS_BASE_LIBS=$pkg_cv_GST_PLUGINS_BASE_LIBS | ||
17219 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
17220 | -echo "${ECHO_T}yes" >&6 | ||
17221 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
17222 | +echo "${ECHO_T}yes" >&6; } | ||
17223 | |||
17224 | HAVE_GST_PLUGINS_BASE="yes" | ||
17225 | |||
17226 | @@ -27498,8 +29722,8 @@ | ||
17227 | |||
17228 | |||
17229 | |||
17230 | - echo "$as_me:$LINENO: checking to see if compiler understands -Wall" >&5 | ||
17231 | -echo $ECHO_N "checking to see if compiler understands -Wall... $ECHO_C" >&6 | ||
17232 | + { echo "$as_me:$LINENO: checking to see if compiler understands -Wall" >&5 | ||
17233 | +echo $ECHO_N "checking to see if compiler understands -Wall... $ECHO_C" >&6; } | ||
17234 | |||
17235 | save_CFLAGS="$CFLAGS" | ||
17236 | CFLAGS="$CFLAGS -Wall" | ||
17237 | @@ -27520,23 +29744,36 @@ | ||
17238 | } | ||
17239 | _ACEOF | ||
17240 | rm -f conftest.$ac_objext | ||
17241 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
17242 | - (eval $ac_compile) 2>conftest.er1 | ||
17243 | +if { (ac_try="$ac_compile" | ||
17244 | +case "(($ac_try" in | ||
17245 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17246 | + *) ac_try_echo=$ac_try;; | ||
17247 | +esac | ||
17248 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17249 | + (eval "$ac_compile") 2>conftest.er1 | ||
17250 | ac_status=$? | ||
17251 | grep -v '^ *+' conftest.er1 >conftest.err | ||
17252 | rm -f conftest.er1 | ||
17253 | cat conftest.err >&5 | ||
17254 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17255 | (exit $ac_status); } && | ||
17256 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17257 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17258 | - (eval $ac_try) 2>&5 | ||
17259 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17260 | + { (case "(($ac_try" in | ||
17261 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17262 | + *) ac_try_echo=$ac_try;; | ||
17263 | +esac | ||
17264 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17265 | + (eval "$ac_try") 2>&5 | ||
17266 | ac_status=$? | ||
17267 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17268 | (exit $ac_status); }; } && | ||
17269 | { ac_try='test -s conftest.$ac_objext' | ||
17270 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17271 | - (eval $ac_try) 2>&5 | ||
17272 | + { (case "(($ac_try" in | ||
17273 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17274 | + *) ac_try_echo=$ac_try;; | ||
17275 | +esac | ||
17276 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17277 | + (eval "$ac_try") 2>&5 | ||
17278 | ac_status=$? | ||
17279 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17280 | (exit $ac_status); }; }; then | ||
17281 | @@ -27545,9 +29782,10 @@ | ||
17282 | echo "$as_me: failed program was:" >&5 | ||
17283 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
17284 | |||
17285 | -flag_ok=no | ||
17286 | + flag_ok=no | ||
17287 | fi | ||
17288 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17289 | + | ||
17290 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17291 | CFLAGS="$save_CFLAGS" | ||
17292 | |||
17293 | if test "X$flag_ok" = Xyes ; then | ||
17294 | @@ -27557,15 +29795,15 @@ | ||
17295 | ERROR_CFLAGS="" | ||
17296 | true | ||
17297 | fi | ||
17298 | - echo "$as_me:$LINENO: result: $flag_ok" >&5 | ||
17299 | -echo "${ECHO_T}$flag_ok" >&6 | ||
17300 | + { echo "$as_me:$LINENO: result: $flag_ok" >&5 | ||
17301 | +echo "${ECHO_T}$flag_ok" >&6; } | ||
17302 | |||
17303 | |||
17304 | if test "x$GST_CVS" != "xno" | ||
17305 | then | ||
17306 | |||
17307 | - echo "$as_me:$LINENO: checking to see if compiler understands -Werror" >&5 | ||
17308 | -echo $ECHO_N "checking to see if compiler understands -Werror... $ECHO_C" >&6 | ||
17309 | + { echo "$as_me:$LINENO: checking to see if compiler understands -Werror" >&5 | ||
17310 | +echo $ECHO_N "checking to see if compiler understands -Werror... $ECHO_C" >&6; } | ||
17311 | |||
17312 | save_CFLAGS="$CFLAGS" | ||
17313 | CFLAGS="$CFLAGS -Werror" | ||
17314 | @@ -27586,23 +29824,36 @@ | ||
17315 | } | ||
17316 | _ACEOF | ||
17317 | rm -f conftest.$ac_objext | ||
17318 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
17319 | - (eval $ac_compile) 2>conftest.er1 | ||
17320 | +if { (ac_try="$ac_compile" | ||
17321 | +case "(($ac_try" in | ||
17322 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17323 | + *) ac_try_echo=$ac_try;; | ||
17324 | +esac | ||
17325 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17326 | + (eval "$ac_compile") 2>conftest.er1 | ||
17327 | ac_status=$? | ||
17328 | grep -v '^ *+' conftest.er1 >conftest.err | ||
17329 | rm -f conftest.er1 | ||
17330 | cat conftest.err >&5 | ||
17331 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17332 | (exit $ac_status); } && | ||
17333 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17334 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17335 | - (eval $ac_try) 2>&5 | ||
17336 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17337 | + { (case "(($ac_try" in | ||
17338 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17339 | + *) ac_try_echo=$ac_try;; | ||
17340 | +esac | ||
17341 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17342 | + (eval "$ac_try") 2>&5 | ||
17343 | ac_status=$? | ||
17344 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17345 | (exit $ac_status); }; } && | ||
17346 | { ac_try='test -s conftest.$ac_objext' | ||
17347 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17348 | - (eval $ac_try) 2>&5 | ||
17349 | + { (case "(($ac_try" in | ||
17350 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17351 | + *) ac_try_echo=$ac_try;; | ||
17352 | +esac | ||
17353 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17354 | + (eval "$ac_try") 2>&5 | ||
17355 | ac_status=$? | ||
17356 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17357 | (exit $ac_status); }; }; then | ||
17358 | @@ -27611,9 +29862,10 @@ | ||
17359 | echo "$as_me: failed program was:" >&5 | ||
17360 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
17361 | |||
17362 | -flag_ok=no | ||
17363 | + flag_ok=no | ||
17364 | fi | ||
17365 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17366 | + | ||
17367 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17368 | CFLAGS="$save_CFLAGS" | ||
17369 | |||
17370 | if test "X$flag_ok" = Xyes ; then | ||
17371 | @@ -27623,8 +29875,8 @@ | ||
17372 | |||
17373 | true | ||
17374 | fi | ||
17375 | - echo "$as_me:$LINENO: result: $flag_ok" >&5 | ||
17376 | -echo "${ECHO_T}$flag_ok" >&6 | ||
17377 | + { echo "$as_me:$LINENO: result: $flag_ok" >&5 | ||
17378 | +echo "${ECHO_T}$flag_ok" >&6; } | ||
17379 | |||
17380 | fi | ||
17381 | |||
17382 | @@ -27668,10 +29920,9 @@ | ||
17383 | if test "x$USE_OPENGL" = "xno"; then | ||
17384 | NOUSE="yes" | ||
17385 | fi | ||
17386 | -# Check whether --enable-opengl or --disable-opengl was given. | ||
17387 | +# Check whether --enable-opengl was given. | ||
17388 | if test "${enable_opengl+set}" = set; then | ||
17389 | - enableval="$enable_opengl" | ||
17390 | - case "${enableval}" in | ||
17391 | + enableval=$enable_opengl; case "${enableval}" in | ||
17392 | yes) USE_OPENGL=yes;; | ||
17393 | no) USE_OPENGL=no;; | ||
17394 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-opengl" >&5 | ||
17395 | @@ -27680,7 +29931,8 @@ | ||
17396 | esac | ||
17397 | else | ||
17398 | USE_OPENGL=yes | ||
17399 | -fi; | ||
17400 | +fi | ||
17401 | + | ||
17402 | if test "x$NOUSE" = "xyes"; then | ||
17403 | USE_OPENGL="no" | ||
17404 | { echo "$as_me:$LINENO: WARNING: *** glsink pre-configured not to be built" >&5 | ||
17405 | @@ -27700,8 +29952,8 @@ | ||
17406 | HAVE_OPENGL=no | ||
17407 | |||
17408 | |||
17409 | - echo "$as_me:$LINENO: checking for glTexImage2D in -lGL" >&5 | ||
17410 | -echo $ECHO_N "checking for glTexImage2D in -lGL... $ECHO_C" >&6 | ||
17411 | + { echo "$as_me:$LINENO: checking for glTexImage2D in -lGL" >&5 | ||
17412 | +echo $ECHO_N "checking for glTexImage2D in -lGL... $ECHO_C" >&6; } | ||
17413 | if test "${ac_cv_lib_GL_glTexImage2D+set}" = set; then | ||
17414 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
17415 | else | ||
17416 | @@ -27714,39 +29966,52 @@ | ||
17417 | cat >>conftest.$ac_ext <<_ACEOF | ||
17418 | /* end confdefs.h. */ | ||
17419 | |||
17420 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
17421 | +/* Override any GCC internal prototype to avoid an error. | ||
17422 | + Use char because int might match the return type of a GCC | ||
17423 | + builtin and then its argument prototype would still apply. */ | ||
17424 | #ifdef __cplusplus | ||
17425 | extern "C" | ||
17426 | #endif | ||
17427 | -/* We use char because int might match the return type of a gcc2 | ||
17428 | - builtin and then its argument prototype would still apply. */ | ||
17429 | char glTexImage2D (); | ||
17430 | int | ||
17431 | main () | ||
17432 | { | ||
17433 | -glTexImage2D (); | ||
17434 | +return glTexImage2D (); | ||
17435 | ; | ||
17436 | return 0; | ||
17437 | } | ||
17438 | _ACEOF | ||
17439 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
17440 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
17441 | - (eval $ac_link) 2>conftest.er1 | ||
17442 | +if { (ac_try="$ac_link" | ||
17443 | +case "(($ac_try" in | ||
17444 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17445 | + *) ac_try_echo=$ac_try;; | ||
17446 | +esac | ||
17447 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17448 | + (eval "$ac_link") 2>conftest.er1 | ||
17449 | ac_status=$? | ||
17450 | grep -v '^ *+' conftest.er1 >conftest.err | ||
17451 | rm -f conftest.er1 | ||
17452 | cat conftest.err >&5 | ||
17453 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17454 | (exit $ac_status); } && | ||
17455 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17456 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17457 | - (eval $ac_try) 2>&5 | ||
17458 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17459 | + { (case "(($ac_try" in | ||
17460 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17461 | + *) ac_try_echo=$ac_try;; | ||
17462 | +esac | ||
17463 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17464 | + (eval "$ac_try") 2>&5 | ||
17465 | ac_status=$? | ||
17466 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17467 | (exit $ac_status); }; } && | ||
17468 | { ac_try='test -s conftest$ac_exeext' | ||
17469 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17470 | - (eval $ac_try) 2>&5 | ||
17471 | + { (case "(($ac_try" in | ||
17472 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17473 | + *) ac_try_echo=$ac_try;; | ||
17474 | +esac | ||
17475 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17476 | + (eval "$ac_try") 2>&5 | ||
17477 | ac_status=$? | ||
17478 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17479 | (exit $ac_status); }; }; then | ||
17480 | @@ -27755,14 +30020,15 @@ | ||
17481 | echo "$as_me: failed program was:" >&5 | ||
17482 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
17483 | |||
17484 | -ac_cv_lib_GL_glTexImage2D=no | ||
17485 | + ac_cv_lib_GL_glTexImage2D=no | ||
17486 | fi | ||
17487 | -rm -f conftest.err conftest.$ac_objext \ | ||
17488 | + | ||
17489 | +rm -f core conftest.err conftest.$ac_objext \ | ||
17490 | conftest$ac_exeext conftest.$ac_ext | ||
17491 | LIBS=$ac_check_lib_save_LIBS | ||
17492 | fi | ||
17493 | -echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glTexImage2D" >&5 | ||
17494 | -echo "${ECHO_T}$ac_cv_lib_GL_glTexImage2D" >&6 | ||
17495 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glTexImage2D" >&5 | ||
17496 | +echo "${ECHO_T}$ac_cv_lib_GL_glTexImage2D" >&6; } | ||
17497 | if test $ac_cv_lib_GL_glTexImage2D = yes; then | ||
17498 | HAVE_GL=yes | ||
17499 | else | ||
17500 | @@ -27771,17 +30037,17 @@ | ||
17501 | |||
17502 | if test "x$HAVE_GL" = "xyes"; then | ||
17503 | if test "${ac_cv_header_GL_gl_h+set}" = set; then | ||
17504 | - echo "$as_me:$LINENO: checking for GL/gl.h" >&5 | ||
17505 | -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 | ||
17506 | + { echo "$as_me:$LINENO: checking for GL/gl.h" >&5 | ||
17507 | +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; } | ||
17508 | if test "${ac_cv_header_GL_gl_h+set}" = set; then | ||
17509 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
17510 | fi | ||
17511 | -echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 | ||
17512 | -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 | ||
17513 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 | ||
17514 | +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; } | ||
17515 | else | ||
17516 | # Is the header compilable? | ||
17517 | -echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 | ||
17518 | -echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6 | ||
17519 | +{ echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 | ||
17520 | +echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6; } | ||
17521 | cat >conftest.$ac_ext <<_ACEOF | ||
17522 | /* confdefs.h. */ | ||
17523 | _ACEOF | ||
17524 | @@ -27792,23 +30058,36 @@ | ||
17525 | #include <GL/gl.h> | ||
17526 | _ACEOF | ||
17527 | rm -f conftest.$ac_objext | ||
17528 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
17529 | - (eval $ac_compile) 2>conftest.er1 | ||
17530 | +if { (ac_try="$ac_compile" | ||
17531 | +case "(($ac_try" in | ||
17532 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17533 | + *) ac_try_echo=$ac_try;; | ||
17534 | +esac | ||
17535 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17536 | + (eval "$ac_compile") 2>conftest.er1 | ||
17537 | ac_status=$? | ||
17538 | grep -v '^ *+' conftest.er1 >conftest.err | ||
17539 | rm -f conftest.er1 | ||
17540 | cat conftest.err >&5 | ||
17541 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17542 | (exit $ac_status); } && | ||
17543 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17544 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17545 | - (eval $ac_try) 2>&5 | ||
17546 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17547 | + { (case "(($ac_try" in | ||
17548 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17549 | + *) ac_try_echo=$ac_try;; | ||
17550 | +esac | ||
17551 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17552 | + (eval "$ac_try") 2>&5 | ||
17553 | ac_status=$? | ||
17554 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17555 | (exit $ac_status); }; } && | ||
17556 | { ac_try='test -s conftest.$ac_objext' | ||
17557 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17558 | - (eval $ac_try) 2>&5 | ||
17559 | + { (case "(($ac_try" in | ||
17560 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17561 | + *) ac_try_echo=$ac_try;; | ||
17562 | +esac | ||
17563 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17564 | + (eval "$ac_try") 2>&5 | ||
17565 | ac_status=$? | ||
17566 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17567 | (exit $ac_status); }; }; then | ||
17568 | @@ -27817,15 +30096,16 @@ | ||
17569 | echo "$as_me: failed program was:" >&5 | ||
17570 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
17571 | |||
17572 | -ac_header_compiler=no | ||
17573 | + ac_header_compiler=no | ||
17574 | fi | ||
17575 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17576 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
17577 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
17578 | + | ||
17579 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17580 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
17581 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
17582 | |||
17583 | # Is the header present? | ||
17584 | -echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 | ||
17585 | -echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6 | ||
17586 | +{ echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 | ||
17587 | +echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6; } | ||
17588 | cat >conftest.$ac_ext <<_ACEOF | ||
17589 | /* confdefs.h. */ | ||
17590 | _ACEOF | ||
17591 | @@ -27834,8 +30114,13 @@ | ||
17592 | /* end confdefs.h. */ | ||
17593 | #include <GL/gl.h> | ||
17594 | _ACEOF | ||
17595 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
17596 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
17597 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
17598 | +case "(($ac_try" in | ||
17599 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17600 | + *) ac_try_echo=$ac_try;; | ||
17601 | +esac | ||
17602 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17603 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
17604 | ac_status=$? | ||
17605 | grep -v '^ *+' conftest.er1 >conftest.err | ||
17606 | rm -f conftest.er1 | ||
17607 | @@ -27859,9 +30144,10 @@ | ||
17608 | |||
17609 | ac_header_preproc=no | ||
17610 | fi | ||
17611 | + | ||
17612 | rm -f conftest.err conftest.$ac_ext | ||
17613 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
17614 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
17615 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
17616 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
17617 | |||
17618 | # So? What about this header? | ||
17619 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
17620 | @@ -27885,25 +30171,23 @@ | ||
17621 | echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} | ||
17622 | { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5 | ||
17623 | echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;} | ||
17624 | - ( | ||
17625 | - cat <<\_ASBOX | ||
17626 | + ( cat <<\_ASBOX | ||
17627 | ## ------------------------------------------------------------------------ ## | ||
17628 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
17629 | ## ------------------------------------------------------------------------ ## | ||
17630 | _ASBOX | ||
17631 | - ) | | ||
17632 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
17633 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
17634 | ;; | ||
17635 | esac | ||
17636 | -echo "$as_me:$LINENO: checking for GL/gl.h" >&5 | ||
17637 | -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 | ||
17638 | +{ echo "$as_me:$LINENO: checking for GL/gl.h" >&5 | ||
17639 | +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; } | ||
17640 | if test "${ac_cv_header_GL_gl_h+set}" = set; then | ||
17641 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
17642 | else | ||
17643 | ac_cv_header_GL_gl_h=$ac_header_preproc | ||
17644 | fi | ||
17645 | -echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 | ||
17646 | -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 | ||
17647 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 | ||
17648 | +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; } | ||
17649 | |||
17650 | fi | ||
17651 | if test $ac_cv_header_GL_gl_h = yes; then | ||
17652 | @@ -27975,10 +30259,9 @@ | ||
17653 | if test "x$USE_GST_V4L2" = "xno"; then | ||
17654 | NOUSE="yes" | ||
17655 | fi | ||
17656 | -# Check whether --enable-gst_v4l2 or --disable-gst_v4l2 was given. | ||
17657 | +# Check whether --enable-gst_v4l2 was given. | ||
17658 | if test "${enable_gst_v4l2+set}" = set; then | ||
17659 | - enableval="$enable_gst_v4l2" | ||
17660 | - case "${enableval}" in | ||
17661 | + enableval=$enable_gst_v4l2; case "${enableval}" in | ||
17662 | yes) USE_GST_V4L2=yes;; | ||
17663 | no) USE_GST_V4L2=no;; | ||
17664 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-gst_v4l2" >&5 | ||
17665 | @@ -27987,7 +30270,8 @@ | ||
17666 | esac | ||
17667 | else | ||
17668 | USE_GST_V4L2=yes | ||
17669 | -fi; | ||
17670 | +fi | ||
17671 | + | ||
17672 | if test "x$NOUSE" = "xyes"; then | ||
17673 | USE_GST_V4L2="no" | ||
17674 | { echo "$as_me:$LINENO: WARNING: *** v4l2src pre-configured not to be built" >&5 | ||
17675 | @@ -28006,8 +30290,8 @@ | ||
17676 | |||
17677 | HAVE_GST_V4L2=no | ||
17678 | |||
17679 | - echo "$as_me:$LINENO: checking Checking for uptodate v4l2 installation" >&5 | ||
17680 | -echo $ECHO_N "checking Checking for uptodate v4l2 installation... $ECHO_C" >&6 | ||
17681 | + { echo "$as_me:$LINENO: checking Checking for uptodate v4l2 installation" >&5 | ||
17682 | +echo $ECHO_N "checking Checking for uptodate v4l2 installation... $ECHO_C" >&6; } | ||
17683 | cat >conftest.$ac_ext <<_ACEOF | ||
17684 | /* confdefs.h. */ | ||
17685 | _ACEOF | ||
17686 | @@ -28035,30 +30319,43 @@ | ||
17687 | } | ||
17688 | _ACEOF | ||
17689 | rm -f conftest.$ac_objext | ||
17690 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
17691 | - (eval $ac_compile) 2>conftest.er1 | ||
17692 | +if { (ac_try="$ac_compile" | ||
17693 | +case "(($ac_try" in | ||
17694 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17695 | + *) ac_try_echo=$ac_try;; | ||
17696 | +esac | ||
17697 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17698 | + (eval "$ac_compile") 2>conftest.er1 | ||
17699 | ac_status=$? | ||
17700 | grep -v '^ *+' conftest.er1 >conftest.err | ||
17701 | rm -f conftest.er1 | ||
17702 | cat conftest.err >&5 | ||
17703 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17704 | (exit $ac_status); } && | ||
17705 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17706 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17707 | - (eval $ac_try) 2>&5 | ||
17708 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17709 | + { (case "(($ac_try" in | ||
17710 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17711 | + *) ac_try_echo=$ac_try;; | ||
17712 | +esac | ||
17713 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17714 | + (eval "$ac_try") 2>&5 | ||
17715 | ac_status=$? | ||
17716 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17717 | (exit $ac_status); }; } && | ||
17718 | { ac_try='test -s conftest.$ac_objext' | ||
17719 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17720 | - (eval $ac_try) 2>&5 | ||
17721 | + { (case "(($ac_try" in | ||
17722 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17723 | + *) ac_try_echo=$ac_try;; | ||
17724 | +esac | ||
17725 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17726 | + (eval "$ac_try") 2>&5 | ||
17727 | ac_status=$? | ||
17728 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17729 | (exit $ac_status); }; }; then | ||
17730 | |||
17731 | HAVE_GST_V4L2="yes" | ||
17732 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
17733 | -echo "${ECHO_T}yes" >&6 | ||
17734 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
17735 | +echo "${ECHO_T}yes" >&6; } | ||
17736 | |||
17737 | else | ||
17738 | echo "$as_me: failed program was:" >&5 | ||
17739 | @@ -28066,20 +30363,20 @@ | ||
17740 | |||
17741 | |||
17742 | HAVE_GST_V4L2="no" | ||
17743 | - echo "$as_me:$LINENO: result: no" >&5 | ||
17744 | -echo "${ECHO_T}no" >&6 | ||
17745 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
17746 | +echo "${ECHO_T}no" >&6; } | ||
17747 | if test "${ac_cv_header_linux_videodev2_h+set}" = set; then | ||
17748 | - echo "$as_me:$LINENO: checking for linux/videodev2.h" >&5 | ||
17749 | -echo $ECHO_N "checking for linux/videodev2.h... $ECHO_C" >&6 | ||
17750 | + { echo "$as_me:$LINENO: checking for linux/videodev2.h" >&5 | ||
17751 | +echo $ECHO_N "checking for linux/videodev2.h... $ECHO_C" >&6; } | ||
17752 | if test "${ac_cv_header_linux_videodev2_h+set}" = set; then | ||
17753 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
17754 | fi | ||
17755 | -echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev2_h" >&5 | ||
17756 | -echo "${ECHO_T}$ac_cv_header_linux_videodev2_h" >&6 | ||
17757 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev2_h" >&5 | ||
17758 | +echo "${ECHO_T}$ac_cv_header_linux_videodev2_h" >&6; } | ||
17759 | else | ||
17760 | # Is the header compilable? | ||
17761 | -echo "$as_me:$LINENO: checking linux/videodev2.h usability" >&5 | ||
17762 | -echo $ECHO_N "checking linux/videodev2.h usability... $ECHO_C" >&6 | ||
17763 | +{ echo "$as_me:$LINENO: checking linux/videodev2.h usability" >&5 | ||
17764 | +echo $ECHO_N "checking linux/videodev2.h usability... $ECHO_C" >&6; } | ||
17765 | cat >conftest.$ac_ext <<_ACEOF | ||
17766 | /* confdefs.h. */ | ||
17767 | _ACEOF | ||
17768 | @@ -28090,23 +30387,36 @@ | ||
17769 | #include <linux/videodev2.h> | ||
17770 | _ACEOF | ||
17771 | rm -f conftest.$ac_objext | ||
17772 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
17773 | - (eval $ac_compile) 2>conftest.er1 | ||
17774 | +if { (ac_try="$ac_compile" | ||
17775 | +case "(($ac_try" in | ||
17776 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17777 | + *) ac_try_echo=$ac_try;; | ||
17778 | +esac | ||
17779 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17780 | + (eval "$ac_compile") 2>conftest.er1 | ||
17781 | ac_status=$? | ||
17782 | grep -v '^ *+' conftest.er1 >conftest.err | ||
17783 | rm -f conftest.er1 | ||
17784 | cat conftest.err >&5 | ||
17785 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17786 | (exit $ac_status); } && | ||
17787 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17788 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17789 | - (eval $ac_try) 2>&5 | ||
17790 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17791 | + { (case "(($ac_try" in | ||
17792 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17793 | + *) ac_try_echo=$ac_try;; | ||
17794 | +esac | ||
17795 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17796 | + (eval "$ac_try") 2>&5 | ||
17797 | ac_status=$? | ||
17798 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17799 | (exit $ac_status); }; } && | ||
17800 | { ac_try='test -s conftest.$ac_objext' | ||
17801 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17802 | - (eval $ac_try) 2>&5 | ||
17803 | + { (case "(($ac_try" in | ||
17804 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17805 | + *) ac_try_echo=$ac_try;; | ||
17806 | +esac | ||
17807 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17808 | + (eval "$ac_try") 2>&5 | ||
17809 | ac_status=$? | ||
17810 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17811 | (exit $ac_status); }; }; then | ||
17812 | @@ -28115,15 +30425,16 @@ | ||
17813 | echo "$as_me: failed program was:" >&5 | ||
17814 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
17815 | |||
17816 | -ac_header_compiler=no | ||
17817 | + ac_header_compiler=no | ||
17818 | fi | ||
17819 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17820 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
17821 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
17822 | + | ||
17823 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17824 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
17825 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
17826 | |||
17827 | # Is the header present? | ||
17828 | -echo "$as_me:$LINENO: checking linux/videodev2.h presence" >&5 | ||
17829 | -echo $ECHO_N "checking linux/videodev2.h presence... $ECHO_C" >&6 | ||
17830 | +{ echo "$as_me:$LINENO: checking linux/videodev2.h presence" >&5 | ||
17831 | +echo $ECHO_N "checking linux/videodev2.h presence... $ECHO_C" >&6; } | ||
17832 | cat >conftest.$ac_ext <<_ACEOF | ||
17833 | /* confdefs.h. */ | ||
17834 | _ACEOF | ||
17835 | @@ -28132,8 +30443,13 @@ | ||
17836 | /* end confdefs.h. */ | ||
17837 | #include <linux/videodev2.h> | ||
17838 | _ACEOF | ||
17839 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
17840 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
17841 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
17842 | +case "(($ac_try" in | ||
17843 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17844 | + *) ac_try_echo=$ac_try;; | ||
17845 | +esac | ||
17846 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17847 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
17848 | ac_status=$? | ||
17849 | grep -v '^ *+' conftest.er1 >conftest.err | ||
17850 | rm -f conftest.er1 | ||
17851 | @@ -28157,9 +30473,10 @@ | ||
17852 | |||
17853 | ac_header_preproc=no | ||
17854 | fi | ||
17855 | + | ||
17856 | rm -f conftest.err conftest.$ac_ext | ||
17857 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
17858 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
17859 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
17860 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
17861 | |||
17862 | # So? What about this header? | ||
17863 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
17864 | @@ -28183,25 +30500,23 @@ | ||
17865 | echo "$as_me: WARNING: linux/videodev2.h: proceeding with the preprocessor's result" >&2;} | ||
17866 | { echo "$as_me:$LINENO: WARNING: linux/videodev2.h: in the future, the compiler will take precedence" >&5 | ||
17867 | echo "$as_me: WARNING: linux/videodev2.h: in the future, the compiler will take precedence" >&2;} | ||
17868 | - ( | ||
17869 | - cat <<\_ASBOX | ||
17870 | + ( cat <<\_ASBOX | ||
17871 | ## ------------------------------------------------------------------------ ## | ||
17872 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
17873 | ## ------------------------------------------------------------------------ ## | ||
17874 | _ASBOX | ||
17875 | - ) | | ||
17876 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
17877 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
17878 | ;; | ||
17879 | esac | ||
17880 | -echo "$as_me:$LINENO: checking for linux/videodev2.h" >&5 | ||
17881 | -echo $ECHO_N "checking for linux/videodev2.h... $ECHO_C" >&6 | ||
17882 | +{ echo "$as_me:$LINENO: checking for linux/videodev2.h" >&5 | ||
17883 | +echo $ECHO_N "checking for linux/videodev2.h... $ECHO_C" >&6; } | ||
17884 | if test "${ac_cv_header_linux_videodev2_h+set}" = set; then | ||
17885 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
17886 | else | ||
17887 | ac_cv_header_linux_videodev2_h=$ac_header_preproc | ||
17888 | fi | ||
17889 | -echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev2_h" >&5 | ||
17890 | -echo "${ECHO_T}$ac_cv_header_linux_videodev2_h" >&6 | ||
17891 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev2_h" >&5 | ||
17892 | +echo "${ECHO_T}$ac_cv_header_linux_videodev2_h" >&6; } | ||
17893 | |||
17894 | fi | ||
17895 | if test $ac_cv_header_linux_videodev2_h = yes; then | ||
17896 | @@ -28221,12 +30536,13 @@ | ||
17897 | |||
17898 | |||
17899 | fi | ||
17900 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17901 | + | ||
17902 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17903 | |||
17904 | if test x$HAVE_GST_V4L2 = xyes ; then | ||
17905 | MISSING_DECL=0 | ||
17906 | - echo "$as_me:$LINENO: checking struct v4l2_buffer declaration" >&5 | ||
17907 | -echo $ECHO_N "checking struct v4l2_buffer declaration... $ECHO_C" >&6 | ||
17908 | + { echo "$as_me:$LINENO: checking struct v4l2_buffer declaration" >&5 | ||
17909 | +echo $ECHO_N "checking struct v4l2_buffer declaration... $ECHO_C" >&6; } | ||
17910 | cat >conftest.$ac_ext <<_ACEOF | ||
17911 | /* confdefs.h. */ | ||
17912 | _ACEOF | ||
17913 | @@ -28253,36 +30569,50 @@ | ||
17914 | } | ||
17915 | _ACEOF | ||
17916 | rm -f conftest.$ac_objext | ||
17917 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
17918 | - (eval $ac_compile) 2>conftest.er1 | ||
17919 | +if { (ac_try="$ac_compile" | ||
17920 | +case "(($ac_try" in | ||
17921 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17922 | + *) ac_try_echo=$ac_try;; | ||
17923 | +esac | ||
17924 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17925 | + (eval "$ac_compile") 2>conftest.er1 | ||
17926 | ac_status=$? | ||
17927 | grep -v '^ *+' conftest.er1 >conftest.err | ||
17928 | rm -f conftest.er1 | ||
17929 | cat conftest.err >&5 | ||
17930 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17931 | (exit $ac_status); } && | ||
17932 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17933 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17934 | - (eval $ac_try) 2>&5 | ||
17935 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
17936 | + { (case "(($ac_try" in | ||
17937 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17938 | + *) ac_try_echo=$ac_try;; | ||
17939 | +esac | ||
17940 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17941 | + (eval "$ac_try") 2>&5 | ||
17942 | ac_status=$? | ||
17943 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17944 | (exit $ac_status); }; } && | ||
17945 | { ac_try='test -s conftest.$ac_objext' | ||
17946 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17947 | - (eval $ac_try) 2>&5 | ||
17948 | + { (case "(($ac_try" in | ||
17949 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17950 | + *) ac_try_echo=$ac_try;; | ||
17951 | +esac | ||
17952 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17953 | + (eval "$ac_try") 2>&5 | ||
17954 | ac_status=$? | ||
17955 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17956 | (exit $ac_status); }; }; then | ||
17957 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
17958 | -echo "${ECHO_T}yes" >&6 | ||
17959 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
17960 | +echo "${ECHO_T}yes" >&6; } | ||
17961 | else | ||
17962 | echo "$as_me: failed program was:" >&5 | ||
17963 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
17964 | |||
17965 | - MISSING_DECL=1 && echo "$as_me:$LINENO: result: no" >&5 | ||
17966 | -echo "${ECHO_T}no" >&6 | ||
17967 | + MISSING_DECL=1 && { echo "$as_me:$LINENO: result: no" >&5 | ||
17968 | +echo "${ECHO_T}no" >&6; } | ||
17969 | fi | ||
17970 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17971 | + | ||
17972 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
17973 | if test x$MISSING_DECL = x1 ; then | ||
17974 | |||
17975 | cat >>confdefs.h <<\_ACEOF | ||
17976 | @@ -28293,8 +30623,8 @@ | ||
17977 | |||
17978 | |||
17979 | if test x$HAVE_X = xyes; then | ||
17980 | - echo "$as_me:$LINENO: checking for XvQueryExtension in -lXv_pic" >&5 | ||
17981 | -echo $ECHO_N "checking for XvQueryExtension in -lXv_pic... $ECHO_C" >&6 | ||
17982 | + { echo "$as_me:$LINENO: checking for XvQueryExtension in -lXv_pic" >&5 | ||
17983 | +echo $ECHO_N "checking for XvQueryExtension in -lXv_pic... $ECHO_C" >&6; } | ||
17984 | if test "${ac_cv_lib_Xv_pic_XvQueryExtension+set}" = set; then | ||
17985 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
17986 | else | ||
17987 | @@ -28307,39 +30637,52 @@ | ||
17988 | cat >>conftest.$ac_ext <<_ACEOF | ||
17989 | /* end confdefs.h. */ | ||
17990 | |||
17991 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
17992 | +/* Override any GCC internal prototype to avoid an error. | ||
17993 | + Use char because int might match the return type of a GCC | ||
17994 | + builtin and then its argument prototype would still apply. */ | ||
17995 | #ifdef __cplusplus | ||
17996 | extern "C" | ||
17997 | #endif | ||
17998 | -/* We use char because int might match the return type of a gcc2 | ||
17999 | - builtin and then its argument prototype would still apply. */ | ||
18000 | char XvQueryExtension (); | ||
18001 | int | ||
18002 | main () | ||
18003 | { | ||
18004 | -XvQueryExtension (); | ||
18005 | +return XvQueryExtension (); | ||
18006 | ; | ||
18007 | return 0; | ||
18008 | } | ||
18009 | _ACEOF | ||
18010 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
18011 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
18012 | - (eval $ac_link) 2>conftest.er1 | ||
18013 | +if { (ac_try="$ac_link" | ||
18014 | +case "(($ac_try" in | ||
18015 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18016 | + *) ac_try_echo=$ac_try;; | ||
18017 | +esac | ||
18018 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18019 | + (eval "$ac_link") 2>conftest.er1 | ||
18020 | ac_status=$? | ||
18021 | grep -v '^ *+' conftest.er1 >conftest.err | ||
18022 | rm -f conftest.er1 | ||
18023 | cat conftest.err >&5 | ||
18024 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18025 | (exit $ac_status); } && | ||
18026 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18027 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18028 | - (eval $ac_try) 2>&5 | ||
18029 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18030 | + { (case "(($ac_try" in | ||
18031 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18032 | + *) ac_try_echo=$ac_try;; | ||
18033 | +esac | ||
18034 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18035 | + (eval "$ac_try") 2>&5 | ||
18036 | ac_status=$? | ||
18037 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18038 | (exit $ac_status); }; } && | ||
18039 | { ac_try='test -s conftest$ac_exeext' | ||
18040 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18041 | - (eval $ac_try) 2>&5 | ||
18042 | + { (case "(($ac_try" in | ||
18043 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18044 | + *) ac_try_echo=$ac_try;; | ||
18045 | +esac | ||
18046 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18047 | + (eval "$ac_try") 2>&5 | ||
18048 | ac_status=$? | ||
18049 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18050 | (exit $ac_status); }; }; then | ||
18051 | @@ -28348,14 +30691,15 @@ | ||
18052 | echo "$as_me: failed program was:" >&5 | ||
18053 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
18054 | |||
18055 | -ac_cv_lib_Xv_pic_XvQueryExtension=no | ||
18056 | + ac_cv_lib_Xv_pic_XvQueryExtension=no | ||
18057 | fi | ||
18058 | -rm -f conftest.err conftest.$ac_objext \ | ||
18059 | + | ||
18060 | +rm -f core conftest.err conftest.$ac_objext \ | ||
18061 | conftest$ac_exeext conftest.$ac_ext | ||
18062 | LIBS=$ac_check_lib_save_LIBS | ||
18063 | fi | ||
18064 | -echo "$as_me:$LINENO: result: $ac_cv_lib_Xv_pic_XvQueryExtension" >&5 | ||
18065 | -echo "${ECHO_T}$ac_cv_lib_Xv_pic_XvQueryExtension" >&6 | ||
18066 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xv_pic_XvQueryExtension" >&5 | ||
18067 | +echo "${ECHO_T}$ac_cv_lib_Xv_pic_XvQueryExtension" >&6; } | ||
18068 | if test $ac_cv_lib_Xv_pic_XvQueryExtension = yes; then | ||
18069 | HAVE_XVIDEO="yes" | ||
18070 | else | ||
18071 | @@ -28368,8 +30712,8 @@ | ||
18072 | |||
18073 | else | ||
18074 | if test x$HAVE_XVIDEO = xno; then | ||
18075 | - echo "$as_me:$LINENO: checking for XvQueryExtension in -lXv" >&5 | ||
18076 | -echo $ECHO_N "checking for XvQueryExtension in -lXv... $ECHO_C" >&6 | ||
18077 | + { echo "$as_me:$LINENO: checking for XvQueryExtension in -lXv" >&5 | ||
18078 | +echo $ECHO_N "checking for XvQueryExtension in -lXv... $ECHO_C" >&6; } | ||
18079 | if test "${ac_cv_lib_Xv_XvQueryExtension+set}" = set; then | ||
18080 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
18081 | else | ||
18082 | @@ -28382,39 +30726,52 @@ | ||
18083 | cat >>conftest.$ac_ext <<_ACEOF | ||
18084 | /* end confdefs.h. */ | ||
18085 | |||
18086 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
18087 | +/* Override any GCC internal prototype to avoid an error. | ||
18088 | + Use char because int might match the return type of a GCC | ||
18089 | + builtin and then its argument prototype would still apply. */ | ||
18090 | #ifdef __cplusplus | ||
18091 | extern "C" | ||
18092 | #endif | ||
18093 | -/* We use char because int might match the return type of a gcc2 | ||
18094 | - builtin and then its argument prototype would still apply. */ | ||
18095 | char XvQueryExtension (); | ||
18096 | int | ||
18097 | main () | ||
18098 | { | ||
18099 | -XvQueryExtension (); | ||
18100 | +return XvQueryExtension (); | ||
18101 | ; | ||
18102 | return 0; | ||
18103 | } | ||
18104 | _ACEOF | ||
18105 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
18106 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
18107 | - (eval $ac_link) 2>conftest.er1 | ||
18108 | +if { (ac_try="$ac_link" | ||
18109 | +case "(($ac_try" in | ||
18110 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18111 | + *) ac_try_echo=$ac_try;; | ||
18112 | +esac | ||
18113 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18114 | + (eval "$ac_link") 2>conftest.er1 | ||
18115 | ac_status=$? | ||
18116 | grep -v '^ *+' conftest.er1 >conftest.err | ||
18117 | rm -f conftest.er1 | ||
18118 | cat conftest.err >&5 | ||
18119 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18120 | (exit $ac_status); } && | ||
18121 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18122 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18123 | - (eval $ac_try) 2>&5 | ||
18124 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18125 | + { (case "(($ac_try" in | ||
18126 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18127 | + *) ac_try_echo=$ac_try;; | ||
18128 | +esac | ||
18129 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18130 | + (eval "$ac_try") 2>&5 | ||
18131 | ac_status=$? | ||
18132 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18133 | (exit $ac_status); }; } && | ||
18134 | { ac_try='test -s conftest$ac_exeext' | ||
18135 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18136 | - (eval $ac_try) 2>&5 | ||
18137 | + { (case "(($ac_try" in | ||
18138 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18139 | + *) ac_try_echo=$ac_try;; | ||
18140 | +esac | ||
18141 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18142 | + (eval "$ac_try") 2>&5 | ||
18143 | ac_status=$? | ||
18144 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18145 | (exit $ac_status); }; }; then | ||
18146 | @@ -28423,14 +30780,15 @@ | ||
18147 | echo "$as_me: failed program was:" >&5 | ||
18148 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
18149 | |||
18150 | -ac_cv_lib_Xv_XvQueryExtension=no | ||
18151 | + ac_cv_lib_Xv_XvQueryExtension=no | ||
18152 | fi | ||
18153 | -rm -f conftest.err conftest.$ac_objext \ | ||
18154 | + | ||
18155 | +rm -f core conftest.err conftest.$ac_objext \ | ||
18156 | conftest$ac_exeext conftest.$ac_ext | ||
18157 | LIBS=$ac_check_lib_save_LIBS | ||
18158 | fi | ||
18159 | -echo "$as_me:$LINENO: result: $ac_cv_lib_Xv_XvQueryExtension" >&5 | ||
18160 | -echo "${ECHO_T}$ac_cv_lib_Xv_XvQueryExtension" >&6 | ||
18161 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xv_XvQueryExtension" >&5 | ||
18162 | +echo "${ECHO_T}$ac_cv_lib_Xv_XvQueryExtension" >&6; } | ||
18163 | if test $ac_cv_lib_Xv_XvQueryExtension = yes; then | ||
18164 | HAVE_XVIDEO="yes" | ||
18165 | else | ||
18166 | @@ -28509,10 +30867,9 @@ | ||
18167 | if test "x$USE_AMRWB" = "xno"; then | ||
18168 | NOUSE="yes" | ||
18169 | fi | ||
18170 | -# Check whether --enable-amrwb or --disable-amrwb was given. | ||
18171 | +# Check whether --enable-amrwb was given. | ||
18172 | if test "${enable_amrwb+set}" = set; then | ||
18173 | - enableval="$enable_amrwb" | ||
18174 | - case "${enableval}" in | ||
18175 | + enableval=$enable_amrwb; case "${enableval}" in | ||
18176 | yes) USE_AMRWB=yes;; | ||
18177 | no) USE_AMRWB=no;; | ||
18178 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-amrwb" >&5 | ||
18179 | @@ -28521,7 +30878,8 @@ | ||
18180 | esac | ||
18181 | else | ||
18182 | USE_AMRWB=yes | ||
18183 | -fi; | ||
18184 | +fi | ||
18185 | + | ||
18186 | if test "x$NOUSE" = "xyes"; then | ||
18187 | USE_AMRWB="no" | ||
18188 | { echo "$as_me:$LINENO: WARNING: *** amrwb pre-configured not to be built" >&5 | ||
18189 | @@ -28597,10 +30955,9 @@ | ||
18190 | if test "x$USE_BZ2" = "xno"; then | ||
18191 | NOUSE="yes" | ||
18192 | fi | ||
18193 | -# Check whether --enable-bz2 or --disable-bz2 was given. | ||
18194 | +# Check whether --enable-bz2 was given. | ||
18195 | if test "${enable_bz2+set}" = set; then | ||
18196 | - enableval="$enable_bz2" | ||
18197 | - case "${enableval}" in | ||
18198 | + enableval=$enable_bz2; case "${enableval}" in | ||
18199 | yes) USE_BZ2=yes;; | ||
18200 | no) USE_BZ2=no;; | ||
18201 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-bz2" >&5 | ||
18202 | @@ -28609,7 +30966,8 @@ | ||
18203 | esac | ||
18204 | else | ||
18205 | USE_BZ2=yes | ||
18206 | -fi; | ||
18207 | +fi | ||
18208 | + | ||
18209 | if test "x$NOUSE" = "xyes"; then | ||
18210 | USE_BZ2="no" | ||
18211 | { echo "$as_me:$LINENO: WARNING: *** bz2 pre-configured not to be built" >&5 | ||
18212 | @@ -28629,8 +30987,8 @@ | ||
18213 | HAVE_BZ2=no | ||
18214 | |||
18215 | |||
18216 | - echo "$as_me:$LINENO: checking for BZ2_bzCompress in -lbz2" >&5 | ||
18217 | -echo $ECHO_N "checking for BZ2_bzCompress in -lbz2... $ECHO_C" >&6 | ||
18218 | + { echo "$as_me:$LINENO: checking for BZ2_bzCompress in -lbz2" >&5 | ||
18219 | +echo $ECHO_N "checking for BZ2_bzCompress in -lbz2... $ECHO_C" >&6; } | ||
18220 | if test "${ac_cv_lib_bz2_BZ2_bzCompress+set}" = set; then | ||
18221 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
18222 | else | ||
18223 | @@ -28643,39 +31001,52 @@ | ||
18224 | cat >>conftest.$ac_ext <<_ACEOF | ||
18225 | /* end confdefs.h. */ | ||
18226 | |||
18227 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
18228 | +/* Override any GCC internal prototype to avoid an error. | ||
18229 | + Use char because int might match the return type of a GCC | ||
18230 | + builtin and then its argument prototype would still apply. */ | ||
18231 | #ifdef __cplusplus | ||
18232 | extern "C" | ||
18233 | #endif | ||
18234 | -/* We use char because int might match the return type of a gcc2 | ||
18235 | - builtin and then its argument prototype would still apply. */ | ||
18236 | char BZ2_bzCompress (); | ||
18237 | int | ||
18238 | main () | ||
18239 | { | ||
18240 | -BZ2_bzCompress (); | ||
18241 | +return BZ2_bzCompress (); | ||
18242 | ; | ||
18243 | return 0; | ||
18244 | } | ||
18245 | _ACEOF | ||
18246 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
18247 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
18248 | - (eval $ac_link) 2>conftest.er1 | ||
18249 | +if { (ac_try="$ac_link" | ||
18250 | +case "(($ac_try" in | ||
18251 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18252 | + *) ac_try_echo=$ac_try;; | ||
18253 | +esac | ||
18254 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18255 | + (eval "$ac_link") 2>conftest.er1 | ||
18256 | ac_status=$? | ||
18257 | grep -v '^ *+' conftest.er1 >conftest.err | ||
18258 | rm -f conftest.er1 | ||
18259 | cat conftest.err >&5 | ||
18260 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18261 | (exit $ac_status); } && | ||
18262 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18263 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18264 | - (eval $ac_try) 2>&5 | ||
18265 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18266 | + { (case "(($ac_try" in | ||
18267 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18268 | + *) ac_try_echo=$ac_try;; | ||
18269 | +esac | ||
18270 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18271 | + (eval "$ac_try") 2>&5 | ||
18272 | ac_status=$? | ||
18273 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18274 | (exit $ac_status); }; } && | ||
18275 | { ac_try='test -s conftest$ac_exeext' | ||
18276 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18277 | - (eval $ac_try) 2>&5 | ||
18278 | + { (case "(($ac_try" in | ||
18279 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18280 | + *) ac_try_echo=$ac_try;; | ||
18281 | +esac | ||
18282 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18283 | + (eval "$ac_try") 2>&5 | ||
18284 | ac_status=$? | ||
18285 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18286 | (exit $ac_status); }; }; then | ||
18287 | @@ -28684,14 +31055,15 @@ | ||
18288 | echo "$as_me: failed program was:" >&5 | ||
18289 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
18290 | |||
18291 | -ac_cv_lib_bz2_BZ2_bzCompress=no | ||
18292 | + ac_cv_lib_bz2_BZ2_bzCompress=no | ||
18293 | fi | ||
18294 | -rm -f conftest.err conftest.$ac_objext \ | ||
18295 | + | ||
18296 | +rm -f core conftest.err conftest.$ac_objext \ | ||
18297 | conftest$ac_exeext conftest.$ac_ext | ||
18298 | LIBS=$ac_check_lib_save_LIBS | ||
18299 | fi | ||
18300 | -echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_BZ2_bzCompress" >&5 | ||
18301 | -echo "${ECHO_T}$ac_cv_lib_bz2_BZ2_bzCompress" >&6 | ||
18302 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_BZ2_bzCompress" >&5 | ||
18303 | +echo "${ECHO_T}$ac_cv_lib_bz2_BZ2_bzCompress" >&6; } | ||
18304 | if test $ac_cv_lib_bz2_BZ2_bzCompress = yes; then | ||
18305 | HAVE_BZ2=yes | ||
18306 | else | ||
18307 | @@ -28700,17 +31072,17 @@ | ||
18308 | |||
18309 | if test "x$HAVE_BZ2" = "xyes"; then | ||
18310 | if test "${ac_cv_header_bzlib_h+set}" = set; then | ||
18311 | - echo "$as_me:$LINENO: checking for bzlib.h" >&5 | ||
18312 | -echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6 | ||
18313 | + { echo "$as_me:$LINENO: checking for bzlib.h" >&5 | ||
18314 | +echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6; } | ||
18315 | if test "${ac_cv_header_bzlib_h+set}" = set; then | ||
18316 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
18317 | fi | ||
18318 | -echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5 | ||
18319 | -echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6 | ||
18320 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5 | ||
18321 | +echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6; } | ||
18322 | else | ||
18323 | # Is the header compilable? | ||
18324 | -echo "$as_me:$LINENO: checking bzlib.h usability" >&5 | ||
18325 | -echo $ECHO_N "checking bzlib.h usability... $ECHO_C" >&6 | ||
18326 | +{ echo "$as_me:$LINENO: checking bzlib.h usability" >&5 | ||
18327 | +echo $ECHO_N "checking bzlib.h usability... $ECHO_C" >&6; } | ||
18328 | cat >conftest.$ac_ext <<_ACEOF | ||
18329 | /* confdefs.h. */ | ||
18330 | _ACEOF | ||
18331 | @@ -28721,23 +31093,36 @@ | ||
18332 | #include <bzlib.h> | ||
18333 | _ACEOF | ||
18334 | rm -f conftest.$ac_objext | ||
18335 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
18336 | - (eval $ac_compile) 2>conftest.er1 | ||
18337 | +if { (ac_try="$ac_compile" | ||
18338 | +case "(($ac_try" in | ||
18339 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18340 | + *) ac_try_echo=$ac_try;; | ||
18341 | +esac | ||
18342 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18343 | + (eval "$ac_compile") 2>conftest.er1 | ||
18344 | ac_status=$? | ||
18345 | grep -v '^ *+' conftest.er1 >conftest.err | ||
18346 | rm -f conftest.er1 | ||
18347 | cat conftest.err >&5 | ||
18348 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18349 | (exit $ac_status); } && | ||
18350 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18351 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18352 | - (eval $ac_try) 2>&5 | ||
18353 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18354 | + { (case "(($ac_try" in | ||
18355 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18356 | + *) ac_try_echo=$ac_try;; | ||
18357 | +esac | ||
18358 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18359 | + (eval "$ac_try") 2>&5 | ||
18360 | ac_status=$? | ||
18361 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18362 | (exit $ac_status); }; } && | ||
18363 | { ac_try='test -s conftest.$ac_objext' | ||
18364 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18365 | - (eval $ac_try) 2>&5 | ||
18366 | + { (case "(($ac_try" in | ||
18367 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18368 | + *) ac_try_echo=$ac_try;; | ||
18369 | +esac | ||
18370 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18371 | + (eval "$ac_try") 2>&5 | ||
18372 | ac_status=$? | ||
18373 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18374 | (exit $ac_status); }; }; then | ||
18375 | @@ -28746,15 +31131,16 @@ | ||
18376 | echo "$as_me: failed program was:" >&5 | ||
18377 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
18378 | |||
18379 | -ac_header_compiler=no | ||
18380 | + ac_header_compiler=no | ||
18381 | fi | ||
18382 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
18383 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
18384 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
18385 | + | ||
18386 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
18387 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
18388 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
18389 | |||
18390 | # Is the header present? | ||
18391 | -echo "$as_me:$LINENO: checking bzlib.h presence" >&5 | ||
18392 | -echo $ECHO_N "checking bzlib.h presence... $ECHO_C" >&6 | ||
18393 | +{ echo "$as_me:$LINENO: checking bzlib.h presence" >&5 | ||
18394 | +echo $ECHO_N "checking bzlib.h presence... $ECHO_C" >&6; } | ||
18395 | cat >conftest.$ac_ext <<_ACEOF | ||
18396 | /* confdefs.h. */ | ||
18397 | _ACEOF | ||
18398 | @@ -28763,8 +31149,13 @@ | ||
18399 | /* end confdefs.h. */ | ||
18400 | #include <bzlib.h> | ||
18401 | _ACEOF | ||
18402 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
18403 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
18404 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
18405 | +case "(($ac_try" in | ||
18406 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18407 | + *) ac_try_echo=$ac_try;; | ||
18408 | +esac | ||
18409 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18410 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
18411 | ac_status=$? | ||
18412 | grep -v '^ *+' conftest.er1 >conftest.err | ||
18413 | rm -f conftest.er1 | ||
18414 | @@ -28788,9 +31179,10 @@ | ||
18415 | |||
18416 | ac_header_preproc=no | ||
18417 | fi | ||
18418 | + | ||
18419 | rm -f conftest.err conftest.$ac_ext | ||
18420 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
18421 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
18422 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
18423 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
18424 | |||
18425 | # So? What about this header? | ||
18426 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
18427 | @@ -28814,25 +31206,23 @@ | ||
18428 | echo "$as_me: WARNING: bzlib.h: proceeding with the preprocessor's result" >&2;} | ||
18429 | { echo "$as_me:$LINENO: WARNING: bzlib.h: in the future, the compiler will take precedence" >&5 | ||
18430 | echo "$as_me: WARNING: bzlib.h: in the future, the compiler will take precedence" >&2;} | ||
18431 | - ( | ||
18432 | - cat <<\_ASBOX | ||
18433 | + ( cat <<\_ASBOX | ||
18434 | ## ------------------------------------------------------------------------ ## | ||
18435 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
18436 | ## ------------------------------------------------------------------------ ## | ||
18437 | _ASBOX | ||
18438 | - ) | | ||
18439 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
18440 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
18441 | ;; | ||
18442 | esac | ||
18443 | -echo "$as_me:$LINENO: checking for bzlib.h" >&5 | ||
18444 | -echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6 | ||
18445 | +{ echo "$as_me:$LINENO: checking for bzlib.h" >&5 | ||
18446 | +echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6; } | ||
18447 | if test "${ac_cv_header_bzlib_h+set}" = set; then | ||
18448 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
18449 | else | ||
18450 | ac_cv_header_bzlib_h=$ac_header_preproc | ||
18451 | fi | ||
18452 | -echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5 | ||
18453 | -echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6 | ||
18454 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5 | ||
18455 | +echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6; } | ||
18456 | |||
18457 | fi | ||
18458 | if test $ac_cv_header_bzlib_h = yes; then | ||
18459 | @@ -28914,10 +31304,9 @@ | ||
18460 | if test "x$USE_DIRECTFB" = "xno"; then | ||
18461 | NOUSE="yes" | ||
18462 | fi | ||
18463 | -# Check whether --enable-directfb or --disable-directfb was given. | ||
18464 | +# Check whether --enable-directfb was given. | ||
18465 | if test "${enable_directfb+set}" = set; then | ||
18466 | - enableval="$enable_directfb" | ||
18467 | - case "${enableval}" in | ||
18468 | + enableval=$enable_directfb; case "${enableval}" in | ||
18469 | yes) USE_DIRECTFB=yes;; | ||
18470 | no) USE_DIRECTFB=no;; | ||
18471 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-directfb" >&5 | ||
18472 | @@ -28926,7 +31315,8 @@ | ||
18473 | esac | ||
18474 | else | ||
18475 | USE_DIRECTFB=yes | ||
18476 | -fi; | ||
18477 | +fi | ||
18478 | + | ||
18479 | if test "x$NOUSE" = "xyes"; then | ||
18480 | USE_DIRECTFB="no" | ||
18481 | { echo "$as_me:$LINENO: WARNING: *** dfbvideosink pre-configured not to be built" >&5 | ||
18482 | @@ -28947,8 +31337,8 @@ | ||
18483 | |||
18484 | |||
18485 | pkg_failed=no | ||
18486 | -echo "$as_me:$LINENO: checking for DIRECTFB" >&5 | ||
18487 | -echo $ECHO_N "checking for DIRECTFB... $ECHO_C" >&6 | ||
18488 | +{ echo "$as_me:$LINENO: checking for DIRECTFB" >&5 | ||
18489 | +echo $ECHO_N "checking for DIRECTFB... $ECHO_C" >&6; } | ||
18490 | |||
18491 | if test -n "$PKG_CONFIG"; then | ||
18492 | if test -n "$PKG_CONFIG" && \ | ||
18493 | @@ -28986,20 +31376,20 @@ | ||
18494 | |||
18495 | |||
18496 | HAVE_DIRECTFB="no" | ||
18497 | - echo "$as_me:$LINENO: result: no" >&5 | ||
18498 | -echo "${ECHO_T}no" >&6 | ||
18499 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
18500 | +echo "${ECHO_T}no" >&6; } | ||
18501 | |||
18502 | elif test $pkg_failed = untried; then | ||
18503 | |||
18504 | HAVE_DIRECTFB="no" | ||
18505 | - echo "$as_me:$LINENO: result: no" >&5 | ||
18506 | -echo "${ECHO_T}no" >&6 | ||
18507 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
18508 | +echo "${ECHO_T}no" >&6; } | ||
18509 | |||
18510 | else | ||
18511 | DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS | ||
18512 | DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS | ||
18513 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
18514 | -echo "${ECHO_T}yes" >&6 | ||
18515 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
18516 | +echo "${ECHO_T}yes" >&6; } | ||
18517 | HAVE_DIRECTFB="yes" | ||
18518 | fi | ||
18519 | |||
18520 | @@ -29051,10 +31441,9 @@ | ||
18521 | if test "x$USE_DTS" = "xno"; then | ||
18522 | NOUSE="yes" | ||
18523 | fi | ||
18524 | -# Check whether --enable-dts or --disable-dts was given. | ||
18525 | +# Check whether --enable-dts was given. | ||
18526 | if test "${enable_dts+set}" = set; then | ||
18527 | - enableval="$enable_dts" | ||
18528 | - case "${enableval}" in | ||
18529 | + enableval=$enable_dts; case "${enableval}" in | ||
18530 | yes) USE_DTS=yes;; | ||
18531 | no) USE_DTS=no;; | ||
18532 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-dts" >&5 | ||
18533 | @@ -29063,7 +31452,8 @@ | ||
18534 | esac | ||
18535 | else | ||
18536 | USE_DTS=yes | ||
18537 | -fi; | ||
18538 | +fi | ||
18539 | + | ||
18540 | if test "x$NOUSE" = "xyes"; then | ||
18541 | USE_DTS="no" | ||
18542 | { echo "$as_me:$LINENO: WARNING: *** dtsdec pre-configured not to be built" >&5 | ||
18543 | @@ -29083,8 +31473,8 @@ | ||
18544 | HAVE_DTS=no | ||
18545 | |||
18546 | |||
18547 | - echo "$as_me:$LINENO: checking for dts_init in -ldts_pic" >&5 | ||
18548 | -echo $ECHO_N "checking for dts_init in -ldts_pic... $ECHO_C" >&6 | ||
18549 | + { echo "$as_me:$LINENO: checking for dts_init in -ldts_pic" >&5 | ||
18550 | +echo $ECHO_N "checking for dts_init in -ldts_pic... $ECHO_C" >&6; } | ||
18551 | if test "${ac_cv_lib_dts_pic_dts_init+set}" = set; then | ||
18552 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
18553 | else | ||
18554 | @@ -29097,39 +31487,52 @@ | ||
18555 | cat >>conftest.$ac_ext <<_ACEOF | ||
18556 | /* end confdefs.h. */ | ||
18557 | |||
18558 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
18559 | +/* Override any GCC internal prototype to avoid an error. | ||
18560 | + Use char because int might match the return type of a GCC | ||
18561 | + builtin and then its argument prototype would still apply. */ | ||
18562 | #ifdef __cplusplus | ||
18563 | extern "C" | ||
18564 | #endif | ||
18565 | -/* We use char because int might match the return type of a gcc2 | ||
18566 | - builtin and then its argument prototype would still apply. */ | ||
18567 | char dts_init (); | ||
18568 | int | ||
18569 | main () | ||
18570 | { | ||
18571 | -dts_init (); | ||
18572 | +return dts_init (); | ||
18573 | ; | ||
18574 | return 0; | ||
18575 | } | ||
18576 | _ACEOF | ||
18577 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
18578 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
18579 | - (eval $ac_link) 2>conftest.er1 | ||
18580 | +if { (ac_try="$ac_link" | ||
18581 | +case "(($ac_try" in | ||
18582 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18583 | + *) ac_try_echo=$ac_try;; | ||
18584 | +esac | ||
18585 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18586 | + (eval "$ac_link") 2>conftest.er1 | ||
18587 | ac_status=$? | ||
18588 | grep -v '^ *+' conftest.er1 >conftest.err | ||
18589 | rm -f conftest.er1 | ||
18590 | cat conftest.err >&5 | ||
18591 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18592 | (exit $ac_status); } && | ||
18593 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18594 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18595 | - (eval $ac_try) 2>&5 | ||
18596 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18597 | + { (case "(($ac_try" in | ||
18598 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18599 | + *) ac_try_echo=$ac_try;; | ||
18600 | +esac | ||
18601 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18602 | + (eval "$ac_try") 2>&5 | ||
18603 | ac_status=$? | ||
18604 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18605 | (exit $ac_status); }; } && | ||
18606 | { ac_try='test -s conftest$ac_exeext' | ||
18607 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18608 | - (eval $ac_try) 2>&5 | ||
18609 | + { (case "(($ac_try" in | ||
18610 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18611 | + *) ac_try_echo=$ac_try;; | ||
18612 | +esac | ||
18613 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18614 | + (eval "$ac_try") 2>&5 | ||
18615 | ac_status=$? | ||
18616 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18617 | (exit $ac_status); }; }; then | ||
18618 | @@ -29138,14 +31541,15 @@ | ||
18619 | echo "$as_me: failed program was:" >&5 | ||
18620 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
18621 | |||
18622 | -ac_cv_lib_dts_pic_dts_init=no | ||
18623 | + ac_cv_lib_dts_pic_dts_init=no | ||
18624 | fi | ||
18625 | -rm -f conftest.err conftest.$ac_objext \ | ||
18626 | + | ||
18627 | +rm -f core conftest.err conftest.$ac_objext \ | ||
18628 | conftest$ac_exeext conftest.$ac_ext | ||
18629 | LIBS=$ac_check_lib_save_LIBS | ||
18630 | fi | ||
18631 | -echo "$as_me:$LINENO: result: $ac_cv_lib_dts_pic_dts_init" >&5 | ||
18632 | -echo "${ECHO_T}$ac_cv_lib_dts_pic_dts_init" >&6 | ||
18633 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dts_pic_dts_init" >&5 | ||
18634 | +echo "${ECHO_T}$ac_cv_lib_dts_pic_dts_init" >&6; } | ||
18635 | if test $ac_cv_lib_dts_pic_dts_init = yes; then | ||
18636 | HAVE_DTS=yes | ||
18637 | else | ||
18638 | @@ -29154,17 +31558,17 @@ | ||
18639 | |||
18640 | if test "x$HAVE_DTS" = "xyes"; then | ||
18641 | if test "${ac_cv_header_dts_h+set}" = set; then | ||
18642 | - echo "$as_me:$LINENO: checking for dts.h" >&5 | ||
18643 | -echo $ECHO_N "checking for dts.h... $ECHO_C" >&6 | ||
18644 | + { echo "$as_me:$LINENO: checking for dts.h" >&5 | ||
18645 | +echo $ECHO_N "checking for dts.h... $ECHO_C" >&6; } | ||
18646 | if test "${ac_cv_header_dts_h+set}" = set; then | ||
18647 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
18648 | fi | ||
18649 | -echo "$as_me:$LINENO: result: $ac_cv_header_dts_h" >&5 | ||
18650 | -echo "${ECHO_T}$ac_cv_header_dts_h" >&6 | ||
18651 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_dts_h" >&5 | ||
18652 | +echo "${ECHO_T}$ac_cv_header_dts_h" >&6; } | ||
18653 | else | ||
18654 | # Is the header compilable? | ||
18655 | -echo "$as_me:$LINENO: checking dts.h usability" >&5 | ||
18656 | -echo $ECHO_N "checking dts.h usability... $ECHO_C" >&6 | ||
18657 | +{ echo "$as_me:$LINENO: checking dts.h usability" >&5 | ||
18658 | +echo $ECHO_N "checking dts.h usability... $ECHO_C" >&6; } | ||
18659 | cat >conftest.$ac_ext <<_ACEOF | ||
18660 | /* confdefs.h. */ | ||
18661 | _ACEOF | ||
18662 | @@ -29175,23 +31579,36 @@ | ||
18663 | #include <dts.h> | ||
18664 | _ACEOF | ||
18665 | rm -f conftest.$ac_objext | ||
18666 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
18667 | - (eval $ac_compile) 2>conftest.er1 | ||
18668 | +if { (ac_try="$ac_compile" | ||
18669 | +case "(($ac_try" in | ||
18670 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18671 | + *) ac_try_echo=$ac_try;; | ||
18672 | +esac | ||
18673 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18674 | + (eval "$ac_compile") 2>conftest.er1 | ||
18675 | ac_status=$? | ||
18676 | grep -v '^ *+' conftest.er1 >conftest.err | ||
18677 | rm -f conftest.er1 | ||
18678 | cat conftest.err >&5 | ||
18679 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18680 | (exit $ac_status); } && | ||
18681 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18682 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18683 | - (eval $ac_try) 2>&5 | ||
18684 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18685 | + { (case "(($ac_try" in | ||
18686 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18687 | + *) ac_try_echo=$ac_try;; | ||
18688 | +esac | ||
18689 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18690 | + (eval "$ac_try") 2>&5 | ||
18691 | ac_status=$? | ||
18692 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18693 | (exit $ac_status); }; } && | ||
18694 | { ac_try='test -s conftest.$ac_objext' | ||
18695 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18696 | - (eval $ac_try) 2>&5 | ||
18697 | + { (case "(($ac_try" in | ||
18698 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18699 | + *) ac_try_echo=$ac_try;; | ||
18700 | +esac | ||
18701 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18702 | + (eval "$ac_try") 2>&5 | ||
18703 | ac_status=$? | ||
18704 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18705 | (exit $ac_status); }; }; then | ||
18706 | @@ -29200,15 +31617,16 @@ | ||
18707 | echo "$as_me: failed program was:" >&5 | ||
18708 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
18709 | |||
18710 | -ac_header_compiler=no | ||
18711 | + ac_header_compiler=no | ||
18712 | fi | ||
18713 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
18714 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
18715 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
18716 | + | ||
18717 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
18718 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
18719 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
18720 | |||
18721 | # Is the header present? | ||
18722 | -echo "$as_me:$LINENO: checking dts.h presence" >&5 | ||
18723 | -echo $ECHO_N "checking dts.h presence... $ECHO_C" >&6 | ||
18724 | +{ echo "$as_me:$LINENO: checking dts.h presence" >&5 | ||
18725 | +echo $ECHO_N "checking dts.h presence... $ECHO_C" >&6; } | ||
18726 | cat >conftest.$ac_ext <<_ACEOF | ||
18727 | /* confdefs.h. */ | ||
18728 | _ACEOF | ||
18729 | @@ -29217,8 +31635,13 @@ | ||
18730 | /* end confdefs.h. */ | ||
18731 | #include <dts.h> | ||
18732 | _ACEOF | ||
18733 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
18734 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
18735 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
18736 | +case "(($ac_try" in | ||
18737 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18738 | + *) ac_try_echo=$ac_try;; | ||
18739 | +esac | ||
18740 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18741 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
18742 | ac_status=$? | ||
18743 | grep -v '^ *+' conftest.er1 >conftest.err | ||
18744 | rm -f conftest.er1 | ||
18745 | @@ -29242,9 +31665,10 @@ | ||
18746 | |||
18747 | ac_header_preproc=no | ||
18748 | fi | ||
18749 | + | ||
18750 | rm -f conftest.err conftest.$ac_ext | ||
18751 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
18752 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
18753 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
18754 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
18755 | |||
18756 | # So? What about this header? | ||
18757 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
18758 | @@ -29268,25 +31692,23 @@ | ||
18759 | echo "$as_me: WARNING: dts.h: proceeding with the preprocessor's result" >&2;} | ||
18760 | { echo "$as_me:$LINENO: WARNING: dts.h: in the future, the compiler will take precedence" >&5 | ||
18761 | echo "$as_me: WARNING: dts.h: in the future, the compiler will take precedence" >&2;} | ||
18762 | - ( | ||
18763 | - cat <<\_ASBOX | ||
18764 | + ( cat <<\_ASBOX | ||
18765 | ## ------------------------------------------------------------------------ ## | ||
18766 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
18767 | ## ------------------------------------------------------------------------ ## | ||
18768 | _ASBOX | ||
18769 | - ) | | ||
18770 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
18771 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
18772 | ;; | ||
18773 | esac | ||
18774 | -echo "$as_me:$LINENO: checking for dts.h" >&5 | ||
18775 | -echo $ECHO_N "checking for dts.h... $ECHO_C" >&6 | ||
18776 | +{ echo "$as_me:$LINENO: checking for dts.h" >&5 | ||
18777 | +echo $ECHO_N "checking for dts.h... $ECHO_C" >&6; } | ||
18778 | if test "${ac_cv_header_dts_h+set}" = set; then | ||
18779 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
18780 | else | ||
18781 | ac_cv_header_dts_h=$ac_header_preproc | ||
18782 | fi | ||
18783 | -echo "$as_me:$LINENO: result: $ac_cv_header_dts_h" >&5 | ||
18784 | -echo "${ECHO_T}$ac_cv_header_dts_h" >&6 | ||
18785 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_dts_h" >&5 | ||
18786 | +echo "${ECHO_T}$ac_cv_header_dts_h" >&6; } | ||
18787 | |||
18788 | fi | ||
18789 | if test $ac_cv_header_dts_h = yes; then | ||
18790 | @@ -29357,10 +31779,9 @@ | ||
18791 | if test "x$USE_DIVX" = "xno"; then | ||
18792 | NOUSE="yes" | ||
18793 | fi | ||
18794 | -# Check whether --enable-divx or --disable-divx was given. | ||
18795 | +# Check whether --enable-divx was given. | ||
18796 | if test "${enable_divx+set}" = set; then | ||
18797 | - enableval="$enable_divx" | ||
18798 | - case "${enableval}" in | ||
18799 | + enableval=$enable_divx; case "${enableval}" in | ||
18800 | yes) USE_DIVX=yes;; | ||
18801 | no) USE_DIVX=no;; | ||
18802 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-divx" >&5 | ||
18803 | @@ -29369,7 +31790,8 @@ | ||
18804 | esac | ||
18805 | else | ||
18806 | USE_DIVX=yes | ||
18807 | -fi; | ||
18808 | +fi | ||
18809 | + | ||
18810 | if test "x$NOUSE" = "xyes"; then | ||
18811 | USE_DIVX="no" | ||
18812 | { echo "$as_me:$LINENO: WARNING: *** divx pre-configured not to be built" >&5 | ||
18813 | @@ -29390,17 +31812,17 @@ | ||
18814 | |||
18815 | HAVE_DIVX=yes | ||
18816 | if test "${ac_cv_header_encore2_h+set}" = set; then | ||
18817 | - echo "$as_me:$LINENO: checking for encore2.h" >&5 | ||
18818 | -echo $ECHO_N "checking for encore2.h... $ECHO_C" >&6 | ||
18819 | + { echo "$as_me:$LINENO: checking for encore2.h" >&5 | ||
18820 | +echo $ECHO_N "checking for encore2.h... $ECHO_C" >&6; } | ||
18821 | if test "${ac_cv_header_encore2_h+set}" = set; then | ||
18822 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
18823 | fi | ||
18824 | -echo "$as_me:$LINENO: result: $ac_cv_header_encore2_h" >&5 | ||
18825 | -echo "${ECHO_T}$ac_cv_header_encore2_h" >&6 | ||
18826 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_encore2_h" >&5 | ||
18827 | +echo "${ECHO_T}$ac_cv_header_encore2_h" >&6; } | ||
18828 | else | ||
18829 | # Is the header compilable? | ||
18830 | -echo "$as_me:$LINENO: checking encore2.h usability" >&5 | ||
18831 | -echo $ECHO_N "checking encore2.h usability... $ECHO_C" >&6 | ||
18832 | +{ echo "$as_me:$LINENO: checking encore2.h usability" >&5 | ||
18833 | +echo $ECHO_N "checking encore2.h usability... $ECHO_C" >&6; } | ||
18834 | cat >conftest.$ac_ext <<_ACEOF | ||
18835 | /* confdefs.h. */ | ||
18836 | _ACEOF | ||
18837 | @@ -29411,23 +31833,36 @@ | ||
18838 | #include <encore2.h> | ||
18839 | _ACEOF | ||
18840 | rm -f conftest.$ac_objext | ||
18841 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
18842 | - (eval $ac_compile) 2>conftest.er1 | ||
18843 | +if { (ac_try="$ac_compile" | ||
18844 | +case "(($ac_try" in | ||
18845 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18846 | + *) ac_try_echo=$ac_try;; | ||
18847 | +esac | ||
18848 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18849 | + (eval "$ac_compile") 2>conftest.er1 | ||
18850 | ac_status=$? | ||
18851 | grep -v '^ *+' conftest.er1 >conftest.err | ||
18852 | rm -f conftest.er1 | ||
18853 | cat conftest.err >&5 | ||
18854 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18855 | (exit $ac_status); } && | ||
18856 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18857 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18858 | - (eval $ac_try) 2>&5 | ||
18859 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18860 | + { (case "(($ac_try" in | ||
18861 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18862 | + *) ac_try_echo=$ac_try;; | ||
18863 | +esac | ||
18864 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18865 | + (eval "$ac_try") 2>&5 | ||
18866 | ac_status=$? | ||
18867 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18868 | (exit $ac_status); }; } && | ||
18869 | { ac_try='test -s conftest.$ac_objext' | ||
18870 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18871 | - (eval $ac_try) 2>&5 | ||
18872 | + { (case "(($ac_try" in | ||
18873 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18874 | + *) ac_try_echo=$ac_try;; | ||
18875 | +esac | ||
18876 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18877 | + (eval "$ac_try") 2>&5 | ||
18878 | ac_status=$? | ||
18879 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18880 | (exit $ac_status); }; }; then | ||
18881 | @@ -29436,15 +31871,16 @@ | ||
18882 | echo "$as_me: failed program was:" >&5 | ||
18883 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
18884 | |||
18885 | -ac_header_compiler=no | ||
18886 | + ac_header_compiler=no | ||
18887 | fi | ||
18888 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
18889 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
18890 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
18891 | + | ||
18892 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
18893 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
18894 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
18895 | |||
18896 | # Is the header present? | ||
18897 | -echo "$as_me:$LINENO: checking encore2.h presence" >&5 | ||
18898 | -echo $ECHO_N "checking encore2.h presence... $ECHO_C" >&6 | ||
18899 | +{ echo "$as_me:$LINENO: checking encore2.h presence" >&5 | ||
18900 | +echo $ECHO_N "checking encore2.h presence... $ECHO_C" >&6; } | ||
18901 | cat >conftest.$ac_ext <<_ACEOF | ||
18902 | /* confdefs.h. */ | ||
18903 | _ACEOF | ||
18904 | @@ -29453,8 +31889,13 @@ | ||
18905 | /* end confdefs.h. */ | ||
18906 | #include <encore2.h> | ||
18907 | _ACEOF | ||
18908 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
18909 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
18910 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
18911 | +case "(($ac_try" in | ||
18912 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18913 | + *) ac_try_echo=$ac_try;; | ||
18914 | +esac | ||
18915 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18916 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
18917 | ac_status=$? | ||
18918 | grep -v '^ *+' conftest.er1 >conftest.err | ||
18919 | rm -f conftest.er1 | ||
18920 | @@ -29478,9 +31919,10 @@ | ||
18921 | |||
18922 | ac_header_preproc=no | ||
18923 | fi | ||
18924 | + | ||
18925 | rm -f conftest.err conftest.$ac_ext | ||
18926 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
18927 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
18928 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
18929 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
18930 | |||
18931 | # So? What about this header? | ||
18932 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
18933 | @@ -29504,25 +31946,23 @@ | ||
18934 | echo "$as_me: WARNING: encore2.h: proceeding with the preprocessor's result" >&2;} | ||
18935 | { echo "$as_me:$LINENO: WARNING: encore2.h: in the future, the compiler will take precedence" >&5 | ||
18936 | echo "$as_me: WARNING: encore2.h: in the future, the compiler will take precedence" >&2;} | ||
18937 | - ( | ||
18938 | - cat <<\_ASBOX | ||
18939 | + ( cat <<\_ASBOX | ||
18940 | ## ------------------------------------------------------------------------ ## | ||
18941 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
18942 | ## ------------------------------------------------------------------------ ## | ||
18943 | _ASBOX | ||
18944 | - ) | | ||
18945 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
18946 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
18947 | ;; | ||
18948 | esac | ||
18949 | -echo "$as_me:$LINENO: checking for encore2.h" >&5 | ||
18950 | -echo $ECHO_N "checking for encore2.h... $ECHO_C" >&6 | ||
18951 | +{ echo "$as_me:$LINENO: checking for encore2.h" >&5 | ||
18952 | +echo $ECHO_N "checking for encore2.h... $ECHO_C" >&6; } | ||
18953 | if test "${ac_cv_header_encore2_h+set}" = set; then | ||
18954 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
18955 | else | ||
18956 | ac_cv_header_encore2_h=$ac_header_preproc | ||
18957 | fi | ||
18958 | -echo "$as_me:$LINENO: result: $ac_cv_header_encore2_h" >&5 | ||
18959 | -echo "${ECHO_T}$ac_cv_header_encore2_h" >&6 | ||
18960 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_encore2_h" >&5 | ||
18961 | +echo "${ECHO_T}$ac_cv_header_encore2_h" >&6; } | ||
18962 | |||
18963 | fi | ||
18964 | if test $ac_cv_header_encore2_h = yes; then | ||
18965 | @@ -29537,8 +31977,8 @@ | ||
18966 | |||
18967 | |||
18968 | if test x$HAVE_DIVX = xyes ; then | ||
18969 | - echo "$as_me:$LINENO: checking Checking for valid divx4linux encore version" >&5 | ||
18970 | -echo $ECHO_N "checking Checking for valid divx4linux encore version... $ECHO_C" >&6 | ||
18971 | + { echo "$as_me:$LINENO: checking Checking for valid divx4linux encore version" >&5 | ||
18972 | +echo $ECHO_N "checking Checking for valid divx4linux encore version... $ECHO_C" >&6; } | ||
18973 | cat >conftest.$ac_ext <<_ACEOF | ||
18974 | /* confdefs.h. */ | ||
18975 | _ACEOF | ||
18976 | @@ -29562,30 +32002,43 @@ | ||
18977 | } | ||
18978 | _ACEOF | ||
18979 | rm -f conftest.$ac_objext | ||
18980 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
18981 | - (eval $ac_compile) 2>conftest.er1 | ||
18982 | +if { (ac_try="$ac_compile" | ||
18983 | +case "(($ac_try" in | ||
18984 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18985 | + *) ac_try_echo=$ac_try;; | ||
18986 | +esac | ||
18987 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18988 | + (eval "$ac_compile") 2>conftest.er1 | ||
18989 | ac_status=$? | ||
18990 | grep -v '^ *+' conftest.er1 >conftest.err | ||
18991 | rm -f conftest.er1 | ||
18992 | cat conftest.err >&5 | ||
18993 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18994 | (exit $ac_status); } && | ||
18995 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18996 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18997 | - (eval $ac_try) 2>&5 | ||
18998 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
18999 | + { (case "(($ac_try" in | ||
19000 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19001 | + *) ac_try_echo=$ac_try;; | ||
19002 | +esac | ||
19003 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19004 | + (eval "$ac_try") 2>&5 | ||
19005 | ac_status=$? | ||
19006 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19007 | (exit $ac_status); }; } && | ||
19008 | { ac_try='test -s conftest.$ac_objext' | ||
19009 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19010 | - (eval $ac_try) 2>&5 | ||
19011 | + { (case "(($ac_try" in | ||
19012 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19013 | + *) ac_try_echo=$ac_try;; | ||
19014 | +esac | ||
19015 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19016 | + (eval "$ac_try") 2>&5 | ||
19017 | ac_status=$? | ||
19018 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19019 | (exit $ac_status); }; }; then | ||
19020 | |||
19021 | HAVE_DIVX=yes | ||
19022 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
19023 | -echo "${ECHO_T}yes" >&6 | ||
19024 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
19025 | +echo "${ECHO_T}yes" >&6; } | ||
19026 | |||
19027 | else | ||
19028 | echo "$as_me: failed program was:" >&5 | ||
19029 | @@ -29593,27 +32046,28 @@ | ||
19030 | |||
19031 | |||
19032 | HAVE_DIVX=no | ||
19033 | - echo "$as_me:$LINENO: result: no" >&5 | ||
19034 | -echo "${ECHO_T}no" >&6 | ||
19035 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
19036 | +echo "${ECHO_T}no" >&6; } | ||
19037 | { echo "$as_me:$LINENO: WARNING: Wrong version of divx4linux installed" >&5 | ||
19038 | echo "$as_me: WARNING: Wrong version of divx4linux installed" >&2;} | ||
19039 | |||
19040 | fi | ||
19041 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19042 | + | ||
19043 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19044 | fi | ||
19045 | if test x$HAVE_DIVX = xyes ; then | ||
19046 | if test "${ac_cv_header_decore_h+set}" = set; then | ||
19047 | - echo "$as_me:$LINENO: checking for decore.h" >&5 | ||
19048 | -echo $ECHO_N "checking for decore.h... $ECHO_C" >&6 | ||
19049 | + { echo "$as_me:$LINENO: checking for decore.h" >&5 | ||
19050 | +echo $ECHO_N "checking for decore.h... $ECHO_C" >&6; } | ||
19051 | if test "${ac_cv_header_decore_h+set}" = set; then | ||
19052 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
19053 | fi | ||
19054 | -echo "$as_me:$LINENO: result: $ac_cv_header_decore_h" >&5 | ||
19055 | -echo "${ECHO_T}$ac_cv_header_decore_h" >&6 | ||
19056 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_decore_h" >&5 | ||
19057 | +echo "${ECHO_T}$ac_cv_header_decore_h" >&6; } | ||
19058 | else | ||
19059 | # Is the header compilable? | ||
19060 | -echo "$as_me:$LINENO: checking decore.h usability" >&5 | ||
19061 | -echo $ECHO_N "checking decore.h usability... $ECHO_C" >&6 | ||
19062 | +{ echo "$as_me:$LINENO: checking decore.h usability" >&5 | ||
19063 | +echo $ECHO_N "checking decore.h usability... $ECHO_C" >&6; } | ||
19064 | cat >conftest.$ac_ext <<_ACEOF | ||
19065 | /* confdefs.h. */ | ||
19066 | _ACEOF | ||
19067 | @@ -29624,23 +32078,36 @@ | ||
19068 | #include <decore.h> | ||
19069 | _ACEOF | ||
19070 | rm -f conftest.$ac_objext | ||
19071 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
19072 | - (eval $ac_compile) 2>conftest.er1 | ||
19073 | +if { (ac_try="$ac_compile" | ||
19074 | +case "(($ac_try" in | ||
19075 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19076 | + *) ac_try_echo=$ac_try;; | ||
19077 | +esac | ||
19078 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19079 | + (eval "$ac_compile") 2>conftest.er1 | ||
19080 | ac_status=$? | ||
19081 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19082 | rm -f conftest.er1 | ||
19083 | cat conftest.err >&5 | ||
19084 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19085 | (exit $ac_status); } && | ||
19086 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19087 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19088 | - (eval $ac_try) 2>&5 | ||
19089 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19090 | + { (case "(($ac_try" in | ||
19091 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19092 | + *) ac_try_echo=$ac_try;; | ||
19093 | +esac | ||
19094 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19095 | + (eval "$ac_try") 2>&5 | ||
19096 | ac_status=$? | ||
19097 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19098 | (exit $ac_status); }; } && | ||
19099 | { ac_try='test -s conftest.$ac_objext' | ||
19100 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19101 | - (eval $ac_try) 2>&5 | ||
19102 | + { (case "(($ac_try" in | ||
19103 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19104 | + *) ac_try_echo=$ac_try;; | ||
19105 | +esac | ||
19106 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19107 | + (eval "$ac_try") 2>&5 | ||
19108 | ac_status=$? | ||
19109 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19110 | (exit $ac_status); }; }; then | ||
19111 | @@ -29649,15 +32116,16 @@ | ||
19112 | echo "$as_me: failed program was:" >&5 | ||
19113 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
19114 | |||
19115 | -ac_header_compiler=no | ||
19116 | + ac_header_compiler=no | ||
19117 | fi | ||
19118 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19119 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
19120 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
19121 | + | ||
19122 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19123 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
19124 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
19125 | |||
19126 | # Is the header present? | ||
19127 | -echo "$as_me:$LINENO: checking decore.h presence" >&5 | ||
19128 | -echo $ECHO_N "checking decore.h presence... $ECHO_C" >&6 | ||
19129 | +{ echo "$as_me:$LINENO: checking decore.h presence" >&5 | ||
19130 | +echo $ECHO_N "checking decore.h presence... $ECHO_C" >&6; } | ||
19131 | cat >conftest.$ac_ext <<_ACEOF | ||
19132 | /* confdefs.h. */ | ||
19133 | _ACEOF | ||
19134 | @@ -29666,8 +32134,13 @@ | ||
19135 | /* end confdefs.h. */ | ||
19136 | #include <decore.h> | ||
19137 | _ACEOF | ||
19138 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
19139 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
19140 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
19141 | +case "(($ac_try" in | ||
19142 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19143 | + *) ac_try_echo=$ac_try;; | ||
19144 | +esac | ||
19145 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19146 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
19147 | ac_status=$? | ||
19148 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19149 | rm -f conftest.er1 | ||
19150 | @@ -29691,9 +32164,10 @@ | ||
19151 | |||
19152 | ac_header_preproc=no | ||
19153 | fi | ||
19154 | + | ||
19155 | rm -f conftest.err conftest.$ac_ext | ||
19156 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
19157 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
19158 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
19159 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
19160 | |||
19161 | # So? What about this header? | ||
19162 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
19163 | @@ -29717,25 +32191,23 @@ | ||
19164 | echo "$as_me: WARNING: decore.h: proceeding with the preprocessor's result" >&2;} | ||
19165 | { echo "$as_me:$LINENO: WARNING: decore.h: in the future, the compiler will take precedence" >&5 | ||
19166 | echo "$as_me: WARNING: decore.h: in the future, the compiler will take precedence" >&2;} | ||
19167 | - ( | ||
19168 | - cat <<\_ASBOX | ||
19169 | + ( cat <<\_ASBOX | ||
19170 | ## ------------------------------------------------------------------------ ## | ||
19171 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
19172 | ## ------------------------------------------------------------------------ ## | ||
19173 | _ASBOX | ||
19174 | - ) | | ||
19175 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
19176 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
19177 | ;; | ||
19178 | esac | ||
19179 | -echo "$as_me:$LINENO: checking for decore.h" >&5 | ||
19180 | -echo $ECHO_N "checking for decore.h... $ECHO_C" >&6 | ||
19181 | +{ echo "$as_me:$LINENO: checking for decore.h" >&5 | ||
19182 | +echo $ECHO_N "checking for decore.h... $ECHO_C" >&6; } | ||
19183 | if test "${ac_cv_header_decore_h+set}" = set; then | ||
19184 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
19185 | else | ||
19186 | ac_cv_header_decore_h=$ac_header_preproc | ||
19187 | fi | ||
19188 | -echo "$as_me:$LINENO: result: $ac_cv_header_decore_h" >&5 | ||
19189 | -echo "${ECHO_T}$ac_cv_header_decore_h" >&6 | ||
19190 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_decore_h" >&5 | ||
19191 | +echo "${ECHO_T}$ac_cv_header_decore_h" >&6; } | ||
19192 | |||
19193 | fi | ||
19194 | if test $ac_cv_header_decore_h = yes; then | ||
19195 | @@ -29751,8 +32223,8 @@ | ||
19196 | |||
19197 | fi | ||
19198 | if test x$HAVE_DIVX = xyes ; then | ||
19199 | - echo "$as_me:$LINENO: checking Checking for valid divx4linux decore version" >&5 | ||
19200 | -echo $ECHO_N "checking Checking for valid divx4linux decore version... $ECHO_C" >&6 | ||
19201 | + { echo "$as_me:$LINENO: checking Checking for valid divx4linux decore version" >&5 | ||
19202 | +echo $ECHO_N "checking Checking for valid divx4linux decore version... $ECHO_C" >&6; } | ||
19203 | cat >conftest.$ac_ext <<_ACEOF | ||
19204 | /* confdefs.h. */ | ||
19205 | _ACEOF | ||
19206 | @@ -29776,30 +32248,43 @@ | ||
19207 | } | ||
19208 | _ACEOF | ||
19209 | rm -f conftest.$ac_objext | ||
19210 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
19211 | - (eval $ac_compile) 2>conftest.er1 | ||
19212 | +if { (ac_try="$ac_compile" | ||
19213 | +case "(($ac_try" in | ||
19214 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19215 | + *) ac_try_echo=$ac_try;; | ||
19216 | +esac | ||
19217 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19218 | + (eval "$ac_compile") 2>conftest.er1 | ||
19219 | ac_status=$? | ||
19220 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19221 | rm -f conftest.er1 | ||
19222 | cat conftest.err >&5 | ||
19223 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19224 | (exit $ac_status); } && | ||
19225 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19226 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19227 | - (eval $ac_try) 2>&5 | ||
19228 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19229 | + { (case "(($ac_try" in | ||
19230 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19231 | + *) ac_try_echo=$ac_try;; | ||
19232 | +esac | ||
19233 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19234 | + (eval "$ac_try") 2>&5 | ||
19235 | ac_status=$? | ||
19236 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19237 | (exit $ac_status); }; } && | ||
19238 | { ac_try='test -s conftest.$ac_objext' | ||
19239 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19240 | - (eval $ac_try) 2>&5 | ||
19241 | + { (case "(($ac_try" in | ||
19242 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19243 | + *) ac_try_echo=$ac_try;; | ||
19244 | +esac | ||
19245 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19246 | + (eval "$ac_try") 2>&5 | ||
19247 | ac_status=$? | ||
19248 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19249 | (exit $ac_status); }; }; then | ||
19250 | |||
19251 | HAVE_DIVX=yes | ||
19252 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
19253 | -echo "${ECHO_T}yes" >&6 | ||
19254 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
19255 | +echo "${ECHO_T}yes" >&6; } | ||
19256 | |||
19257 | else | ||
19258 | echo "$as_me: failed program was:" >&5 | ||
19259 | @@ -29807,19 +32292,20 @@ | ||
19260 | |||
19261 | |||
19262 | HAVE_DIVX=no | ||
19263 | - echo "$as_me:$LINENO: result: no" >&5 | ||
19264 | -echo "${ECHO_T}no" >&6 | ||
19265 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
19266 | +echo "${ECHO_T}no" >&6; } | ||
19267 | { echo "$as_me:$LINENO: WARNING: Wrong version of divx4linux installed" >&5 | ||
19268 | echo "$as_me: WARNING: Wrong version of divx4linux installed" >&2;} | ||
19269 | |||
19270 | fi | ||
19271 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19272 | + | ||
19273 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19274 | fi | ||
19275 | LIBS="-lm" | ||
19276 | if test x$HAVE_DIVX = xyes; then | ||
19277 | |||
19278 | -echo "$as_me:$LINENO: checking for encore in -ldivxencore" >&5 | ||
19279 | -echo $ECHO_N "checking for encore in -ldivxencore... $ECHO_C" >&6 | ||
19280 | +{ echo "$as_me:$LINENO: checking for encore in -ldivxencore" >&5 | ||
19281 | +echo $ECHO_N "checking for encore in -ldivxencore... $ECHO_C" >&6; } | ||
19282 | if test "${ac_cv_lib_divxencore_encore+set}" = set; then | ||
19283 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
19284 | else | ||
19285 | @@ -29832,39 +32318,52 @@ | ||
19286 | cat >>conftest.$ac_ext <<_ACEOF | ||
19287 | /* end confdefs.h. */ | ||
19288 | |||
19289 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
19290 | +/* Override any GCC internal prototype to avoid an error. | ||
19291 | + Use char because int might match the return type of a GCC | ||
19292 | + builtin and then its argument prototype would still apply. */ | ||
19293 | #ifdef __cplusplus | ||
19294 | extern "C" | ||
19295 | #endif | ||
19296 | -/* We use char because int might match the return type of a gcc2 | ||
19297 | - builtin and then its argument prototype would still apply. */ | ||
19298 | char encore (); | ||
19299 | int | ||
19300 | main () | ||
19301 | { | ||
19302 | -encore (); | ||
19303 | +return encore (); | ||
19304 | ; | ||
19305 | return 0; | ||
19306 | } | ||
19307 | _ACEOF | ||
19308 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
19309 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
19310 | - (eval $ac_link) 2>conftest.er1 | ||
19311 | +if { (ac_try="$ac_link" | ||
19312 | +case "(($ac_try" in | ||
19313 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19314 | + *) ac_try_echo=$ac_try;; | ||
19315 | +esac | ||
19316 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19317 | + (eval "$ac_link") 2>conftest.er1 | ||
19318 | ac_status=$? | ||
19319 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19320 | rm -f conftest.er1 | ||
19321 | cat conftest.err >&5 | ||
19322 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19323 | (exit $ac_status); } && | ||
19324 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19325 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19326 | - (eval $ac_try) 2>&5 | ||
19327 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19328 | + { (case "(($ac_try" in | ||
19329 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19330 | + *) ac_try_echo=$ac_try;; | ||
19331 | +esac | ||
19332 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19333 | + (eval "$ac_try") 2>&5 | ||
19334 | ac_status=$? | ||
19335 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19336 | (exit $ac_status); }; } && | ||
19337 | { ac_try='test -s conftest$ac_exeext' | ||
19338 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19339 | - (eval $ac_try) 2>&5 | ||
19340 | + { (case "(($ac_try" in | ||
19341 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19342 | + *) ac_try_echo=$ac_try;; | ||
19343 | +esac | ||
19344 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19345 | + (eval "$ac_try") 2>&5 | ||
19346 | ac_status=$? | ||
19347 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19348 | (exit $ac_status); }; }; then | ||
19349 | @@ -29873,14 +32372,15 @@ | ||
19350 | echo "$as_me: failed program was:" >&5 | ||
19351 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
19352 | |||
19353 | -ac_cv_lib_divxencore_encore=no | ||
19354 | + ac_cv_lib_divxencore_encore=no | ||
19355 | fi | ||
19356 | -rm -f conftest.err conftest.$ac_objext \ | ||
19357 | + | ||
19358 | +rm -f core conftest.err conftest.$ac_objext \ | ||
19359 | conftest$ac_exeext conftest.$ac_ext | ||
19360 | LIBS=$ac_check_lib_save_LIBS | ||
19361 | fi | ||
19362 | -echo "$as_me:$LINENO: result: $ac_cv_lib_divxencore_encore" >&5 | ||
19363 | -echo "${ECHO_T}$ac_cv_lib_divxencore_encore" >&6 | ||
19364 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_divxencore_encore" >&5 | ||
19365 | +echo "${ECHO_T}$ac_cv_lib_divxencore_encore" >&6; } | ||
19366 | if test $ac_cv_lib_divxencore_encore = yes; then | ||
19367 | cat >>confdefs.h <<_ACEOF | ||
19368 | #define HAVE_LIBDIVXENCORE 1 | ||
19369 | @@ -29899,8 +32399,8 @@ | ||
19370 | fi | ||
19371 | if test x$HAVE_DIVX = xyes; then | ||
19372 | |||
19373 | -echo "$as_me:$LINENO: checking for decore in -ldivxdecore" >&5 | ||
19374 | -echo $ECHO_N "checking for decore in -ldivxdecore... $ECHO_C" >&6 | ||
19375 | +{ echo "$as_me:$LINENO: checking for decore in -ldivxdecore" >&5 | ||
19376 | +echo $ECHO_N "checking for decore in -ldivxdecore... $ECHO_C" >&6; } | ||
19377 | if test "${ac_cv_lib_divxdecore_decore+set}" = set; then | ||
19378 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
19379 | else | ||
19380 | @@ -29913,39 +32413,52 @@ | ||
19381 | cat >>conftest.$ac_ext <<_ACEOF | ||
19382 | /* end confdefs.h. */ | ||
19383 | |||
19384 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
19385 | +/* Override any GCC internal prototype to avoid an error. | ||
19386 | + Use char because int might match the return type of a GCC | ||
19387 | + builtin and then its argument prototype would still apply. */ | ||
19388 | #ifdef __cplusplus | ||
19389 | extern "C" | ||
19390 | #endif | ||
19391 | -/* We use char because int might match the return type of a gcc2 | ||
19392 | - builtin and then its argument prototype would still apply. */ | ||
19393 | char decore (); | ||
19394 | int | ||
19395 | main () | ||
19396 | { | ||
19397 | -decore (); | ||
19398 | +return decore (); | ||
19399 | ; | ||
19400 | return 0; | ||
19401 | } | ||
19402 | _ACEOF | ||
19403 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
19404 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
19405 | - (eval $ac_link) 2>conftest.er1 | ||
19406 | +if { (ac_try="$ac_link" | ||
19407 | +case "(($ac_try" in | ||
19408 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19409 | + *) ac_try_echo=$ac_try;; | ||
19410 | +esac | ||
19411 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19412 | + (eval "$ac_link") 2>conftest.er1 | ||
19413 | ac_status=$? | ||
19414 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19415 | rm -f conftest.er1 | ||
19416 | cat conftest.err >&5 | ||
19417 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19418 | (exit $ac_status); } && | ||
19419 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19420 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19421 | - (eval $ac_try) 2>&5 | ||
19422 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19423 | + { (case "(($ac_try" in | ||
19424 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19425 | + *) ac_try_echo=$ac_try;; | ||
19426 | +esac | ||
19427 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19428 | + (eval "$ac_try") 2>&5 | ||
19429 | ac_status=$? | ||
19430 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19431 | (exit $ac_status); }; } && | ||
19432 | { ac_try='test -s conftest$ac_exeext' | ||
19433 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19434 | - (eval $ac_try) 2>&5 | ||
19435 | + { (case "(($ac_try" in | ||
19436 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19437 | + *) ac_try_echo=$ac_try;; | ||
19438 | +esac | ||
19439 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19440 | + (eval "$ac_try") 2>&5 | ||
19441 | ac_status=$? | ||
19442 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19443 | (exit $ac_status); }; }; then | ||
19444 | @@ -29954,14 +32467,15 @@ | ||
19445 | echo "$as_me: failed program was:" >&5 | ||
19446 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
19447 | |||
19448 | -ac_cv_lib_divxdecore_decore=no | ||
19449 | + ac_cv_lib_divxdecore_decore=no | ||
19450 | fi | ||
19451 | -rm -f conftest.err conftest.$ac_objext \ | ||
19452 | + | ||
19453 | +rm -f core conftest.err conftest.$ac_objext \ | ||
19454 | conftest$ac_exeext conftest.$ac_ext | ||
19455 | LIBS=$ac_check_lib_save_LIBS | ||
19456 | fi | ||
19457 | -echo "$as_me:$LINENO: result: $ac_cv_lib_divxdecore_decore" >&5 | ||
19458 | -echo "${ECHO_T}$ac_cv_lib_divxdecore_decore" >&6 | ||
19459 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_divxdecore_decore" >&5 | ||
19460 | +echo "${ECHO_T}$ac_cv_lib_divxdecore_decore" >&6; } | ||
19461 | if test $ac_cv_lib_divxdecore_decore = yes; then | ||
19462 | cat >>confdefs.h <<_ACEOF | ||
19463 | #define HAVE_LIBDIVXDECORE 1 | ||
19464 | @@ -30033,10 +32547,9 @@ | ||
19465 | if test "x$USE_FAAC" = "xno"; then | ||
19466 | NOUSE="yes" | ||
19467 | fi | ||
19468 | -# Check whether --enable-faac or --disable-faac was given. | ||
19469 | +# Check whether --enable-faac was given. | ||
19470 | if test "${enable_faac+set}" = set; then | ||
19471 | - enableval="$enable_faac" | ||
19472 | - case "${enableval}" in | ||
19473 | + enableval=$enable_faac; case "${enableval}" in | ||
19474 | yes) USE_FAAC=yes;; | ||
19475 | no) USE_FAAC=no;; | ||
19476 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-faac" >&5 | ||
19477 | @@ -30045,7 +32558,8 @@ | ||
19478 | esac | ||
19479 | else | ||
19480 | USE_FAAC=yes | ||
19481 | -fi; | ||
19482 | +fi | ||
19483 | + | ||
19484 | if test "x$NOUSE" = "xyes"; then | ||
19485 | USE_FAAC="no" | ||
19486 | { echo "$as_me:$LINENO: WARNING: *** faac pre-configured not to be built" >&5 | ||
19487 | @@ -30065,8 +32579,8 @@ | ||
19488 | HAVE_FAAC=no | ||
19489 | |||
19490 | |||
19491 | - echo "$as_me:$LINENO: checking for faacEncOpen in -lfaac" >&5 | ||
19492 | -echo $ECHO_N "checking for faacEncOpen in -lfaac... $ECHO_C" >&6 | ||
19493 | + { echo "$as_me:$LINENO: checking for faacEncOpen in -lfaac" >&5 | ||
19494 | +echo $ECHO_N "checking for faacEncOpen in -lfaac... $ECHO_C" >&6; } | ||
19495 | if test "${ac_cv_lib_faac_faacEncOpen+set}" = set; then | ||
19496 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
19497 | else | ||
19498 | @@ -30079,39 +32593,52 @@ | ||
19499 | cat >>conftest.$ac_ext <<_ACEOF | ||
19500 | /* end confdefs.h. */ | ||
19501 | |||
19502 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
19503 | +/* Override any GCC internal prototype to avoid an error. | ||
19504 | + Use char because int might match the return type of a GCC | ||
19505 | + builtin and then its argument prototype would still apply. */ | ||
19506 | #ifdef __cplusplus | ||
19507 | extern "C" | ||
19508 | #endif | ||
19509 | -/* We use char because int might match the return type of a gcc2 | ||
19510 | - builtin and then its argument prototype would still apply. */ | ||
19511 | char faacEncOpen (); | ||
19512 | int | ||
19513 | main () | ||
19514 | { | ||
19515 | -faacEncOpen (); | ||
19516 | +return faacEncOpen (); | ||
19517 | ; | ||
19518 | return 0; | ||
19519 | } | ||
19520 | _ACEOF | ||
19521 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
19522 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
19523 | - (eval $ac_link) 2>conftest.er1 | ||
19524 | +if { (ac_try="$ac_link" | ||
19525 | +case "(($ac_try" in | ||
19526 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19527 | + *) ac_try_echo=$ac_try;; | ||
19528 | +esac | ||
19529 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19530 | + (eval "$ac_link") 2>conftest.er1 | ||
19531 | ac_status=$? | ||
19532 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19533 | rm -f conftest.er1 | ||
19534 | cat conftest.err >&5 | ||
19535 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19536 | (exit $ac_status); } && | ||
19537 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19538 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19539 | - (eval $ac_try) 2>&5 | ||
19540 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19541 | + { (case "(($ac_try" in | ||
19542 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19543 | + *) ac_try_echo=$ac_try;; | ||
19544 | +esac | ||
19545 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19546 | + (eval "$ac_try") 2>&5 | ||
19547 | ac_status=$? | ||
19548 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19549 | (exit $ac_status); }; } && | ||
19550 | { ac_try='test -s conftest$ac_exeext' | ||
19551 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19552 | - (eval $ac_try) 2>&5 | ||
19553 | + { (case "(($ac_try" in | ||
19554 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19555 | + *) ac_try_echo=$ac_try;; | ||
19556 | +esac | ||
19557 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19558 | + (eval "$ac_try") 2>&5 | ||
19559 | ac_status=$? | ||
19560 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19561 | (exit $ac_status); }; }; then | ||
19562 | @@ -30120,14 +32647,15 @@ | ||
19563 | echo "$as_me: failed program was:" >&5 | ||
19564 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
19565 | |||
19566 | -ac_cv_lib_faac_faacEncOpen=no | ||
19567 | + ac_cv_lib_faac_faacEncOpen=no | ||
19568 | fi | ||
19569 | -rm -f conftest.err conftest.$ac_objext \ | ||
19570 | + | ||
19571 | +rm -f core conftest.err conftest.$ac_objext \ | ||
19572 | conftest$ac_exeext conftest.$ac_ext | ||
19573 | LIBS=$ac_check_lib_save_LIBS | ||
19574 | fi | ||
19575 | -echo "$as_me:$LINENO: result: $ac_cv_lib_faac_faacEncOpen" >&5 | ||
19576 | -echo "${ECHO_T}$ac_cv_lib_faac_faacEncOpen" >&6 | ||
19577 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_faac_faacEncOpen" >&5 | ||
19578 | +echo "${ECHO_T}$ac_cv_lib_faac_faacEncOpen" >&6; } | ||
19579 | if test $ac_cv_lib_faac_faacEncOpen = yes; then | ||
19580 | HAVE_FAAC=yes | ||
19581 | else | ||
19582 | @@ -30136,17 +32664,17 @@ | ||
19583 | |||
19584 | if test "x$HAVE_FAAC" = "xyes"; then | ||
19585 | if test "${ac_cv_header_faac_h+set}" = set; then | ||
19586 | - echo "$as_me:$LINENO: checking for faac.h" >&5 | ||
19587 | -echo $ECHO_N "checking for faac.h... $ECHO_C" >&6 | ||
19588 | + { echo "$as_me:$LINENO: checking for faac.h" >&5 | ||
19589 | +echo $ECHO_N "checking for faac.h... $ECHO_C" >&6; } | ||
19590 | if test "${ac_cv_header_faac_h+set}" = set; then | ||
19591 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
19592 | fi | ||
19593 | -echo "$as_me:$LINENO: result: $ac_cv_header_faac_h" >&5 | ||
19594 | -echo "${ECHO_T}$ac_cv_header_faac_h" >&6 | ||
19595 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_faac_h" >&5 | ||
19596 | +echo "${ECHO_T}$ac_cv_header_faac_h" >&6; } | ||
19597 | else | ||
19598 | # Is the header compilable? | ||
19599 | -echo "$as_me:$LINENO: checking faac.h usability" >&5 | ||
19600 | -echo $ECHO_N "checking faac.h usability... $ECHO_C" >&6 | ||
19601 | +{ echo "$as_me:$LINENO: checking faac.h usability" >&5 | ||
19602 | +echo $ECHO_N "checking faac.h usability... $ECHO_C" >&6; } | ||
19603 | cat >conftest.$ac_ext <<_ACEOF | ||
19604 | /* confdefs.h. */ | ||
19605 | _ACEOF | ||
19606 | @@ -30157,23 +32685,36 @@ | ||
19607 | #include <faac.h> | ||
19608 | _ACEOF | ||
19609 | rm -f conftest.$ac_objext | ||
19610 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
19611 | - (eval $ac_compile) 2>conftest.er1 | ||
19612 | +if { (ac_try="$ac_compile" | ||
19613 | +case "(($ac_try" in | ||
19614 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19615 | + *) ac_try_echo=$ac_try;; | ||
19616 | +esac | ||
19617 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19618 | + (eval "$ac_compile") 2>conftest.er1 | ||
19619 | ac_status=$? | ||
19620 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19621 | rm -f conftest.er1 | ||
19622 | cat conftest.err >&5 | ||
19623 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19624 | (exit $ac_status); } && | ||
19625 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19626 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19627 | - (eval $ac_try) 2>&5 | ||
19628 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19629 | + { (case "(($ac_try" in | ||
19630 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19631 | + *) ac_try_echo=$ac_try;; | ||
19632 | +esac | ||
19633 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19634 | + (eval "$ac_try") 2>&5 | ||
19635 | ac_status=$? | ||
19636 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19637 | (exit $ac_status); }; } && | ||
19638 | { ac_try='test -s conftest.$ac_objext' | ||
19639 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19640 | - (eval $ac_try) 2>&5 | ||
19641 | + { (case "(($ac_try" in | ||
19642 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19643 | + *) ac_try_echo=$ac_try;; | ||
19644 | +esac | ||
19645 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19646 | + (eval "$ac_try") 2>&5 | ||
19647 | ac_status=$? | ||
19648 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19649 | (exit $ac_status); }; }; then | ||
19650 | @@ -30182,15 +32723,16 @@ | ||
19651 | echo "$as_me: failed program was:" >&5 | ||
19652 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
19653 | |||
19654 | -ac_header_compiler=no | ||
19655 | + ac_header_compiler=no | ||
19656 | fi | ||
19657 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19658 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
19659 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
19660 | + | ||
19661 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19662 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
19663 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
19664 | |||
19665 | # Is the header present? | ||
19666 | -echo "$as_me:$LINENO: checking faac.h presence" >&5 | ||
19667 | -echo $ECHO_N "checking faac.h presence... $ECHO_C" >&6 | ||
19668 | +{ echo "$as_me:$LINENO: checking faac.h presence" >&5 | ||
19669 | +echo $ECHO_N "checking faac.h presence... $ECHO_C" >&6; } | ||
19670 | cat >conftest.$ac_ext <<_ACEOF | ||
19671 | /* confdefs.h. */ | ||
19672 | _ACEOF | ||
19673 | @@ -30199,8 +32741,13 @@ | ||
19674 | /* end confdefs.h. */ | ||
19675 | #include <faac.h> | ||
19676 | _ACEOF | ||
19677 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
19678 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
19679 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
19680 | +case "(($ac_try" in | ||
19681 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19682 | + *) ac_try_echo=$ac_try;; | ||
19683 | +esac | ||
19684 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19685 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
19686 | ac_status=$? | ||
19687 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19688 | rm -f conftest.er1 | ||
19689 | @@ -30224,9 +32771,10 @@ | ||
19690 | |||
19691 | ac_header_preproc=no | ||
19692 | fi | ||
19693 | + | ||
19694 | rm -f conftest.err conftest.$ac_ext | ||
19695 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
19696 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
19697 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
19698 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
19699 | |||
19700 | # So? What about this header? | ||
19701 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
19702 | @@ -30250,25 +32798,23 @@ | ||
19703 | echo "$as_me: WARNING: faac.h: proceeding with the preprocessor's result" >&2;} | ||
19704 | { echo "$as_me:$LINENO: WARNING: faac.h: in the future, the compiler will take precedence" >&5 | ||
19705 | echo "$as_me: WARNING: faac.h: in the future, the compiler will take precedence" >&2;} | ||
19706 | - ( | ||
19707 | - cat <<\_ASBOX | ||
19708 | + ( cat <<\_ASBOX | ||
19709 | ## ------------------------------------------------------------------------ ## | ||
19710 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
19711 | ## ------------------------------------------------------------------------ ## | ||
19712 | _ASBOX | ||
19713 | - ) | | ||
19714 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
19715 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
19716 | ;; | ||
19717 | esac | ||
19718 | -echo "$as_me:$LINENO: checking for faac.h" >&5 | ||
19719 | -echo $ECHO_N "checking for faac.h... $ECHO_C" >&6 | ||
19720 | +{ echo "$as_me:$LINENO: checking for faac.h" >&5 | ||
19721 | +echo $ECHO_N "checking for faac.h... $ECHO_C" >&6; } | ||
19722 | if test "${ac_cv_header_faac_h+set}" = set; then | ||
19723 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
19724 | else | ||
19725 | ac_cv_header_faac_h=$ac_header_preproc | ||
19726 | fi | ||
19727 | -echo "$as_me:$LINENO: result: $ac_cv_header_faac_h" >&5 | ||
19728 | -echo "${ECHO_T}$ac_cv_header_faac_h" >&6 | ||
19729 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_faac_h" >&5 | ||
19730 | +echo "${ECHO_T}$ac_cv_header_faac_h" >&6; } | ||
19731 | |||
19732 | fi | ||
19733 | if test $ac_cv_header_faac_h = yes; then | ||
19734 | @@ -30349,10 +32895,9 @@ | ||
19735 | if test "x$USE_FAAD" = "xno"; then | ||
19736 | NOUSE="yes" | ||
19737 | fi | ||
19738 | -# Check whether --enable-faad or --disable-faad was given. | ||
19739 | +# Check whether --enable-faad was given. | ||
19740 | if test "${enable_faad+set}" = set; then | ||
19741 | - enableval="$enable_faad" | ||
19742 | - case "${enableval}" in | ||
19743 | + enableval=$enable_faad; case "${enableval}" in | ||
19744 | yes) USE_FAAD=yes;; | ||
19745 | no) USE_FAAD=no;; | ||
19746 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-faad" >&5 | ||
19747 | @@ -30361,7 +32906,8 @@ | ||
19748 | esac | ||
19749 | else | ||
19750 | USE_FAAD=yes | ||
19751 | -fi; | ||
19752 | +fi | ||
19753 | + | ||
19754 | if test "x$NOUSE" = "xyes"; then | ||
19755 | USE_FAAD="no" | ||
19756 | { echo "$as_me:$LINENO: WARNING: *** faad pre-configured not to be built" >&5 | ||
19757 | @@ -30382,8 +32928,8 @@ | ||
19758 | |||
19759 | HAVE_FAAD="yes" | ||
19760 | |||
19761 | - echo "$as_me:$LINENO: checking for faacDecOpen in -lfaad" >&5 | ||
19762 | -echo $ECHO_N "checking for faacDecOpen in -lfaad... $ECHO_C" >&6 | ||
19763 | + { echo "$as_me:$LINENO: checking for faacDecOpen in -lfaad" >&5 | ||
19764 | +echo $ECHO_N "checking for faacDecOpen in -lfaad... $ECHO_C" >&6; } | ||
19765 | if test "${ac_cv_lib_faad_faacDecOpen+set}" = set; then | ||
19766 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
19767 | else | ||
19768 | @@ -30396,39 +32942,52 @@ | ||
19769 | cat >>conftest.$ac_ext <<_ACEOF | ||
19770 | /* end confdefs.h. */ | ||
19771 | |||
19772 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
19773 | +/* Override any GCC internal prototype to avoid an error. | ||
19774 | + Use char because int might match the return type of a GCC | ||
19775 | + builtin and then its argument prototype would still apply. */ | ||
19776 | #ifdef __cplusplus | ||
19777 | extern "C" | ||
19778 | #endif | ||
19779 | -/* We use char because int might match the return type of a gcc2 | ||
19780 | - builtin and then its argument prototype would still apply. */ | ||
19781 | char faacDecOpen (); | ||
19782 | int | ||
19783 | main () | ||
19784 | { | ||
19785 | -faacDecOpen (); | ||
19786 | +return faacDecOpen (); | ||
19787 | ; | ||
19788 | return 0; | ||
19789 | } | ||
19790 | _ACEOF | ||
19791 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
19792 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
19793 | - (eval $ac_link) 2>conftest.er1 | ||
19794 | +if { (ac_try="$ac_link" | ||
19795 | +case "(($ac_try" in | ||
19796 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19797 | + *) ac_try_echo=$ac_try;; | ||
19798 | +esac | ||
19799 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19800 | + (eval "$ac_link") 2>conftest.er1 | ||
19801 | ac_status=$? | ||
19802 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19803 | rm -f conftest.er1 | ||
19804 | cat conftest.err >&5 | ||
19805 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19806 | (exit $ac_status); } && | ||
19807 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19808 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19809 | - (eval $ac_try) 2>&5 | ||
19810 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19811 | + { (case "(($ac_try" in | ||
19812 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19813 | + *) ac_try_echo=$ac_try;; | ||
19814 | +esac | ||
19815 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19816 | + (eval "$ac_try") 2>&5 | ||
19817 | ac_status=$? | ||
19818 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19819 | (exit $ac_status); }; } && | ||
19820 | { ac_try='test -s conftest$ac_exeext' | ||
19821 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19822 | - (eval $ac_try) 2>&5 | ||
19823 | + { (case "(($ac_try" in | ||
19824 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19825 | + *) ac_try_echo=$ac_try;; | ||
19826 | +esac | ||
19827 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19828 | + (eval "$ac_try") 2>&5 | ||
19829 | ac_status=$? | ||
19830 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19831 | (exit $ac_status); }; }; then | ||
19832 | @@ -30437,14 +32996,15 @@ | ||
19833 | echo "$as_me: failed program was:" >&5 | ||
19834 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
19835 | |||
19836 | -ac_cv_lib_faad_faacDecOpen=no | ||
19837 | + ac_cv_lib_faad_faacDecOpen=no | ||
19838 | fi | ||
19839 | -rm -f conftest.err conftest.$ac_objext \ | ||
19840 | + | ||
19841 | +rm -f core conftest.err conftest.$ac_objext \ | ||
19842 | conftest$ac_exeext conftest.$ac_ext | ||
19843 | LIBS=$ac_check_lib_save_LIBS | ||
19844 | fi | ||
19845 | -echo "$as_me:$LINENO: result: $ac_cv_lib_faad_faacDecOpen" >&5 | ||
19846 | -echo "${ECHO_T}$ac_cv_lib_faad_faacDecOpen" >&6 | ||
19847 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_faad_faacDecOpen" >&5 | ||
19848 | +echo "${ECHO_T}$ac_cv_lib_faad_faacDecOpen" >&6; } | ||
19849 | if test $ac_cv_lib_faad_faacDecOpen = yes; then | ||
19850 | HAVE_FAAD=yes | ||
19851 | else | ||
19852 | @@ -30453,17 +33013,17 @@ | ||
19853 | |||
19854 | if test "x$HAVE_FAAD" = "xyes"; then | ||
19855 | if test "${ac_cv_header_faad_h+set}" = set; then | ||
19856 | - echo "$as_me:$LINENO: checking for faad.h" >&5 | ||
19857 | -echo $ECHO_N "checking for faad.h... $ECHO_C" >&6 | ||
19858 | + { echo "$as_me:$LINENO: checking for faad.h" >&5 | ||
19859 | +echo $ECHO_N "checking for faad.h... $ECHO_C" >&6; } | ||
19860 | if test "${ac_cv_header_faad_h+set}" = set; then | ||
19861 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
19862 | fi | ||
19863 | -echo "$as_me:$LINENO: result: $ac_cv_header_faad_h" >&5 | ||
19864 | -echo "${ECHO_T}$ac_cv_header_faad_h" >&6 | ||
19865 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_faad_h" >&5 | ||
19866 | +echo "${ECHO_T}$ac_cv_header_faad_h" >&6; } | ||
19867 | else | ||
19868 | # Is the header compilable? | ||
19869 | -echo "$as_me:$LINENO: checking faad.h usability" >&5 | ||
19870 | -echo $ECHO_N "checking faad.h usability... $ECHO_C" >&6 | ||
19871 | +{ echo "$as_me:$LINENO: checking faad.h usability" >&5 | ||
19872 | +echo $ECHO_N "checking faad.h usability... $ECHO_C" >&6; } | ||
19873 | cat >conftest.$ac_ext <<_ACEOF | ||
19874 | /* confdefs.h. */ | ||
19875 | _ACEOF | ||
19876 | @@ -30474,23 +33034,36 @@ | ||
19877 | #include <faad.h> | ||
19878 | _ACEOF | ||
19879 | rm -f conftest.$ac_objext | ||
19880 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
19881 | - (eval $ac_compile) 2>conftest.er1 | ||
19882 | +if { (ac_try="$ac_compile" | ||
19883 | +case "(($ac_try" in | ||
19884 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19885 | + *) ac_try_echo=$ac_try;; | ||
19886 | +esac | ||
19887 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19888 | + (eval "$ac_compile") 2>conftest.er1 | ||
19889 | ac_status=$? | ||
19890 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19891 | rm -f conftest.er1 | ||
19892 | cat conftest.err >&5 | ||
19893 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19894 | (exit $ac_status); } && | ||
19895 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19896 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19897 | - (eval $ac_try) 2>&5 | ||
19898 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
19899 | + { (case "(($ac_try" in | ||
19900 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19901 | + *) ac_try_echo=$ac_try;; | ||
19902 | +esac | ||
19903 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19904 | + (eval "$ac_try") 2>&5 | ||
19905 | ac_status=$? | ||
19906 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19907 | (exit $ac_status); }; } && | ||
19908 | { ac_try='test -s conftest.$ac_objext' | ||
19909 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19910 | - (eval $ac_try) 2>&5 | ||
19911 | + { (case "(($ac_try" in | ||
19912 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19913 | + *) ac_try_echo=$ac_try;; | ||
19914 | +esac | ||
19915 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19916 | + (eval "$ac_try") 2>&5 | ||
19917 | ac_status=$? | ||
19918 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19919 | (exit $ac_status); }; }; then | ||
19920 | @@ -30499,15 +33072,16 @@ | ||
19921 | echo "$as_me: failed program was:" >&5 | ||
19922 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
19923 | |||
19924 | -ac_header_compiler=no | ||
19925 | + ac_header_compiler=no | ||
19926 | fi | ||
19927 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19928 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
19929 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
19930 | + | ||
19931 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19932 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
19933 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
19934 | |||
19935 | # Is the header present? | ||
19936 | -echo "$as_me:$LINENO: checking faad.h presence" >&5 | ||
19937 | -echo $ECHO_N "checking faad.h presence... $ECHO_C" >&6 | ||
19938 | +{ echo "$as_me:$LINENO: checking faad.h presence" >&5 | ||
19939 | +echo $ECHO_N "checking faad.h presence... $ECHO_C" >&6; } | ||
19940 | cat >conftest.$ac_ext <<_ACEOF | ||
19941 | /* confdefs.h. */ | ||
19942 | _ACEOF | ||
19943 | @@ -30516,8 +33090,13 @@ | ||
19944 | /* end confdefs.h. */ | ||
19945 | #include <faad.h> | ||
19946 | _ACEOF | ||
19947 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
19948 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
19949 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
19950 | +case "(($ac_try" in | ||
19951 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
19952 | + *) ac_try_echo=$ac_try;; | ||
19953 | +esac | ||
19954 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
19955 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
19956 | ac_status=$? | ||
19957 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19958 | rm -f conftest.er1 | ||
19959 | @@ -30541,9 +33120,10 @@ | ||
19960 | |||
19961 | ac_header_preproc=no | ||
19962 | fi | ||
19963 | + | ||
19964 | rm -f conftest.err conftest.$ac_ext | ||
19965 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
19966 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
19967 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
19968 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
19969 | |||
19970 | # So? What about this header? | ||
19971 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
19972 | @@ -30567,25 +33147,23 @@ | ||
19973 | echo "$as_me: WARNING: faad.h: proceeding with the preprocessor's result" >&2;} | ||
19974 | { echo "$as_me:$LINENO: WARNING: faad.h: in the future, the compiler will take precedence" >&5 | ||
19975 | echo "$as_me: WARNING: faad.h: in the future, the compiler will take precedence" >&2;} | ||
19976 | - ( | ||
19977 | - cat <<\_ASBOX | ||
19978 | + ( cat <<\_ASBOX | ||
19979 | ## ------------------------------------------------------------------------ ## | ||
19980 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
19981 | ## ------------------------------------------------------------------------ ## | ||
19982 | _ASBOX | ||
19983 | - ) | | ||
19984 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
19985 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
19986 | ;; | ||
19987 | esac | ||
19988 | -echo "$as_me:$LINENO: checking for faad.h" >&5 | ||
19989 | -echo $ECHO_N "checking for faad.h... $ECHO_C" >&6 | ||
19990 | +{ echo "$as_me:$LINENO: checking for faad.h" >&5 | ||
19991 | +echo $ECHO_N "checking for faad.h... $ECHO_C" >&6; } | ||
19992 | if test "${ac_cv_header_faad_h+set}" = set; then | ||
19993 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
19994 | else | ||
19995 | ac_cv_header_faad_h=$ac_header_preproc | ||
19996 | fi | ||
19997 | -echo "$as_me:$LINENO: result: $ac_cv_header_faad_h" >&5 | ||
19998 | -echo "${ECHO_T}$ac_cv_header_faad_h" >&6 | ||
19999 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_faad_h" >&5 | ||
20000 | +echo "${ECHO_T}$ac_cv_header_faad_h" >&6; } | ||
20001 | |||
20002 | fi | ||
20003 | if test $ac_cv_header_faad_h = yes; then | ||
20004 | @@ -30607,8 +33185,8 @@ | ||
20005 | |||
20006 | |||
20007 | if test $HAVE_FAAD = "yes"; then | ||
20008 | - echo "$as_me:$LINENO: checking Checking for FAAD >= 2" >&5 | ||
20009 | -echo $ECHO_N "checking Checking for FAAD >= 2... $ECHO_C" >&6 | ||
20010 | + { echo "$as_me:$LINENO: checking Checking for FAAD >= 2" >&5 | ||
20011 | +echo $ECHO_N "checking Checking for FAAD >= 2... $ECHO_C" >&6; } | ||
20012 | if test "$cross_compiling" = yes; then | ||
20013 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling | ||
20014 | See \`config.log' for more details." >&5 | ||
20015 | @@ -30643,20 +33221,29 @@ | ||
20016 | |||
20017 | _ACEOF | ||
20018 | rm -f conftest$ac_exeext | ||
20019 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
20020 | - (eval $ac_link) 2>&5 | ||
20021 | +if { (ac_try="$ac_link" | ||
20022 | +case "(($ac_try" in | ||
20023 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20024 | + *) ac_try_echo=$ac_try;; | ||
20025 | +esac | ||
20026 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20027 | + (eval "$ac_link") 2>&5 | ||
20028 | ac_status=$? | ||
20029 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20030 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
20031 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20032 | - (eval $ac_try) 2>&5 | ||
20033 | + { (case "(($ac_try" in | ||
20034 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20035 | + *) ac_try_echo=$ac_try;; | ||
20036 | +esac | ||
20037 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20038 | + (eval "$ac_try") 2>&5 | ||
20039 | ac_status=$? | ||
20040 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20041 | (exit $ac_status); }; }; then | ||
20042 | |||
20043 | HAVE_FAAD="yes" | ||
20044 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
20045 | -echo "${ECHO_T}yes" >&6 | ||
20046 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
20047 | +echo "${ECHO_T}yes" >&6; } | ||
20048 | |||
20049 | else | ||
20050 | echo "$as_me: program exited with status $ac_status" >&5 | ||
20051 | @@ -30666,12 +33253,14 @@ | ||
20052 | ( exit $ac_status ) | ||
20053 | |||
20054 | HAVE_FAAD="no" | ||
20055 | - echo "$as_me:$LINENO: result: no" >&5 | ||
20056 | -echo "${ECHO_T}no" >&6 | ||
20057 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
20058 | +echo "${ECHO_T}no" >&6; } | ||
20059 | |||
20060 | fi | ||
20061 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
20062 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
20063 | fi | ||
20064 | + | ||
20065 | + | ||
20066 | fi | ||
20067 | |||
20068 | GIVEN_CFLAGS=$FAAD_CFLAGS | ||
20069 | @@ -30733,10 +33322,9 @@ | ||
20070 | if test "x$USE_GSM" = "xno"; then | ||
20071 | NOUSE="yes" | ||
20072 | fi | ||
20073 | -# Check whether --enable-gsm or --disable-gsm was given. | ||
20074 | +# Check whether --enable-gsm was given. | ||
20075 | if test "${enable_gsm+set}" = set; then | ||
20076 | - enableval="$enable_gsm" | ||
20077 | - case "${enableval}" in | ||
20078 | + enableval=$enable_gsm; case "${enableval}" in | ||
20079 | yes) USE_GSM=yes;; | ||
20080 | no) USE_GSM=no;; | ||
20081 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-gsm" >&5 | ||
20082 | @@ -30745,7 +33333,8 @@ | ||
20083 | esac | ||
20084 | else | ||
20085 | USE_GSM=yes | ||
20086 | -fi; | ||
20087 | +fi | ||
20088 | + | ||
20089 | if test "x$NOUSE" = "xyes"; then | ||
20090 | USE_GSM="no" | ||
20091 | { echo "$as_me:$LINENO: WARNING: *** gsmenc gsmdec pre-configured not to be built" >&5 | ||
20092 | @@ -30765,8 +33354,8 @@ | ||
20093 | HAVE_GSM=no | ||
20094 | |||
20095 | |||
20096 | - echo "$as_me:$LINENO: checking for gsm_create in -lgsm" >&5 | ||
20097 | -echo $ECHO_N "checking for gsm_create in -lgsm... $ECHO_C" >&6 | ||
20098 | + { echo "$as_me:$LINENO: checking for gsm_create in -lgsm" >&5 | ||
20099 | +echo $ECHO_N "checking for gsm_create in -lgsm... $ECHO_C" >&6; } | ||
20100 | if test "${ac_cv_lib_gsm_gsm_create+set}" = set; then | ||
20101 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
20102 | else | ||
20103 | @@ -30779,39 +33368,52 @@ | ||
20104 | cat >>conftest.$ac_ext <<_ACEOF | ||
20105 | /* end confdefs.h. */ | ||
20106 | |||
20107 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
20108 | +/* Override any GCC internal prototype to avoid an error. | ||
20109 | + Use char because int might match the return type of a GCC | ||
20110 | + builtin and then its argument prototype would still apply. */ | ||
20111 | #ifdef __cplusplus | ||
20112 | extern "C" | ||
20113 | #endif | ||
20114 | -/* We use char because int might match the return type of a gcc2 | ||
20115 | - builtin and then its argument prototype would still apply. */ | ||
20116 | char gsm_create (); | ||
20117 | int | ||
20118 | main () | ||
20119 | { | ||
20120 | -gsm_create (); | ||
20121 | +return gsm_create (); | ||
20122 | ; | ||
20123 | return 0; | ||
20124 | } | ||
20125 | _ACEOF | ||
20126 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
20127 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
20128 | - (eval $ac_link) 2>conftest.er1 | ||
20129 | +if { (ac_try="$ac_link" | ||
20130 | +case "(($ac_try" in | ||
20131 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20132 | + *) ac_try_echo=$ac_try;; | ||
20133 | +esac | ||
20134 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20135 | + (eval "$ac_link") 2>conftest.er1 | ||
20136 | ac_status=$? | ||
20137 | grep -v '^ *+' conftest.er1 >conftest.err | ||
20138 | rm -f conftest.er1 | ||
20139 | cat conftest.err >&5 | ||
20140 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20141 | (exit $ac_status); } && | ||
20142 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
20143 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20144 | - (eval $ac_try) 2>&5 | ||
20145 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
20146 | + { (case "(($ac_try" in | ||
20147 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20148 | + *) ac_try_echo=$ac_try;; | ||
20149 | +esac | ||
20150 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20151 | + (eval "$ac_try") 2>&5 | ||
20152 | ac_status=$? | ||
20153 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20154 | (exit $ac_status); }; } && | ||
20155 | { ac_try='test -s conftest$ac_exeext' | ||
20156 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20157 | - (eval $ac_try) 2>&5 | ||
20158 | + { (case "(($ac_try" in | ||
20159 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20160 | + *) ac_try_echo=$ac_try;; | ||
20161 | +esac | ||
20162 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20163 | + (eval "$ac_try") 2>&5 | ||
20164 | ac_status=$? | ||
20165 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20166 | (exit $ac_status); }; }; then | ||
20167 | @@ -30820,14 +33422,15 @@ | ||
20168 | echo "$as_me: failed program was:" >&5 | ||
20169 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
20170 | |||
20171 | -ac_cv_lib_gsm_gsm_create=no | ||
20172 | + ac_cv_lib_gsm_gsm_create=no | ||
20173 | fi | ||
20174 | -rm -f conftest.err conftest.$ac_objext \ | ||
20175 | + | ||
20176 | +rm -f core conftest.err conftest.$ac_objext \ | ||
20177 | conftest$ac_exeext conftest.$ac_ext | ||
20178 | LIBS=$ac_check_lib_save_LIBS | ||
20179 | fi | ||
20180 | -echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_gsm_create" >&5 | ||
20181 | -echo "${ECHO_T}$ac_cv_lib_gsm_gsm_create" >&6 | ||
20182 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_gsm_create" >&5 | ||
20183 | +echo "${ECHO_T}$ac_cv_lib_gsm_gsm_create" >&6; } | ||
20184 | if test $ac_cv_lib_gsm_gsm_create = yes; then | ||
20185 | HAVE_GSM=yes | ||
20186 | else | ||
20187 | @@ -30836,17 +33439,17 @@ | ||
20188 | |||
20189 | if test "x$HAVE_GSM" = "xyes"; then | ||
20190 | if test "${ac_cv_header_gsm_h+set}" = set; then | ||
20191 | - echo "$as_me:$LINENO: checking for gsm.h" >&5 | ||
20192 | -echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6 | ||
20193 | + { echo "$as_me:$LINENO: checking for gsm.h" >&5 | ||
20194 | +echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6; } | ||
20195 | if test "${ac_cv_header_gsm_h+set}" = set; then | ||
20196 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
20197 | fi | ||
20198 | -echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5 | ||
20199 | -echo "${ECHO_T}$ac_cv_header_gsm_h" >&6 | ||
20200 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5 | ||
20201 | +echo "${ECHO_T}$ac_cv_header_gsm_h" >&6; } | ||
20202 | else | ||
20203 | # Is the header compilable? | ||
20204 | -echo "$as_me:$LINENO: checking gsm.h usability" >&5 | ||
20205 | -echo $ECHO_N "checking gsm.h usability... $ECHO_C" >&6 | ||
20206 | +{ echo "$as_me:$LINENO: checking gsm.h usability" >&5 | ||
20207 | +echo $ECHO_N "checking gsm.h usability... $ECHO_C" >&6; } | ||
20208 | cat >conftest.$ac_ext <<_ACEOF | ||
20209 | /* confdefs.h. */ | ||
20210 | _ACEOF | ||
20211 | @@ -30857,23 +33460,36 @@ | ||
20212 | #include <gsm.h> | ||
20213 | _ACEOF | ||
20214 | rm -f conftest.$ac_objext | ||
20215 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
20216 | - (eval $ac_compile) 2>conftest.er1 | ||
20217 | +if { (ac_try="$ac_compile" | ||
20218 | +case "(($ac_try" in | ||
20219 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20220 | + *) ac_try_echo=$ac_try;; | ||
20221 | +esac | ||
20222 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20223 | + (eval "$ac_compile") 2>conftest.er1 | ||
20224 | ac_status=$? | ||
20225 | grep -v '^ *+' conftest.er1 >conftest.err | ||
20226 | rm -f conftest.er1 | ||
20227 | cat conftest.err >&5 | ||
20228 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20229 | (exit $ac_status); } && | ||
20230 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
20231 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20232 | - (eval $ac_try) 2>&5 | ||
20233 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
20234 | + { (case "(($ac_try" in | ||
20235 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20236 | + *) ac_try_echo=$ac_try;; | ||
20237 | +esac | ||
20238 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20239 | + (eval "$ac_try") 2>&5 | ||
20240 | ac_status=$? | ||
20241 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20242 | (exit $ac_status); }; } && | ||
20243 | { ac_try='test -s conftest.$ac_objext' | ||
20244 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20245 | - (eval $ac_try) 2>&5 | ||
20246 | + { (case "(($ac_try" in | ||
20247 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20248 | + *) ac_try_echo=$ac_try;; | ||
20249 | +esac | ||
20250 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20251 | + (eval "$ac_try") 2>&5 | ||
20252 | ac_status=$? | ||
20253 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20254 | (exit $ac_status); }; }; then | ||
20255 | @@ -30882,15 +33498,16 @@ | ||
20256 | echo "$as_me: failed program was:" >&5 | ||
20257 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
20258 | |||
20259 | -ac_header_compiler=no | ||
20260 | + ac_header_compiler=no | ||
20261 | fi | ||
20262 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20263 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
20264 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
20265 | + | ||
20266 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20267 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
20268 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
20269 | |||
20270 | # Is the header present? | ||
20271 | -echo "$as_me:$LINENO: checking gsm.h presence" >&5 | ||
20272 | -echo $ECHO_N "checking gsm.h presence... $ECHO_C" >&6 | ||
20273 | +{ echo "$as_me:$LINENO: checking gsm.h presence" >&5 | ||
20274 | +echo $ECHO_N "checking gsm.h presence... $ECHO_C" >&6; } | ||
20275 | cat >conftest.$ac_ext <<_ACEOF | ||
20276 | /* confdefs.h. */ | ||
20277 | _ACEOF | ||
20278 | @@ -30899,8 +33516,13 @@ | ||
20279 | /* end confdefs.h. */ | ||
20280 | #include <gsm.h> | ||
20281 | _ACEOF | ||
20282 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
20283 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
20284 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
20285 | +case "(($ac_try" in | ||
20286 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20287 | + *) ac_try_echo=$ac_try;; | ||
20288 | +esac | ||
20289 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20290 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
20291 | ac_status=$? | ||
20292 | grep -v '^ *+' conftest.er1 >conftest.err | ||
20293 | rm -f conftest.er1 | ||
20294 | @@ -30924,9 +33546,10 @@ | ||
20295 | |||
20296 | ac_header_preproc=no | ||
20297 | fi | ||
20298 | + | ||
20299 | rm -f conftest.err conftest.$ac_ext | ||
20300 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
20301 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
20302 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
20303 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
20304 | |||
20305 | # So? What about this header? | ||
20306 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
20307 | @@ -30950,25 +33573,23 @@ | ||
20308 | echo "$as_me: WARNING: gsm.h: proceeding with the preprocessor's result" >&2;} | ||
20309 | { echo "$as_me:$LINENO: WARNING: gsm.h: in the future, the compiler will take precedence" >&5 | ||
20310 | echo "$as_me: WARNING: gsm.h: in the future, the compiler will take precedence" >&2;} | ||
20311 | - ( | ||
20312 | - cat <<\_ASBOX | ||
20313 | + ( cat <<\_ASBOX | ||
20314 | ## ------------------------------------------------------------------------ ## | ||
20315 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
20316 | ## ------------------------------------------------------------------------ ## | ||
20317 | _ASBOX | ||
20318 | - ) | | ||
20319 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
20320 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
20321 | ;; | ||
20322 | esac | ||
20323 | -echo "$as_me:$LINENO: checking for gsm.h" >&5 | ||
20324 | -echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6 | ||
20325 | +{ echo "$as_me:$LINENO: checking for gsm.h" >&5 | ||
20326 | +echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6; } | ||
20327 | if test "${ac_cv_header_gsm_h+set}" = set; then | ||
20328 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
20329 | else | ||
20330 | ac_cv_header_gsm_h=$ac_header_preproc | ||
20331 | fi | ||
20332 | -echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5 | ||
20333 | -echo "${ECHO_T}$ac_cv_header_gsm_h" >&6 | ||
20334 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5 | ||
20335 | +echo "${ECHO_T}$ac_cv_header_gsm_h" >&6; } | ||
20336 | |||
20337 | fi | ||
20338 | if test $ac_cv_header_gsm_h = yes; then | ||
20339 | @@ -30991,8 +33612,8 @@ | ||
20340 | |||
20341 | if test $HAVE_GSM != "yes"; then | ||
20342 | |||
20343 | - echo "$as_me:$LINENO: checking for gsm_create in -lgsm" >&5 | ||
20344 | -echo $ECHO_N "checking for gsm_create in -lgsm... $ECHO_C" >&6 | ||
20345 | + { echo "$as_me:$LINENO: checking for gsm_create in -lgsm" >&5 | ||
20346 | +echo $ECHO_N "checking for gsm_create in -lgsm... $ECHO_C" >&6; } | ||
20347 | if test "${ac_cv_lib_gsm_gsm_create+set}" = set; then | ||
20348 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
20349 | else | ||
20350 | @@ -31005,39 +33626,52 @@ | ||
20351 | cat >>conftest.$ac_ext <<_ACEOF | ||
20352 | /* end confdefs.h. */ | ||
20353 | |||
20354 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
20355 | +/* Override any GCC internal prototype to avoid an error. | ||
20356 | + Use char because int might match the return type of a GCC | ||
20357 | + builtin and then its argument prototype would still apply. */ | ||
20358 | #ifdef __cplusplus | ||
20359 | extern "C" | ||
20360 | #endif | ||
20361 | -/* We use char because int might match the return type of a gcc2 | ||
20362 | - builtin and then its argument prototype would still apply. */ | ||
20363 | char gsm_create (); | ||
20364 | int | ||
20365 | main () | ||
20366 | { | ||
20367 | -gsm_create (); | ||
20368 | +return gsm_create (); | ||
20369 | ; | ||
20370 | return 0; | ||
20371 | } | ||
20372 | _ACEOF | ||
20373 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
20374 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
20375 | - (eval $ac_link) 2>conftest.er1 | ||
20376 | +if { (ac_try="$ac_link" | ||
20377 | +case "(($ac_try" in | ||
20378 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20379 | + *) ac_try_echo=$ac_try;; | ||
20380 | +esac | ||
20381 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20382 | + (eval "$ac_link") 2>conftest.er1 | ||
20383 | ac_status=$? | ||
20384 | grep -v '^ *+' conftest.er1 >conftest.err | ||
20385 | rm -f conftest.er1 | ||
20386 | cat conftest.err >&5 | ||
20387 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20388 | (exit $ac_status); } && | ||
20389 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
20390 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20391 | - (eval $ac_try) 2>&5 | ||
20392 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
20393 | + { (case "(($ac_try" in | ||
20394 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20395 | + *) ac_try_echo=$ac_try;; | ||
20396 | +esac | ||
20397 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20398 | + (eval "$ac_try") 2>&5 | ||
20399 | ac_status=$? | ||
20400 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20401 | (exit $ac_status); }; } && | ||
20402 | { ac_try='test -s conftest$ac_exeext' | ||
20403 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20404 | - (eval $ac_try) 2>&5 | ||
20405 | + { (case "(($ac_try" in | ||
20406 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20407 | + *) ac_try_echo=$ac_try;; | ||
20408 | +esac | ||
20409 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20410 | + (eval "$ac_try") 2>&5 | ||
20411 | ac_status=$? | ||
20412 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20413 | (exit $ac_status); }; }; then | ||
20414 | @@ -31046,14 +33680,15 @@ | ||
20415 | echo "$as_me: failed program was:" >&5 | ||
20416 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
20417 | |||
20418 | -ac_cv_lib_gsm_gsm_create=no | ||
20419 | + ac_cv_lib_gsm_gsm_create=no | ||
20420 | fi | ||
20421 | -rm -f conftest.err conftest.$ac_objext \ | ||
20422 | + | ||
20423 | +rm -f core conftest.err conftest.$ac_objext \ | ||
20424 | conftest$ac_exeext conftest.$ac_ext | ||
20425 | LIBS=$ac_check_lib_save_LIBS | ||
20426 | fi | ||
20427 | -echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_gsm_create" >&5 | ||
20428 | -echo "${ECHO_T}$ac_cv_lib_gsm_gsm_create" >&6 | ||
20429 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_gsm_create" >&5 | ||
20430 | +echo "${ECHO_T}$ac_cv_lib_gsm_gsm_create" >&6; } | ||
20431 | if test $ac_cv_lib_gsm_gsm_create = yes; then | ||
20432 | HAVE_GSM=yes | ||
20433 | else | ||
20434 | @@ -31062,17 +33697,17 @@ | ||
20435 | |||
20436 | if test "x$HAVE_GSM" = "xyes"; then | ||
20437 | if test "${ac_cv_header_gsm_gsm_h+set}" = set; then | ||
20438 | - echo "$as_me:$LINENO: checking for gsm/gsm.h" >&5 | ||
20439 | -echo $ECHO_N "checking for gsm/gsm.h... $ECHO_C" >&6 | ||
20440 | + { echo "$as_me:$LINENO: checking for gsm/gsm.h" >&5 | ||
20441 | +echo $ECHO_N "checking for gsm/gsm.h... $ECHO_C" >&6; } | ||
20442 | if test "${ac_cv_header_gsm_gsm_h+set}" = set; then | ||
20443 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
20444 | fi | ||
20445 | -echo "$as_me:$LINENO: result: $ac_cv_header_gsm_gsm_h" >&5 | ||
20446 | -echo "${ECHO_T}$ac_cv_header_gsm_gsm_h" >&6 | ||
20447 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_gsm_h" >&5 | ||
20448 | +echo "${ECHO_T}$ac_cv_header_gsm_gsm_h" >&6; } | ||
20449 | else | ||
20450 | # Is the header compilable? | ||
20451 | -echo "$as_me:$LINENO: checking gsm/gsm.h usability" >&5 | ||
20452 | -echo $ECHO_N "checking gsm/gsm.h usability... $ECHO_C" >&6 | ||
20453 | +{ echo "$as_me:$LINENO: checking gsm/gsm.h usability" >&5 | ||
20454 | +echo $ECHO_N "checking gsm/gsm.h usability... $ECHO_C" >&6; } | ||
20455 | cat >conftest.$ac_ext <<_ACEOF | ||
20456 | /* confdefs.h. */ | ||
20457 | _ACEOF | ||
20458 | @@ -31083,23 +33718,36 @@ | ||
20459 | #include <gsm/gsm.h> | ||
20460 | _ACEOF | ||
20461 | rm -f conftest.$ac_objext | ||
20462 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
20463 | - (eval $ac_compile) 2>conftest.er1 | ||
20464 | +if { (ac_try="$ac_compile" | ||
20465 | +case "(($ac_try" in | ||
20466 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20467 | + *) ac_try_echo=$ac_try;; | ||
20468 | +esac | ||
20469 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20470 | + (eval "$ac_compile") 2>conftest.er1 | ||
20471 | ac_status=$? | ||
20472 | grep -v '^ *+' conftest.er1 >conftest.err | ||
20473 | rm -f conftest.er1 | ||
20474 | cat conftest.err >&5 | ||
20475 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20476 | (exit $ac_status); } && | ||
20477 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
20478 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20479 | - (eval $ac_try) 2>&5 | ||
20480 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
20481 | + { (case "(($ac_try" in | ||
20482 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20483 | + *) ac_try_echo=$ac_try;; | ||
20484 | +esac | ||
20485 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20486 | + (eval "$ac_try") 2>&5 | ||
20487 | ac_status=$? | ||
20488 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20489 | (exit $ac_status); }; } && | ||
20490 | { ac_try='test -s conftest.$ac_objext' | ||
20491 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20492 | - (eval $ac_try) 2>&5 | ||
20493 | + { (case "(($ac_try" in | ||
20494 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20495 | + *) ac_try_echo=$ac_try;; | ||
20496 | +esac | ||
20497 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20498 | + (eval "$ac_try") 2>&5 | ||
20499 | ac_status=$? | ||
20500 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20501 | (exit $ac_status); }; }; then | ||
20502 | @@ -31108,15 +33756,16 @@ | ||
20503 | echo "$as_me: failed program was:" >&5 | ||
20504 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
20505 | |||
20506 | -ac_header_compiler=no | ||
20507 | + ac_header_compiler=no | ||
20508 | fi | ||
20509 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20510 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
20511 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
20512 | + | ||
20513 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20514 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
20515 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
20516 | |||
20517 | # Is the header present? | ||
20518 | -echo "$as_me:$LINENO: checking gsm/gsm.h presence" >&5 | ||
20519 | -echo $ECHO_N "checking gsm/gsm.h presence... $ECHO_C" >&6 | ||
20520 | +{ echo "$as_me:$LINENO: checking gsm/gsm.h presence" >&5 | ||
20521 | +echo $ECHO_N "checking gsm/gsm.h presence... $ECHO_C" >&6; } | ||
20522 | cat >conftest.$ac_ext <<_ACEOF | ||
20523 | /* confdefs.h. */ | ||
20524 | _ACEOF | ||
20525 | @@ -31125,8 +33774,13 @@ | ||
20526 | /* end confdefs.h. */ | ||
20527 | #include <gsm/gsm.h> | ||
20528 | _ACEOF | ||
20529 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
20530 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
20531 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
20532 | +case "(($ac_try" in | ||
20533 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20534 | + *) ac_try_echo=$ac_try;; | ||
20535 | +esac | ||
20536 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20537 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
20538 | ac_status=$? | ||
20539 | grep -v '^ *+' conftest.er1 >conftest.err | ||
20540 | rm -f conftest.er1 | ||
20541 | @@ -31150,9 +33804,10 @@ | ||
20542 | |||
20543 | ac_header_preproc=no | ||
20544 | fi | ||
20545 | + | ||
20546 | rm -f conftest.err conftest.$ac_ext | ||
20547 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
20548 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
20549 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
20550 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
20551 | |||
20552 | # So? What about this header? | ||
20553 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
20554 | @@ -31176,25 +33831,23 @@ | ||
20555 | echo "$as_me: WARNING: gsm/gsm.h: proceeding with the preprocessor's result" >&2;} | ||
20556 | { echo "$as_me:$LINENO: WARNING: gsm/gsm.h: in the future, the compiler will take precedence" >&5 | ||
20557 | echo "$as_me: WARNING: gsm/gsm.h: in the future, the compiler will take precedence" >&2;} | ||
20558 | - ( | ||
20559 | - cat <<\_ASBOX | ||
20560 | + ( cat <<\_ASBOX | ||
20561 | ## ------------------------------------------------------------------------ ## | ||
20562 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
20563 | ## ------------------------------------------------------------------------ ## | ||
20564 | _ASBOX | ||
20565 | - ) | | ||
20566 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
20567 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
20568 | ;; | ||
20569 | esac | ||
20570 | -echo "$as_me:$LINENO: checking for gsm/gsm.h" >&5 | ||
20571 | -echo $ECHO_N "checking for gsm/gsm.h... $ECHO_C" >&6 | ||
20572 | +{ echo "$as_me:$LINENO: checking for gsm/gsm.h" >&5 | ||
20573 | +echo $ECHO_N "checking for gsm/gsm.h... $ECHO_C" >&6; } | ||
20574 | if test "${ac_cv_header_gsm_gsm_h+set}" = set; then | ||
20575 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
20576 | else | ||
20577 | ac_cv_header_gsm_gsm_h=$ac_header_preproc | ||
20578 | fi | ||
20579 | -echo "$as_me:$LINENO: result: $ac_cv_header_gsm_gsm_h" >&5 | ||
20580 | -echo "${ECHO_T}$ac_cv_header_gsm_gsm_h" >&6 | ||
20581 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_gsm_h" >&5 | ||
20582 | +echo "${ECHO_T}$ac_cv_header_gsm_gsm_h" >&6; } | ||
20583 | |||
20584 | fi | ||
20585 | if test $ac_cv_header_gsm_gsm_h = yes; then | ||
20586 | @@ -31273,10 +33926,9 @@ | ||
20587 | if test "x$USE_IVORBIS" = "xno"; then | ||
20588 | NOUSE="yes" | ||
20589 | fi | ||
20590 | -# Check whether --enable-ivorbis or --disable-ivorbis was given. | ||
20591 | +# Check whether --enable-ivorbis was given. | ||
20592 | if test "${enable_ivorbis+set}" = set; then | ||
20593 | - enableval="$enable_ivorbis" | ||
20594 | - case "${enableval}" in | ||
20595 | + enableval=$enable_ivorbis; case "${enableval}" in | ||
20596 | yes) USE_IVORBIS=yes;; | ||
20597 | no) USE_IVORBIS=no;; | ||
20598 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-ivorbis" >&5 | ||
20599 | @@ -31285,7 +33937,8 @@ | ||
20600 | esac | ||
20601 | else | ||
20602 | USE_IVORBIS=yes | ||
20603 | -fi; | ||
20604 | +fi | ||
20605 | + | ||
20606 | if test "x$NOUSE" = "xyes"; then | ||
20607 | USE_IVORBIS="no" | ||
20608 | { echo "$as_me:$LINENO: WARNING: *** ivorbisdec pre-configured not to be built" >&5 | ||
20609 | @@ -31306,8 +33959,8 @@ | ||
20610 | |||
20611 | IVORBIS_LIBS= | ||
20612 | IVORBIS_CFLAGS= | ||
20613 | - echo "$as_me:$LINENO: checking for vorbis_block_init in -lvorbisidec" >&5 | ||
20614 | -echo $ECHO_N "checking for vorbis_block_init in -lvorbisidec... $ECHO_C" >&6 | ||
20615 | + { echo "$as_me:$LINENO: checking for vorbis_block_init in -lvorbisidec" >&5 | ||
20616 | +echo $ECHO_N "checking for vorbis_block_init in -lvorbisidec... $ECHO_C" >&6; } | ||
20617 | if test "${ac_cv_lib_vorbisidec_vorbis_block_init+set}" = set; then | ||
20618 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
20619 | else | ||
20620 | @@ -31320,39 +33973,52 @@ | ||
20621 | cat >>conftest.$ac_ext <<_ACEOF | ||
20622 | /* end confdefs.h. */ | ||
20623 | |||
20624 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
20625 | +/* Override any GCC internal prototype to avoid an error. | ||
20626 | + Use char because int might match the return type of a GCC | ||
20627 | + builtin and then its argument prototype would still apply. */ | ||
20628 | #ifdef __cplusplus | ||
20629 | extern "C" | ||
20630 | #endif | ||
20631 | -/* We use char because int might match the return type of a gcc2 | ||
20632 | - builtin and then its argument prototype would still apply. */ | ||
20633 | char vorbis_block_init (); | ||
20634 | int | ||
20635 | main () | ||
20636 | { | ||
20637 | -vorbis_block_init (); | ||
20638 | +return vorbis_block_init (); | ||
20639 | ; | ||
20640 | return 0; | ||
20641 | } | ||
20642 | _ACEOF | ||
20643 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
20644 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
20645 | - (eval $ac_link) 2>conftest.er1 | ||
20646 | +if { (ac_try="$ac_link" | ||
20647 | +case "(($ac_try" in | ||
20648 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20649 | + *) ac_try_echo=$ac_try;; | ||
20650 | +esac | ||
20651 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20652 | + (eval "$ac_link") 2>conftest.er1 | ||
20653 | ac_status=$? | ||
20654 | grep -v '^ *+' conftest.er1 >conftest.err | ||
20655 | rm -f conftest.er1 | ||
20656 | cat conftest.err >&5 | ||
20657 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20658 | (exit $ac_status); } && | ||
20659 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
20660 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20661 | - (eval $ac_try) 2>&5 | ||
20662 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
20663 | + { (case "(($ac_try" in | ||
20664 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20665 | + *) ac_try_echo=$ac_try;; | ||
20666 | +esac | ||
20667 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20668 | + (eval "$ac_try") 2>&5 | ||
20669 | ac_status=$? | ||
20670 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20671 | (exit $ac_status); }; } && | ||
20672 | { ac_try='test -s conftest$ac_exeext' | ||
20673 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20674 | - (eval $ac_try) 2>&5 | ||
20675 | + { (case "(($ac_try" in | ||
20676 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20677 | + *) ac_try_echo=$ac_try;; | ||
20678 | +esac | ||
20679 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20680 | + (eval "$ac_try") 2>&5 | ||
20681 | ac_status=$? | ||
20682 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20683 | (exit $ac_status); }; }; then | ||
20684 | @@ -31361,17 +34027,23 @@ | ||
20685 | echo "$as_me: failed program was:" >&5 | ||
20686 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
20687 | |||
20688 | -ac_cv_lib_vorbisidec_vorbis_block_init=no | ||
20689 | + ac_cv_lib_vorbisidec_vorbis_block_init=no | ||
20690 | fi | ||
20691 | -rm -f conftest.err conftest.$ac_objext \ | ||
20692 | + | ||
20693 | +rm -f core conftest.err conftest.$ac_objext \ | ||
20694 | conftest$ac_exeext conftest.$ac_ext | ||
20695 | LIBS=$ac_check_lib_save_LIBS | ||
20696 | fi | ||
20697 | -echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisidec_vorbis_block_init" >&5 | ||
20698 | -echo "${ECHO_T}$ac_cv_lib_vorbisidec_vorbis_block_init" >&6 | ||
20699 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisidec_vorbis_block_init" >&5 | ||
20700 | +echo "${ECHO_T}$ac_cv_lib_vorbisidec_vorbis_block_init" >&6; } | ||
20701 | if test $ac_cv_lib_vorbisidec_vorbis_block_init = yes; then | ||
20702 | IVORBIS_LIBS=-lvorbisidec | ||
20703 | HAVE_IVORBIS=yes | ||
20704 | + case $host in | ||
20705 | + arm-*-*) | ||
20706 | + IVORBIS_CFLAGS="-D_ARM_ASSEM_ $IVORBIS_CFLAGS" | ||
20707 | + esac | ||
20708 | + | ||
20709 | else | ||
20710 | HAVE_IVORBIS=no | ||
20711 | fi | ||
20712 | @@ -31427,10 +34099,9 @@ | ||
20713 | if test "x$USE_LIBMMS" = "xno"; then | ||
20714 | NOUSE="yes" | ||
20715 | fi | ||
20716 | -# Check whether --enable-libmms or --disable-libmms was given. | ||
20717 | +# Check whether --enable-libmms was given. | ||
20718 | if test "${enable_libmms+set}" = set; then | ||
20719 | - enableval="$enable_libmms" | ||
20720 | - case "${enableval}" in | ||
20721 | + enableval=$enable_libmms; case "${enableval}" in | ||
20722 | yes) USE_LIBMMS=yes;; | ||
20723 | no) USE_LIBMMS=no;; | ||
20724 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-libmms" >&5 | ||
20725 | @@ -31439,7 +34110,8 @@ | ||
20726 | esac | ||
20727 | else | ||
20728 | USE_LIBMMS=yes | ||
20729 | -fi; | ||
20730 | +fi | ||
20731 | + | ||
20732 | if test "x$NOUSE" = "xyes"; then | ||
20733 | USE_LIBMMS="no" | ||
20734 | { echo "$as_me:$LINENO: WARNING: *** libmms pre-configured not to be built" >&5 | ||
20735 | @@ -31460,8 +34132,8 @@ | ||
20736 | |||
20737 | |||
20738 | pkg_failed=no | ||
20739 | -echo "$as_me:$LINENO: checking for LIBMMS" >&5 | ||
20740 | -echo $ECHO_N "checking for LIBMMS... $ECHO_C" >&6 | ||
20741 | +{ echo "$as_me:$LINENO: checking for LIBMMS" >&5 | ||
20742 | +echo $ECHO_N "checking for LIBMMS... $ECHO_C" >&6; } | ||
20743 | |||
20744 | if test -n "$PKG_CONFIG"; then | ||
20745 | if test -n "$PKG_CONFIG" && \ | ||
20746 | @@ -31499,20 +34171,20 @@ | ||
20747 | |||
20748 | |||
20749 | HAVE_LIBMMS="no" | ||
20750 | - echo "$as_me:$LINENO: result: no" >&5 | ||
20751 | -echo "${ECHO_T}no" >&6 | ||
20752 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
20753 | +echo "${ECHO_T}no" >&6; } | ||
20754 | |||
20755 | elif test $pkg_failed = untried; then | ||
20756 | |||
20757 | HAVE_LIBMMS="no" | ||
20758 | - echo "$as_me:$LINENO: result: no" >&5 | ||
20759 | -echo "${ECHO_T}no" >&6 | ||
20760 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
20761 | +echo "${ECHO_T}no" >&6; } | ||
20762 | |||
20763 | else | ||
20764 | LIBMMS_CFLAGS=$pkg_cv_LIBMMS_CFLAGS | ||
20765 | LIBMMS_LIBS=$pkg_cv_LIBMMS_LIBS | ||
20766 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
20767 | -echo "${ECHO_T}yes" >&6 | ||
20768 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
20769 | +echo "${ECHO_T}yes" >&6; } | ||
20770 | HAVE_LIBMMS="yes" | ||
20771 | fi | ||
20772 | |||
20773 | @@ -31566,10 +34238,9 @@ | ||
20774 | if test "x$USE_MUSEPACK" = "xno"; then | ||
20775 | NOUSE="yes" | ||
20776 | fi | ||
20777 | -# Check whether --enable-musepack or --disable-musepack was given. | ||
20778 | +# Check whether --enable-musepack was given. | ||
20779 | if test "${enable_musepack+set}" = set; then | ||
20780 | - enableval="$enable_musepack" | ||
20781 | - case "${enableval}" in | ||
20782 | + enableval=$enable_musepack; case "${enableval}" in | ||
20783 | yes) USE_MUSEPACK=yes;; | ||
20784 | no) USE_MUSEPACK=no;; | ||
20785 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-musepack" >&5 | ||
20786 | @@ -31578,7 +34249,8 @@ | ||
20787 | esac | ||
20788 | else | ||
20789 | USE_MUSEPACK=yes | ||
20790 | -fi; | ||
20791 | +fi | ||
20792 | + | ||
20793 | if test "x$NOUSE" = "xyes"; then | ||
20794 | USE_MUSEPACK="no" | ||
20795 | { echo "$as_me:$LINENO: WARNING: *** musepack pre-configured not to be built" >&5 | ||
20796 | @@ -31597,24 +34269,24 @@ | ||
20797 | |||
20798 | HAVE_MUSEPACK=no | ||
20799 | |||
20800 | - ac_ext=cc | ||
20801 | + ac_ext=cpp | ||
20802 | ac_cpp='$CXXCPP $CPPFLAGS' | ||
20803 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
20804 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
20805 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
20806 | |||
20807 | if test "${ac_cv_header_mpcdec_mpcdec_h+set}" = set; then | ||
20808 | - echo "$as_me:$LINENO: checking for mpcdec/mpcdec.h" >&5 | ||
20809 | -echo $ECHO_N "checking for mpcdec/mpcdec.h... $ECHO_C" >&6 | ||
20810 | + { echo "$as_me:$LINENO: checking for mpcdec/mpcdec.h" >&5 | ||
20811 | +echo $ECHO_N "checking for mpcdec/mpcdec.h... $ECHO_C" >&6; } | ||
20812 | if test "${ac_cv_header_mpcdec_mpcdec_h+set}" = set; then | ||
20813 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
20814 | fi | ||
20815 | -echo "$as_me:$LINENO: result: $ac_cv_header_mpcdec_mpcdec_h" >&5 | ||
20816 | -echo "${ECHO_T}$ac_cv_header_mpcdec_mpcdec_h" >&6 | ||
20817 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_mpcdec_mpcdec_h" >&5 | ||
20818 | +echo "${ECHO_T}$ac_cv_header_mpcdec_mpcdec_h" >&6; } | ||
20819 | else | ||
20820 | # Is the header compilable? | ||
20821 | -echo "$as_me:$LINENO: checking mpcdec/mpcdec.h usability" >&5 | ||
20822 | -echo $ECHO_N "checking mpcdec/mpcdec.h usability... $ECHO_C" >&6 | ||
20823 | +{ echo "$as_me:$LINENO: checking mpcdec/mpcdec.h usability" >&5 | ||
20824 | +echo $ECHO_N "checking mpcdec/mpcdec.h usability... $ECHO_C" >&6; } | ||
20825 | cat >conftest.$ac_ext <<_ACEOF | ||
20826 | /* confdefs.h. */ | ||
20827 | _ACEOF | ||
20828 | @@ -31625,23 +34297,36 @@ | ||
20829 | #include <mpcdec/mpcdec.h> | ||
20830 | _ACEOF | ||
20831 | rm -f conftest.$ac_objext | ||
20832 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
20833 | - (eval $ac_compile) 2>conftest.er1 | ||
20834 | +if { (ac_try="$ac_compile" | ||
20835 | +case "(($ac_try" in | ||
20836 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20837 | + *) ac_try_echo=$ac_try;; | ||
20838 | +esac | ||
20839 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20840 | + (eval "$ac_compile") 2>conftest.er1 | ||
20841 | ac_status=$? | ||
20842 | grep -v '^ *+' conftest.er1 >conftest.err | ||
20843 | rm -f conftest.er1 | ||
20844 | cat conftest.err >&5 | ||
20845 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20846 | (exit $ac_status); } && | ||
20847 | - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
20848 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20849 | - (eval $ac_try) 2>&5 | ||
20850 | + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | ||
20851 | + { (case "(($ac_try" in | ||
20852 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20853 | + *) ac_try_echo=$ac_try;; | ||
20854 | +esac | ||
20855 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20856 | + (eval "$ac_try") 2>&5 | ||
20857 | ac_status=$? | ||
20858 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20859 | (exit $ac_status); }; } && | ||
20860 | { ac_try='test -s conftest.$ac_objext' | ||
20861 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20862 | - (eval $ac_try) 2>&5 | ||
20863 | + { (case "(($ac_try" in | ||
20864 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20865 | + *) ac_try_echo=$ac_try;; | ||
20866 | +esac | ||
20867 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20868 | + (eval "$ac_try") 2>&5 | ||
20869 | ac_status=$? | ||
20870 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20871 | (exit $ac_status); }; }; then | ||
20872 | @@ -31650,15 +34335,16 @@ | ||
20873 | echo "$as_me: failed program was:" >&5 | ||
20874 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
20875 | |||
20876 | -ac_header_compiler=no | ||
20877 | + ac_header_compiler=no | ||
20878 | fi | ||
20879 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20880 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
20881 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
20882 | + | ||
20883 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20884 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
20885 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
20886 | |||
20887 | # Is the header present? | ||
20888 | -echo "$as_me:$LINENO: checking mpcdec/mpcdec.h presence" >&5 | ||
20889 | -echo $ECHO_N "checking mpcdec/mpcdec.h presence... $ECHO_C" >&6 | ||
20890 | +{ echo "$as_me:$LINENO: checking mpcdec/mpcdec.h presence" >&5 | ||
20891 | +echo $ECHO_N "checking mpcdec/mpcdec.h presence... $ECHO_C" >&6; } | ||
20892 | cat >conftest.$ac_ext <<_ACEOF | ||
20893 | /* confdefs.h. */ | ||
20894 | _ACEOF | ||
20895 | @@ -31667,8 +34353,13 @@ | ||
20896 | /* end confdefs.h. */ | ||
20897 | #include <mpcdec/mpcdec.h> | ||
20898 | _ACEOF | ||
20899 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
20900 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
20901 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
20902 | +case "(($ac_try" in | ||
20903 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20904 | + *) ac_try_echo=$ac_try;; | ||
20905 | +esac | ||
20906 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20907 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
20908 | ac_status=$? | ||
20909 | grep -v '^ *+' conftest.er1 >conftest.err | ||
20910 | rm -f conftest.er1 | ||
20911 | @@ -31692,9 +34383,10 @@ | ||
20912 | |||
20913 | ac_header_preproc=no | ||
20914 | fi | ||
20915 | + | ||
20916 | rm -f conftest.err conftest.$ac_ext | ||
20917 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
20918 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
20919 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
20920 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
20921 | |||
20922 | # So? What about this header? | ||
20923 | case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in | ||
20924 | @@ -31718,25 +34410,23 @@ | ||
20925 | echo "$as_me: WARNING: mpcdec/mpcdec.h: proceeding with the preprocessor's result" >&2;} | ||
20926 | { echo "$as_me:$LINENO: WARNING: mpcdec/mpcdec.h: in the future, the compiler will take precedence" >&5 | ||
20927 | echo "$as_me: WARNING: mpcdec/mpcdec.h: in the future, the compiler will take precedence" >&2;} | ||
20928 | - ( | ||
20929 | - cat <<\_ASBOX | ||
20930 | + ( cat <<\_ASBOX | ||
20931 | ## ------------------------------------------------------------------------ ## | ||
20932 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
20933 | ## ------------------------------------------------------------------------ ## | ||
20934 | _ASBOX | ||
20935 | - ) | | ||
20936 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
20937 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
20938 | ;; | ||
20939 | esac | ||
20940 | -echo "$as_me:$LINENO: checking for mpcdec/mpcdec.h" >&5 | ||
20941 | -echo $ECHO_N "checking for mpcdec/mpcdec.h... $ECHO_C" >&6 | ||
20942 | +{ echo "$as_me:$LINENO: checking for mpcdec/mpcdec.h" >&5 | ||
20943 | +echo $ECHO_N "checking for mpcdec/mpcdec.h... $ECHO_C" >&6; } | ||
20944 | if test "${ac_cv_header_mpcdec_mpcdec_h+set}" = set; then | ||
20945 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
20946 | else | ||
20947 | ac_cv_header_mpcdec_mpcdec_h=$ac_header_preproc | ||
20948 | fi | ||
20949 | -echo "$as_me:$LINENO: result: $ac_cv_header_mpcdec_mpcdec_h" >&5 | ||
20950 | -echo "${ECHO_T}$ac_cv_header_mpcdec_mpcdec_h" >&6 | ||
20951 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_mpcdec_mpcdec_h" >&5 | ||
20952 | +echo "${ECHO_T}$ac_cv_header_mpcdec_mpcdec_h" >&6; } | ||
20953 | |||
20954 | fi | ||
20955 | if test $ac_cv_header_mpcdec_mpcdec_h = yes; then | ||
20956 | @@ -31805,10 +34495,9 @@ | ||
20957 | if test "x$USE_MUSICBRAINZ" = "xno"; then | ||
20958 | NOUSE="yes" | ||
20959 | fi | ||
20960 | -# Check whether --enable-musicbrainz or --disable-musicbrainz was given. | ||
20961 | +# Check whether --enable-musicbrainz was given. | ||
20962 | if test "${enable_musicbrainz+set}" = set; then | ||
20963 | - enableval="$enable_musicbrainz" | ||
20964 | - case "${enableval}" in | ||
20965 | + enableval=$enable_musicbrainz; case "${enableval}" in | ||
20966 | yes) USE_MUSICBRAINZ=yes;; | ||
20967 | no) USE_MUSICBRAINZ=no;; | ||
20968 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-musicbrainz" >&5 | ||
20969 | @@ -31817,7 +34506,8 @@ | ||
20970 | esac | ||
20971 | else | ||
20972 | USE_MUSICBRAINZ=yes | ||
20973 | -fi; | ||
20974 | +fi | ||
20975 | + | ||
20976 | if test "x$NOUSE" = "xyes"; then | ||
20977 | USE_MUSICBRAINZ="no" | ||
20978 | { echo "$as_me:$LINENO: WARNING: *** musicbrainz pre-configured not to be built" >&5 | ||
20979 | @@ -31838,8 +34528,8 @@ | ||
20980 | |||
20981 | |||
20982 | pkg_failed=no | ||
20983 | -echo "$as_me:$LINENO: checking for MUSICBRAINZ" >&5 | ||
20984 | -echo $ECHO_N "checking for MUSICBRAINZ... $ECHO_C" >&6 | ||
20985 | +{ echo "$as_me:$LINENO: checking for MUSICBRAINZ" >&5 | ||
20986 | +echo $ECHO_N "checking for MUSICBRAINZ... $ECHO_C" >&6; } | ||
20987 | |||
20988 | if test -n "$PKG_CONFIG"; then | ||
20989 | if test -n "$PKG_CONFIG" && \ | ||
20990 | @@ -31881,8 +34571,8 @@ | ||
20991 | else | ||
20992 | MUSICBRAINZ_CFLAGS=$pkg_cv_MUSICBRAINZ_CFLAGS | ||
20993 | MUSICBRAINZ_LIBS=$pkg_cv_MUSICBRAINZ_LIBS | ||
20994 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
20995 | -echo "${ECHO_T}yes" >&6 | ||
20996 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
20997 | +echo "${ECHO_T}yes" >&6; } | ||
20998 | HAVE_MUSICBRAINZ="yes" | ||
20999 | fi | ||
21000 | |||
21001 | @@ -31936,10 +34626,9 @@ | ||
21002 | if test "x$USE_NEON" = "xno"; then | ||
21003 | NOUSE="yes" | ||
21004 | fi | ||
21005 | -# Check whether --enable-neon or --disable-neon was given. | ||
21006 | +# Check whether --enable-neon was given. | ||
21007 | if test "${enable_neon+set}" = set; then | ||
21008 | - enableval="$enable_neon" | ||
21009 | - case "${enableval}" in | ||
21010 | + enableval=$enable_neon; case "${enableval}" in | ||
21011 | yes) USE_NEON=yes;; | ||
21012 | no) USE_NEON=no;; | ||
21013 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-neon" >&5 | ||
21014 | @@ -31948,7 +34637,8 @@ | ||
21015 | esac | ||
21016 | else | ||
21017 | USE_NEON=yes | ||
21018 | -fi; | ||
21019 | +fi | ||
21020 | + | ||
21021 | if test "x$NOUSE" = "xyes"; then | ||
21022 | USE_NEON="no" | ||
21023 | { echo "$as_me:$LINENO: WARNING: *** neonhttpsrc pre-configured not to be built" >&5 | ||
21024 | @@ -31969,8 +34659,8 @@ | ||
21025 | |||
21026 | |||
21027 | pkg_failed=no | ||
21028 | -echo "$as_me:$LINENO: checking for NEON" >&5 | ||
21029 | -echo $ECHO_N "checking for NEON... $ECHO_C" >&6 | ||
21030 | +{ echo "$as_me:$LINENO: checking for NEON" >&5 | ||
21031 | +echo $ECHO_N "checking for NEON... $ECHO_C" >&6; } | ||
21032 | |||
21033 | if test -n "$PKG_CONFIG"; then | ||
21034 | if test -n "$PKG_CONFIG" && \ | ||
21035 | @@ -32008,20 +34698,20 @@ | ||
21036 | |||
21037 | |||
21038 | HAVE_NEON="no" | ||
21039 | - echo "$as_me:$LINENO: result: no" >&5 | ||
21040 | -echo "${ECHO_T}no" >&6 | ||
21041 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
21042 | +echo "${ECHO_T}no" >&6; } | ||
21043 | |||
21044 | elif test $pkg_failed = untried; then | ||
21045 | |||
21046 | HAVE_NEON="no" | ||
21047 | - echo "$as_me:$LINENO: result: no" >&5 | ||
21048 | -echo "${ECHO_T}no" >&6 | ||
21049 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
21050 | +echo "${ECHO_T}no" >&6; } | ||
21051 | |||
21052 | else | ||
21053 | NEON_CFLAGS=$pkg_cv_NEON_CFLAGS | ||
21054 | NEON_LIBS=$pkg_cv_NEON_LIBS | ||
21055 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
21056 | -echo "${ECHO_T}yes" >&6 | ||
21057 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
21058 | +echo "${ECHO_T}yes" >&6; } | ||
21059 | HAVE_NEON="yes" | ||
21060 | fi | ||
21061 | |||
21062 | @@ -32075,10 +34765,9 @@ | ||
21063 | if test "x$USE_SDL" = "xno"; then | ||
21064 | NOUSE="yes" | ||
21065 | fi | ||
21066 | -# Check whether --enable-sdl or --disable-sdl was given. | ||
21067 | +# Check whether --enable-sdl was given. | ||
21068 | if test "${enable_sdl+set}" = set; then | ||
21069 | - enableval="$enable_sdl" | ||
21070 | - case "${enableval}" in | ||
21071 | + enableval=$enable_sdl; case "${enableval}" in | ||
21072 | yes) USE_SDL=yes;; | ||
21073 | no) USE_SDL=no;; | ||
21074 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-sdl" >&5 | ||
21075 | @@ -32087,7 +34776,8 @@ | ||
21076 | esac | ||
21077 | else | ||
21078 | USE_SDL=yes | ||
21079 | -fi; | ||
21080 | +fi | ||
21081 | + | ||
21082 | if test "x$NOUSE" = "xyes"; then | ||
21083 | USE_SDL="no" | ||
21084 | { echo "$as_me:$LINENO: WARNING: *** sdlvideosink sdlaudiosink pre-configured not to be built" >&5 | ||
21085 | @@ -32107,30 +34797,30 @@ | ||
21086 | HAVE_SDL=no | ||
21087 | |||
21088 | |||
21089 | -# Check whether --with-sdl-prefix or --without-sdl-prefix was given. | ||
21090 | +# Check whether --with-sdl-prefix was given. | ||
21091 | if test "${with_sdl_prefix+set}" = set; then | ||
21092 | - withval="$with_sdl_prefix" | ||
21093 | - sdl_prefix="$withval" | ||
21094 | + withval=$with_sdl_prefix; sdl_prefix="$withval" | ||
21095 | else | ||
21096 | sdl_prefix="" | ||
21097 | -fi; | ||
21098 | +fi | ||
21099 | |||
21100 | |||
21101 | -# Check whether --with-sdl-exec-prefix or --without-sdl-exec-prefix was given. | ||
21102 | + | ||
21103 | +# Check whether --with-sdl-exec-prefix was given. | ||
21104 | if test "${with_sdl_exec_prefix+set}" = set; then | ||
21105 | - withval="$with_sdl_exec_prefix" | ||
21106 | - sdl_exec_prefix="$withval" | ||
21107 | + withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval" | ||
21108 | else | ||
21109 | sdl_exec_prefix="" | ||
21110 | -fi; | ||
21111 | +fi | ||
21112 | |||
21113 | -# Check whether --enable-sdltest or --disable-sdltest was given. | ||
21114 | -if test "${enable_sdltest+set}" = set; then | ||
21115 | - enableval="$enable_sdltest" | ||
21116 | |||
21117 | +# Check whether --enable-sdltest was given. | ||
21118 | +if test "${enable_sdltest+set}" = set; then | ||
21119 | + enableval=$enable_sdltest; | ||
21120 | else | ||
21121 | enable_sdltest=yes | ||
21122 | -fi; | ||
21123 | +fi | ||
21124 | + | ||
21125 | |||
21126 | if test x$sdl_exec_prefix != x ; then | ||
21127 | sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" | ||
21128 | @@ -32147,8 +34837,8 @@ | ||
21129 | |||
21130 | # Extract the first word of "sdl-config", so it can be a program name with args. | ||
21131 | set dummy sdl-config; ac_word=$2 | ||
21132 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
21133 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
21134 | +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
21135 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
21136 | if test "${ac_cv_path_SDL_CONFIG+set}" = set; then | ||
21137 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
21138 | else | ||
21139 | @@ -32163,31 +34853,32 @@ | ||
21140 | IFS=$as_save_IFS | ||
21141 | test -z "$as_dir" && as_dir=. | ||
21142 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
21143 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21144 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
21145 | ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
21146 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21147 | break 2 | ||
21148 | fi | ||
21149 | done | ||
21150 | done | ||
21151 | +IFS=$as_save_IFS | ||
21152 | |||
21153 | test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" | ||
21154 | ;; | ||
21155 | esac | ||
21156 | fi | ||
21157 | SDL_CONFIG=$ac_cv_path_SDL_CONFIG | ||
21158 | - | ||
21159 | if test -n "$SDL_CONFIG"; then | ||
21160 | - echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5 | ||
21161 | -echo "${ECHO_T}$SDL_CONFIG" >&6 | ||
21162 | + { echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5 | ||
21163 | +echo "${ECHO_T}$SDL_CONFIG" >&6; } | ||
21164 | else | ||
21165 | - echo "$as_me:$LINENO: result: no" >&5 | ||
21166 | -echo "${ECHO_T}no" >&6 | ||
21167 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
21168 | +echo "${ECHO_T}no" >&6; } | ||
21169 | fi | ||
21170 | |||
21171 | + | ||
21172 | min_sdl_version=0.11.0 | ||
21173 | - echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5 | ||
21174 | -echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6 | ||
21175 | + { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5 | ||
21176 | +echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6; } | ||
21177 | no_sdl="" | ||
21178 | if test "$SDL_CONFIG" = "no" ; then | ||
21179 | no_sdl=yes | ||
21180 | @@ -32276,13 +34967,22 @@ | ||
21181 | |||
21182 | _ACEOF | ||
21183 | rm -f conftest$ac_exeext | ||
21184 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
21185 | - (eval $ac_link) 2>&5 | ||
21186 | +if { (ac_try="$ac_link" | ||
21187 | +case "(($ac_try" in | ||
21188 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21189 | + *) ac_try_echo=$ac_try;; | ||
21190 | +esac | ||
21191 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21192 | + (eval "$ac_link") 2>&5 | ||
21193 | ac_status=$? | ||
21194 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21195 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
21196 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21197 | - (eval $ac_try) 2>&5 | ||
21198 | + { (case "(($ac_try" in | ||
21199 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21200 | + *) ac_try_echo=$ac_try;; | ||
21201 | +esac | ||
21202 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21203 | + (eval "$ac_try") 2>&5 | ||
21204 | ac_status=$? | ||
21205 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21206 | (exit $ac_status); }; }; then | ||
21207 | @@ -32295,19 +34995,21 @@ | ||
21208 | ( exit $ac_status ) | ||
21209 | no_sdl=yes | ||
21210 | fi | ||
21211 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
21212 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
21213 | fi | ||
21214 | + | ||
21215 | + | ||
21216 | CFLAGS="$ac_save_CFLAGS" | ||
21217 | LIBS="$ac_save_LIBS" | ||
21218 | fi | ||
21219 | fi | ||
21220 | if test "x$no_sdl" = x ; then | ||
21221 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
21222 | -echo "${ECHO_T}yes" >&6 | ||
21223 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
21224 | +echo "${ECHO_T}yes" >&6; } | ||
21225 | HAVE_SDL=yes | ||
21226 | else | ||
21227 | - echo "$as_me:$LINENO: result: no" >&5 | ||
21228 | -echo "${ECHO_T}no" >&6 | ||
21229 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
21230 | +echo "${ECHO_T}no" >&6; } | ||
21231 | if test "$SDL_CONFIG" = "no" ; then | ||
21232 | echo "*** The sdl-config script installed by SDL could not be found" | ||
21233 | echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" | ||
21234 | @@ -32344,23 +35046,36 @@ | ||
21235 | } | ||
21236 | _ACEOF | ||
21237 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
21238 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
21239 | - (eval $ac_link) 2>conftest.er1 | ||
21240 | +if { (ac_try="$ac_link" | ||
21241 | +case "(($ac_try" in | ||
21242 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21243 | + *) ac_try_echo=$ac_try;; | ||
21244 | +esac | ||
21245 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21246 | + (eval "$ac_link") 2>conftest.er1 | ||
21247 | ac_status=$? | ||
21248 | grep -v '^ *+' conftest.er1 >conftest.err | ||
21249 | rm -f conftest.er1 | ||
21250 | cat conftest.err >&5 | ||
21251 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21252 | (exit $ac_status); } && | ||
21253 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
21254 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21255 | - (eval $ac_try) 2>&5 | ||
21256 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
21257 | + { (case "(($ac_try" in | ||
21258 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21259 | + *) ac_try_echo=$ac_try;; | ||
21260 | +esac | ||
21261 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21262 | + (eval "$ac_try") 2>&5 | ||
21263 | ac_status=$? | ||
21264 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21265 | (exit $ac_status); }; } && | ||
21266 | { ac_try='test -s conftest$ac_exeext' | ||
21267 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21268 | - (eval $ac_try) 2>&5 | ||
21269 | + { (case "(($ac_try" in | ||
21270 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21271 | + *) ac_try_echo=$ac_try;; | ||
21272 | +esac | ||
21273 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21274 | + (eval "$ac_try") 2>&5 | ||
21275 | ac_status=$? | ||
21276 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21277 | (exit $ac_status); }; }; then | ||
21278 | @@ -32377,12 +35092,13 @@ | ||
21279 | echo "$as_me: failed program was:" >&5 | ||
21280 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
21281 | |||
21282 | - echo "*** The test program failed to compile or link. See the file config.log for the" | ||
21283 | + echo "*** The test program failed to compile or link. See the file config.log for the" | ||
21284 | echo "*** exact error that occured. This usually means SDL was incorrectly installed" | ||
21285 | echo "*** or that you have moved SDL since it was installed. In the latter case, you" | ||
21286 | echo "*** may want to edit the sdl-config script: $SDL_CONFIG" | ||
21287 | fi | ||
21288 | -rm -f conftest.err conftest.$ac_objext \ | ||
21289 | + | ||
21290 | +rm -f core conftest.err conftest.$ac_objext \ | ||
21291 | conftest$ac_exeext conftest.$ac_ext | ||
21292 | CFLAGS="$ac_save_CFLAGS" | ||
21293 | LIBS="$ac_save_LIBS" | ||
21294 | @@ -32445,10 +35161,9 @@ | ||
21295 | if test "x$USE_SOUNDTOUCH" = "xno"; then | ||
21296 | NOUSE="yes" | ||
21297 | fi | ||
21298 | -# Check whether --enable-soundtouch or --disable-soundtouch was given. | ||
21299 | +# Check whether --enable-soundtouch was given. | ||
21300 | if test "${enable_soundtouch+set}" = set; then | ||
21301 | - enableval="$enable_soundtouch" | ||
21302 | - case "${enableval}" in | ||
21303 | + enableval=$enable_soundtouch; case "${enableval}" in | ||
21304 | yes) USE_SOUNDTOUCH=yes;; | ||
21305 | no) USE_SOUNDTOUCH=no;; | ||
21306 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-soundtouch" >&5 | ||
21307 | @@ -32457,7 +35172,8 @@ | ||
21308 | esac | ||
21309 | else | ||
21310 | USE_SOUNDTOUCH=yes | ||
21311 | -fi; | ||
21312 | +fi | ||
21313 | + | ||
21314 | if test "x$NOUSE" = "xyes"; then | ||
21315 | USE_SOUNDTOUCH="no" | ||
21316 | { echo "$as_me:$LINENO: WARNING: *** soundtouch pre-configured not to be built" >&5 | ||
21317 | @@ -32478,8 +35194,8 @@ | ||
21318 | |||
21319 | |||
21320 | pkg_failed=no | ||
21321 | -echo "$as_me:$LINENO: checking for SOUNDTOUCH" >&5 | ||
21322 | -echo $ECHO_N "checking for SOUNDTOUCH... $ECHO_C" >&6 | ||
21323 | +{ echo "$as_me:$LINENO: checking for SOUNDTOUCH" >&5 | ||
21324 | +echo $ECHO_N "checking for SOUNDTOUCH... $ECHO_C" >&6; } | ||
21325 | |||
21326 | if test -n "$PKG_CONFIG"; then | ||
21327 | if test -n "$PKG_CONFIG" && \ | ||
21328 | @@ -32517,18 +35233,18 @@ | ||
21329 | |||
21330 | |||
21331 | HAVE_SOUNDTOUCH=no | ||
21332 | - echo "$as_me:$LINENO: result: no" >&5 | ||
21333 | -echo "${ECHO_T}no" >&6 | ||
21334 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
21335 | +echo "${ECHO_T}no" >&6; } | ||
21336 | elif test $pkg_failed = untried; then | ||
21337 | |||
21338 | HAVE_SOUNDTOUCH=no | ||
21339 | - echo "$as_me:$LINENO: result: no" >&5 | ||
21340 | -echo "${ECHO_T}no" >&6 | ||
21341 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
21342 | +echo "${ECHO_T}no" >&6; } | ||
21343 | else | ||
21344 | SOUNDTOUCH_CFLAGS=$pkg_cv_SOUNDTOUCH_CFLAGS | ||
21345 | SOUNDTOUCH_LIBS=$pkg_cv_SOUNDTOUCH_LIBS | ||
21346 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
21347 | -echo "${ECHO_T}yes" >&6 | ||
21348 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
21349 | +echo "${ECHO_T}yes" >&6; } | ||
21350 | HAVE_SOUNDTOUCH=yes | ||
21351 | fi | ||
21352 | |||
21353 | @@ -32587,10 +35303,9 @@ | ||
21354 | if test "x$USE_SWFDEC" = "xno"; then | ||
21355 | NOUSE="yes" | ||
21356 | fi | ||
21357 | -# Check whether --enable-swfdec or --disable-swfdec was given. | ||
21358 | +# Check whether --enable-swfdec was given. | ||
21359 | if test "${enable_swfdec+set}" = set; then | ||
21360 | - enableval="$enable_swfdec" | ||
21361 | - case "${enableval}" in | ||
21362 | + enableval=$enable_swfdec; case "${enableval}" in | ||
21363 | yes) USE_SWFDEC=yes;; | ||
21364 | no) USE_SWFDEC=no;; | ||
21365 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-swfdec" >&5 | ||
21366 | @@ -32599,7 +35314,8 @@ | ||
21367 | esac | ||
21368 | else | ||
21369 | USE_SWFDEC=yes | ||
21370 | -fi; | ||
21371 | +fi | ||
21372 | + | ||
21373 | if test "x$NOUSE" = "xyes"; then | ||
21374 | USE_SWFDEC="no" | ||
21375 | { echo "$as_me:$LINENO: WARNING: *** swfdec pre-configured not to be built" >&5 | ||
21376 | @@ -32620,8 +35336,8 @@ | ||
21377 | |||
21378 | |||
21379 | pkg_failed=no | ||
21380 | -echo "$as_me:$LINENO: checking for SWFDEC" >&5 | ||
21381 | -echo $ECHO_N "checking for SWFDEC... $ECHO_C" >&6 | ||
21382 | +{ echo "$as_me:$LINENO: checking for SWFDEC" >&5 | ||
21383 | +echo $ECHO_N "checking for SWFDEC... $ECHO_C" >&6; } | ||
21384 | |||
21385 | if test -n "$PKG_CONFIG"; then | ||
21386 | if test -n "$PKG_CONFIG" && \ | ||
21387 | @@ -32659,20 +35375,20 @@ | ||
21388 | |||
21389 | |||
21390 | HAVE_SWFDEC=no | ||
21391 | - echo "$as_me:$LINENO: result: no" >&5 | ||
21392 | -echo "${ECHO_T}no" >&6 | ||
21393 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
21394 | +echo "${ECHO_T}no" >&6; } | ||
21395 | |||
21396 | elif test $pkg_failed = untried; then | ||
21397 | |||
21398 | HAVE_SWFDEC=no | ||
21399 | - echo "$as_me:$LINENO: result: no" >&5 | ||
21400 | -echo "${ECHO_T}no" >&6 | ||
21401 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
21402 | +echo "${ECHO_T}no" >&6; } | ||
21403 | |||
21404 | else | ||
21405 | SWFDEC_CFLAGS=$pkg_cv_SWFDEC_CFLAGS | ||
21406 | SWFDEC_LIBS=$pkg_cv_SWFDEC_LIBS | ||
21407 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
21408 | -echo "${ECHO_T}yes" >&6 | ||
21409 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
21410 | +echo "${ECHO_T}yes" >&6; } | ||
21411 | HAVE_SWFDEC=yes | ||
21412 | fi | ||
21413 | |||
21414 | @@ -32726,10 +35442,9 @@ | ||
21415 | if test "x$USE_THEORADEC" = "xno"; then | ||
21416 | NOUSE="yes" | ||
21417 | fi | ||
21418 | -# Check whether --enable-theoradec or --disable-theoradec was given. | ||
21419 | +# Check whether --enable-theoradec was given. | ||
21420 | if test "${enable_theoradec+set}" = set; then | ||
21421 | - enableval="$enable_theoradec" | ||
21422 | - case "${enableval}" in | ||
21423 | + enableval=$enable_theoradec; case "${enableval}" in | ||
21424 | yes) USE_THEORADEC=yes;; | ||
21425 | no) USE_THEORADEC=no;; | ||
21426 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-theoradec" >&5 | ||
21427 | @@ -32738,7 +35453,8 @@ | ||
21428 | esac | ||
21429 | else | ||
21430 | USE_THEORADEC=yes | ||
21431 | -fi; | ||
21432 | +fi | ||
21433 | + | ||
21434 | if test "x$NOUSE" = "xyes"; then | ||
21435 | USE_THEORADEC="no" | ||
21436 | { echo "$as_me:$LINENO: WARNING: *** theoraexpdec pre-configured not to be built" >&5 | ||
21437 | @@ -32759,8 +35475,8 @@ | ||
21438 | |||
21439 | |||
21440 | pkg_failed=no | ||
21441 | -echo "$as_me:$LINENO: checking for THEORADEC" >&5 | ||
21442 | -echo $ECHO_N "checking for THEORADEC... $ECHO_C" >&6 | ||
21443 | +{ echo "$as_me:$LINENO: checking for THEORADEC" >&5 | ||
21444 | +echo $ECHO_N "checking for THEORADEC... $ECHO_C" >&6; } | ||
21445 | |||
21446 | if test -n "$PKG_CONFIG"; then | ||
21447 | if test -n "$PKG_CONFIG" && \ | ||
21448 | @@ -32798,20 +35514,20 @@ | ||
21449 | |||
21450 | |||
21451 | HAVE_THEORADEC="no" | ||
21452 | - echo "$as_me:$LINENO: result: no" >&5 | ||
21453 | -echo "${ECHO_T}no" >&6 | ||
21454 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
21455 | +echo "${ECHO_T}no" >&6; } | ||
21456 | |||
21457 | elif test $pkg_failed = untried; then | ||
21458 | |||
21459 | HAVE_THEORADEC="no" | ||
21460 | - echo "$as_me:$LINENO: result: no" >&5 | ||
21461 | -echo "${ECHO_T}no" >&6 | ||
21462 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
21463 | +echo "${ECHO_T}no" >&6; } | ||
21464 | |||
21465 | else | ||
21466 | THEORADEC_CFLAGS=$pkg_cv_THEORADEC_CFLAGS | ||
21467 | THEORADEC_LIBS=$pkg_cv_THEORADEC_LIBS | ||
21468 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
21469 | -echo "${ECHO_T}yes" >&6 | ||
21470 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
21471 | +echo "${ECHO_T}yes" >&6; } | ||
21472 | HAVE_THEORADEC="yes" | ||
21473 | fi | ||
21474 | |||
21475 | @@ -32865,10 +35581,9 @@ | ||
21476 | if test "x$USE_XVID" = "xno"; then | ||
21477 | NOUSE="yes" | ||
21478 | fi | ||
21479 | -# Check whether --enable-xvid or --disable-xvid was given. | ||
21480 | +# Check whether --enable-xvid was given. | ||
21481 | if test "${enable_xvid+set}" = set; then | ||
21482 | - enableval="$enable_xvid" | ||
21483 | - case "${enableval}" in | ||
21484 | + enableval=$enable_xvid; case "${enableval}" in | ||
21485 | yes) USE_XVID=yes;; | ||
21486 | no) USE_XVID=no;; | ||
21487 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-xvid" >&5 | ||
21488 | @@ -32877,7 +35592,8 @@ | ||
21489 | esac | ||
21490 | else | ||
21491 | USE_XVID=yes | ||
21492 | -fi; | ||
21493 | +fi | ||
21494 | + | ||
21495 | if test "x$NOUSE" = "xyes"; then | ||
21496 | USE_XVID="no" | ||
21497 | { echo "$as_me:$LINENO: WARNING: *** xvid pre-configured not to be built" >&5 | ||
21498 | @@ -32898,17 +35614,17 @@ | ||
21499 | |||
21500 | HAVE_XVID=no | ||
21501 | if test "${ac_cv_header_xvid_h+set}" = set; then | ||
21502 | - echo "$as_me:$LINENO: checking for xvid.h" >&5 | ||
21503 | -echo $ECHO_N "checking for xvid.h... $ECHO_C" >&6 | ||
21504 | + { echo "$as_me:$LINENO: checking for xvid.h" >&5 | ||
21505 | +echo $ECHO_N "checking for xvid.h... $ECHO_C" >&6; } | ||
21506 | if test "${ac_cv_header_xvid_h+set}" = set; then | ||
21507 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
21508 | fi | ||
21509 | -echo "$as_me:$LINENO: result: $ac_cv_header_xvid_h" >&5 | ||
21510 | -echo "${ECHO_T}$ac_cv_header_xvid_h" >&6 | ||
21511 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_xvid_h" >&5 | ||
21512 | +echo "${ECHO_T}$ac_cv_header_xvid_h" >&6; } | ||
21513 | else | ||
21514 | # Is the header compilable? | ||
21515 | -echo "$as_me:$LINENO: checking xvid.h usability" >&5 | ||
21516 | -echo $ECHO_N "checking xvid.h usability... $ECHO_C" >&6 | ||
21517 | +{ echo "$as_me:$LINENO: checking xvid.h usability" >&5 | ||
21518 | +echo $ECHO_N "checking xvid.h usability... $ECHO_C" >&6; } | ||
21519 | cat >conftest.$ac_ext <<_ACEOF | ||
21520 | /* confdefs.h. */ | ||
21521 | _ACEOF | ||
21522 | @@ -32919,23 +35635,36 @@ | ||
21523 | #include <xvid.h> | ||
21524 | _ACEOF | ||
21525 | rm -f conftest.$ac_objext | ||
21526 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
21527 | - (eval $ac_compile) 2>conftest.er1 | ||
21528 | +if { (ac_try="$ac_compile" | ||
21529 | +case "(($ac_try" in | ||
21530 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21531 | + *) ac_try_echo=$ac_try;; | ||
21532 | +esac | ||
21533 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21534 | + (eval "$ac_compile") 2>conftest.er1 | ||
21535 | ac_status=$? | ||
21536 | grep -v '^ *+' conftest.er1 >conftest.err | ||
21537 | rm -f conftest.er1 | ||
21538 | cat conftest.err >&5 | ||
21539 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21540 | (exit $ac_status); } && | ||
21541 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
21542 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21543 | - (eval $ac_try) 2>&5 | ||
21544 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
21545 | + { (case "(($ac_try" in | ||
21546 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21547 | + *) ac_try_echo=$ac_try;; | ||
21548 | +esac | ||
21549 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21550 | + (eval "$ac_try") 2>&5 | ||
21551 | ac_status=$? | ||
21552 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21553 | (exit $ac_status); }; } && | ||
21554 | { ac_try='test -s conftest.$ac_objext' | ||
21555 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21556 | - (eval $ac_try) 2>&5 | ||
21557 | + { (case "(($ac_try" in | ||
21558 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21559 | + *) ac_try_echo=$ac_try;; | ||
21560 | +esac | ||
21561 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21562 | + (eval "$ac_try") 2>&5 | ||
21563 | ac_status=$? | ||
21564 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21565 | (exit $ac_status); }; }; then | ||
21566 | @@ -32944,15 +35673,16 @@ | ||
21567 | echo "$as_me: failed program was:" >&5 | ||
21568 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
21569 | |||
21570 | -ac_header_compiler=no | ||
21571 | + ac_header_compiler=no | ||
21572 | fi | ||
21573 | -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21574 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
21575 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
21576 | + | ||
21577 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21578 | +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
21579 | +echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
21580 | |||
21581 | # Is the header present? | ||
21582 | -echo "$as_me:$LINENO: checking xvid.h presence" >&5 | ||
21583 | -echo $ECHO_N "checking xvid.h presence... $ECHO_C" >&6 | ||
21584 | +{ echo "$as_me:$LINENO: checking xvid.h presence" >&5 | ||
21585 | +echo $ECHO_N "checking xvid.h presence... $ECHO_C" >&6; } | ||
21586 | cat >conftest.$ac_ext <<_ACEOF | ||
21587 | /* confdefs.h. */ | ||
21588 | _ACEOF | ||
21589 | @@ -32961,8 +35691,13 @@ | ||
21590 | /* end confdefs.h. */ | ||
21591 | #include <xvid.h> | ||
21592 | _ACEOF | ||
21593 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
21594 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
21595 | +if { (ac_try="$ac_cpp conftest.$ac_ext" | ||
21596 | +case "(($ac_try" in | ||
21597 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21598 | + *) ac_try_echo=$ac_try;; | ||
21599 | +esac | ||
21600 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21601 | + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
21602 | ac_status=$? | ||
21603 | grep -v '^ *+' conftest.er1 >conftest.err | ||
21604 | rm -f conftest.er1 | ||
21605 | @@ -32986,9 +35721,10 @@ | ||
21606 | |||
21607 | ac_header_preproc=no | ||
21608 | fi | ||
21609 | + | ||
21610 | rm -f conftest.err conftest.$ac_ext | ||
21611 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
21612 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
21613 | +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
21614 | +echo "${ECHO_T}$ac_header_preproc" >&6; } | ||
21615 | |||
21616 | # So? What about this header? | ||
21617 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
21618 | @@ -33012,33 +35748,31 @@ | ||
21619 | echo "$as_me: WARNING: xvid.h: proceeding with the preprocessor's result" >&2;} | ||
21620 | { echo "$as_me:$LINENO: WARNING: xvid.h: in the future, the compiler will take precedence" >&5 | ||
21621 | echo "$as_me: WARNING: xvid.h: in the future, the compiler will take precedence" >&2;} | ||
21622 | - ( | ||
21623 | - cat <<\_ASBOX | ||
21624 | + ( cat <<\_ASBOX | ||
21625 | ## ------------------------------------------------------------------------ ## | ||
21626 | ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer ## | ||
21627 | ## ------------------------------------------------------------------------ ## | ||
21628 | _ASBOX | ||
21629 | - ) | | ||
21630 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
21631 | + ) | sed "s/^/$as_me: WARNING: /" >&2 | ||
21632 | ;; | ||
21633 | esac | ||
21634 | -echo "$as_me:$LINENO: checking for xvid.h" >&5 | ||
21635 | -echo $ECHO_N "checking for xvid.h... $ECHO_C" >&6 | ||
21636 | +{ echo "$as_me:$LINENO: checking for xvid.h" >&5 | ||
21637 | +echo $ECHO_N "checking for xvid.h... $ECHO_C" >&6; } | ||
21638 | if test "${ac_cv_header_xvid_h+set}" = set; then | ||
21639 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
21640 | else | ||
21641 | ac_cv_header_xvid_h=$ac_header_preproc | ||
21642 | fi | ||
21643 | -echo "$as_me:$LINENO: result: $ac_cv_header_xvid_h" >&5 | ||
21644 | -echo "${ECHO_T}$ac_cv_header_xvid_h" >&6 | ||
21645 | +{ echo "$as_me:$LINENO: result: $ac_cv_header_xvid_h" >&5 | ||
21646 | +echo "${ECHO_T}$ac_cv_header_xvid_h" >&6; } | ||
21647 | |||
21648 | fi | ||
21649 | if test $ac_cv_header_xvid_h = yes; then | ||
21650 | |||
21651 | OLD_LIBS="$LIBS" | ||
21652 | LIBS="-lm" | ||
21653 | - echo "$as_me:$LINENO: checking for xvid_encore in -lxvidcore" >&5 | ||
21654 | -echo $ECHO_N "checking for xvid_encore in -lxvidcore... $ECHO_C" >&6 | ||
21655 | + { echo "$as_me:$LINENO: checking for xvid_encore in -lxvidcore" >&5 | ||
21656 | +echo $ECHO_N "checking for xvid_encore in -lxvidcore... $ECHO_C" >&6; } | ||
21657 | if test "${ac_cv_lib_xvidcore_xvid_encore+set}" = set; then | ||
21658 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
21659 | else | ||
21660 | @@ -33051,39 +35785,52 @@ | ||
21661 | cat >>conftest.$ac_ext <<_ACEOF | ||
21662 | /* end confdefs.h. */ | ||
21663 | |||
21664 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
21665 | +/* Override any GCC internal prototype to avoid an error. | ||
21666 | + Use char because int might match the return type of a GCC | ||
21667 | + builtin and then its argument prototype would still apply. */ | ||
21668 | #ifdef __cplusplus | ||
21669 | extern "C" | ||
21670 | #endif | ||
21671 | -/* We use char because int might match the return type of a gcc2 | ||
21672 | - builtin and then its argument prototype would still apply. */ | ||
21673 | char xvid_encore (); | ||
21674 | int | ||
21675 | main () | ||
21676 | { | ||
21677 | -xvid_encore (); | ||
21678 | +return xvid_encore (); | ||
21679 | ; | ||
21680 | return 0; | ||
21681 | } | ||
21682 | _ACEOF | ||
21683 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
21684 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
21685 | - (eval $ac_link) 2>conftest.er1 | ||
21686 | +if { (ac_try="$ac_link" | ||
21687 | +case "(($ac_try" in | ||
21688 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21689 | + *) ac_try_echo=$ac_try;; | ||
21690 | +esac | ||
21691 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21692 | + (eval "$ac_link") 2>conftest.er1 | ||
21693 | ac_status=$? | ||
21694 | grep -v '^ *+' conftest.er1 >conftest.err | ||
21695 | rm -f conftest.er1 | ||
21696 | cat conftest.err >&5 | ||
21697 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21698 | (exit $ac_status); } && | ||
21699 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
21700 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21701 | - (eval $ac_try) 2>&5 | ||
21702 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
21703 | + { (case "(($ac_try" in | ||
21704 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21705 | + *) ac_try_echo=$ac_try;; | ||
21706 | +esac | ||
21707 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21708 | + (eval "$ac_try") 2>&5 | ||
21709 | ac_status=$? | ||
21710 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21711 | (exit $ac_status); }; } && | ||
21712 | { ac_try='test -s conftest$ac_exeext' | ||
21713 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21714 | - (eval $ac_try) 2>&5 | ||
21715 | + { (case "(($ac_try" in | ||
21716 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21717 | + *) ac_try_echo=$ac_try;; | ||
21718 | +esac | ||
21719 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21720 | + (eval "$ac_try") 2>&5 | ||
21721 | ac_status=$? | ||
21722 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21723 | (exit $ac_status); }; }; then | ||
21724 | @@ -33092,18 +35839,19 @@ | ||
21725 | echo "$as_me: failed program was:" >&5 | ||
21726 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
21727 | |||
21728 | -ac_cv_lib_xvidcore_xvid_encore=no | ||
21729 | + ac_cv_lib_xvidcore_xvid_encore=no | ||
21730 | fi | ||
21731 | -rm -f conftest.err conftest.$ac_objext \ | ||
21732 | + | ||
21733 | +rm -f core conftest.err conftest.$ac_objext \ | ||
21734 | conftest$ac_exeext conftest.$ac_ext | ||
21735 | LIBS=$ac_check_lib_save_LIBS | ||
21736 | fi | ||
21737 | -echo "$as_me:$LINENO: result: $ac_cv_lib_xvidcore_xvid_encore" >&5 | ||
21738 | -echo "${ECHO_T}$ac_cv_lib_xvidcore_xvid_encore" >&6 | ||
21739 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_xvidcore_xvid_encore" >&5 | ||
21740 | +echo "${ECHO_T}$ac_cv_lib_xvidcore_xvid_encore" >&6; } | ||
21741 | if test $ac_cv_lib_xvidcore_xvid_encore = yes; then | ||
21742 | |||
21743 | - echo "$as_me:$LINENO: checking for xvid_decore in -lxvidcore" >&5 | ||
21744 | -echo $ECHO_N "checking for xvid_decore in -lxvidcore... $ECHO_C" >&6 | ||
21745 | + { echo "$as_me:$LINENO: checking for xvid_decore in -lxvidcore" >&5 | ||
21746 | +echo $ECHO_N "checking for xvid_decore in -lxvidcore... $ECHO_C" >&6; } | ||
21747 | if test "${ac_cv_lib_xvidcore_xvid_decore+set}" = set; then | ||
21748 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
21749 | else | ||
21750 | @@ -33116,39 +35864,52 @@ | ||
21751 | cat >>conftest.$ac_ext <<_ACEOF | ||
21752 | /* end confdefs.h. */ | ||
21753 | |||
21754 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
21755 | +/* Override any GCC internal prototype to avoid an error. | ||
21756 | + Use char because int might match the return type of a GCC | ||
21757 | + builtin and then its argument prototype would still apply. */ | ||
21758 | #ifdef __cplusplus | ||
21759 | extern "C" | ||
21760 | #endif | ||
21761 | -/* We use char because int might match the return type of a gcc2 | ||
21762 | - builtin and then its argument prototype would still apply. */ | ||
21763 | char xvid_decore (); | ||
21764 | int | ||
21765 | main () | ||
21766 | { | ||
21767 | -xvid_decore (); | ||
21768 | +return xvid_decore (); | ||
21769 | ; | ||
21770 | return 0; | ||
21771 | } | ||
21772 | _ACEOF | ||
21773 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
21774 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
21775 | - (eval $ac_link) 2>conftest.er1 | ||
21776 | +if { (ac_try="$ac_link" | ||
21777 | +case "(($ac_try" in | ||
21778 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21779 | + *) ac_try_echo=$ac_try;; | ||
21780 | +esac | ||
21781 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21782 | + (eval "$ac_link") 2>conftest.er1 | ||
21783 | ac_status=$? | ||
21784 | grep -v '^ *+' conftest.er1 >conftest.err | ||
21785 | rm -f conftest.er1 | ||
21786 | cat conftest.err >&5 | ||
21787 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21788 | (exit $ac_status); } && | ||
21789 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
21790 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21791 | - (eval $ac_try) 2>&5 | ||
21792 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
21793 | + { (case "(($ac_try" in | ||
21794 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21795 | + *) ac_try_echo=$ac_try;; | ||
21796 | +esac | ||
21797 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21798 | + (eval "$ac_try") 2>&5 | ||
21799 | ac_status=$? | ||
21800 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21801 | (exit $ac_status); }; } && | ||
21802 | { ac_try='test -s conftest$ac_exeext' | ||
21803 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21804 | - (eval $ac_try) 2>&5 | ||
21805 | + { (case "(($ac_try" in | ||
21806 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21807 | + *) ac_try_echo=$ac_try;; | ||
21808 | +esac | ||
21809 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21810 | + (eval "$ac_try") 2>&5 | ||
21811 | ac_status=$? | ||
21812 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21813 | (exit $ac_status); }; }; then | ||
21814 | @@ -33157,18 +35918,19 @@ | ||
21815 | echo "$as_me: failed program was:" >&5 | ||
21816 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
21817 | |||
21818 | -ac_cv_lib_xvidcore_xvid_decore=no | ||
21819 | + ac_cv_lib_xvidcore_xvid_decore=no | ||
21820 | fi | ||
21821 | -rm -f conftest.err conftest.$ac_objext \ | ||
21822 | + | ||
21823 | +rm -f core conftest.err conftest.$ac_objext \ | ||
21824 | conftest$ac_exeext conftest.$ac_ext | ||
21825 | LIBS=$ac_check_lib_save_LIBS | ||
21826 | fi | ||
21827 | -echo "$as_me:$LINENO: result: $ac_cv_lib_xvidcore_xvid_decore" >&5 | ||
21828 | -echo "${ECHO_T}$ac_cv_lib_xvidcore_xvid_decore" >&6 | ||
21829 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_xvidcore_xvid_decore" >&5 | ||
21830 | +echo "${ECHO_T}$ac_cv_lib_xvidcore_xvid_decore" >&6; } | ||
21831 | if test $ac_cv_lib_xvidcore_xvid_decore = yes; then | ||
21832 | |||
21833 | - echo "$as_me:$LINENO: checking for xvid_global in -lxvidcore" >&5 | ||
21834 | -echo $ECHO_N "checking for xvid_global in -lxvidcore... $ECHO_C" >&6 | ||
21835 | + { echo "$as_me:$LINENO: checking for xvid_global in -lxvidcore" >&5 | ||
21836 | +echo $ECHO_N "checking for xvid_global in -lxvidcore... $ECHO_C" >&6; } | ||
21837 | if test "${ac_cv_lib_xvidcore_xvid_global+set}" = set; then | ||
21838 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
21839 | else | ||
21840 | @@ -33181,39 +35943,52 @@ | ||
21841 | cat >>conftest.$ac_ext <<_ACEOF | ||
21842 | /* end confdefs.h. */ | ||
21843 | |||
21844 | -/* Override any gcc2 internal prototype to avoid an error. */ | ||
21845 | +/* Override any GCC internal prototype to avoid an error. | ||
21846 | + Use char because int might match the return type of a GCC | ||
21847 | + builtin and then its argument prototype would still apply. */ | ||
21848 | #ifdef __cplusplus | ||
21849 | extern "C" | ||
21850 | #endif | ||
21851 | -/* We use char because int might match the return type of a gcc2 | ||
21852 | - builtin and then its argument prototype would still apply. */ | ||
21853 | char xvid_global (); | ||
21854 | int | ||
21855 | main () | ||
21856 | { | ||
21857 | -xvid_global (); | ||
21858 | +return xvid_global (); | ||
21859 | ; | ||
21860 | return 0; | ||
21861 | } | ||
21862 | _ACEOF | ||
21863 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
21864 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
21865 | - (eval $ac_link) 2>conftest.er1 | ||
21866 | +if { (ac_try="$ac_link" | ||
21867 | +case "(($ac_try" in | ||
21868 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21869 | + *) ac_try_echo=$ac_try;; | ||
21870 | +esac | ||
21871 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21872 | + (eval "$ac_link") 2>conftest.er1 | ||
21873 | ac_status=$? | ||
21874 | grep -v '^ *+' conftest.er1 >conftest.err | ||
21875 | rm -f conftest.er1 | ||
21876 | cat conftest.err >&5 | ||
21877 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21878 | (exit $ac_status); } && | ||
21879 | - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
21880 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21881 | - (eval $ac_try) 2>&5 | ||
21882 | + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
21883 | + { (case "(($ac_try" in | ||
21884 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21885 | + *) ac_try_echo=$ac_try;; | ||
21886 | +esac | ||
21887 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21888 | + (eval "$ac_try") 2>&5 | ||
21889 | ac_status=$? | ||
21890 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21891 | (exit $ac_status); }; } && | ||
21892 | { ac_try='test -s conftest$ac_exeext' | ||
21893 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21894 | - (eval $ac_try) 2>&5 | ||
21895 | + { (case "(($ac_try" in | ||
21896 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21897 | + *) ac_try_echo=$ac_try;; | ||
21898 | +esac | ||
21899 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21900 | + (eval "$ac_try") 2>&5 | ||
21901 | ac_status=$? | ||
21902 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21903 | (exit $ac_status); }; }; then | ||
21904 | @@ -33222,18 +35997,19 @@ | ||
21905 | echo "$as_me: failed program was:" >&5 | ||
21906 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
21907 | |||
21908 | -ac_cv_lib_xvidcore_xvid_global=no | ||
21909 | + ac_cv_lib_xvidcore_xvid_global=no | ||
21910 | fi | ||
21911 | -rm -f conftest.err conftest.$ac_objext \ | ||
21912 | + | ||
21913 | +rm -f core conftest.err conftest.$ac_objext \ | ||
21914 | conftest$ac_exeext conftest.$ac_ext | ||
21915 | LIBS=$ac_check_lib_save_LIBS | ||
21916 | fi | ||
21917 | -echo "$as_me:$LINENO: result: $ac_cv_lib_xvidcore_xvid_global" >&5 | ||
21918 | -echo "${ECHO_T}$ac_cv_lib_xvidcore_xvid_global" >&6 | ||
21919 | +{ echo "$as_me:$LINENO: result: $ac_cv_lib_xvidcore_xvid_global" >&5 | ||
21920 | +echo "${ECHO_T}$ac_cv_lib_xvidcore_xvid_global" >&6; } | ||
21921 | if test $ac_cv_lib_xvidcore_xvid_global = yes; then | ||
21922 | |||
21923 | - echo "$as_me:$LINENO: checking for uptodate XviD API version" >&5 | ||
21924 | -echo $ECHO_N "checking for uptodate XviD API version... $ECHO_C" >&6 | ||
21925 | + { echo "$as_me:$LINENO: checking for uptodate XviD API version" >&5 | ||
21926 | +echo $ECHO_N "checking for uptodate XviD API version... $ECHO_C" >&6; } | ||
21927 | if test "$cross_compiling" = yes; then | ||
21928 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling | ||
21929 | See \`config.log' for more details." >&5 | ||
21930 | @@ -33256,18 +36032,27 @@ | ||
21931 | |||
21932 | _ACEOF | ||
21933 | rm -f conftest$ac_exeext | ||
21934 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
21935 | - (eval $ac_link) 2>&5 | ||
21936 | +if { (ac_try="$ac_link" | ||
21937 | +case "(($ac_try" in | ||
21938 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21939 | + *) ac_try_echo=$ac_try;; | ||
21940 | +esac | ||
21941 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21942 | + (eval "$ac_link") 2>&5 | ||
21943 | ac_status=$? | ||
21944 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21945 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
21946 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21947 | - (eval $ac_try) 2>&5 | ||
21948 | + { (case "(($ac_try" in | ||
21949 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21950 | + *) ac_try_echo=$ac_try;; | ||
21951 | +esac | ||
21952 | +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21953 | + (eval "$ac_try") 2>&5 | ||
21954 | ac_status=$? | ||
21955 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21956 | (exit $ac_status); }; }; then | ||
21957 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
21958 | -echo "${ECHO_T}yes" >&6 | ||
21959 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
21960 | +echo "${ECHO_T}yes" >&6; } | ||
21961 | XVID_LIBS="-lxvidcore -lm" | ||
21962 | |||
21963 | HAVE_XVID=yes | ||
21964 | @@ -33278,12 +36063,14 @@ | ||
21965 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
21966 | |||
21967 | ( exit $ac_status ) | ||
21968 | -echo "$as_me:$LINENO: result: no" >&5 | ||
21969 | -echo "${ECHO_T}no" >&6 | ||
21970 | +{ echo "$as_me:$LINENO: result: no" >&5 | ||
21971 | +echo "${ECHO_T}no" >&6; } | ||
21972 | fi | ||
21973 | -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
21974 | +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
21975 | fi | ||
21976 | |||
21977 | + | ||
21978 | + | ||
21979 | fi | ||
21980 | |||
21981 | |||
21982 | @@ -33346,10 +36133,9 @@ | ||
21983 | if test "x$USE_WAVPACK" = "xno"; then | ||
21984 | NOUSE="yes" | ||
21985 | fi | ||
21986 | -# Check whether --enable-wavpack or --disable-wavpack was given. | ||
21987 | +# Check whether --enable-wavpack was given. | ||
21988 | if test "${enable_wavpack+set}" = set; then | ||
21989 | - enableval="$enable_wavpack" | ||
21990 | - case "${enableval}" in | ||
21991 | + enableval=$enable_wavpack; case "${enableval}" in | ||
21992 | yes) USE_WAVPACK=yes;; | ||
21993 | no) USE_WAVPACK=no;; | ||
21994 | *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-wavpack" >&5 | ||
21995 | @@ -33358,7 +36144,8 @@ | ||
21996 | esac | ||
21997 | else | ||
21998 | USE_WAVPACK=yes | ||
21999 | -fi; | ||
22000 | +fi | ||
22001 | + | ||
22002 | if test "x$NOUSE" = "xyes"; then | ||
22003 | USE_WAVPACK="no" | ||
22004 | { echo "$as_me:$LINENO: WARNING: *** wavpack pre-configured not to be built" >&5 | ||
22005 | @@ -33379,8 +36166,8 @@ | ||
22006 | |||
22007 | |||
22008 | pkg_failed=no | ||
22009 | -echo "$as_me:$LINENO: checking for WAVPACK" >&5 | ||
22010 | -echo $ECHO_N "checking for WAVPACK... $ECHO_C" >&6 | ||
22011 | +{ echo "$as_me:$LINENO: checking for WAVPACK" >&5 | ||
22012 | +echo $ECHO_N "checking for WAVPACK... $ECHO_C" >&6; } | ||
22013 | |||
22014 | if test -n "$PKG_CONFIG"; then | ||
22015 | if test -n "$PKG_CONFIG" && \ | ||
22016 | @@ -33418,20 +36205,20 @@ | ||
22017 | |||
22018 | |||
22019 | HAVE_WAVPACK=no | ||
22020 | - echo "$as_me:$LINENO: result: no" >&5 | ||
22021 | -echo "${ECHO_T}no" >&6 | ||
22022 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
22023 | +echo "${ECHO_T}no" >&6; } | ||
22024 | |||
22025 | elif test $pkg_failed = untried; then | ||
22026 | |||
22027 | HAVE_WAVPACK=no | ||
22028 | - echo "$as_me:$LINENO: result: no" >&5 | ||
22029 | -echo "${ECHO_T}no" >&6 | ||
22030 | + { echo "$as_me:$LINENO: result: no" >&5 | ||
22031 | +echo "${ECHO_T}no" >&6; } | ||
22032 | |||
22033 | else | ||
22034 | WAVPACK_CFLAGS=$pkg_cv_WAVPACK_CFLAGS | ||
22035 | WAVPACK_LIBS=$pkg_cv_WAVPACK_LIBS | ||
22036 | - echo "$as_me:$LINENO: result: yes" >&5 | ||
22037 | -echo "${ECHO_T}yes" >&6 | ||
22038 | + { echo "$as_me:$LINENO: result: yes" >&5 | ||
22039 | +echo "${ECHO_T}yes" >&6; } | ||
22040 | HAVE_WAVPACK=yes | ||
22041 | fi | ||
22042 | |||
22043 | @@ -33501,7 +36288,7 @@ | ||
22044 | |||
22045 | |||
22046 | |||
22047 | - ac_config_files="$ac_config_files Makefile gst-plugins-bad.spec gst/Makefile gst/cdxaparse/Makefile gst/freeze/Makefile gst/modplug/Makefile gst/modplug/libmodplug/Makefile gst/speed/Makefile gst/qtdemux/Makefile gst/tta/Makefile gst/xingheader/Makefile gst-libs/Makefile gst-libs/gst/Makefile sys/Makefile sys/glsink/Makefile sys/v4l2/Makefile examples/Makefile examples/directfb/Makefile ext/amrwb/amrwb-code/Makefile ext/amrwb/Makefile ext/bz2/Makefile ext/directfb/Makefile ext/divx/Makefile ext/dts/Makefile ext/faac/Makefile ext/faad/Makefile ext/gsm/Makefile ext/ivorbis/Makefile ext/libmms/Makefile ext/Makefile ext/musepack/Makefile ext/musicbrainz/Makefile ext/neon/Makefile ext/sdl/Makefile ext/soundtouch/Makefile ext/swfdec/Makefile ext/theora/Makefile ext/wavpack/Makefile ext/xvid/Makefile po/Makefile.in docs/Makefile docs/plugins/Makefile docs/version.entities common/Makefile common/m4/Makefile m4/Makefile tests/Makefile tests/check/Makefile tests/icles/Makefile" | ||
22048 | +ac_config_files="$ac_config_files Makefile gst-plugins-bad.spec gst/Makefile gst/cdxaparse/Makefile gst/freeze/Makefile gst/modplug/Makefile gst/modplug/libmodplug/Makefile gst/speed/Makefile gst/qtdemux/Makefile gst/tta/Makefile gst/xingheader/Makefile gst-libs/Makefile gst-libs/gst/Makefile sys/Makefile sys/glsink/Makefile sys/v4l2/Makefile examples/Makefile examples/directfb/Makefile ext/amrwb/amrwb-code/Makefile ext/amrwb/Makefile ext/bz2/Makefile ext/directfb/Makefile ext/divx/Makefile ext/dts/Makefile ext/faac/Makefile ext/faad/Makefile ext/gsm/Makefile ext/ivorbis/Makefile ext/libmms/Makefile ext/Makefile ext/musepack/Makefile ext/musicbrainz/Makefile ext/neon/Makefile ext/sdl/Makefile ext/soundtouch/Makefile ext/swfdec/Makefile ext/theora/Makefile ext/wavpack/Makefile ext/xvid/Makefile po/Makefile.in docs/Makefile docs/plugins/Makefile docs/version.entities common/Makefile common/m4/Makefile m4/Makefile tests/Makefile tests/check/Makefile tests/icles/Makefile" | ||
22049 | |||
22050 | cat >confcache <<\_ACEOF | ||
22051 | # This file is a shell script that caches the results of configure | ||
22052 | @@ -33521,39 +36308,58 @@ | ||
22053 | |||
22054 | # The following way of writing the cache mishandles newlines in values, | ||
22055 | # but we know of no workaround that is simple, portable, and efficient. | ||
22056 | -# So, don't put newlines in cache variables' values. | ||
22057 | +# So, we kill variables containing newlines. | ||
22058 | # Ultrix sh set writes to stderr and can't be redirected directly, | ||
22059 | # and sets the high bit in the cache file unless we assign to the vars. | ||
22060 | -{ | ||
22061 | +( | ||
22062 | + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do | ||
22063 | + eval ac_val=\$$ac_var | ||
22064 | + case $ac_val in #( | ||
22065 | + *${as_nl}*) | ||
22066 | + case $ac_var in #( | ||
22067 | + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 | ||
22068 | +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; | ||
22069 | + esac | ||
22070 | + case $ac_var in #( | ||
22071 | + _ | IFS | as_nl) ;; #( | ||
22072 | + *) $as_unset $ac_var ;; | ||
22073 | + esac ;; | ||
22074 | + esac | ||
22075 | + done | ||
22076 | + | ||
22077 | (set) 2>&1 | | ||
22078 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in | ||
22079 | - *ac_space=\ *) | ||
22080 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( | ||
22081 | + *${as_nl}ac_space=\ *) | ||
22082 | # `set' does not quote correctly, so add quotes (double-quote | ||
22083 | # substitution turns \\\\ into \\, and sed turns \\ into \). | ||
22084 | sed -n \ | ||
22085 | "s/'/'\\\\''/g; | ||
22086 | s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" | ||
22087 | - ;; | ||
22088 | + ;; #( | ||
22089 | *) | ||
22090 | # `set' quotes correctly as required by POSIX, so do not add quotes. | ||
22091 | - sed -n \ | ||
22092 | - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
22093 | + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" | ||
22094 | ;; | ||
22095 | - esac; | ||
22096 | -} | | ||
22097 | + esac | | ||
22098 | + sort | ||
22099 | +) | | ||
22100 | sed ' | ||
22101 | + /^ac_cv_env_/b end | ||
22102 | t clear | ||
22103 | - : clear | ||
22104 | + :clear | ||
22105 | s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ | ||
22106 | t end | ||
22107 | - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ | ||
22108 | - : end' >>confcache | ||
22109 | -if diff $cache_file confcache >/dev/null 2>&1; then :; else | ||
22110 | - if test -w $cache_file; then | ||
22111 | - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" | ||
22112 | + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ | ||
22113 | + :end' >>confcache | ||
22114 | +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else | ||
22115 | + if test -w "$cache_file"; then | ||
22116 | + test "x$cache_file" != "x/dev/null" && | ||
22117 | + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 | ||
22118 | +echo "$as_me: updating cache $cache_file" >&6;} | ||
22119 | cat confcache >$cache_file | ||
22120 | else | ||
22121 | - echo "not updating unwritable cache $cache_file" | ||
22122 | + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 | ||
22123 | +echo "$as_me: not updating unwritable cache $cache_file" >&6;} | ||
22124 | fi | ||
22125 | fi | ||
22126 | rm -f confcache | ||
22127 | @@ -33562,32 +36368,18 @@ | ||
22128 | # Let make expand exec_prefix. | ||
22129 | test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' | ||
22130 | |||
22131 | -# VPATH may cause trouble with some makes, so we remove $(srcdir), | ||
22132 | -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and | ||
22133 | -# trailing colons and then remove the whole line if VPATH becomes empty | ||
22134 | -# (actually we leave an empty line to preserve line numbers). | ||
22135 | -if test "x$srcdir" = x.; then | ||
22136 | - ac_vpsub='/^[ ]*VPATH[ ]*=/{ | ||
22137 | -s/:*\$(srcdir):*/:/; | ||
22138 | -s/:*\${srcdir}:*/:/; | ||
22139 | -s/:*@srcdir@:*/:/; | ||
22140 | -s/^\([^=]*=[ ]*\):*/\1/; | ||
22141 | -s/:*$//; | ||
22142 | -s/^[^=]*=[ ]*$//; | ||
22143 | -}' | ||
22144 | -fi | ||
22145 | - | ||
22146 | DEFS=-DHAVE_CONFIG_H | ||
22147 | |||
22148 | ac_libobjs= | ||
22149 | ac_ltlibobjs= | ||
22150 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue | ||
22151 | # 1. Remove the extension, and $U if already installed. | ||
22152 | - ac_i=`echo "$ac_i" | | ||
22153 | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` | ||
22154 | - # 2. Add them. | ||
22155 | - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" | ||
22156 | - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' | ||
22157 | + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' | ||
22158 | + ac_i=`echo "$ac_i" | sed "$ac_script"` | ||
22159 | + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR | ||
22160 | + # will be set to the directory where LIBOBJS objects are built. | ||
22161 | + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" | ||
22162 | + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' | ||
22163 | done | ||
22164 | LIBOBJS=$ac_libobjs | ||
22165 | |||
22166 | @@ -33975,11 +36767,35 @@ | ||
22167 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
22168 | # is contrary to our usage. Disable this feature. | ||
22169 | alias -g '${1+"$@"}'='"$@"' | ||
22170 | -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | ||
22171 | - set -o posix | ||
22172 | + setopt NO_GLOB_SUBST | ||
22173 | +else | ||
22174 | + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | ||
22175 | fi | ||
22176 | +BIN_SH=xpg4; export BIN_SH # for Tru64 | ||
22177 | DUALCASE=1; export DUALCASE # for MKS sh | ||
22178 | |||
22179 | + | ||
22180 | +# PATH needs CR | ||
22181 | +# Avoid depending upon Character Ranges. | ||
22182 | +as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
22183 | +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
22184 | +as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
22185 | +as_cr_digits='0123456789' | ||
22186 | +as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
22187 | + | ||
22188 | +# The user is always right. | ||
22189 | +if test "${PATH_SEPARATOR+set}" != set; then | ||
22190 | + echo "#! /bin/sh" >conf$$.sh | ||
22191 | + echo "exit 0" >>conf$$.sh | ||
22192 | + chmod +x conf$$.sh | ||
22193 | + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
22194 | + PATH_SEPARATOR=';' | ||
22195 | + else | ||
22196 | + PATH_SEPARATOR=: | ||
22197 | + fi | ||
22198 | + rm -f conf$$.sh | ||
22199 | +fi | ||
22200 | + | ||
22201 | # Support unset when possible. | ||
22202 | if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
22203 | as_unset=unset | ||
22204 | @@ -33988,8 +36804,43 @@ | ||
22205 | fi | ||
22206 | |||
22207 | |||
22208 | +# IFS | ||
22209 | +# We need space, tab and new line, in precisely that order. Quoting is | ||
22210 | +# there to prevent editors from complaining about space-tab. | ||
22211 | +# (If _AS_PATH_WALK were called with IFS unset, it would disable word | ||
22212 | +# splitting by setting IFS to empty value.) | ||
22213 | +as_nl=' | ||
22214 | +' | ||
22215 | +IFS=" "" $as_nl" | ||
22216 | + | ||
22217 | +# Find who we are. Look in the path if we contain no directory separator. | ||
22218 | +case $0 in | ||
22219 | + *[\\/]* ) as_myself=$0 ;; | ||
22220 | + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
22221 | +for as_dir in $PATH | ||
22222 | +do | ||
22223 | + IFS=$as_save_IFS | ||
22224 | + test -z "$as_dir" && as_dir=. | ||
22225 | + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
22226 | +done | ||
22227 | +IFS=$as_save_IFS | ||
22228 | + | ||
22229 | + ;; | ||
22230 | +esac | ||
22231 | +# We did not find ourselves, most probably we were run as `sh COMMAND' | ||
22232 | +# in which case we are not to be found in the path. | ||
22233 | +if test "x$as_myself" = x; then | ||
22234 | + as_myself=$0 | ||
22235 | +fi | ||
22236 | +if test ! -f "$as_myself"; then | ||
22237 | + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | ||
22238 | + { (exit 1); exit 1; } | ||
22239 | +fi | ||
22240 | + | ||
22241 | # Work around bugs in pre-3.0 UWIN ksh. | ||
22242 | -$as_unset ENV MAIL MAILPATH | ||
22243 | +for as_var in ENV MAIL MAILPATH | ||
22244 | +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
22245 | +done | ||
22246 | PS1='$ ' | ||
22247 | PS2='> ' | ||
22248 | PS4='+ ' | ||
22249 | @@ -34003,18 +36854,19 @@ | ||
22250 | if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
22251 | eval $as_var=C; export $as_var | ||
22252 | else | ||
22253 | - $as_unset $as_var | ||
22254 | + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
22255 | fi | ||
22256 | done | ||
22257 | |||
22258 | # Required to use basename. | ||
22259 | -if expr a : '\(a\)' >/dev/null 2>&1; then | ||
22260 | +if expr a : '\(a\)' >/dev/null 2>&1 && | ||
22261 | + test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
22262 | as_expr=expr | ||
22263 | else | ||
22264 | as_expr=false | ||
22265 | fi | ||
22266 | |||
22267 | -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then | ||
22268 | +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then | ||
22269 | as_basename=basename | ||
22270 | else | ||
22271 | as_basename=false | ||
22272 | @@ -34022,159 +36874,120 @@ | ||
22273 | |||
22274 | |||
22275 | # Name of the executable. | ||
22276 | -as_me=`$as_basename "$0" || | ||
22277 | +as_me=`$as_basename -- "$0" || | ||
22278 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | ||
22279 | X"$0" : 'X\(//\)$' \| \ | ||
22280 | - X"$0" : 'X\(/\)$' \| \ | ||
22281 | - . : '\(.\)' 2>/dev/null || | ||
22282 | + X"$0" : 'X\(/\)' \| . 2>/dev/null || | ||
22283 | echo X/"$0" | | ||
22284 | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } | ||
22285 | - /^X\/\(\/\/\)$/{ s//\1/; q; } | ||
22286 | - /^X\/\(\/\).*/{ s//\1/; q; } | ||
22287 | - s/.*/./; q'` | ||
22288 | - | ||
22289 | - | ||
22290 | -# PATH needs CR, and LINENO needs CR and PATH. | ||
22291 | -# Avoid depending upon Character Ranges. | ||
22292 | -as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
22293 | -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
22294 | -as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
22295 | -as_cr_digits='0123456789' | ||
22296 | -as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
22297 | + sed '/^.*\/\([^/][^/]*\)\/*$/{ | ||
22298 | + s//\1/ | ||
22299 | + q | ||
22300 | + } | ||
22301 | + /^X\/\(\/\/\)$/{ | ||
22302 | + s//\1/ | ||
22303 | + q | ||
22304 | + } | ||
22305 | + /^X\/\(\/\).*/{ | ||
22306 | + s//\1/ | ||
22307 | + q | ||
22308 | + } | ||
22309 | + s/.*/./; q'` | ||
22310 | |||
22311 | -# The user is always right. | ||
22312 | -if test "${PATH_SEPARATOR+set}" != set; then | ||
22313 | - echo "#! /bin/sh" >conf$$.sh | ||
22314 | - echo "exit 0" >>conf$$.sh | ||
22315 | - chmod +x conf$$.sh | ||
22316 | - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
22317 | - PATH_SEPARATOR=';' | ||
22318 | - else | ||
22319 | - PATH_SEPARATOR=: | ||
22320 | - fi | ||
22321 | - rm -f conf$$.sh | ||
22322 | -fi | ||
22323 | +# CDPATH. | ||
22324 | +$as_unset CDPATH | ||
22325 | |||
22326 | |||
22327 | - as_lineno_1=$LINENO | ||
22328 | - as_lineno_2=$LINENO | ||
22329 | - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
22330 | - test "x$as_lineno_1" != "x$as_lineno_2" && | ||
22331 | - test "x$as_lineno_3" = "x$as_lineno_2" || { | ||
22332 | - # Find who we are. Look in the path if we contain no path at all | ||
22333 | - # relative or not. | ||
22334 | - case $0 in | ||
22335 | - *[\\/]* ) as_myself=$0 ;; | ||
22336 | - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
22337 | -for as_dir in $PATH | ||
22338 | -do | ||
22339 | - IFS=$as_save_IFS | ||
22340 | - test -z "$as_dir" && as_dir=. | ||
22341 | - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
22342 | -done | ||
22343 | |||
22344 | - ;; | ||
22345 | - esac | ||
22346 | - # We did not find ourselves, most probably we were run as `sh COMMAND' | ||
22347 | - # in which case we are not to be found in the path. | ||
22348 | - if test "x$as_myself" = x; then | ||
22349 | - as_myself=$0 | ||
22350 | - fi | ||
22351 | - if test ! -f "$as_myself"; then | ||
22352 | - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 | ||
22353 | -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} | ||
22354 | - { (exit 1); exit 1; }; } | ||
22355 | - fi | ||
22356 | - case $CONFIG_SHELL in | ||
22357 | - '') | ||
22358 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
22359 | -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | ||
22360 | -do | ||
22361 | - IFS=$as_save_IFS | ||
22362 | - test -z "$as_dir" && as_dir=. | ||
22363 | - for as_base in sh bash ksh sh5; do | ||
22364 | - case $as_dir in | ||
22365 | - /*) | ||
22366 | - if ("$as_dir/$as_base" -c ' | ||
22367 | as_lineno_1=$LINENO | ||
22368 | as_lineno_2=$LINENO | ||
22369 | - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
22370 | test "x$as_lineno_1" != "x$as_lineno_2" && | ||
22371 | - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then | ||
22372 | - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } | ||
22373 | - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } | ||
22374 | - CONFIG_SHELL=$as_dir/$as_base | ||
22375 | - export CONFIG_SHELL | ||
22376 | - exec "$CONFIG_SHELL" "$0" ${1+"$@"} | ||
22377 | - fi;; | ||
22378 | - esac | ||
22379 | - done | ||
22380 | -done | ||
22381 | -;; | ||
22382 | - esac | ||
22383 | + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { | ||
22384 | |||
22385 | # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | ||
22386 | # uniformly replaced by the line number. The first 'sed' inserts a | ||
22387 | - # line-number line before each line; the second 'sed' does the real | ||
22388 | - # work. The second script uses 'N' to pair each line-number line | ||
22389 | - # with the numbered line, and appends trailing '-' during | ||
22390 | - # substitution so that $LINENO is not a special case at line end. | ||
22391 | + # line-number line after each line using $LINENO; the second 'sed' | ||
22392 | + # does the real work. The second script uses 'N' to pair each | ||
22393 | + # line-number line with the line containing $LINENO, and appends | ||
22394 | + # trailing '-' during substitution so that $LINENO is not a special | ||
22395 | + # case at line end. | ||
22396 | # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | ||
22397 | - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) | ||
22398 | - sed '=' <$as_myself | | ||
22399 | + # scripts with optimization help from Paolo Bonzini. Blame Lee | ||
22400 | + # E. McMahon (1931-1989) for sed's syntax. :-) | ||
22401 | + sed -n ' | ||
22402 | + p | ||
22403 | + /[$]LINENO/= | ||
22404 | + ' <$as_myself | | ||
22405 | sed ' | ||
22406 | + s/[$]LINENO.*/&-/ | ||
22407 | + t lineno | ||
22408 | + b | ||
22409 | + :lineno | ||
22410 | N | ||
22411 | - s,$,-, | ||
22412 | - : loop | ||
22413 | - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, | ||
22414 | + :loop | ||
22415 | + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ | ||
22416 | t loop | ||
22417 | - s,-$,, | ||
22418 | - s,^['$as_cr_digits']*\n,, | ||
22419 | + s/-\n.*// | ||
22420 | ' >$as_me.lineno && | ||
22421 | - chmod +x $as_me.lineno || | ||
22422 | - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 | ||
22423 | -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} | ||
22424 | + chmod +x "$as_me.lineno" || | ||
22425 | + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | ||
22426 | { (exit 1); exit 1; }; } | ||
22427 | |||
22428 | # Don't try to exec as it changes $[0], causing all sort of problems | ||
22429 | # (the dirname of $[0] is not the place where we might find the | ||
22430 | - # original and so on. Autoconf is especially sensible to this). | ||
22431 | - . ./$as_me.lineno | ||
22432 | + # original and so on. Autoconf is especially sensitive to this). | ||
22433 | + . "./$as_me.lineno" | ||
22434 | # Exit status is that of the last command. | ||
22435 | exit | ||
22436 | } | ||
22437 | |||
22438 | |||
22439 | -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in | ||
22440 | - *c*,-n*) ECHO_N= ECHO_C=' | ||
22441 | -' ECHO_T=' ' ;; | ||
22442 | - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; | ||
22443 | - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; | ||
22444 | +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | ||
22445 | + as_dirname=dirname | ||
22446 | +else | ||
22447 | + as_dirname=false | ||
22448 | +fi | ||
22449 | + | ||
22450 | +ECHO_C= ECHO_N= ECHO_T= | ||
22451 | +case `echo -n x` in | ||
22452 | +-n*) | ||
22453 | + case `echo 'x\c'` in | ||
22454 | + *c*) ECHO_T=' ';; # ECHO_T is single tab character. | ||
22455 | + *) ECHO_C='\c';; | ||
22456 | + esac;; | ||
22457 | +*) | ||
22458 | + ECHO_N='-n';; | ||
22459 | esac | ||
22460 | |||
22461 | -if expr a : '\(a\)' >/dev/null 2>&1; then | ||
22462 | +if expr a : '\(a\)' >/dev/null 2>&1 && | ||
22463 | + test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
22464 | as_expr=expr | ||
22465 | else | ||
22466 | as_expr=false | ||
22467 | fi | ||
22468 | |||
22469 | rm -f conf$$ conf$$.exe conf$$.file | ||
22470 | +if test -d conf$$.dir; then | ||
22471 | + rm -f conf$$.dir/conf$$.file | ||
22472 | +else | ||
22473 | + rm -f conf$$.dir | ||
22474 | + mkdir conf$$.dir | ||
22475 | +fi | ||
22476 | echo >conf$$.file | ||
22477 | if ln -s conf$$.file conf$$ 2>/dev/null; then | ||
22478 | - # We could just check for DJGPP; but this test a) works b) is more generic | ||
22479 | - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). | ||
22480 | - if test -f conf$$.exe; then | ||
22481 | - # Don't use ln at all; we don't have any links | ||
22482 | + as_ln_s='ln -s' | ||
22483 | + # ... but there are two gotchas: | ||
22484 | + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | ||
22485 | + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | ||
22486 | + # In both cases, we have to default to `cp -p'. | ||
22487 | + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | ||
22488 | as_ln_s='cp -p' | ||
22489 | - else | ||
22490 | - as_ln_s='ln -s' | ||
22491 | - fi | ||
22492 | elif ln conf$$.file conf$$ 2>/dev/null; then | ||
22493 | as_ln_s=ln | ||
22494 | else | ||
22495 | as_ln_s='cp -p' | ||
22496 | fi | ||
22497 | -rm -f conf$$ conf$$.exe conf$$.file | ||
22498 | +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | ||
22499 | +rmdir conf$$.dir 2>/dev/null | ||
22500 | |||
22501 | if mkdir -p . 2>/dev/null; then | ||
22502 | as_mkdir_p=: | ||
22503 | @@ -34183,7 +36996,19 @@ | ||
22504 | as_mkdir_p=false | ||
22505 | fi | ||
22506 | |||
22507 | -as_executable_p="test -f" | ||
22508 | +# Find out whether ``test -x'' works. Don't use a zero-byte file, as | ||
22509 | +# systems may use methods other than mode bits to determine executability. | ||
22510 | +cat >conf$$.file <<_ASEOF | ||
22511 | +#! /bin/sh | ||
22512 | +exit 0 | ||
22513 | +_ASEOF | ||
22514 | +chmod +x conf$$.file | ||
22515 | +if test -x conf$$.file >/dev/null 2>&1; then | ||
22516 | + as_executable_p="test -x" | ||
22517 | +else | ||
22518 | + as_executable_p=: | ||
22519 | +fi | ||
22520 | +rm -f conf$$.file | ||
22521 | |||
22522 | # Sed expression to map a string onto a valid CPP name. | ||
22523 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | ||
22524 | @@ -34192,31 +37017,14 @@ | ||
22525 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | ||
22526 | |||
22527 | |||
22528 | -# IFS | ||
22529 | -# We need space, tab and new line, in precisely that order. | ||
22530 | -as_nl=' | ||
22531 | -' | ||
22532 | -IFS=" $as_nl" | ||
22533 | - | ||
22534 | -# CDPATH. | ||
22535 | -$as_unset CDPATH | ||
22536 | - | ||
22537 | exec 6>&1 | ||
22538 | |||
22539 | -# Open the log real soon, to keep \$[0] and so on meaningful, and to | ||
22540 | +# Save the log message, to keep $[0] and so on meaningful, and to | ||
22541 | # report actual input values of CONFIG_FILES etc. instead of their | ||
22542 | -# values after options handling. Logging --version etc. is OK. | ||
22543 | -exec 5>>config.log | ||
22544 | -{ | ||
22545 | - echo | ||
22546 | - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX | ||
22547 | -## Running $as_me. ## | ||
22548 | -_ASBOX | ||
22549 | -} >&5 | ||
22550 | -cat >&5 <<_CSEOF | ||
22551 | - | ||
22552 | +# values after options handling. | ||
22553 | +ac_log=" | ||
22554 | This file was extended by GStreamer Bad Plug-ins $as_me 0.10.3, which was | ||
22555 | -generated by GNU Autoconf 2.59. Invocation command line was | ||
22556 | +generated by GNU Autoconf 2.60. Invocation command line was | ||
22557 | |||
22558 | CONFIG_FILES = $CONFIG_FILES | ||
22559 | CONFIG_HEADERS = $CONFIG_HEADERS | ||
22560 | @@ -34224,30 +37032,20 @@ | ||
22561 | CONFIG_COMMANDS = $CONFIG_COMMANDS | ||
22562 | $ $0 $@ | ||
22563 | |||
22564 | -_CSEOF | ||
22565 | -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 | ||
22566 | -echo >&5 | ||
22567 | +on `(hostname || uname -n) 2>/dev/null | sed 1q` | ||
22568 | +" | ||
22569 | + | ||
22570 | _ACEOF | ||
22571 | |||
22572 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
22573 | # Files that config.status was made for. | ||
22574 | -if test -n "$ac_config_files"; then | ||
22575 | - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS | ||
22576 | -fi | ||
22577 | - | ||
22578 | -if test -n "$ac_config_headers"; then | ||
22579 | - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS | ||
22580 | -fi | ||
22581 | - | ||
22582 | -if test -n "$ac_config_links"; then | ||
22583 | - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS | ||
22584 | -fi | ||
22585 | +config_files="$ac_config_files" | ||
22586 | +config_headers="$ac_config_headers" | ||
22587 | +config_commands="$ac_config_commands" | ||
22588 | |||
22589 | -if test -n "$ac_config_commands"; then | ||
22590 | - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS | ||
22591 | -fi | ||
22592 | +_ACEOF | ||
22593 | |||
22594 | cat >>$CONFIG_STATUS <<\_ACEOF | ||
22595 | - | ||
22596 | ac_cs_usage="\ | ||
22597 | \`$as_me' instantiates files from templates according to the | ||
22598 | current configuration. | ||
22599 | @@ -34274,19 +37072,21 @@ | ||
22600 | $config_commands | ||
22601 | |||
22602 | Report bugs to <bug-autoconf@gnu.org>." | ||
22603 | -_ACEOF | ||
22604 | |||
22605 | +_ACEOF | ||
22606 | cat >>$CONFIG_STATUS <<_ACEOF | ||
22607 | ac_cs_version="\\ | ||
22608 | GStreamer Bad Plug-ins config.status 0.10.3 | ||
22609 | -configured by $0, generated by GNU Autoconf 2.59, | ||
22610 | - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" | ||
22611 | +configured by $0, generated by GNU Autoconf 2.60, | ||
22612 | + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" | ||
22613 | |||
22614 | -Copyright (C) 2003 Free Software Foundation, Inc. | ||
22615 | +Copyright (C) 2006 Free Software Foundation, Inc. | ||
22616 | This config.status script is free software; the Free Software Foundation | ||
22617 | gives unlimited permission to copy, distribute and modify it." | ||
22618 | -srcdir=$srcdir | ||
22619 | -INSTALL="$INSTALL" | ||
22620 | + | ||
22621 | +ac_pwd='$ac_pwd' | ||
22622 | +srcdir='$srcdir' | ||
22623 | +INSTALL='$INSTALL' | ||
22624 | _ACEOF | ||
22625 | |||
22626 | cat >>$CONFIG_STATUS <<\_ACEOF | ||
22627 | @@ -34297,39 +37097,24 @@ | ||
22628 | do | ||
22629 | case $1 in | ||
22630 | --*=*) | ||
22631 | - ac_option=`expr "x$1" : 'x\([^=]*\)='` | ||
22632 | - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` | ||
22633 | + ac_option=`expr "X$1" : 'X\([^=]*\)='` | ||
22634 | + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` | ||
22635 | ac_shift=: | ||
22636 | ;; | ||
22637 | - -*) | ||
22638 | + *) | ||
22639 | ac_option=$1 | ||
22640 | ac_optarg=$2 | ||
22641 | ac_shift=shift | ||
22642 | ;; | ||
22643 | - *) # This is not an option, so the user has probably given explicit | ||
22644 | - # arguments. | ||
22645 | - ac_option=$1 | ||
22646 | - ac_need_defaults=false;; | ||
22647 | esac | ||
22648 | |||
22649 | case $ac_option in | ||
22650 | # Handling of the options. | ||
22651 | -_ACEOF | ||
22652 | -cat >>$CONFIG_STATUS <<\_ACEOF | ||
22653 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) | ||
22654 | ac_cs_recheck=: ;; | ||
22655 | - --version | --vers* | -V ) | ||
22656 | - echo "$ac_cs_version"; exit 0 ;; | ||
22657 | - --he | --h) | ||
22658 | - # Conflict between --help and --header | ||
22659 | - { { echo "$as_me:$LINENO: error: ambiguous option: $1 | ||
22660 | -Try \`$0 --help' for more information." >&5 | ||
22661 | -echo "$as_me: error: ambiguous option: $1 | ||
22662 | -Try \`$0 --help' for more information." >&2;} | ||
22663 | - { (exit 1); exit 1; }; };; | ||
22664 | - --help | --hel | -h ) | ||
22665 | - echo "$ac_cs_usage"; exit 0 ;; | ||
22666 | - --debug | --d* | -d ) | ||
22667 | + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) | ||
22668 | + echo "$ac_cs_version"; exit ;; | ||
22669 | + --debug | --debu | --deb | --de | --d | -d ) | ||
22670 | debug=: ;; | ||
22671 | --file | --fil | --fi | --f ) | ||
22672 | $ac_shift | ||
22673 | @@ -34339,18 +37124,24 @@ | ||
22674 | $ac_shift | ||
22675 | CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" | ||
22676 | ac_need_defaults=false;; | ||
22677 | + --he | --h) | ||
22678 | + # Conflict between --help and --header | ||
22679 | + { echo "$as_me: error: ambiguous option: $1 | ||
22680 | +Try \`$0 --help' for more information." >&2 | ||
22681 | + { (exit 1); exit 1; }; };; | ||
22682 | + --help | --hel | -h ) | ||
22683 | + echo "$ac_cs_usage"; exit ;; | ||
22684 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | ||
22685 | | -silent | --silent | --silen | --sile | --sil | --si | --s) | ||
22686 | ac_cs_silent=: ;; | ||
22687 | |||
22688 | # This is an error. | ||
22689 | - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 | ||
22690 | -Try \`$0 --help' for more information." >&5 | ||
22691 | -echo "$as_me: error: unrecognized option: $1 | ||
22692 | -Try \`$0 --help' for more information." >&2;} | ||
22693 | + -*) { echo "$as_me: error: unrecognized option: $1 | ||
22694 | +Try \`$0 --help' for more information." >&2 | ||
22695 | { (exit 1); exit 1; }; } ;; | ||
22696 | |||
22697 | - *) ac_config_targets="$ac_config_targets $1" ;; | ||
22698 | + *) ac_config_targets="$ac_config_targets $1" | ||
22699 | + ac_need_defaults=false ;; | ||
22700 | |||
22701 | esac | ||
22702 | shift | ||
22703 | @@ -34366,17 +37157,28 @@ | ||
22704 | _ACEOF | ||
22705 | cat >>$CONFIG_STATUS <<_ACEOF | ||
22706 | if \$ac_cs_recheck; then | ||
22707 | - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 | ||
22708 | - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | ||
22709 | + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 | ||
22710 | + CONFIG_SHELL=$SHELL | ||
22711 | + export CONFIG_SHELL | ||
22712 | + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | ||
22713 | fi | ||
22714 | |||
22715 | _ACEOF | ||
22716 | - | ||
22717 | +cat >>$CONFIG_STATUS <<\_ACEOF | ||
22718 | +exec 5>>config.log | ||
22719 | +{ | ||
22720 | + echo | ||
22721 | + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX | ||
22722 | +## Running $as_me. ## | ||
22723 | +_ASBOX | ||
22724 | + echo "$ac_log" | ||
22725 | +} >&5 | ||
22726 | + | ||
22727 | +_ACEOF | ||
22728 | cat >>$CONFIG_STATUS <<_ACEOF | ||
22729 | # | ||
22730 | -# INIT-COMMANDS section. | ||
22731 | +# INIT-COMMANDS | ||
22732 | # | ||
22733 | - | ||
22734 | AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" | ||
22735 | # Capture the value of obsolete ALL_LINGUAS because we need it to compute | ||
22736 | # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it | ||
22737 | @@ -34406,72 +37208,73 @@ | ||
22738 | |||
22739 | _ACEOF | ||
22740 | |||
22741 | - | ||
22742 | - | ||
22743 | cat >>$CONFIG_STATUS <<\_ACEOF | ||
22744 | + | ||
22745 | +# Handling of arguments. | ||
22746 | for ac_config_target in $ac_config_targets | ||
22747 | do | ||
22748 | - case "$ac_config_target" in | ||
22749 | - # Handling of arguments. | ||
22750 | - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; | ||
22751 | - "gst-plugins-bad.spec" ) CONFIG_FILES="$CONFIG_FILES gst-plugins-bad.spec" ;; | ||
22752 | - "gst/Makefile" ) CONFIG_FILES="$CONFIG_FILES gst/Makefile" ;; | ||
22753 | - "gst/cdxaparse/Makefile" ) CONFIG_FILES="$CONFIG_FILES gst/cdxaparse/Makefile" ;; | ||
22754 | - "gst/freeze/Makefile" ) CONFIG_FILES="$CONFIG_FILES gst/freeze/Makefile" ;; | ||
22755 | - "gst/modplug/Makefile" ) CONFIG_FILES="$CONFIG_FILES gst/modplug/Makefile" ;; | ||
22756 | - "gst/modplug/libmodplug/Makefile" ) CONFIG_FILES="$CONFIG_FILES gst/modplug/libmodplug/Makefile" ;; | ||
22757 | - "gst/speed/Makefile" ) CONFIG_FILES="$CONFIG_FILES gst/speed/Makefile" ;; | ||
22758 | - "gst/qtdemux/Makefile" ) CONFIG_FILES="$CONFIG_FILES gst/qtdemux/Makefile" ;; | ||
22759 | - "gst/tta/Makefile" ) CONFIG_FILES="$CONFIG_FILES gst/tta/Makefile" ;; | ||
22760 | - "gst/xingheader/Makefile" ) CONFIG_FILES="$CONFIG_FILES gst/xingheader/Makefile" ;; | ||
22761 | - "gst-libs/Makefile" ) CONFIG_FILES="$CONFIG_FILES gst-libs/Makefile" ;; | ||
22762 | - "gst-libs/gst/Makefile" ) CONFIG_FILES="$CONFIG_FILES gst-libs/gst/Makefile" ;; | ||
22763 | - "sys/Makefile" ) CONFIG_FILES="$CONFIG_FILES sys/Makefile" ;; | ||
22764 | - "sys/glsink/Makefile" ) CONFIG_FILES="$CONFIG_FILES sys/glsink/Makefile" ;; | ||
22765 | - "sys/v4l2/Makefile" ) CONFIG_FILES="$CONFIG_FILES sys/v4l2/Makefile" ;; | ||
22766 | - "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; | ||
22767 | - "examples/directfb/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/directfb/Makefile" ;; | ||
22768 | - "ext/amrwb/amrwb-code/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/amrwb/amrwb-code/Makefile" ;; | ||
22769 | - "ext/amrwb/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/amrwb/Makefile" ;; | ||
22770 | - "ext/bz2/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/bz2/Makefile" ;; | ||
22771 | - "ext/directfb/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/directfb/Makefile" ;; | ||
22772 | - "ext/divx/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/divx/Makefile" ;; | ||
22773 | - "ext/dts/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/dts/Makefile" ;; | ||
22774 | - "ext/faac/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/faac/Makefile" ;; | ||
22775 | - "ext/faad/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/faad/Makefile" ;; | ||
22776 | - "ext/gsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/gsm/Makefile" ;; | ||
22777 | - "ext/ivorbis/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/ivorbis/Makefile" ;; | ||
22778 | - "ext/libmms/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/libmms/Makefile" ;; | ||
22779 | - "ext/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/Makefile" ;; | ||
22780 | - "ext/musepack/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/musepack/Makefile" ;; | ||
22781 | - "ext/musicbrainz/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/musicbrainz/Makefile" ;; | ||
22782 | - "ext/neon/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/neon/Makefile" ;; | ||
22783 | - "ext/sdl/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/sdl/Makefile" ;; | ||
22784 | - "ext/soundtouch/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/soundtouch/Makefile" ;; | ||
22785 | - "ext/swfdec/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/swfdec/Makefile" ;; | ||
22786 | - "ext/theora/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/theora/Makefile" ;; | ||
22787 | - "ext/wavpack/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/wavpack/Makefile" ;; | ||
22788 | - "ext/xvid/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/xvid/Makefile" ;; | ||
22789 | - "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; | ||
22790 | - "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; | ||
22791 | - "docs/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/plugins/Makefile" ;; | ||
22792 | - "docs/version.entities" ) CONFIG_FILES="$CONFIG_FILES docs/version.entities" ;; | ||
22793 | - "common/Makefile" ) CONFIG_FILES="$CONFIG_FILES common/Makefile" ;; | ||
22794 | - "common/m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES common/m4/Makefile" ;; | ||
22795 | - "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; | ||
22796 | - "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; | ||
22797 | - "tests/check/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/check/Makefile" ;; | ||
22798 | - "tests/icles/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/icles/Makefile" ;; | ||
22799 | - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; | ||
22800 | - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; | ||
22801 | - "$ac_stdint_h" ) CONFIG_COMMANDS="$CONFIG_COMMANDS $ac_stdint_h" ;; | ||
22802 | - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; | ||
22803 | + case $ac_config_target in | ||
22804 | + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; | ||
22805 | + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; | ||
22806 | + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; | ||
22807 | + "$ac_stdint_h") CONFIG_COMMANDS="$CONFIG_COMMANDS $ac_stdint_h" ;; | ||
22808 | + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | ||
22809 | + "gst-plugins-bad.spec") CONFIG_FILES="$CONFIG_FILES gst-plugins-bad.spec" ;; | ||
22810 | + "gst/Makefile") CONFIG_FILES="$CONFIG_FILES gst/Makefile" ;; | ||
22811 | + "gst/cdxaparse/Makefile") CONFIG_FILES="$CONFIG_FILES gst/cdxaparse/Makefile" ;; | ||
22812 | + "gst/freeze/Makefile") CONFIG_FILES="$CONFIG_FILES gst/freeze/Makefile" ;; | ||
22813 | + "gst/modplug/Makefile") CONFIG_FILES="$CONFIG_FILES gst/modplug/Makefile" ;; | ||
22814 | + "gst/modplug/libmodplug/Makefile") CONFIG_FILES="$CONFIG_FILES gst/modplug/libmodplug/Makefile" ;; | ||
22815 | + "gst/speed/Makefile") CONFIG_FILES="$CONFIG_FILES gst/speed/Makefile" ;; | ||
22816 | + "gst/qtdemux/Makefile") CONFIG_FILES="$CONFIG_FILES gst/qtdemux/Makefile" ;; | ||
22817 | + "gst/tta/Makefile") CONFIG_FILES="$CONFIG_FILES gst/tta/Makefile" ;; | ||
22818 | + "gst/xingheader/Makefile") CONFIG_FILES="$CONFIG_FILES gst/xingheader/Makefile" ;; | ||
22819 | + "gst-libs/Makefile") CONFIG_FILES="$CONFIG_FILES gst-libs/Makefile" ;; | ||
22820 | + "gst-libs/gst/Makefile") CONFIG_FILES="$CONFIG_FILES gst-libs/gst/Makefile" ;; | ||
22821 | + "sys/Makefile") CONFIG_FILES="$CONFIG_FILES sys/Makefile" ;; | ||
22822 | + "sys/glsink/Makefile") CONFIG_FILES="$CONFIG_FILES sys/glsink/Makefile" ;; | ||
22823 | + "sys/v4l2/Makefile") CONFIG_FILES="$CONFIG_FILES sys/v4l2/Makefile" ;; | ||
22824 | + "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; | ||
22825 | + "examples/directfb/Makefile") CONFIG_FILES="$CONFIG_FILES examples/directfb/Makefile" ;; | ||
22826 | + "ext/amrwb/amrwb-code/Makefile") CONFIG_FILES="$CONFIG_FILES ext/amrwb/amrwb-code/Makefile" ;; | ||
22827 | + "ext/amrwb/Makefile") CONFIG_FILES="$CONFIG_FILES ext/amrwb/Makefile" ;; | ||
22828 | + "ext/bz2/Makefile") CONFIG_FILES="$CONFIG_FILES ext/bz2/Makefile" ;; | ||
22829 | + "ext/directfb/Makefile") CONFIG_FILES="$CONFIG_FILES ext/directfb/Makefile" ;; | ||
22830 | + "ext/divx/Makefile") CONFIG_FILES="$CONFIG_FILES ext/divx/Makefile" ;; | ||
22831 | + "ext/dts/Makefile") CONFIG_FILES="$CONFIG_FILES ext/dts/Makefile" ;; | ||
22832 | + "ext/faac/Makefile") CONFIG_FILES="$CONFIG_FILES ext/faac/Makefile" ;; | ||
22833 | + "ext/faad/Makefile") CONFIG_FILES="$CONFIG_FILES ext/faad/Makefile" ;; | ||
22834 | + "ext/gsm/Makefile") CONFIG_FILES="$CONFIG_FILES ext/gsm/Makefile" ;; | ||
22835 | + "ext/ivorbis/Makefile") CONFIG_FILES="$CONFIG_FILES ext/ivorbis/Makefile" ;; | ||
22836 | + "ext/libmms/Makefile") CONFIG_FILES="$CONFIG_FILES ext/libmms/Makefile" ;; | ||
22837 | + "ext/Makefile") CONFIG_FILES="$CONFIG_FILES ext/Makefile" ;; | ||
22838 | + "ext/musepack/Makefile") CONFIG_FILES="$CONFIG_FILES ext/musepack/Makefile" ;; | ||
22839 | + "ext/musicbrainz/Makefile") CONFIG_FILES="$CONFIG_FILES ext/musicbrainz/Makefile" ;; | ||
22840 | + "ext/neon/Makefile") CONFIG_FILES="$CONFIG_FILES ext/neon/Makefile" ;; | ||
22841 | + "ext/sdl/Makefile") CONFIG_FILES="$CONFIG_FILES ext/sdl/Makefile" ;; | ||
22842 | + "ext/soundtouch/Makefile") CONFIG_FILES="$CONFIG_FILES ext/soundtouch/Makefile" ;; | ||
22843 | + "ext/swfdec/Makefile") CONFIG_FILES="$CONFIG_FILES ext/swfdec/Makefile" ;; | ||
22844 | + "ext/theora/Makefile") CONFIG_FILES="$CONFIG_FILES ext/theora/Makefile" ;; | ||
22845 | + "ext/wavpack/Makefile") CONFIG_FILES="$CONFIG_FILES ext/wavpack/Makefile" ;; | ||
22846 | + "ext/xvid/Makefile") CONFIG_FILES="$CONFIG_FILES ext/xvid/Makefile" ;; | ||
22847 | + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; | ||
22848 | + "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; | ||
22849 | + "docs/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES docs/plugins/Makefile" ;; | ||
22850 | + "docs/version.entities") CONFIG_FILES="$CONFIG_FILES docs/version.entities" ;; | ||
22851 | + "common/Makefile") CONFIG_FILES="$CONFIG_FILES common/Makefile" ;; | ||
22852 | + "common/m4/Makefile") CONFIG_FILES="$CONFIG_FILES common/m4/Makefile" ;; | ||
22853 | + "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; | ||
22854 | + "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; | ||
22855 | + "tests/check/Makefile") CONFIG_FILES="$CONFIG_FILES tests/check/Makefile" ;; | ||
22856 | + "tests/icles/Makefile") CONFIG_FILES="$CONFIG_FILES tests/icles/Makefile" ;; | ||
22857 | + | ||
22858 | *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 | ||
22859 | echo "$as_me: error: invalid argument: $ac_config_target" >&2;} | ||
22860 | { (exit 1); exit 1; }; };; | ||
22861 | esac | ||
22862 | done | ||
22863 | |||
22864 | + | ||
22865 | # If the user did not use the arguments to specify the items to instantiate, | ||
22866 | # then the envvar interface is used. Set only those that are not. | ||
22867 | # We use the long form for the default assignment because of an extremely | ||
22868 | @@ -34483,547 +37286,733 @@ | ||
22869 | fi | ||
22870 | |||
22871 | # Have a temporary directory for convenience. Make it in the build tree | ||
22872 | -# simply because there is no reason to put it here, and in addition, | ||
22873 | +# simply because there is no reason against having it here, and in addition, | ||
22874 | # creating and moving files from /tmp can sometimes cause problems. | ||
22875 | -# Create a temporary directory, and hook for its removal unless debugging. | ||
22876 | +# Hook for its removal unless debugging. | ||
22877 | +# Note that there is a small window in which the directory will not be cleaned: | ||
22878 | +# after its creation but before its name has been assigned to `$tmp'. | ||
22879 | $debug || | ||
22880 | { | ||
22881 | - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 | ||
22882 | + tmp= | ||
22883 | + trap 'exit_status=$? | ||
22884 | + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status | ||
22885 | +' 0 | ||
22886 | trap '{ (exit 1); exit 1; }' 1 2 13 15 | ||
22887 | } | ||
22888 | - | ||
22889 | # Create a (secure) tmp directory for tmp files. | ||
22890 | |||
22891 | { | ||
22892 | - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && | ||
22893 | + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && | ||
22894 | test -n "$tmp" && test -d "$tmp" | ||
22895 | } || | ||
22896 | { | ||
22897 | - tmp=./confstat$$-$RANDOM | ||
22898 | - (umask 077 && mkdir $tmp) | ||
22899 | + tmp=./conf$$-$RANDOM | ||
22900 | + (umask 077 && mkdir "$tmp") | ||
22901 | } || | ||
22902 | { | ||
22903 | echo "$me: cannot create a temporary directory in ." >&2 | ||
22904 | { (exit 1); exit 1; } | ||
22905 | } | ||
22906 | |||
22907 | -_ACEOF | ||
22908 | - | ||
22909 | -cat >>$CONFIG_STATUS <<_ACEOF | ||
22910 | - | ||
22911 | # | ||
22912 | -# CONFIG_FILES section. | ||
22913 | +# Set up the sed scripts for CONFIG_FILES section. | ||
22914 | # | ||
22915 | |||
22916 | # No need to generate the scripts if there are no CONFIG_FILES. | ||
22917 | # This happens for instance when ./config.status config.h | ||
22918 | -if test -n "\$CONFIG_FILES"; then | ||
22919 | - # Protect against being on the right side of a sed subst in config.status. | ||
22920 | - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; | ||
22921 | - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF | ||
22922 | -s,@SHELL@,$SHELL,;t t | ||
22923 | -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t | ||
22924 | -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t | ||
22925 | -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t | ||
22926 | -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t | ||
22927 | -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t | ||
22928 | -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t | ||
22929 | -s,@exec_prefix@,$exec_prefix,;t t | ||
22930 | -s,@prefix@,$prefix,;t t | ||
22931 | -s,@program_transform_name@,$program_transform_name,;t t | ||
22932 | -s,@bindir@,$bindir,;t t | ||
22933 | -s,@sbindir@,$sbindir,;t t | ||
22934 | -s,@libexecdir@,$libexecdir,;t t | ||
22935 | -s,@datadir@,$datadir,;t t | ||
22936 | -s,@sysconfdir@,$sysconfdir,;t t | ||
22937 | -s,@sharedstatedir@,$sharedstatedir,;t t | ||
22938 | -s,@localstatedir@,$localstatedir,;t t | ||
22939 | -s,@libdir@,$libdir,;t t | ||
22940 | -s,@includedir@,$includedir,;t t | ||
22941 | -s,@oldincludedir@,$oldincludedir,;t t | ||
22942 | -s,@infodir@,$infodir,;t t | ||
22943 | -s,@mandir@,$mandir,;t t | ||
22944 | -s,@build_alias@,$build_alias,;t t | ||
22945 | -s,@host_alias@,$host_alias,;t t | ||
22946 | -s,@target_alias@,$target_alias,;t t | ||
22947 | -s,@DEFS@,$DEFS,;t t | ||
22948 | -s,@ECHO_C@,$ECHO_C,;t t | ||
22949 | -s,@ECHO_N@,$ECHO_N,;t t | ||
22950 | -s,@ECHO_T@,$ECHO_T,;t t | ||
22951 | -s,@LIBS@,$LIBS,;t t | ||
22952 | -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t | ||
22953 | -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t | ||
22954 | -s,@INSTALL_DATA@,$INSTALL_DATA,;t t | ||
22955 | -s,@CYGPATH_W@,$CYGPATH_W,;t t | ||
22956 | -s,@PACKAGE@,$PACKAGE,;t t | ||
22957 | -s,@VERSION@,$VERSION,;t t | ||
22958 | -s,@ACLOCAL@,$ACLOCAL,;t t | ||
22959 | -s,@AUTOCONF@,$AUTOCONF,;t t | ||
22960 | -s,@AUTOMAKE@,$AUTOMAKE,;t t | ||
22961 | -s,@AUTOHEADER@,$AUTOHEADER,;t t | ||
22962 | -s,@MAKEINFO@,$MAKEINFO,;t t | ||
22963 | -s,@install_sh@,$install_sh,;t t | ||
22964 | -s,@STRIP@,$STRIP,;t t | ||
22965 | -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t | ||
22966 | -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t | ||
22967 | -s,@mkdir_p@,$mkdir_p,;t t | ||
22968 | -s,@AWK@,$AWK,;t t | ||
22969 | -s,@SET_MAKE@,$SET_MAKE,;t t | ||
22970 | -s,@am__leading_dot@,$am__leading_dot,;t t | ||
22971 | -s,@AMTAR@,$AMTAR,;t t | ||
22972 | -s,@am__tar@,$am__tar,;t t | ||
22973 | -s,@am__untar@,$am__untar,;t t | ||
22974 | -s,@PACKAGE_VERSION_MAJOR@,$PACKAGE_VERSION_MAJOR,;t t | ||
22975 | -s,@PACKAGE_VERSION_MINOR@,$PACKAGE_VERSION_MINOR,;t t | ||
22976 | -s,@PACKAGE_VERSION_MICRO@,$PACKAGE_VERSION_MICRO,;t t | ||
22977 | -s,@PACKAGE_VERSION_NANO@,$PACKAGE_VERSION_NANO,;t t | ||
22978 | -s,@PACKAGE_VERSION_RELEASE@,$PACKAGE_VERSION_RELEASE,;t t | ||
22979 | -s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t | ||
22980 | -s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t | ||
22981 | -s,@MAINT@,$MAINT,;t t | ||
22982 | -s,@build@,$build,;t t | ||
22983 | -s,@build_cpu@,$build_cpu,;t t | ||
22984 | -s,@build_vendor@,$build_vendor,;t t | ||
22985 | -s,@build_os@,$build_os,;t t | ||
22986 | -s,@host@,$host,;t t | ||
22987 | -s,@host_cpu@,$host_cpu,;t t | ||
22988 | -s,@host_vendor@,$host_vendor,;t t | ||
22989 | -s,@host_os@,$host_os,;t t | ||
22990 | -s,@GST_MAJORMINOR@,$GST_MAJORMINOR,;t t | ||
22991 | -s,@CC@,$CC,;t t | ||
22992 | -s,@CFLAGS@,$CFLAGS,;t t | ||
22993 | -s,@LDFLAGS@,$LDFLAGS,;t t | ||
22994 | -s,@CPPFLAGS@,$CPPFLAGS,;t t | ||
22995 | -s,@ac_ct_CC@,$ac_ct_CC,;t t | ||
22996 | -s,@EXEEXT@,$EXEEXT,;t t | ||
22997 | -s,@OBJEXT@,$OBJEXT,;t t | ||
22998 | -s,@DEPDIR@,$DEPDIR,;t t | ||
22999 | -s,@am__include@,$am__include,;t t | ||
23000 | -s,@am__quote@,$am__quote,;t t | ||
23001 | -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t | ||
23002 | -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t | ||
23003 | -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t | ||
23004 | -s,@CCDEPMODE@,$CCDEPMODE,;t t | ||
23005 | -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t | ||
23006 | -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t | ||
23007 | -s,@EGREP@,$EGREP,;t t | ||
23008 | -s,@LN_S@,$LN_S,;t t | ||
23009 | -s,@ECHO@,$ECHO,;t t | ||
23010 | -s,@AR@,$AR,;t t | ||
23011 | -s,@ac_ct_AR@,$ac_ct_AR,;t t | ||
23012 | -s,@RANLIB@,$RANLIB,;t t | ||
23013 | -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t | ||
23014 | -s,@CPP@,$CPP,;t t | ||
23015 | -s,@CXX@,$CXX,;t t | ||
23016 | -s,@CXXFLAGS@,$CXXFLAGS,;t t | ||
23017 | -s,@ac_ct_CXX@,$ac_ct_CXX,;t t | ||
23018 | -s,@CXXDEPMODE@,$CXXDEPMODE,;t t | ||
23019 | -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t | ||
23020 | -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t | ||
23021 | -s,@CXXCPP@,$CXXCPP,;t t | ||
23022 | -s,@F77@,$F77,;t t | ||
23023 | -s,@FFLAGS@,$FFLAGS,;t t | ||
23024 | -s,@ac_ct_F77@,$ac_ct_F77,;t t | ||
23025 | -s,@LIBTOOL@,$LIBTOOL,;t t | ||
23026 | -s,@ACLOCAL_AMFLAGS@,$ACLOCAL_AMFLAGS,;t t | ||
23027 | -s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t | ||
23028 | -s,@MSGFMT@,$MSGFMT,;t t | ||
23029 | -s,@GMSGFMT@,$GMSGFMT,;t t | ||
23030 | -s,@XGETTEXT@,$XGETTEXT,;t t | ||
23031 | -s,@MSGMERGE@,$MSGMERGE,;t t | ||
23032 | -s,@USE_NLS@,$USE_NLS,;t t | ||
23033 | -s,@LIBICONV@,$LIBICONV,;t t | ||
23034 | -s,@LTLIBICONV@,$LTLIBICONV,;t t | ||
23035 | -s,@INTLLIBS@,$INTLLIBS,;t t | ||
23036 | -s,@LIBINTL@,$LIBINTL,;t t | ||
23037 | -s,@LTLIBINTL@,$LTLIBINTL,;t t | ||
23038 | -s,@POSUB@,$POSUB,;t t | ||
23039 | -s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t | ||
23040 | -s,@LOCALEDIR@,$LOCALEDIR,;t t | ||
23041 | -s,@PKG_CONFIG@,$PKG_CONFIG,;t t | ||
23042 | -s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t | ||
23043 | -s,@VALGRIND_CFLAGS@,$VALGRIND_CFLAGS,;t t | ||
23044 | -s,@VALGRIND_LIBS@,$VALGRIND_LIBS,;t t | ||
23045 | -s,@GST_GCOV_ENABLED_TRUE@,$GST_GCOV_ENABLED_TRUE,;t t | ||
23046 | -s,@GST_GCOV_ENABLED_FALSE@,$GST_GCOV_ENABLED_FALSE,;t t | ||
23047 | -s,@BUILD_EXAMPLES_TRUE@,$BUILD_EXAMPLES_TRUE,;t t | ||
23048 | -s,@BUILD_EXAMPLES_FALSE@,$BUILD_EXAMPLES_FALSE,;t t | ||
23049 | -s,@GST_PACKAGE_NAME@,$GST_PACKAGE_NAME,;t t | ||
23050 | -s,@GST_PACKAGE_ORIGIN@,$GST_PACKAGE_ORIGIN,;t t | ||
23051 | -s,@GST_PLUGINS_ALL@,$GST_PLUGINS_ALL,;t t | ||
23052 | -s,@USE_EXTERNAL_TRUE@,$USE_EXTERNAL_TRUE,;t t | ||
23053 | -s,@USE_EXTERNAL_FALSE@,$USE_EXTERNAL_FALSE,;t t | ||
23054 | -s,@BUILD_EXTERNAL_TRUE@,$BUILD_EXTERNAL_TRUE,;t t | ||
23055 | -s,@BUILD_EXTERNAL_FALSE@,$BUILD_EXTERNAL_FALSE,;t t | ||
23056 | -s,@USE_EXPERIMENTAL_TRUE@,$USE_EXPERIMENTAL_TRUE,;t t | ||
23057 | -s,@USE_EXPERIMENTAL_FALSE@,$USE_EXPERIMENTAL_FALSE,;t t | ||
23058 | -s,@BUILD_EXPERIMENTAL_TRUE@,$BUILD_EXPERIMENTAL_TRUE,;t t | ||
23059 | -s,@BUILD_EXPERIMENTAL_FALSE@,$BUILD_EXPERIMENTAL_FALSE,;t t | ||
23060 | -s,@HAVE_CPU_I386_TRUE@,$HAVE_CPU_I386_TRUE,;t t | ||
23061 | -s,@HAVE_CPU_I386_FALSE@,$HAVE_CPU_I386_FALSE,;t t | ||
23062 | -s,@HAVE_CPU_PPC_TRUE@,$HAVE_CPU_PPC_TRUE,;t t | ||
23063 | -s,@HAVE_CPU_PPC_FALSE@,$HAVE_CPU_PPC_FALSE,;t t | ||
23064 | -s,@HAVE_CPU_ALPHA_TRUE@,$HAVE_CPU_ALPHA_TRUE,;t t | ||
23065 | -s,@HAVE_CPU_ALPHA_FALSE@,$HAVE_CPU_ALPHA_FALSE,;t t | ||
23066 | -s,@HAVE_CPU_ARM_TRUE@,$HAVE_CPU_ARM_TRUE,;t t | ||
23067 | -s,@HAVE_CPU_ARM_FALSE@,$HAVE_CPU_ARM_FALSE,;t t | ||
23068 | -s,@HAVE_CPU_SPARC_TRUE@,$HAVE_CPU_SPARC_TRUE,;t t | ||
23069 | -s,@HAVE_CPU_SPARC_FALSE@,$HAVE_CPU_SPARC_FALSE,;t t | ||
23070 | -s,@HAVE_CPU_HPPA_TRUE@,$HAVE_CPU_HPPA_TRUE,;t t | ||
23071 | -s,@HAVE_CPU_HPPA_FALSE@,$HAVE_CPU_HPPA_FALSE,;t t | ||
23072 | -s,@HAVE_CPU_MIPS_TRUE@,$HAVE_CPU_MIPS_TRUE,;t t | ||
23073 | -s,@HAVE_CPU_MIPS_FALSE@,$HAVE_CPU_MIPS_FALSE,;t t | ||
23074 | -s,@HAVE_CPU_S390_TRUE@,$HAVE_CPU_S390_TRUE,;t t | ||
23075 | -s,@HAVE_CPU_S390_FALSE@,$HAVE_CPU_S390_FALSE,;t t | ||
23076 | -s,@HAVE_CPU_IA64_TRUE@,$HAVE_CPU_IA64_TRUE,;t t | ||
23077 | -s,@HAVE_CPU_IA64_FALSE@,$HAVE_CPU_IA64_FALSE,;t t | ||
23078 | -s,@HAVE_CPU_M68K_TRUE@,$HAVE_CPU_M68K_TRUE,;t t | ||
23079 | -s,@HAVE_CPU_M68K_FALSE@,$HAVE_CPU_M68K_FALSE,;t t | ||
23080 | -s,@HAVE_CPU_X86_64_TRUE@,$HAVE_CPU_X86_64_TRUE,;t t | ||
23081 | -s,@HAVE_CPU_X86_64_FALSE@,$HAVE_CPU_X86_64_FALSE,;t t | ||
23082 | -s,@HAVE_CXX@,$HAVE_CXX,;t t | ||
23083 | -s,@VALGRIND_PATH@,$VALGRIND_PATH,;t t | ||
23084 | -s,@HAVE_VALGRIND_TRUE@,$HAVE_VALGRIND_TRUE,;t t | ||
23085 | -s,@HAVE_VALGRIND_FALSE@,$HAVE_VALGRIND_FALSE,;t t | ||
23086 | -s,@HTML_DIR@,$HTML_DIR,;t t | ||
23087 | -s,@ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t | ||
23088 | -s,@ENABLE_GTK_DOC_FALSE@,$ENABLE_GTK_DOC_FALSE,;t t | ||
23089 | -s,@GTK_DOC_USE_LIBTOOL_TRUE@,$GTK_DOC_USE_LIBTOOL_TRUE,;t t | ||
23090 | -s,@GTK_DOC_USE_LIBTOOL_FALSE@,$GTK_DOC_USE_LIBTOOL_FALSE,;t t | ||
23091 | -s,@PYTHON@,$PYTHON,;t t | ||
23092 | -s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t | ||
23093 | -s,@PYTHON_PREFIX@,$PYTHON_PREFIX,;t t | ||
23094 | -s,@PYTHON_EXEC_PREFIX@,$PYTHON_EXEC_PREFIX,;t t | ||
23095 | -s,@PYTHON_PLATFORM@,$PYTHON_PLATFORM,;t t | ||
23096 | -s,@pythondir@,$pythondir,;t t | ||
23097 | -s,@pkgpythondir@,$pkgpythondir,;t t | ||
23098 | -s,@pyexecdir@,$pyexecdir,;t t | ||
23099 | -s,@pkgpyexecdir@,$pkgpyexecdir,;t t | ||
23100 | -s,@GLIB_REQ@,$GLIB_REQ,;t t | ||
23101 | -s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t | ||
23102 | -s,@GLIB_LIBS@,$GLIB_LIBS,;t t | ||
23103 | -s,@LIBOIL_CFLAGS@,$LIBOIL_CFLAGS,;t t | ||
23104 | -s,@LIBOIL_LIBS@,$LIBOIL_LIBS,;t t | ||
23105 | -s,@GST_CFLAGS@,$GST_CFLAGS,;t t | ||
23106 | -s,@GST_LIBS@,$GST_LIBS,;t t | ||
23107 | -s,@GST_TOOLS_DIR@,$GST_TOOLS_DIR,;t t | ||
23108 | -s,@GST_PLUGINS_DIR@,$GST_PLUGINS_DIR,;t t | ||
23109 | -s,@GST_BASE_CFLAGS@,$GST_BASE_CFLAGS,;t t | ||
23110 | -s,@GST_BASE_LIBS@,$GST_BASE_LIBS,;t t | ||
23111 | -s,@GST_CHECK_CFLAGS@,$GST_CHECK_CFLAGS,;t t | ||
23112 | -s,@GST_CHECK_LIBS@,$GST_CHECK_LIBS,;t t | ||
23113 | -s,@CHECK_CFLAGS@,$CHECK_CFLAGS,;t t | ||
23114 | -s,@CHECK_LIBS@,$CHECK_LIBS,;t t | ||
23115 | -s,@HAVE_CHECK_TRUE@,$HAVE_CHECK_TRUE,;t t | ||
23116 | -s,@HAVE_CHECK_FALSE@,$HAVE_CHECK_FALSE,;t t | ||
23117 | -s,@GST_PLUGINS_BASE_CFLAGS@,$GST_PLUGINS_BASE_CFLAGS,;t t | ||
23118 | -s,@GST_PLUGINS_BASE_LIBS@,$GST_PLUGINS_BASE_LIBS,;t t | ||
23119 | -s,@GSTPB_PLUGINS_DIR@,$GSTPB_PLUGINS_DIR,;t t | ||
23120 | -s,@GST_LICENSE@,$GST_LICENSE,;t t | ||
23121 | -s,@PLUGINDIR@,$PLUGINDIR,;t t | ||
23122 | -s,@plugindir@,$plugindir,;t t | ||
23123 | -s,@ERROR_CFLAGS@,$ERROR_CFLAGS,;t t | ||
23124 | -s,@GST_LEVEL_DEFAULT@,$GST_LEVEL_DEFAULT,;t t | ||
23125 | -s,@GST_PLUGINS_SELECTED@,$GST_PLUGINS_SELECTED,;t t | ||
23126 | -s,@HAVE_GL@,$HAVE_GL,;t t | ||
23127 | -s,@USE_OPENGL_TRUE@,$USE_OPENGL_TRUE,;t t | ||
23128 | -s,@USE_OPENGL_FALSE@,$USE_OPENGL_FALSE,;t t | ||
23129 | -s,@XVIDEO_LIBS@,$XVIDEO_LIBS,;t t | ||
23130 | -s,@USE_GST_V4L2_TRUE@,$USE_GST_V4L2_TRUE,;t t | ||
23131 | -s,@USE_GST_V4L2_FALSE@,$USE_GST_V4L2_FALSE,;t t | ||
23132 | -s,@USE_XVIDEO_TRUE@,$USE_XVIDEO_TRUE,;t t | ||
23133 | -s,@USE_XVIDEO_FALSE@,$USE_XVIDEO_FALSE,;t t | ||
23134 | -s,@HAVE_AMRWB@,$HAVE_AMRWB,;t t | ||
23135 | -s,@USE_AMRWB_TRUE@,$USE_AMRWB_TRUE,;t t | ||
23136 | -s,@USE_AMRWB_FALSE@,$USE_AMRWB_FALSE,;t t | ||
23137 | -s,@HAVE_BZ2@,$HAVE_BZ2,;t t | ||
23138 | -s,@BZ2_LIBS@,$BZ2_LIBS,;t t | ||
23139 | -s,@USE_BZ2_TRUE@,$USE_BZ2_TRUE,;t t | ||
23140 | -s,@USE_BZ2_FALSE@,$USE_BZ2_FALSE,;t t | ||
23141 | -s,@DIRECTFB_CFLAGS@,$DIRECTFB_CFLAGS,;t t | ||
23142 | -s,@DIRECTFB_LIBS@,$DIRECTFB_LIBS,;t t | ||
23143 | -s,@USE_DIRECTFB_TRUE@,$USE_DIRECTFB_TRUE,;t t | ||
23144 | -s,@USE_DIRECTFB_FALSE@,$USE_DIRECTFB_FALSE,;t t | ||
23145 | -s,@HAVE_DTS@,$HAVE_DTS,;t t | ||
23146 | -s,@DTS_LIBS@,$DTS_LIBS,;t t | ||
23147 | -s,@USE_DTS_TRUE@,$USE_DTS_TRUE,;t t | ||
23148 | -s,@USE_DTS_FALSE@,$USE_DTS_FALSE,;t t | ||
23149 | -s,@DIVXENC_LIBS@,$DIVXENC_LIBS,;t t | ||
23150 | -s,@DIVXDEC_LIBS@,$DIVXDEC_LIBS,;t t | ||
23151 | -s,@USE_DIVX_TRUE@,$USE_DIVX_TRUE,;t t | ||
23152 | -s,@USE_DIVX_FALSE@,$USE_DIVX_FALSE,;t t | ||
23153 | -s,@HAVE_FAAC@,$HAVE_FAAC,;t t | ||
23154 | -s,@FAAC_LIBS@,$FAAC_LIBS,;t t | ||
23155 | -s,@USE_FAAC_TRUE@,$USE_FAAC_TRUE,;t t | ||
23156 | -s,@USE_FAAC_FALSE@,$USE_FAAC_FALSE,;t t | ||
23157 | -s,@HAVE_FAAD@,$HAVE_FAAD,;t t | ||
23158 | -s,@FAAD_LIBS@,$FAAD_LIBS,;t t | ||
23159 | -s,@USE_FAAD_TRUE@,$USE_FAAD_TRUE,;t t | ||
23160 | -s,@USE_FAAD_FALSE@,$USE_FAAD_FALSE,;t t | ||
23161 | -s,@HAVE_GSM@,$HAVE_GSM,;t t | ||
23162 | -s,@GSM_LIBS@,$GSM_LIBS,;t t | ||
23163 | -s,@USE_GSM_TRUE@,$USE_GSM_TRUE,;t t | ||
23164 | -s,@USE_GSM_FALSE@,$USE_GSM_FALSE,;t t | ||
23165 | -s,@IVORBIS_LIBS@,$IVORBIS_LIBS,;t t | ||
23166 | -s,@IVORBIS_CFLAGS@,$IVORBIS_CFLAGS,;t t | ||
23167 | -s,@USE_IVORBIS_TRUE@,$USE_IVORBIS_TRUE,;t t | ||
23168 | -s,@USE_IVORBIS_FALSE@,$USE_IVORBIS_FALSE,;t t | ||
23169 | -s,@LIBMMS_CFLAGS@,$LIBMMS_CFLAGS,;t t | ||
23170 | -s,@LIBMMS_LIBS@,$LIBMMS_LIBS,;t t | ||
23171 | -s,@USE_LIBMMS_TRUE@,$USE_LIBMMS_TRUE,;t t | ||
23172 | -s,@USE_LIBMMS_FALSE@,$USE_LIBMMS_FALSE,;t t | ||
23173 | -s,@MUSEPACK_LIBS@,$MUSEPACK_LIBS,;t t | ||
23174 | -s,@USE_MUSEPACK_TRUE@,$USE_MUSEPACK_TRUE,;t t | ||
23175 | -s,@USE_MUSEPACK_FALSE@,$USE_MUSEPACK_FALSE,;t t | ||
23176 | -s,@MUSICBRAINZ_CFLAGS@,$MUSICBRAINZ_CFLAGS,;t t | ||
23177 | -s,@MUSICBRAINZ_LIBS@,$MUSICBRAINZ_LIBS,;t t | ||
23178 | -s,@USE_MUSICBRAINZ_TRUE@,$USE_MUSICBRAINZ_TRUE,;t t | ||
23179 | -s,@USE_MUSICBRAINZ_FALSE@,$USE_MUSICBRAINZ_FALSE,;t t | ||
23180 | -s,@NEON_CFLAGS@,$NEON_CFLAGS,;t t | ||
23181 | -s,@NEON_LIBS@,$NEON_LIBS,;t t | ||
23182 | -s,@USE_NEON_TRUE@,$USE_NEON_TRUE,;t t | ||
23183 | -s,@USE_NEON_FALSE@,$USE_NEON_FALSE,;t t | ||
23184 | -s,@SDL_CONFIG@,$SDL_CONFIG,;t t | ||
23185 | -s,@SDL_CFLAGS@,$SDL_CFLAGS,;t t | ||
23186 | -s,@SDL_LIBS@,$SDL_LIBS,;t t | ||
23187 | -s,@USE_SDL_TRUE@,$USE_SDL_TRUE,;t t | ||
23188 | -s,@USE_SDL_FALSE@,$USE_SDL_FALSE,;t t | ||
23189 | -s,@SOUNDTOUCH_CFLAGS@,$SOUNDTOUCH_CFLAGS,;t t | ||
23190 | -s,@SOUNDTOUCH_LIBS@,$SOUNDTOUCH_LIBS,;t t | ||
23191 | -s,@USE_SOUNDTOUCH_TRUE@,$USE_SOUNDTOUCH_TRUE,;t t | ||
23192 | -s,@USE_SOUNDTOUCH_FALSE@,$USE_SOUNDTOUCH_FALSE,;t t | ||
23193 | -s,@SWFDEC_CFLAGS@,$SWFDEC_CFLAGS,;t t | ||
23194 | -s,@SWFDEC_LIBS@,$SWFDEC_LIBS,;t t | ||
23195 | -s,@USE_SWFDEC_TRUE@,$USE_SWFDEC_TRUE,;t t | ||
23196 | -s,@USE_SWFDEC_FALSE@,$USE_SWFDEC_FALSE,;t t | ||
23197 | -s,@THEORADEC_CFLAGS@,$THEORADEC_CFLAGS,;t t | ||
23198 | -s,@THEORADEC_LIBS@,$THEORADEC_LIBS,;t t | ||
23199 | -s,@USE_THEORADEC_TRUE@,$USE_THEORADEC_TRUE,;t t | ||
23200 | -s,@USE_THEORADEC_FALSE@,$USE_THEORADEC_FALSE,;t t | ||
23201 | -s,@XVID_LIBS@,$XVID_LIBS,;t t | ||
23202 | -s,@USE_XVID_TRUE@,$USE_XVID_TRUE,;t t | ||
23203 | -s,@USE_XVID_FALSE@,$USE_XVID_FALSE,;t t | ||
23204 | -s,@WAVPACK_CFLAGS@,$WAVPACK_CFLAGS,;t t | ||
23205 | -s,@WAVPACK_LIBS@,$WAVPACK_LIBS,;t t | ||
23206 | -s,@USE_WAVPACK_TRUE@,$USE_WAVPACK_TRUE,;t t | ||
23207 | -s,@USE_WAVPACK_FALSE@,$USE_WAVPACK_FALSE,;t t | ||
23208 | -s,@PROFILE_CFLAGS@,$PROFILE_CFLAGS,;t t | ||
23209 | -s,@DEPRECATED_CFLAGS@,$DEPRECATED_CFLAGS,;t t | ||
23210 | -s,@GST_OPTION_CFLAGS@,$GST_OPTION_CFLAGS,;t t | ||
23211 | -s,@GST_PLUGIN_LDFLAGS@,$GST_PLUGIN_LDFLAGS,;t t | ||
23212 | -s,@LIBOBJS@,$LIBOBJS,;t t | ||
23213 | -s,@LTLIBOBJS@,$LTLIBOBJS,;t t | ||
23214 | -CEOF | ||
23215 | - | ||
23216 | -_ACEOF | ||
23217 | - | ||
23218 | - cat >>$CONFIG_STATUS <<\_ACEOF | ||
23219 | - # Split the substitutions into bite-sized pieces for seds with | ||
23220 | - # small command number limits, like on Digital OSF/1 and HP-UX. | ||
23221 | - ac_max_sed_lines=48 | ||
23222 | - ac_sed_frag=1 # Number of current file. | ||
23223 | - ac_beg=1 # First line for current file. | ||
23224 | - ac_end=$ac_max_sed_lines # Line after last line for current file. | ||
23225 | - ac_more_lines=: | ||
23226 | - ac_sed_cmds= | ||
23227 | - while $ac_more_lines; do | ||
23228 | - if test $ac_beg -gt 1; then | ||
23229 | - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag | ||
23230 | - else | ||
23231 | - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag | ||
23232 | - fi | ||
23233 | - if test ! -s $tmp/subs.frag; then | ||
23234 | - ac_more_lines=false | ||
23235 | - else | ||
23236 | - # The purpose of the label and of the branching condition is to | ||
23237 | - # speed up the sed processing (if there are no `@' at all, there | ||
23238 | - # is no need to browse any of the substitutions). | ||
23239 | - # These are the two extra sed commands mentioned above. | ||
23240 | - (echo ':t | ||
23241 | - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed | ||
23242 | - if test -z "$ac_sed_cmds"; then | ||
23243 | - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" | ||
23244 | - else | ||
23245 | - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" | ||
23246 | - fi | ||
23247 | - ac_sed_frag=`expr $ac_sed_frag + 1` | ||
23248 | - ac_beg=$ac_end | ||
23249 | - ac_end=`expr $ac_end + $ac_max_sed_lines` | ||
23250 | - fi | ||
23251 | - done | ||
23252 | - if test -z "$ac_sed_cmds"; then | ||
23253 | - ac_sed_cmds=cat | ||
23254 | +if test -n "$CONFIG_FILES"; then | ||
23255 | + | ||
23256 | +_ACEOF | ||
23257 | + | ||
23258 | + | ||
23259 | + | ||
23260 | +ac_delim='%!_!# ' | ||
23261 | +for ac_last_try in false false false false false :; do | ||
23262 | + cat >conf$$subs.sed <<_ACEOF | ||
23263 | +SHELL!$SHELL$ac_delim | ||
23264 | +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim | ||
23265 | +PACKAGE_NAME!$PACKAGE_NAME$ac_delim | ||
23266 | +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim | ||
23267 | +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim | ||
23268 | +PACKAGE_STRING!$PACKAGE_STRING$ac_delim | ||
23269 | +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim | ||
23270 | +exec_prefix!$exec_prefix$ac_delim | ||
23271 | +prefix!$prefix$ac_delim | ||
23272 | +program_transform_name!$program_transform_name$ac_delim | ||
23273 | +bindir!$bindir$ac_delim | ||
23274 | +sbindir!$sbindir$ac_delim | ||
23275 | +libexecdir!$libexecdir$ac_delim | ||
23276 | +datarootdir!$datarootdir$ac_delim | ||
23277 | +datadir!$datadir$ac_delim | ||
23278 | +sysconfdir!$sysconfdir$ac_delim | ||
23279 | +sharedstatedir!$sharedstatedir$ac_delim | ||
23280 | +localstatedir!$localstatedir$ac_delim | ||
23281 | +includedir!$includedir$ac_delim | ||
23282 | +oldincludedir!$oldincludedir$ac_delim | ||
23283 | +docdir!$docdir$ac_delim | ||
23284 | +infodir!$infodir$ac_delim | ||
23285 | +htmldir!$htmldir$ac_delim | ||
23286 | +dvidir!$dvidir$ac_delim | ||
23287 | +pdfdir!$pdfdir$ac_delim | ||
23288 | +psdir!$psdir$ac_delim | ||
23289 | +libdir!$libdir$ac_delim | ||
23290 | +localedir!$localedir$ac_delim | ||
23291 | +mandir!$mandir$ac_delim | ||
23292 | +DEFS!$DEFS$ac_delim | ||
23293 | +ECHO_C!$ECHO_C$ac_delim | ||
23294 | +ECHO_N!$ECHO_N$ac_delim | ||
23295 | +ECHO_T!$ECHO_T$ac_delim | ||
23296 | +LIBS!$LIBS$ac_delim | ||
23297 | +build_alias!$build_alias$ac_delim | ||
23298 | +host_alias!$host_alias$ac_delim | ||
23299 | +target_alias!$target_alias$ac_delim | ||
23300 | +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim | ||
23301 | +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim | ||
23302 | +INSTALL_DATA!$INSTALL_DATA$ac_delim | ||
23303 | +CYGPATH_W!$CYGPATH_W$ac_delim | ||
23304 | +PACKAGE!$PACKAGE$ac_delim | ||
23305 | +VERSION!$VERSION$ac_delim | ||
23306 | +ACLOCAL!$ACLOCAL$ac_delim | ||
23307 | +AUTOCONF!$AUTOCONF$ac_delim | ||
23308 | +AUTOMAKE!$AUTOMAKE$ac_delim | ||
23309 | +AUTOHEADER!$AUTOHEADER$ac_delim | ||
23310 | +MAKEINFO!$MAKEINFO$ac_delim | ||
23311 | +install_sh!$install_sh$ac_delim | ||
23312 | +STRIP!$STRIP$ac_delim | ||
23313 | +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim | ||
23314 | +mkdir_p!$mkdir_p$ac_delim | ||
23315 | +AWK!$AWK$ac_delim | ||
23316 | +SET_MAKE!$SET_MAKE$ac_delim | ||
23317 | +am__leading_dot!$am__leading_dot$ac_delim | ||
23318 | +AMTAR!$AMTAR$ac_delim | ||
23319 | +am__tar!$am__tar$ac_delim | ||
23320 | +am__untar!$am__untar$ac_delim | ||
23321 | +PACKAGE_VERSION_MAJOR!$PACKAGE_VERSION_MAJOR$ac_delim | ||
23322 | +PACKAGE_VERSION_MINOR!$PACKAGE_VERSION_MINOR$ac_delim | ||
23323 | +PACKAGE_VERSION_MICRO!$PACKAGE_VERSION_MICRO$ac_delim | ||
23324 | +PACKAGE_VERSION_NANO!$PACKAGE_VERSION_NANO$ac_delim | ||
23325 | +PACKAGE_VERSION_RELEASE!$PACKAGE_VERSION_RELEASE$ac_delim | ||
23326 | +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim | ||
23327 | +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim | ||
23328 | +MAINT!$MAINT$ac_delim | ||
23329 | +build!$build$ac_delim | ||
23330 | +build_cpu!$build_cpu$ac_delim | ||
23331 | +build_vendor!$build_vendor$ac_delim | ||
23332 | +build_os!$build_os$ac_delim | ||
23333 | +host!$host$ac_delim | ||
23334 | +host_cpu!$host_cpu$ac_delim | ||
23335 | +host_vendor!$host_vendor$ac_delim | ||
23336 | +host_os!$host_os$ac_delim | ||
23337 | +GST_MAJORMINOR!$GST_MAJORMINOR$ac_delim | ||
23338 | +CC!$CC$ac_delim | ||
23339 | +CFLAGS!$CFLAGS$ac_delim | ||
23340 | +LDFLAGS!$LDFLAGS$ac_delim | ||
23341 | +CPPFLAGS!$CPPFLAGS$ac_delim | ||
23342 | +ac_ct_CC!$ac_ct_CC$ac_delim | ||
23343 | +EXEEXT!$EXEEXT$ac_delim | ||
23344 | +OBJEXT!$OBJEXT$ac_delim | ||
23345 | +DEPDIR!$DEPDIR$ac_delim | ||
23346 | +am__include!$am__include$ac_delim | ||
23347 | +am__quote!$am__quote$ac_delim | ||
23348 | +AMDEP_TRUE!$AMDEP_TRUE$ac_delim | ||
23349 | +AMDEP_FALSE!$AMDEP_FALSE$ac_delim | ||
23350 | +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim | ||
23351 | +CCDEPMODE!$CCDEPMODE$ac_delim | ||
23352 | +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim | ||
23353 | +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim | ||
23354 | +GREP!$GREP$ac_delim | ||
23355 | +EGREP!$EGREP$ac_delim | ||
23356 | +LN_S!$LN_S$ac_delim | ||
23357 | +ECHO!$ECHO$ac_delim | ||
23358 | +AR!$AR$ac_delim | ||
23359 | +RANLIB!$RANLIB$ac_delim | ||
23360 | +_ACEOF | ||
23361 | + | ||
23362 | + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | ||
23363 | + break | ||
23364 | + elif $ac_last_try; then | ||
23365 | + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | ||
23366 | +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | ||
23367 | + { (exit 1); exit 1; }; } | ||
23368 | + else | ||
23369 | + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | ||
23370 | fi | ||
23371 | -fi # test -n "$CONFIG_FILES" | ||
23372 | +done | ||
23373 | + | ||
23374 | +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` | ||
23375 | +if test -n "$ac_eof"; then | ||
23376 | + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` | ||
23377 | + ac_eof=`expr $ac_eof + 1` | ||
23378 | +fi | ||
23379 | + | ||
23380 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
23381 | +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof | ||
23382 | +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b | ||
23383 | +_ACEOF | ||
23384 | +sed ' | ||
23385 | +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g | ||
23386 | +s/^/s,@/; s/!/@,|#_!!_#|/ | ||
23387 | +:n | ||
23388 | +t n | ||
23389 | +s/'"$ac_delim"'$/,g/; t | ||
23390 | +s/$/\\/; p | ||
23391 | +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n | ||
23392 | +' >>$CONFIG_STATUS <conf$$subs.sed | ||
23393 | +rm -f conf$$subs.sed | ||
23394 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
23395 | +CEOF$ac_eof | ||
23396 | +_ACEOF | ||
23397 | + | ||
23398 | + | ||
23399 | +ac_delim='%!_!# ' | ||
23400 | +for ac_last_try in false false false false false :; do | ||
23401 | + cat >conf$$subs.sed <<_ACEOF | ||
23402 | +CPP!$CPP$ac_delim | ||
23403 | +CXX!$CXX$ac_delim | ||
23404 | +CXXFLAGS!$CXXFLAGS$ac_delim | ||
23405 | +ac_ct_CXX!$ac_ct_CXX$ac_delim | ||
23406 | +CXXDEPMODE!$CXXDEPMODE$ac_delim | ||
23407 | +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim | ||
23408 | +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim | ||
23409 | +CXXCPP!$CXXCPP$ac_delim | ||
23410 | +F77!$F77$ac_delim | ||
23411 | +FFLAGS!$FFLAGS$ac_delim | ||
23412 | +ac_ct_F77!$ac_ct_F77$ac_delim | ||
23413 | +LIBTOOL!$LIBTOOL$ac_delim | ||
23414 | +ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim | ||
23415 | +MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim | ||
23416 | +MSGFMT!$MSGFMT$ac_delim | ||
23417 | +GMSGFMT!$GMSGFMT$ac_delim | ||
23418 | +XGETTEXT!$XGETTEXT$ac_delim | ||
23419 | +MSGMERGE!$MSGMERGE$ac_delim | ||
23420 | +USE_NLS!$USE_NLS$ac_delim | ||
23421 | +LIBICONV!$LIBICONV$ac_delim | ||
23422 | +LTLIBICONV!$LTLIBICONV$ac_delim | ||
23423 | +INTLLIBS!$INTLLIBS$ac_delim | ||
23424 | +LIBINTL!$LIBINTL$ac_delim | ||
23425 | +LTLIBINTL!$LTLIBINTL$ac_delim | ||
23426 | +POSUB!$POSUB$ac_delim | ||
23427 | +GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim | ||
23428 | +LOCALEDIR!$LOCALEDIR$ac_delim | ||
23429 | +PKG_CONFIG!$PKG_CONFIG$ac_delim | ||
23430 | +VALGRIND_CFLAGS!$VALGRIND_CFLAGS$ac_delim | ||
23431 | +VALGRIND_LIBS!$VALGRIND_LIBS$ac_delim | ||
23432 | +GST_GCOV_ENABLED_TRUE!$GST_GCOV_ENABLED_TRUE$ac_delim | ||
23433 | +GST_GCOV_ENABLED_FALSE!$GST_GCOV_ENABLED_FALSE$ac_delim | ||
23434 | +BUILD_EXAMPLES_TRUE!$BUILD_EXAMPLES_TRUE$ac_delim | ||
23435 | +BUILD_EXAMPLES_FALSE!$BUILD_EXAMPLES_FALSE$ac_delim | ||
23436 | +GST_PACKAGE_NAME!$GST_PACKAGE_NAME$ac_delim | ||
23437 | +GST_PACKAGE_ORIGIN!$GST_PACKAGE_ORIGIN$ac_delim | ||
23438 | +GST_PLUGINS_ALL!$GST_PLUGINS_ALL$ac_delim | ||
23439 | +USE_EXTERNAL_TRUE!$USE_EXTERNAL_TRUE$ac_delim | ||
23440 | +USE_EXTERNAL_FALSE!$USE_EXTERNAL_FALSE$ac_delim | ||
23441 | +BUILD_EXTERNAL_TRUE!$BUILD_EXTERNAL_TRUE$ac_delim | ||
23442 | +BUILD_EXTERNAL_FALSE!$BUILD_EXTERNAL_FALSE$ac_delim | ||
23443 | +USE_EXPERIMENTAL_TRUE!$USE_EXPERIMENTAL_TRUE$ac_delim | ||
23444 | +USE_EXPERIMENTAL_FALSE!$USE_EXPERIMENTAL_FALSE$ac_delim | ||
23445 | +BUILD_EXPERIMENTAL_TRUE!$BUILD_EXPERIMENTAL_TRUE$ac_delim | ||
23446 | +BUILD_EXPERIMENTAL_FALSE!$BUILD_EXPERIMENTAL_FALSE$ac_delim | ||
23447 | +HAVE_CPU_I386_TRUE!$HAVE_CPU_I386_TRUE$ac_delim | ||
23448 | +HAVE_CPU_I386_FALSE!$HAVE_CPU_I386_FALSE$ac_delim | ||
23449 | +HAVE_CPU_PPC_TRUE!$HAVE_CPU_PPC_TRUE$ac_delim | ||
23450 | +HAVE_CPU_PPC_FALSE!$HAVE_CPU_PPC_FALSE$ac_delim | ||
23451 | +HAVE_CPU_ALPHA_TRUE!$HAVE_CPU_ALPHA_TRUE$ac_delim | ||
23452 | +HAVE_CPU_ALPHA_FALSE!$HAVE_CPU_ALPHA_FALSE$ac_delim | ||
23453 | +HAVE_CPU_ARM_TRUE!$HAVE_CPU_ARM_TRUE$ac_delim | ||
23454 | +HAVE_CPU_ARM_FALSE!$HAVE_CPU_ARM_FALSE$ac_delim | ||
23455 | +HAVE_CPU_SPARC_TRUE!$HAVE_CPU_SPARC_TRUE$ac_delim | ||
23456 | +HAVE_CPU_SPARC_FALSE!$HAVE_CPU_SPARC_FALSE$ac_delim | ||
23457 | +HAVE_CPU_HPPA_TRUE!$HAVE_CPU_HPPA_TRUE$ac_delim | ||
23458 | +HAVE_CPU_HPPA_FALSE!$HAVE_CPU_HPPA_FALSE$ac_delim | ||
23459 | +HAVE_CPU_MIPS_TRUE!$HAVE_CPU_MIPS_TRUE$ac_delim | ||
23460 | +HAVE_CPU_MIPS_FALSE!$HAVE_CPU_MIPS_FALSE$ac_delim | ||
23461 | +HAVE_CPU_S390_TRUE!$HAVE_CPU_S390_TRUE$ac_delim | ||
23462 | +HAVE_CPU_S390_FALSE!$HAVE_CPU_S390_FALSE$ac_delim | ||
23463 | +HAVE_CPU_IA64_TRUE!$HAVE_CPU_IA64_TRUE$ac_delim | ||
23464 | +HAVE_CPU_IA64_FALSE!$HAVE_CPU_IA64_FALSE$ac_delim | ||
23465 | +HAVE_CPU_M68K_TRUE!$HAVE_CPU_M68K_TRUE$ac_delim | ||
23466 | +HAVE_CPU_M68K_FALSE!$HAVE_CPU_M68K_FALSE$ac_delim | ||
23467 | +HAVE_CPU_X86_64_TRUE!$HAVE_CPU_X86_64_TRUE$ac_delim | ||
23468 | +HAVE_CPU_X86_64_FALSE!$HAVE_CPU_X86_64_FALSE$ac_delim | ||
23469 | +HAVE_CXX!$HAVE_CXX$ac_delim | ||
23470 | +VALGRIND_PATH!$VALGRIND_PATH$ac_delim | ||
23471 | +HAVE_VALGRIND_TRUE!$HAVE_VALGRIND_TRUE$ac_delim | ||
23472 | +HAVE_VALGRIND_FALSE!$HAVE_VALGRIND_FALSE$ac_delim | ||
23473 | +HTML_DIR!$HTML_DIR$ac_delim | ||
23474 | +ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim | ||
23475 | +ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim | ||
23476 | +GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim | ||
23477 | +GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim | ||
23478 | +PYTHON!$PYTHON$ac_delim | ||
23479 | +PYTHON_VERSION!$PYTHON_VERSION$ac_delim | ||
23480 | +PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim | ||
23481 | +PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim | ||
23482 | +PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim | ||
23483 | +pythondir!$pythondir$ac_delim | ||
23484 | +pkgpythondir!$pkgpythondir$ac_delim | ||
23485 | +pyexecdir!$pyexecdir$ac_delim | ||
23486 | +pkgpyexecdir!$pkgpyexecdir$ac_delim | ||
23487 | +GLIB_REQ!$GLIB_REQ$ac_delim | ||
23488 | +GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim | ||
23489 | +GLIB_LIBS!$GLIB_LIBS$ac_delim | ||
23490 | +LIBOIL_CFLAGS!$LIBOIL_CFLAGS$ac_delim | ||
23491 | +LIBOIL_LIBS!$LIBOIL_LIBS$ac_delim | ||
23492 | +GST_CFLAGS!$GST_CFLAGS$ac_delim | ||
23493 | +GST_LIBS!$GST_LIBS$ac_delim | ||
23494 | +GST_TOOLS_DIR!$GST_TOOLS_DIR$ac_delim | ||
23495 | +GST_PLUGINS_DIR!$GST_PLUGINS_DIR$ac_delim | ||
23496 | +GST_BASE_CFLAGS!$GST_BASE_CFLAGS$ac_delim | ||
23497 | +GST_BASE_LIBS!$GST_BASE_LIBS$ac_delim | ||
23498 | +GST_CHECK_CFLAGS!$GST_CHECK_CFLAGS$ac_delim | ||
23499 | +_ACEOF | ||
23500 | + | ||
23501 | + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | ||
23502 | + break | ||
23503 | + elif $ac_last_try; then | ||
23504 | + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | ||
23505 | +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | ||
23506 | + { (exit 1); exit 1; }; } | ||
23507 | + else | ||
23508 | + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | ||
23509 | + fi | ||
23510 | +done | ||
23511 | + | ||
23512 | +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` | ||
23513 | +if test -n "$ac_eof"; then | ||
23514 | + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` | ||
23515 | + ac_eof=`expr $ac_eof + 1` | ||
23516 | +fi | ||
23517 | + | ||
23518 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
23519 | +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof | ||
23520 | +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b | ||
23521 | +_ACEOF | ||
23522 | +sed ' | ||
23523 | +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g | ||
23524 | +s/^/s,@/; s/!/@,|#_!!_#|/ | ||
23525 | +:n | ||
23526 | +t n | ||
23527 | +s/'"$ac_delim"'$/,g/; t | ||
23528 | +s/$/\\/; p | ||
23529 | +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n | ||
23530 | +' >>$CONFIG_STATUS <conf$$subs.sed | ||
23531 | +rm -f conf$$subs.sed | ||
23532 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
23533 | +CEOF$ac_eof | ||
23534 | +_ACEOF | ||
23535 | + | ||
23536 | + | ||
23537 | +ac_delim='%!_!# ' | ||
23538 | +for ac_last_try in false false false false false :; do | ||
23539 | + cat >conf$$subs.sed <<_ACEOF | ||
23540 | +GST_CHECK_LIBS!$GST_CHECK_LIBS$ac_delim | ||
23541 | +CHECK_CFLAGS!$CHECK_CFLAGS$ac_delim | ||
23542 | +CHECK_LIBS!$CHECK_LIBS$ac_delim | ||
23543 | +HAVE_CHECK_TRUE!$HAVE_CHECK_TRUE$ac_delim | ||
23544 | +HAVE_CHECK_FALSE!$HAVE_CHECK_FALSE$ac_delim | ||
23545 | +GST_PLUGINS_BASE_CFLAGS!$GST_PLUGINS_BASE_CFLAGS$ac_delim | ||
23546 | +GST_PLUGINS_BASE_LIBS!$GST_PLUGINS_BASE_LIBS$ac_delim | ||
23547 | +GSTPB_PLUGINS_DIR!$GSTPB_PLUGINS_DIR$ac_delim | ||
23548 | +GST_LICENSE!$GST_LICENSE$ac_delim | ||
23549 | +PLUGINDIR!$PLUGINDIR$ac_delim | ||
23550 | +plugindir!$plugindir$ac_delim | ||
23551 | +ERROR_CFLAGS!$ERROR_CFLAGS$ac_delim | ||
23552 | +GST_LEVEL_DEFAULT!$GST_LEVEL_DEFAULT$ac_delim | ||
23553 | +GST_PLUGINS_SELECTED!$GST_PLUGINS_SELECTED$ac_delim | ||
23554 | +HAVE_GL!$HAVE_GL$ac_delim | ||
23555 | +USE_OPENGL_TRUE!$USE_OPENGL_TRUE$ac_delim | ||
23556 | +USE_OPENGL_FALSE!$USE_OPENGL_FALSE$ac_delim | ||
23557 | +XVIDEO_LIBS!$XVIDEO_LIBS$ac_delim | ||
23558 | +USE_GST_V4L2_TRUE!$USE_GST_V4L2_TRUE$ac_delim | ||
23559 | +USE_GST_V4L2_FALSE!$USE_GST_V4L2_FALSE$ac_delim | ||
23560 | +USE_XVIDEO_TRUE!$USE_XVIDEO_TRUE$ac_delim | ||
23561 | +USE_XVIDEO_FALSE!$USE_XVIDEO_FALSE$ac_delim | ||
23562 | +HAVE_AMRWB!$HAVE_AMRWB$ac_delim | ||
23563 | +USE_AMRWB_TRUE!$USE_AMRWB_TRUE$ac_delim | ||
23564 | +USE_AMRWB_FALSE!$USE_AMRWB_FALSE$ac_delim | ||
23565 | +HAVE_BZ2!$HAVE_BZ2$ac_delim | ||
23566 | +BZ2_LIBS!$BZ2_LIBS$ac_delim | ||
23567 | +USE_BZ2_TRUE!$USE_BZ2_TRUE$ac_delim | ||
23568 | +USE_BZ2_FALSE!$USE_BZ2_FALSE$ac_delim | ||
23569 | +DIRECTFB_CFLAGS!$DIRECTFB_CFLAGS$ac_delim | ||
23570 | +DIRECTFB_LIBS!$DIRECTFB_LIBS$ac_delim | ||
23571 | +USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim | ||
23572 | +USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim | ||
23573 | +HAVE_DTS!$HAVE_DTS$ac_delim | ||
23574 | +DTS_LIBS!$DTS_LIBS$ac_delim | ||
23575 | +USE_DTS_TRUE!$USE_DTS_TRUE$ac_delim | ||
23576 | +USE_DTS_FALSE!$USE_DTS_FALSE$ac_delim | ||
23577 | +DIVXENC_LIBS!$DIVXENC_LIBS$ac_delim | ||
23578 | +DIVXDEC_LIBS!$DIVXDEC_LIBS$ac_delim | ||
23579 | +USE_DIVX_TRUE!$USE_DIVX_TRUE$ac_delim | ||
23580 | +USE_DIVX_FALSE!$USE_DIVX_FALSE$ac_delim | ||
23581 | +HAVE_FAAC!$HAVE_FAAC$ac_delim | ||
23582 | +FAAC_LIBS!$FAAC_LIBS$ac_delim | ||
23583 | +USE_FAAC_TRUE!$USE_FAAC_TRUE$ac_delim | ||
23584 | +USE_FAAC_FALSE!$USE_FAAC_FALSE$ac_delim | ||
23585 | +HAVE_FAAD!$HAVE_FAAD$ac_delim | ||
23586 | +FAAD_LIBS!$FAAD_LIBS$ac_delim | ||
23587 | +USE_FAAD_TRUE!$USE_FAAD_TRUE$ac_delim | ||
23588 | +USE_FAAD_FALSE!$USE_FAAD_FALSE$ac_delim | ||
23589 | +HAVE_GSM!$HAVE_GSM$ac_delim | ||
23590 | +GSM_LIBS!$GSM_LIBS$ac_delim | ||
23591 | +USE_GSM_TRUE!$USE_GSM_TRUE$ac_delim | ||
23592 | +USE_GSM_FALSE!$USE_GSM_FALSE$ac_delim | ||
23593 | +IVORBIS_LIBS!$IVORBIS_LIBS$ac_delim | ||
23594 | +IVORBIS_CFLAGS!$IVORBIS_CFLAGS$ac_delim | ||
23595 | +USE_IVORBIS_TRUE!$USE_IVORBIS_TRUE$ac_delim | ||
23596 | +USE_IVORBIS_FALSE!$USE_IVORBIS_FALSE$ac_delim | ||
23597 | +LIBMMS_CFLAGS!$LIBMMS_CFLAGS$ac_delim | ||
23598 | +LIBMMS_LIBS!$LIBMMS_LIBS$ac_delim | ||
23599 | +USE_LIBMMS_TRUE!$USE_LIBMMS_TRUE$ac_delim | ||
23600 | +USE_LIBMMS_FALSE!$USE_LIBMMS_FALSE$ac_delim | ||
23601 | +MUSEPACK_LIBS!$MUSEPACK_LIBS$ac_delim | ||
23602 | +USE_MUSEPACK_TRUE!$USE_MUSEPACK_TRUE$ac_delim | ||
23603 | +USE_MUSEPACK_FALSE!$USE_MUSEPACK_FALSE$ac_delim | ||
23604 | +MUSICBRAINZ_CFLAGS!$MUSICBRAINZ_CFLAGS$ac_delim | ||
23605 | +MUSICBRAINZ_LIBS!$MUSICBRAINZ_LIBS$ac_delim | ||
23606 | +USE_MUSICBRAINZ_TRUE!$USE_MUSICBRAINZ_TRUE$ac_delim | ||
23607 | +USE_MUSICBRAINZ_FALSE!$USE_MUSICBRAINZ_FALSE$ac_delim | ||
23608 | +NEON_CFLAGS!$NEON_CFLAGS$ac_delim | ||
23609 | +NEON_LIBS!$NEON_LIBS$ac_delim | ||
23610 | +USE_NEON_TRUE!$USE_NEON_TRUE$ac_delim | ||
23611 | +USE_NEON_FALSE!$USE_NEON_FALSE$ac_delim | ||
23612 | +SDL_CONFIG!$SDL_CONFIG$ac_delim | ||
23613 | +SDL_CFLAGS!$SDL_CFLAGS$ac_delim | ||
23614 | +SDL_LIBS!$SDL_LIBS$ac_delim | ||
23615 | +USE_SDL_TRUE!$USE_SDL_TRUE$ac_delim | ||
23616 | +USE_SDL_FALSE!$USE_SDL_FALSE$ac_delim | ||
23617 | +SOUNDTOUCH_CFLAGS!$SOUNDTOUCH_CFLAGS$ac_delim | ||
23618 | +SOUNDTOUCH_LIBS!$SOUNDTOUCH_LIBS$ac_delim | ||
23619 | +USE_SOUNDTOUCH_TRUE!$USE_SOUNDTOUCH_TRUE$ac_delim | ||
23620 | +USE_SOUNDTOUCH_FALSE!$USE_SOUNDTOUCH_FALSE$ac_delim | ||
23621 | +SWFDEC_CFLAGS!$SWFDEC_CFLAGS$ac_delim | ||
23622 | +SWFDEC_LIBS!$SWFDEC_LIBS$ac_delim | ||
23623 | +USE_SWFDEC_TRUE!$USE_SWFDEC_TRUE$ac_delim | ||
23624 | +USE_SWFDEC_FALSE!$USE_SWFDEC_FALSE$ac_delim | ||
23625 | +THEORADEC_CFLAGS!$THEORADEC_CFLAGS$ac_delim | ||
23626 | +THEORADEC_LIBS!$THEORADEC_LIBS$ac_delim | ||
23627 | +USE_THEORADEC_TRUE!$USE_THEORADEC_TRUE$ac_delim | ||
23628 | +USE_THEORADEC_FALSE!$USE_THEORADEC_FALSE$ac_delim | ||
23629 | +XVID_LIBS!$XVID_LIBS$ac_delim | ||
23630 | +USE_XVID_TRUE!$USE_XVID_TRUE$ac_delim | ||
23631 | +USE_XVID_FALSE!$USE_XVID_FALSE$ac_delim | ||
23632 | +WAVPACK_CFLAGS!$WAVPACK_CFLAGS$ac_delim | ||
23633 | +WAVPACK_LIBS!$WAVPACK_LIBS$ac_delim | ||
23634 | +USE_WAVPACK_TRUE!$USE_WAVPACK_TRUE$ac_delim | ||
23635 | +USE_WAVPACK_FALSE!$USE_WAVPACK_FALSE$ac_delim | ||
23636 | +PROFILE_CFLAGS!$PROFILE_CFLAGS$ac_delim | ||
23637 | +_ACEOF | ||
23638 | + | ||
23639 | + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | ||
23640 | + break | ||
23641 | + elif $ac_last_try; then | ||
23642 | + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | ||
23643 | +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | ||
23644 | + { (exit 1); exit 1; }; } | ||
23645 | + else | ||
23646 | + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | ||
23647 | + fi | ||
23648 | +done | ||
23649 | + | ||
23650 | +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` | ||
23651 | +if test -n "$ac_eof"; then | ||
23652 | + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` | ||
23653 | + ac_eof=`expr $ac_eof + 1` | ||
23654 | +fi | ||
23655 | + | ||
23656 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
23657 | +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof | ||
23658 | +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b | ||
23659 | +_ACEOF | ||
23660 | +sed ' | ||
23661 | +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g | ||
23662 | +s/^/s,@/; s/!/@,|#_!!_#|/ | ||
23663 | +:n | ||
23664 | +t n | ||
23665 | +s/'"$ac_delim"'$/,g/; t | ||
23666 | +s/$/\\/; p | ||
23667 | +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n | ||
23668 | +' >>$CONFIG_STATUS <conf$$subs.sed | ||
23669 | +rm -f conf$$subs.sed | ||
23670 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
23671 | +CEOF$ac_eof | ||
23672 | +_ACEOF | ||
23673 | + | ||
23674 | + | ||
23675 | +ac_delim='%!_!# ' | ||
23676 | +for ac_last_try in false false false false false :; do | ||
23677 | + cat >conf$$subs.sed <<_ACEOF | ||
23678 | +DEPRECATED_CFLAGS!$DEPRECATED_CFLAGS$ac_delim | ||
23679 | +GST_OPTION_CFLAGS!$GST_OPTION_CFLAGS$ac_delim | ||
23680 | +GST_PLUGIN_LDFLAGS!$GST_PLUGIN_LDFLAGS$ac_delim | ||
23681 | +LIBOBJS!$LIBOBJS$ac_delim | ||
23682 | +LTLIBOBJS!$LTLIBOBJS$ac_delim | ||
23683 | +_ACEOF | ||
23684 | + | ||
23685 | + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then | ||
23686 | + break | ||
23687 | + elif $ac_last_try; then | ||
23688 | + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | ||
23689 | +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | ||
23690 | + { (exit 1); exit 1; }; } | ||
23691 | + else | ||
23692 | + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | ||
23693 | + fi | ||
23694 | +done | ||
23695 | + | ||
23696 | +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` | ||
23697 | +if test -n "$ac_eof"; then | ||
23698 | + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` | ||
23699 | + ac_eof=`expr $ac_eof + 1` | ||
23700 | +fi | ||
23701 | |||
23702 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
23703 | +cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof | ||
23704 | +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end | ||
23705 | _ACEOF | ||
23706 | +sed ' | ||
23707 | +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g | ||
23708 | +s/^/s,@/; s/!/@,|#_!!_#|/ | ||
23709 | +:n | ||
23710 | +t n | ||
23711 | +s/'"$ac_delim"'$/,g/; t | ||
23712 | +s/$/\\/; p | ||
23713 | +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n | ||
23714 | +' >>$CONFIG_STATUS <conf$$subs.sed | ||
23715 | +rm -f conf$$subs.sed | ||
23716 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
23717 | +:end | ||
23718 | +s/|#_!!_#|//g | ||
23719 | +CEOF$ac_eof | ||
23720 | +_ACEOF | ||
23721 | + | ||
23722 | + | ||
23723 | +# VPATH may cause trouble with some makes, so we remove $(srcdir), | ||
23724 | +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and | ||
23725 | +# trailing colons and then remove the whole line if VPATH becomes empty | ||
23726 | +# (actually we leave an empty line to preserve line numbers). | ||
23727 | +if test "x$srcdir" = x.; then | ||
23728 | + ac_vpsub='/^[ ]*VPATH[ ]*=/{ | ||
23729 | +s/:*\$(srcdir):*/:/ | ||
23730 | +s/:*\${srcdir}:*/:/ | ||
23731 | +s/:*@srcdir@:*/:/ | ||
23732 | +s/^\([^=]*=[ ]*\):*/\1/ | ||
23733 | +s/:*$// | ||
23734 | +s/^[^=]*=[ ]*$// | ||
23735 | +}' | ||
23736 | +fi | ||
23737 | + | ||
23738 | cat >>$CONFIG_STATUS <<\_ACEOF | ||
23739 | -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue | ||
23740 | - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | ||
23741 | - case $ac_file in | ||
23742 | - - | *:- | *:-:* ) # input from stdin | ||
23743 | - cat >$tmp/stdin | ||
23744 | - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
23745 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
23746 | - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
23747 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
23748 | - * ) ac_file_in=$ac_file.in ;; | ||
23749 | +fi # test -n "$CONFIG_FILES" | ||
23750 | + | ||
23751 | + | ||
23752 | +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS | ||
23753 | +do | ||
23754 | + case $ac_tag in | ||
23755 | + :[FHLC]) ac_mode=$ac_tag; continue;; | ||
23756 | + esac | ||
23757 | + case $ac_mode$ac_tag in | ||
23758 | + :[FHL]*:*);; | ||
23759 | + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 | ||
23760 | +echo "$as_me: error: Invalid tag $ac_tag." >&2;} | ||
23761 | + { (exit 1); exit 1; }; };; | ||
23762 | + :[FH]-) ac_tag=-:-;; | ||
23763 | + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; | ||
23764 | + esac | ||
23765 | + ac_save_IFS=$IFS | ||
23766 | + IFS=: | ||
23767 | + set x $ac_tag | ||
23768 | + IFS=$ac_save_IFS | ||
23769 | + shift | ||
23770 | + ac_file=$1 | ||
23771 | + shift | ||
23772 | + | ||
23773 | + case $ac_mode in | ||
23774 | + :L) ac_source=$1;; | ||
23775 | + :[FH]) | ||
23776 | + ac_file_inputs= | ||
23777 | + for ac_f | ||
23778 | + do | ||
23779 | + case $ac_f in | ||
23780 | + -) ac_f="$tmp/stdin";; | ||
23781 | + *) # Look for the file first in the build tree, then in the source tree | ||
23782 | + # (if the path is not absolute). The absolute path cannot be DOS-style, | ||
23783 | + # because $ac_f cannot contain `:'. | ||
23784 | + test -f "$ac_f" || | ||
23785 | + case $ac_f in | ||
23786 | + [\\/$]*) false;; | ||
23787 | + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; | ||
23788 | + esac || | ||
23789 | + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 | ||
23790 | +echo "$as_me: error: cannot find input file: $ac_f" >&2;} | ||
23791 | + { (exit 1); exit 1; }; };; | ||
23792 | + esac | ||
23793 | + ac_file_inputs="$ac_file_inputs $ac_f" | ||
23794 | + done | ||
23795 | + | ||
23796 | + # Let's still pretend it is `configure' which instantiates (i.e., don't | ||
23797 | + # use $as_me), people would be surprised to read: | ||
23798 | + # /* config.h. Generated by config.status. */ | ||
23799 | + configure_input="Generated from "`IFS=: | ||
23800 | + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." | ||
23801 | + if test x"$ac_file" != x-; then | ||
23802 | + configure_input="$ac_file. $configure_input" | ||
23803 | + { echo "$as_me:$LINENO: creating $ac_file" >&5 | ||
23804 | +echo "$as_me: creating $ac_file" >&6;} | ||
23805 | + fi | ||
23806 | + | ||
23807 | + case $ac_tag in | ||
23808 | + *:-:* | *:-) cat >"$tmp/stdin";; | ||
23809 | + esac | ||
23810 | + ;; | ||
23811 | esac | ||
23812 | |||
23813 | - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. | ||
23814 | - ac_dir=`(dirname "$ac_file") 2>/dev/null || | ||
23815 | + ac_dir=`$as_dirname -- "$ac_file" || | ||
23816 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
23817 | X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
23818 | X"$ac_file" : 'X\(//\)$' \| \ | ||
23819 | - X"$ac_file" : 'X\(/\)' \| \ | ||
23820 | - . : '\(.\)' 2>/dev/null || | ||
23821 | + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || | ||
23822 | echo X"$ac_file" | | ||
23823 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
23824 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
23825 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
23826 | - /^X\(\/\).*/{ s//\1/; q; } | ||
23827 | - s/.*/./; q'` | ||
23828 | - { if $as_mkdir_p; then | ||
23829 | - mkdir -p "$ac_dir" | ||
23830 | - else | ||
23831 | - as_dir="$ac_dir" | ||
23832 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
23833 | + s//\1/ | ||
23834 | + q | ||
23835 | + } | ||
23836 | + /^X\(\/\/\)[^/].*/{ | ||
23837 | + s//\1/ | ||
23838 | + q | ||
23839 | + } | ||
23840 | + /^X\(\/\/\)$/{ | ||
23841 | + s//\1/ | ||
23842 | + q | ||
23843 | + } | ||
23844 | + /^X\(\/\).*/{ | ||
23845 | + s//\1/ | ||
23846 | + q | ||
23847 | + } | ||
23848 | + s/.*/./; q'` | ||
23849 | + { as_dir="$ac_dir" | ||
23850 | + case $as_dir in #( | ||
23851 | + -*) as_dir=./$as_dir;; | ||
23852 | + esac | ||
23853 | + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { | ||
23854 | as_dirs= | ||
23855 | - while test ! -d "$as_dir"; do | ||
23856 | - as_dirs="$as_dir $as_dirs" | ||
23857 | - as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
23858 | + while :; do | ||
23859 | + case $as_dir in #( | ||
23860 | + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( | ||
23861 | + *) as_qdir=$as_dir;; | ||
23862 | + esac | ||
23863 | + as_dirs="'$as_qdir' $as_dirs" | ||
23864 | + as_dir=`$as_dirname -- "$as_dir" || | ||
23865 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
23866 | X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
23867 | X"$as_dir" : 'X\(//\)$' \| \ | ||
23868 | - X"$as_dir" : 'X\(/\)' \| \ | ||
23869 | - . : '\(.\)' 2>/dev/null || | ||
23870 | + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | ||
23871 | echo X"$as_dir" | | ||
23872 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
23873 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
23874 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
23875 | - /^X\(\/\).*/{ s//\1/; q; } | ||
23876 | - s/.*/./; q'` | ||
23877 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
23878 | + s//\1/ | ||
23879 | + q | ||
23880 | + } | ||
23881 | + /^X\(\/\/\)[^/].*/{ | ||
23882 | + s//\1/ | ||
23883 | + q | ||
23884 | + } | ||
23885 | + /^X\(\/\/\)$/{ | ||
23886 | + s//\1/ | ||
23887 | + q | ||
23888 | + } | ||
23889 | + /^X\(\/\).*/{ | ||
23890 | + s//\1/ | ||
23891 | + q | ||
23892 | + } | ||
23893 | + s/.*/./; q'` | ||
23894 | + test -d "$as_dir" && break | ||
23895 | done | ||
23896 | - test ! -n "$as_dirs" || mkdir $as_dirs | ||
23897 | - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 | ||
23898 | -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} | ||
23899 | + test -z "$as_dirs" || eval "mkdir $as_dirs" | ||
23900 | + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | ||
23901 | +echo "$as_me: error: cannot create directory $as_dir" >&2;} | ||
23902 | { (exit 1); exit 1; }; }; } | ||
23903 | - | ||
23904 | ac_builddir=. | ||
23905 | |||
23906 | -if test "$ac_dir" != .; then | ||
23907 | +case "$ac_dir" in | ||
23908 | +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; | ||
23909 | +*) | ||
23910 | ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | ||
23911 | - # A "../" for each directory in $ac_dir_suffix. | ||
23912 | - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` | ||
23913 | -else | ||
23914 | - ac_dir_suffix= ac_top_builddir= | ||
23915 | -fi | ||
23916 | + # A ".." for each directory in $ac_dir_suffix. | ||
23917 | + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` | ||
23918 | + case $ac_top_builddir_sub in | ||
23919 | + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; | ||
23920 | + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; | ||
23921 | + esac ;; | ||
23922 | +esac | ||
23923 | +ac_abs_top_builddir=$ac_pwd | ||
23924 | +ac_abs_builddir=$ac_pwd$ac_dir_suffix | ||
23925 | +# for backward compatibility: | ||
23926 | +ac_top_builddir=$ac_top_build_prefix | ||
23927 | |||
23928 | case $srcdir in | ||
23929 | - .) # No --srcdir option. We are building in place. | ||
23930 | + .) # We are building in place. | ||
23931 | ac_srcdir=. | ||
23932 | - if test -z "$ac_top_builddir"; then | ||
23933 | - ac_top_srcdir=. | ||
23934 | - else | ||
23935 | - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | ||
23936 | - fi ;; | ||
23937 | - [\\/]* | ?:[\\/]* ) # Absolute path. | ||
23938 | + ac_top_srcdir=$ac_top_builddir_sub | ||
23939 | + ac_abs_top_srcdir=$ac_pwd ;; | ||
23940 | + [\\/]* | ?:[\\/]* ) # Absolute name. | ||
23941 | ac_srcdir=$srcdir$ac_dir_suffix; | ||
23942 | - ac_top_srcdir=$srcdir ;; | ||
23943 | - *) # Relative path. | ||
23944 | - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | ||
23945 | - ac_top_srcdir=$ac_top_builddir$srcdir ;; | ||
23946 | + ac_top_srcdir=$srcdir | ||
23947 | + ac_abs_top_srcdir=$srcdir ;; | ||
23948 | + *) # Relative name. | ||
23949 | + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix | ||
23950 | + ac_top_srcdir=$ac_top_build_prefix$srcdir | ||
23951 | + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; | ||
23952 | esac | ||
23953 | +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix | ||
23954 | |||
23955 | -# Do not use `cd foo && pwd` to compute absolute paths, because | ||
23956 | -# the directories may not exist. | ||
23957 | -case `pwd` in | ||
23958 | -.) ac_abs_builddir="$ac_dir";; | ||
23959 | -*) | ||
23960 | - case "$ac_dir" in | ||
23961 | - .) ac_abs_builddir=`pwd`;; | ||
23962 | - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
23963 | - *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
23964 | - esac;; | ||
23965 | -esac | ||
23966 | -case $ac_abs_builddir in | ||
23967 | -.) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
23968 | -*) | ||
23969 | - case ${ac_top_builddir}. in | ||
23970 | - .) ac_abs_top_builddir=$ac_abs_builddir;; | ||
23971 | - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
23972 | - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | ||
23973 | - esac;; | ||
23974 | -esac | ||
23975 | -case $ac_abs_builddir in | ||
23976 | -.) ac_abs_srcdir=$ac_srcdir;; | ||
23977 | -*) | ||
23978 | - case $ac_srcdir in | ||
23979 | - .) ac_abs_srcdir=$ac_abs_builddir;; | ||
23980 | - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
23981 | - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
23982 | - esac;; | ||
23983 | -esac | ||
23984 | -case $ac_abs_builddir in | ||
23985 | -.) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
23986 | -*) | ||
23987 | - case $ac_top_srcdir in | ||
23988 | - .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
23989 | - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
23990 | - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
23991 | - esac;; | ||
23992 | -esac | ||
23993 | |||
23994 | + case $ac_mode in | ||
23995 | + :F) | ||
23996 | + # | ||
23997 | + # CONFIG_FILE | ||
23998 | + # | ||
23999 | |||
24000 | case $INSTALL in | ||
24001 | [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; | ||
24002 | - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; | ||
24003 | + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; | ||
24004 | esac | ||
24005 | +_ACEOF | ||
24006 | |||
24007 | - # Let's still pretend it is `configure' which instantiates (i.e., don't | ||
24008 | - # use $as_me), people would be surprised to read: | ||
24009 | - # /* config.h. Generated by config.status. */ | ||
24010 | - if test x"$ac_file" = x-; then | ||
24011 | - configure_input= | ||
24012 | - else | ||
24013 | - configure_input="$ac_file. " | ||
24014 | - fi | ||
24015 | - configure_input=$configure_input"Generated from `echo $ac_file_in | | ||
24016 | - sed 's,.*/,,'` by configure." | ||
24017 | - | ||
24018 | - # First look for the input files in the build tree, otherwise in the | ||
24019 | - # src tree. | ||
24020 | - ac_file_inputs=`IFS=: | ||
24021 | - for f in $ac_file_in; do | ||
24022 | - case $f in | ||
24023 | - -) echo $tmp/stdin ;; | ||
24024 | - [\\/$]*) | ||
24025 | - # Absolute (can't be DOS-style, as IFS=:) | ||
24026 | - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
24027 | -echo "$as_me: error: cannot find input file: $f" >&2;} | ||
24028 | - { (exit 1); exit 1; }; } | ||
24029 | - echo "$f";; | ||
24030 | - *) # Relative | ||
24031 | - if test -f "$f"; then | ||
24032 | - # Build tree | ||
24033 | - echo "$f" | ||
24034 | - elif test -f "$srcdir/$f"; then | ||
24035 | - # Source tree | ||
24036 | - echo "$srcdir/$f" | ||
24037 | - else | ||
24038 | - # /dev/null tree | ||
24039 | - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
24040 | -echo "$as_me: error: cannot find input file: $f" >&2;} | ||
24041 | - { (exit 1); exit 1; }; } | ||
24042 | - fi;; | ||
24043 | - esac | ||
24044 | - done` || { (exit 1); exit 1; } | ||
24045 | - | ||
24046 | - if test x"$ac_file" != x-; then | ||
24047 | - { echo "$as_me:$LINENO: creating $ac_file" >&5 | ||
24048 | -echo "$as_me: creating $ac_file" >&6;} | ||
24049 | - rm -f "$ac_file" | ||
24050 | - fi | ||
24051 | +cat >>$CONFIG_STATUS <<\_ACEOF | ||
24052 | +# If the template does not know about datarootdir, expand it. | ||
24053 | +# FIXME: This hack should be removed a few years after 2.60. | ||
24054 | +ac_datarootdir_hack=; ac_datarootdir_seen= | ||
24055 | + | ||
24056 | +case `sed -n '/datarootdir/ { | ||
24057 | + p | ||
24058 | + q | ||
24059 | +} | ||
24060 | +/@datadir@/p | ||
24061 | +/@docdir@/p | ||
24062 | +/@infodir@/p | ||
24063 | +/@localedir@/p | ||
24064 | +/@mandir@/p | ||
24065 | +' $ac_file_inputs` in | ||
24066 | +*datarootdir*) ac_datarootdir_seen=yes;; | ||
24067 | +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) | ||
24068 | + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 | ||
24069 | +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} | ||
24070 | +_ACEOF | ||
24071 | +cat >>$CONFIG_STATUS <<_ACEOF | ||
24072 | + ac_datarootdir_hack=' | ||
24073 | + s&@datadir@&$datadir&g | ||
24074 | + s&@docdir@&$docdir&g | ||
24075 | + s&@infodir@&$infodir&g | ||
24076 | + s&@localedir@&$localedir&g | ||
24077 | + s&@mandir@&$mandir&g | ||
24078 | + s&\\\${datarootdir}&$datarootdir&g' ;; | ||
24079 | +esac | ||
24080 | _ACEOF | ||
24081 | + | ||
24082 | +# Neutralize VPATH when `$srcdir' = `.'. | ||
24083 | +# Shell code in configure.ac might set extrasub. | ||
24084 | +# FIXME: do we really want to maintain this feature? | ||
24085 | cat >>$CONFIG_STATUS <<_ACEOF | ||
24086 | sed "$ac_vpsub | ||
24087 | $extrasub | ||
24088 | @@ -35031,248 +38020,130 @@ | ||
24089 | cat >>$CONFIG_STATUS <<\_ACEOF | ||
24090 | :t | ||
24091 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b | ||
24092 | -s,@configure_input@,$configure_input,;t t | ||
24093 | -s,@srcdir@,$ac_srcdir,;t t | ||
24094 | -s,@abs_srcdir@,$ac_abs_srcdir,;t t | ||
24095 | -s,@top_srcdir@,$ac_top_srcdir,;t t | ||
24096 | -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t | ||
24097 | -s,@builddir@,$ac_builddir,;t t | ||
24098 | -s,@abs_builddir@,$ac_abs_builddir,;t t | ||
24099 | -s,@top_builddir@,$ac_top_builddir,;t t | ||
24100 | -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t | ||
24101 | -s,@INSTALL@,$ac_INSTALL,;t t | ||
24102 | -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out | ||
24103 | - rm -f $tmp/stdin | ||
24104 | - if test x"$ac_file" != x-; then | ||
24105 | - mv $tmp/out $ac_file | ||
24106 | - else | ||
24107 | - cat $tmp/out | ||
24108 | - rm -f $tmp/out | ||
24109 | - fi | ||
24110 | +s&@configure_input@&$configure_input&;t t | ||
24111 | +s&@top_builddir@&$ac_top_builddir_sub&;t t | ||
24112 | +s&@srcdir@&$ac_srcdir&;t t | ||
24113 | +s&@abs_srcdir@&$ac_abs_srcdir&;t t | ||
24114 | +s&@top_srcdir@&$ac_top_srcdir&;t t | ||
24115 | +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t | ||
24116 | +s&@builddir@&$ac_builddir&;t t | ||
24117 | +s&@abs_builddir@&$ac_abs_builddir&;t t | ||
24118 | +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t | ||
24119 | +s&@INSTALL@&$ac_INSTALL&;t t | ||
24120 | +$ac_datarootdir_hack | ||
24121 | +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out | ||
24122 | + | ||
24123 | +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && | ||
24124 | + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && | ||
24125 | + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && | ||
24126 | + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' | ||
24127 | +which seems to be undefined. Please make sure it is defined." >&5 | ||
24128 | +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' | ||
24129 | +which seems to be undefined. Please make sure it is defined." >&2;} | ||
24130 | |||
24131 | -done | ||
24132 | -_ACEOF | ||
24133 | -cat >>$CONFIG_STATUS <<\_ACEOF | ||
24134 | - | ||
24135 | -# | ||
24136 | -# CONFIG_HEADER section. | ||
24137 | -# | ||
24138 | - | ||
24139 | -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where | ||
24140 | -# NAME is the cpp macro being defined and VALUE is the value it is being given. | ||
24141 | -# | ||
24142 | -# ac_d sets the value in "#define NAME VALUE" lines. | ||
24143 | -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' | ||
24144 | -ac_dB='[ ].*$,\1#\2' | ||
24145 | -ac_dC=' ' | ||
24146 | -ac_dD=',;t' | ||
24147 | -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". | ||
24148 | -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' | ||
24149 | -ac_uB='$,\1#\2define\3' | ||
24150 | -ac_uC=' ' | ||
24151 | -ac_uD=',;t' | ||
24152 | - | ||
24153 | -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue | ||
24154 | - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | ||
24155 | + rm -f "$tmp/stdin" | ||
24156 | case $ac_file in | ||
24157 | - - | *:- | *:-:* ) # input from stdin | ||
24158 | - cat >$tmp/stdin | ||
24159 | - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
24160 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
24161 | - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
24162 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
24163 | - * ) ac_file_in=$ac_file.in ;; | ||
24164 | + -) cat "$tmp/out"; rm -f "$tmp/out";; | ||
24165 | + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; | ||
24166 | esac | ||
24167 | - | ||
24168 | - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 | ||
24169 | -echo "$as_me: creating $ac_file" >&6;} | ||
24170 | - | ||
24171 | - # First look for the input files in the build tree, otherwise in the | ||
24172 | - # src tree. | ||
24173 | - ac_file_inputs=`IFS=: | ||
24174 | - for f in $ac_file_in; do | ||
24175 | - case $f in | ||
24176 | - -) echo $tmp/stdin ;; | ||
24177 | - [\\/$]*) | ||
24178 | - # Absolute (can't be DOS-style, as IFS=:) | ||
24179 | - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
24180 | -echo "$as_me: error: cannot find input file: $f" >&2;} | ||
24181 | - { (exit 1); exit 1; }; } | ||
24182 | - # Do quote $f, to prevent DOS paths from being IFS'd. | ||
24183 | - echo "$f";; | ||
24184 | - *) # Relative | ||
24185 | - if test -f "$f"; then | ||
24186 | - # Build tree | ||
24187 | - echo "$f" | ||
24188 | - elif test -f "$srcdir/$f"; then | ||
24189 | - # Source tree | ||
24190 | - echo "$srcdir/$f" | ||
24191 | - else | ||
24192 | - # /dev/null tree | ||
24193 | - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
24194 | -echo "$as_me: error: cannot find input file: $f" >&2;} | ||
24195 | - { (exit 1); exit 1; }; } | ||
24196 | - fi;; | ||
24197 | - esac | ||
24198 | - done` || { (exit 1); exit 1; } | ||
24199 | - # Remove the trailing spaces. | ||
24200 | - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in | ||
24201 | - | ||
24202 | + ;; | ||
24203 | + :H) | ||
24204 | + # | ||
24205 | + # CONFIG_HEADER | ||
24206 | + # | ||
24207 | _ACEOF | ||
24208 | |||
24209 | -# Transform confdefs.h into two sed scripts, `conftest.defines' and | ||
24210 | -# `conftest.undefs', that substitutes the proper values into | ||
24211 | -# config.h.in to produce config.h. The first handles `#define' | ||
24212 | -# templates, and the second `#undef' templates. | ||
24213 | -# And first: Protect against being on the right side of a sed subst in | ||
24214 | -# config.status. Protect against being in an unquoted here document | ||
24215 | -# in config.status. | ||
24216 | -rm -f conftest.defines conftest.undefs | ||
24217 | -# Using a here document instead of a string reduces the quoting nightmare. | ||
24218 | -# Putting comments in sed scripts is not portable. | ||
24219 | -# | ||
24220 | -# `end' is used to avoid that the second main sed command (meant for | ||
24221 | -# 0-ary CPP macros) applies to n-ary macro definitions. | ||
24222 | -# See the Autoconf documentation for `clear'. | ||
24223 | -cat >confdef2sed.sed <<\_ACEOF | ||
24224 | -s/[\\&,]/\\&/g | ||
24225 | -s,[\\$`],\\&,g | ||
24226 | -t clear | ||
24227 | -: clear | ||
24228 | -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp | ||
24229 | -t end | ||
24230 | -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp | ||
24231 | -: end | ||
24232 | -_ACEOF | ||
24233 | -# If some macros were called several times there might be several times | ||
24234 | -# the same #defines, which is useless. Nevertheless, we may not want to | ||
24235 | -# sort them, since we want the *last* AC-DEFINE to be honored. | ||
24236 | -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines | ||
24237 | -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs | ||
24238 | -rm -f confdef2sed.sed | ||
24239 | +# Transform confdefs.h into a sed script `conftest.defines', that | ||
24240 | +# substitutes the proper values into config.h.in to produce config.h. | ||
24241 | +rm -f conftest.defines conftest.tail | ||
24242 | +# First, append a space to every undef/define line, to ease matching. | ||
24243 | +echo 's/$/ /' >conftest.defines | ||
24244 | +# Then, protect against being on the right side of a sed subst, or in | ||
24245 | +# an unquoted here document, in config.status. If some macros were | ||
24246 | +# called several times there might be several #defines for the same | ||
24247 | +# symbol, which is useless. But do not sort them, since the last | ||
24248 | +# AC_DEFINE must be honored. | ||
24249 | +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* | ||
24250 | +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where | ||
24251 | +# NAME is the cpp macro being defined, VALUE is the value it is being given. | ||
24252 | +# PARAMS is the parameter list in the macro definition--in most cases, it's | ||
24253 | +# just an empty string. | ||
24254 | +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' | ||
24255 | +ac_dB='\\)[ (].*,\\1define\\2' | ||
24256 | +ac_dC=' ' | ||
24257 | +ac_dD=' ,' | ||
24258 | |||
24259 | -# This sed command replaces #undef with comments. This is necessary, for | ||
24260 | +uniq confdefs.h | | ||
24261 | + sed -n ' | ||
24262 | + t rset | ||
24263 | + :rset | ||
24264 | + s/^[ ]*#[ ]*define[ ][ ]*// | ||
24265 | + t ok | ||
24266 | + d | ||
24267 | + :ok | ||
24268 | + s/[\\&,]/\\&/g | ||
24269 | + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p | ||
24270 | + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p | ||
24271 | + ' >>conftest.defines | ||
24272 | + | ||
24273 | +# Remove the space that was appended to ease matching. | ||
24274 | +# Then replace #undef with comments. This is necessary, for | ||
24275 | # example, in the case of _POSIX_SOURCE, which is predefined and required | ||
24276 | # on some systems where configure will not decide to define it. | ||
24277 | -cat >>conftest.undefs <<\_ACEOF | ||
24278 | -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, | ||
24279 | -_ACEOF | ||
24280 | +# (The regexp can be short, since the line contains either #define or #undef.) | ||
24281 | +echo 's/ $// | ||
24282 | +s,^[ #]*u.*,/* & */,' >>conftest.defines | ||
24283 | + | ||
24284 | +# Break up conftest.defines: | ||
24285 | +ac_max_sed_lines=50 | ||
24286 | + | ||
24287 | +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" | ||
24288 | +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" | ||
24289 | +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" | ||
24290 | +# et cetera. | ||
24291 | +ac_in='$ac_file_inputs' | ||
24292 | +ac_out='"$tmp/out1"' | ||
24293 | +ac_nxt='"$tmp/out2"' | ||
24294 | |||
24295 | -# Break up conftest.defines because some shells have a limit on the size | ||
24296 | -# of here documents, and old seds have small limits too (100 cmds). | ||
24297 | -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS | ||
24298 | -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS | ||
24299 | -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS | ||
24300 | -echo ' :' >>$CONFIG_STATUS | ||
24301 | -rm -f conftest.tail | ||
24302 | -while grep . conftest.defines >/dev/null | ||
24303 | +while : | ||
24304 | do | ||
24305 | - # Write a limited-size here document to $tmp/defines.sed. | ||
24306 | - echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS | ||
24307 | - # Speed up: don't consider the non `#define' lines. | ||
24308 | - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS | ||
24309 | - # Work around the forget-to-reset-the-flag bug. | ||
24310 | - echo 't clr' >>$CONFIG_STATUS | ||
24311 | - echo ': clr' >>$CONFIG_STATUS | ||
24312 | - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS | ||
24313 | + # Write a here document: | ||
24314 | + cat >>$CONFIG_STATUS <<_ACEOF | ||
24315 | + # First, check the format of the line: | ||
24316 | + cat >"\$tmp/defines.sed" <<\\CEOF | ||
24317 | +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def | ||
24318 | +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def | ||
24319 | +b | ||
24320 | +:def | ||
24321 | +_ACEOF | ||
24322 | + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS | ||
24323 | echo 'CEOF | ||
24324 | - sed -f $tmp/defines.sed $tmp/in >$tmp/out | ||
24325 | - rm -f $tmp/in | ||
24326 | - mv $tmp/out $tmp/in | ||
24327 | -' >>$CONFIG_STATUS | ||
24328 | - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail | ||
24329 | + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS | ||
24330 | + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in | ||
24331 | + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail | ||
24332 | + grep . conftest.tail >/dev/null || break | ||
24333 | rm -f conftest.defines | ||
24334 | mv conftest.tail conftest.defines | ||
24335 | done | ||
24336 | -rm -f conftest.defines | ||
24337 | -echo ' fi # grep' >>$CONFIG_STATUS | ||
24338 | -echo >>$CONFIG_STATUS | ||
24339 | - | ||
24340 | -# Break up conftest.undefs because some shells have a limit on the size | ||
24341 | -# of here documents, and old seds have small limits too (100 cmds). | ||
24342 | -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS | ||
24343 | -rm -f conftest.tail | ||
24344 | -while grep . conftest.undefs >/dev/null | ||
24345 | -do | ||
24346 | - # Write a limited-size here document to $tmp/undefs.sed. | ||
24347 | - echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS | ||
24348 | - # Speed up: don't consider the non `#undef' | ||
24349 | - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS | ||
24350 | - # Work around the forget-to-reset-the-flag bug. | ||
24351 | - echo 't clr' >>$CONFIG_STATUS | ||
24352 | - echo ': clr' >>$CONFIG_STATUS | ||
24353 | - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS | ||
24354 | - echo 'CEOF | ||
24355 | - sed -f $tmp/undefs.sed $tmp/in >$tmp/out | ||
24356 | - rm -f $tmp/in | ||
24357 | - mv $tmp/out $tmp/in | ||
24358 | -' >>$CONFIG_STATUS | ||
24359 | - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail | ||
24360 | - rm -f conftest.undefs | ||
24361 | - mv conftest.tail conftest.undefs | ||
24362 | -done | ||
24363 | -rm -f conftest.undefs | ||
24364 | +rm -f conftest.defines conftest.tail | ||
24365 | |||
24366 | +echo "ac_result=$ac_in" >>$CONFIG_STATUS | ||
24367 | cat >>$CONFIG_STATUS <<\_ACEOF | ||
24368 | - # Let's still pretend it is `configure' which instantiates (i.e., don't | ||
24369 | - # use $as_me), people would be surprised to read: | ||
24370 | - # /* config.h. Generated by config.status. */ | ||
24371 | - if test x"$ac_file" = x-; then | ||
24372 | - echo "/* Generated by configure. */" >$tmp/config.h | ||
24373 | - else | ||
24374 | - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h | ||
24375 | - fi | ||
24376 | - cat $tmp/in >>$tmp/config.h | ||
24377 | - rm -f $tmp/in | ||
24378 | if test x"$ac_file" != x-; then | ||
24379 | - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then | ||
24380 | + echo "/* $configure_input */" >"$tmp/config.h" | ||
24381 | + cat "$ac_result" >>"$tmp/config.h" | ||
24382 | + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then | ||
24383 | { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 | ||
24384 | echo "$as_me: $ac_file is unchanged" >&6;} | ||
24385 | else | ||
24386 | - ac_dir=`(dirname "$ac_file") 2>/dev/null || | ||
24387 | -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
24388 | - X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
24389 | - X"$ac_file" : 'X\(//\)$' \| \ | ||
24390 | - X"$ac_file" : 'X\(/\)' \| \ | ||
24391 | - . : '\(.\)' 2>/dev/null || | ||
24392 | -echo X"$ac_file" | | ||
24393 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
24394 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
24395 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
24396 | - /^X\(\/\).*/{ s//\1/; q; } | ||
24397 | - s/.*/./; q'` | ||
24398 | - { if $as_mkdir_p; then | ||
24399 | - mkdir -p "$ac_dir" | ||
24400 | - else | ||
24401 | - as_dir="$ac_dir" | ||
24402 | - as_dirs= | ||
24403 | - while test ! -d "$as_dir"; do | ||
24404 | - as_dirs="$as_dir $as_dirs" | ||
24405 | - as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
24406 | -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
24407 | - X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
24408 | - X"$as_dir" : 'X\(//\)$' \| \ | ||
24409 | - X"$as_dir" : 'X\(/\)' \| \ | ||
24410 | - . : '\(.\)' 2>/dev/null || | ||
24411 | -echo X"$as_dir" | | ||
24412 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
24413 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
24414 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
24415 | - /^X\(\/\).*/{ s//\1/; q; } | ||
24416 | - s/.*/./; q'` | ||
24417 | - done | ||
24418 | - test ! -n "$as_dirs" || mkdir $as_dirs | ||
24419 | - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 | ||
24420 | -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} | ||
24421 | - { (exit 1); exit 1; }; }; } | ||
24422 | - | ||
24423 | rm -f $ac_file | ||
24424 | - mv $tmp/config.h $ac_file | ||
24425 | + mv "$tmp/config.h" $ac_file | ||
24426 | fi | ||
24427 | else | ||
24428 | - cat $tmp/config.h | ||
24429 | - rm -f $tmp/config.h | ||
24430 | + echo "/* $configure_input */" | ||
24431 | + cat "$ac_result" | ||
24432 | fi | ||
24433 | + rm -f "$tmp/out12" | ||
24434 | # Compute $ac_file's index in $config_headers. | ||
24435 | _am_stamp_count=1 | ||
24436 | for _am_header in $config_headers :; do | ||
24437 | @@ -35283,135 +38154,39 @@ | ||
24438 | _am_stamp_count=`expr $_am_stamp_count + 1` ;; | ||
24439 | esac | ||
24440 | done | ||
24441 | -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || | ||
24442 | +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || | ||
24443 | $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
24444 | X$ac_file : 'X\(//\)[^/]' \| \ | ||
24445 | X$ac_file : 'X\(//\)$' \| \ | ||
24446 | - X$ac_file : 'X\(/\)' \| \ | ||
24447 | - . : '\(.\)' 2>/dev/null || | ||
24448 | + X$ac_file : 'X\(/\)' \| . 2>/dev/null || | ||
24449 | echo X$ac_file | | ||
24450 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
24451 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
24452 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
24453 | - /^X\(\/\).*/{ s//\1/; q; } | ||
24454 | - s/.*/./; q'`/stamp-h$_am_stamp_count | ||
24455 | -done | ||
24456 | -_ACEOF | ||
24457 | -cat >>$CONFIG_STATUS <<\_ACEOF | ||
24458 | - | ||
24459 | -# | ||
24460 | -# CONFIG_COMMANDS section. | ||
24461 | -# | ||
24462 | -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue | ||
24463 | - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` | ||
24464 | - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
24465 | - ac_dir=`(dirname "$ac_dest") 2>/dev/null || | ||
24466 | -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
24467 | - X"$ac_dest" : 'X\(//\)[^/]' \| \ | ||
24468 | - X"$ac_dest" : 'X\(//\)$' \| \ | ||
24469 | - X"$ac_dest" : 'X\(/\)' \| \ | ||
24470 | - . : '\(.\)' 2>/dev/null || | ||
24471 | -echo X"$ac_dest" | | ||
24472 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
24473 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
24474 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
24475 | - /^X\(\/\).*/{ s//\1/; q; } | ||
24476 | - s/.*/./; q'` | ||
24477 | - { if $as_mkdir_p; then | ||
24478 | - mkdir -p "$ac_dir" | ||
24479 | - else | ||
24480 | - as_dir="$ac_dir" | ||
24481 | - as_dirs= | ||
24482 | - while test ! -d "$as_dir"; do | ||
24483 | - as_dirs="$as_dir $as_dirs" | ||
24484 | - as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
24485 | -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
24486 | - X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
24487 | - X"$as_dir" : 'X\(//\)$' \| \ | ||
24488 | - X"$as_dir" : 'X\(/\)' \| \ | ||
24489 | - . : '\(.\)' 2>/dev/null || | ||
24490 | -echo X"$as_dir" | | ||
24491 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
24492 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
24493 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
24494 | - /^X\(\/\).*/{ s//\1/; q; } | ||
24495 | - s/.*/./; q'` | ||
24496 | - done | ||
24497 | - test ! -n "$as_dirs" || mkdir $as_dirs | ||
24498 | - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 | ||
24499 | -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} | ||
24500 | - { (exit 1); exit 1; }; }; } | ||
24501 | - | ||
24502 | - ac_builddir=. | ||
24503 | - | ||
24504 | -if test "$ac_dir" != .; then | ||
24505 | - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | ||
24506 | - # A "../" for each directory in $ac_dir_suffix. | ||
24507 | - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` | ||
24508 | -else | ||
24509 | - ac_dir_suffix= ac_top_builddir= | ||
24510 | -fi | ||
24511 | - | ||
24512 | -case $srcdir in | ||
24513 | - .) # No --srcdir option. We are building in place. | ||
24514 | - ac_srcdir=. | ||
24515 | - if test -z "$ac_top_builddir"; then | ||
24516 | - ac_top_srcdir=. | ||
24517 | - else | ||
24518 | - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | ||
24519 | - fi ;; | ||
24520 | - [\\/]* | ?:[\\/]* ) # Absolute path. | ||
24521 | - ac_srcdir=$srcdir$ac_dir_suffix; | ||
24522 | - ac_top_srcdir=$srcdir ;; | ||
24523 | - *) # Relative path. | ||
24524 | - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | ||
24525 | - ac_top_srcdir=$ac_top_builddir$srcdir ;; | ||
24526 | -esac | ||
24527 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
24528 | + s//\1/ | ||
24529 | + q | ||
24530 | + } | ||
24531 | + /^X\(\/\/\)[^/].*/{ | ||
24532 | + s//\1/ | ||
24533 | + q | ||
24534 | + } | ||
24535 | + /^X\(\/\/\)$/{ | ||
24536 | + s//\1/ | ||
24537 | + q | ||
24538 | + } | ||
24539 | + /^X\(\/\).*/{ | ||
24540 | + s//\1/ | ||
24541 | + q | ||
24542 | + } | ||
24543 | + s/.*/./; q'`/stamp-h$_am_stamp_count | ||
24544 | + ;; | ||
24545 | |||
24546 | -# Do not use `cd foo && pwd` to compute absolute paths, because | ||
24547 | -# the directories may not exist. | ||
24548 | -case `pwd` in | ||
24549 | -.) ac_abs_builddir="$ac_dir";; | ||
24550 | -*) | ||
24551 | - case "$ac_dir" in | ||
24552 | - .) ac_abs_builddir=`pwd`;; | ||
24553 | - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
24554 | - *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
24555 | - esac;; | ||
24556 | -esac | ||
24557 | -case $ac_abs_builddir in | ||
24558 | -.) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
24559 | -*) | ||
24560 | - case ${ac_top_builddir}. in | ||
24561 | - .) ac_abs_top_builddir=$ac_abs_builddir;; | ||
24562 | - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
24563 | - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | ||
24564 | - esac;; | ||
24565 | -esac | ||
24566 | -case $ac_abs_builddir in | ||
24567 | -.) ac_abs_srcdir=$ac_srcdir;; | ||
24568 | -*) | ||
24569 | - case $ac_srcdir in | ||
24570 | - .) ac_abs_srcdir=$ac_abs_builddir;; | ||
24571 | - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
24572 | - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
24573 | - esac;; | ||
24574 | -esac | ||
24575 | -case $ac_abs_builddir in | ||
24576 | -.) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
24577 | -*) | ||
24578 | - case $ac_top_srcdir in | ||
24579 | - .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
24580 | - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
24581 | - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
24582 | - esac;; | ||
24583 | -esac | ||
24584 | + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 | ||
24585 | +echo "$as_me: executing $ac_file commands" >&6;} | ||
24586 | + ;; | ||
24587 | + esac | ||
24588 | |||
24589 | |||
24590 | - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 | ||
24591 | -echo "$as_me: executing $ac_dest commands" >&6;} | ||
24592 | - case $ac_dest in | ||
24593 | - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do | ||
24594 | + case $ac_file$ac_mode in | ||
24595 | + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do | ||
24596 | # Strip MF so we end up with the name of the file. | ||
24597 | mf=`echo "$mf" | sed -e 's/:.*$//'` | ||
24598 | # Check whether this is an Automake generated Makefile or not. | ||
24599 | @@ -35421,18 +38196,29 @@ | ||
24600 | # each Makefile.in and add a new line on top of each file to say so. | ||
24601 | # So let's grep whole file. | ||
24602 | if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then | ||
24603 | - dirpart=`(dirname "$mf") 2>/dev/null || | ||
24604 | + dirpart=`$as_dirname -- "$mf" || | ||
24605 | $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
24606 | X"$mf" : 'X\(//\)[^/]' \| \ | ||
24607 | X"$mf" : 'X\(//\)$' \| \ | ||
24608 | - X"$mf" : 'X\(/\)' \| \ | ||
24609 | - . : '\(.\)' 2>/dev/null || | ||
24610 | + X"$mf" : 'X\(/\)' \| . 2>/dev/null || | ||
24611 | echo X"$mf" | | ||
24612 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
24613 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
24614 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
24615 | - /^X\(\/\).*/{ s//\1/; q; } | ||
24616 | - s/.*/./; q'` | ||
24617 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
24618 | + s//\1/ | ||
24619 | + q | ||
24620 | + } | ||
24621 | + /^X\(\/\/\)[^/].*/{ | ||
24622 | + s//\1/ | ||
24623 | + q | ||
24624 | + } | ||
24625 | + /^X\(\/\/\)$/{ | ||
24626 | + s//\1/ | ||
24627 | + q | ||
24628 | + } | ||
24629 | + /^X\(\/\).*/{ | ||
24630 | + s//\1/ | ||
24631 | + q | ||
24632 | + } | ||
24633 | + s/.*/./; q'` | ||
24634 | else | ||
24635 | continue | ||
24636 | fi | ||
24637 | @@ -35454,49 +38240,76 @@ | ||
24638 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | ||
24639 | # Make sure the directory exists. | ||
24640 | test -f "$dirpart/$file" && continue | ||
24641 | - fdir=`(dirname "$file") 2>/dev/null || | ||
24642 | + fdir=`$as_dirname -- "$file" || | ||
24643 | $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
24644 | X"$file" : 'X\(//\)[^/]' \| \ | ||
24645 | X"$file" : 'X\(//\)$' \| \ | ||
24646 | - X"$file" : 'X\(/\)' \| \ | ||
24647 | - . : '\(.\)' 2>/dev/null || | ||
24648 | + X"$file" : 'X\(/\)' \| . 2>/dev/null || | ||
24649 | echo X"$file" | | ||
24650 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
24651 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
24652 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
24653 | - /^X\(\/\).*/{ s//\1/; q; } | ||
24654 | - s/.*/./; q'` | ||
24655 | - { if $as_mkdir_p; then | ||
24656 | - mkdir -p $dirpart/$fdir | ||
24657 | - else | ||
24658 | - as_dir=$dirpart/$fdir | ||
24659 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
24660 | + s//\1/ | ||
24661 | + q | ||
24662 | + } | ||
24663 | + /^X\(\/\/\)[^/].*/{ | ||
24664 | + s//\1/ | ||
24665 | + q | ||
24666 | + } | ||
24667 | + /^X\(\/\/\)$/{ | ||
24668 | + s//\1/ | ||
24669 | + q | ||
24670 | + } | ||
24671 | + /^X\(\/\).*/{ | ||
24672 | + s//\1/ | ||
24673 | + q | ||
24674 | + } | ||
24675 | + s/.*/./; q'` | ||
24676 | + { as_dir=$dirpart/$fdir | ||
24677 | + case $as_dir in #( | ||
24678 | + -*) as_dir=./$as_dir;; | ||
24679 | + esac | ||
24680 | + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { | ||
24681 | as_dirs= | ||
24682 | - while test ! -d "$as_dir"; do | ||
24683 | - as_dirs="$as_dir $as_dirs" | ||
24684 | - as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
24685 | + while :; do | ||
24686 | + case $as_dir in #( | ||
24687 | + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( | ||
24688 | + *) as_qdir=$as_dir;; | ||
24689 | + esac | ||
24690 | + as_dirs="'$as_qdir' $as_dirs" | ||
24691 | + as_dir=`$as_dirname -- "$as_dir" || | ||
24692 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
24693 | X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
24694 | X"$as_dir" : 'X\(//\)$' \| \ | ||
24695 | - X"$as_dir" : 'X\(/\)' \| \ | ||
24696 | - . : '\(.\)' 2>/dev/null || | ||
24697 | + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | ||
24698 | echo X"$as_dir" | | ||
24699 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
24700 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
24701 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
24702 | - /^X\(\/\).*/{ s//\1/; q; } | ||
24703 | - s/.*/./; q'` | ||
24704 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
24705 | + s//\1/ | ||
24706 | + q | ||
24707 | + } | ||
24708 | + /^X\(\/\/\)[^/].*/{ | ||
24709 | + s//\1/ | ||
24710 | + q | ||
24711 | + } | ||
24712 | + /^X\(\/\/\)$/{ | ||
24713 | + s//\1/ | ||
24714 | + q | ||
24715 | + } | ||
24716 | + /^X\(\/\).*/{ | ||
24717 | + s//\1/ | ||
24718 | + q | ||
24719 | + } | ||
24720 | + s/.*/./; q'` | ||
24721 | + test -d "$as_dir" && break | ||
24722 | done | ||
24723 | - test ! -n "$as_dirs" || mkdir $as_dirs | ||
24724 | - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 | ||
24725 | -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} | ||
24726 | + test -z "$as_dirs" || eval "mkdir $as_dirs" | ||
24727 | + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | ||
24728 | +echo "$as_me: error: cannot create directory $as_dir" >&2;} | ||
24729 | { (exit 1); exit 1; }; }; } | ||
24730 | - | ||
24731 | # echo "creating $dirpart/$file" | ||
24732 | echo '# dummy' > "$dirpart/$file" | ||
24733 | done | ||
24734 | done | ||
24735 | ;; | ||
24736 | - default-1 ) | ||
24737 | + "default-1":C) | ||
24738 | for ac_file in $CONFIG_FILES; do | ||
24739 | # Support "outfile[:infile[:infile...]]" | ||
24740 | case "$ac_file" in | ||
24741 | @@ -35592,7 +38405,7 @@ | ||
24742 | ;; | ||
24743 | esac | ||
24744 | done ;; | ||
24745 | - $ac_stdint_h ) | ||
24746 | + "$ac_stdint_h":C) | ||
24747 | { echo "$as_me:$LINENO: creating $ac_stdint_h : $_ac_stdint_h" >&5 | ||
24748 | echo "$as_me: creating $ac_stdint_h : $_ac_stdint_h" >&6;} | ||
24749 | ac_stdint=$tmp/_stdint.h | ||
24750 | @@ -35947,52 +38760,78 @@ | ||
24751 | { echo "$as_me:$LINENO: $ac_stdint_h is unchanged" >&5 | ||
24752 | echo "$as_me: $ac_stdint_h is unchanged" >&6;} | ||
24753 | else | ||
24754 | - ac_dir=`(dirname "$ac_stdint_h") 2>/dev/null || | ||
24755 | + ac_dir=`$as_dirname -- "$ac_stdint_h" || | ||
24756 | $as_expr X"$ac_stdint_h" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
24757 | X"$ac_stdint_h" : 'X\(//\)[^/]' \| \ | ||
24758 | X"$ac_stdint_h" : 'X\(//\)$' \| \ | ||
24759 | - X"$ac_stdint_h" : 'X\(/\)' \| \ | ||
24760 | - . : '\(.\)' 2>/dev/null || | ||
24761 | + X"$ac_stdint_h" : 'X\(/\)' \| . 2>/dev/null || | ||
24762 | echo X"$ac_stdint_h" | | ||
24763 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
24764 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
24765 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
24766 | - /^X\(\/\).*/{ s//\1/; q; } | ||
24767 | - s/.*/./; q'` | ||
24768 | - { if $as_mkdir_p; then | ||
24769 | - mkdir -p "$ac_dir" | ||
24770 | - else | ||
24771 | - as_dir="$ac_dir" | ||
24772 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
24773 | + s//\1/ | ||
24774 | + q | ||
24775 | + } | ||
24776 | + /^X\(\/\/\)[^/].*/{ | ||
24777 | + s//\1/ | ||
24778 | + q | ||
24779 | + } | ||
24780 | + /^X\(\/\/\)$/{ | ||
24781 | + s//\1/ | ||
24782 | + q | ||
24783 | + } | ||
24784 | + /^X\(\/\).*/{ | ||
24785 | + s//\1/ | ||
24786 | + q | ||
24787 | + } | ||
24788 | + s/.*/./; q'` | ||
24789 | + { as_dir="$ac_dir" | ||
24790 | + case $as_dir in #( | ||
24791 | + -*) as_dir=./$as_dir;; | ||
24792 | + esac | ||
24793 | + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { | ||
24794 | as_dirs= | ||
24795 | - while test ! -d "$as_dir"; do | ||
24796 | - as_dirs="$as_dir $as_dirs" | ||
24797 | - as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
24798 | + while :; do | ||
24799 | + case $as_dir in #( | ||
24800 | + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( | ||
24801 | + *) as_qdir=$as_dir;; | ||
24802 | + esac | ||
24803 | + as_dirs="'$as_qdir' $as_dirs" | ||
24804 | + as_dir=`$as_dirname -- "$as_dir" || | ||
24805 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
24806 | X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
24807 | X"$as_dir" : 'X\(//\)$' \| \ | ||
24808 | - X"$as_dir" : 'X\(/\)' \| \ | ||
24809 | - . : '\(.\)' 2>/dev/null || | ||
24810 | + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | ||
24811 | echo X"$as_dir" | | ||
24812 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
24813 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
24814 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
24815 | - /^X\(\/\).*/{ s//\1/; q; } | ||
24816 | - s/.*/./; q'` | ||
24817 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
24818 | + s//\1/ | ||
24819 | + q | ||
24820 | + } | ||
24821 | + /^X\(\/\/\)[^/].*/{ | ||
24822 | + s//\1/ | ||
24823 | + q | ||
24824 | + } | ||
24825 | + /^X\(\/\/\)$/{ | ||
24826 | + s//\1/ | ||
24827 | + q | ||
24828 | + } | ||
24829 | + /^X\(\/\).*/{ | ||
24830 | + s//\1/ | ||
24831 | + q | ||
24832 | + } | ||
24833 | + s/.*/./; q'` | ||
24834 | + test -d "$as_dir" && break | ||
24835 | done | ||
24836 | - test ! -n "$as_dirs" || mkdir $as_dirs | ||
24837 | - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 | ||
24838 | -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} | ||
24839 | + test -z "$as_dirs" || eval "mkdir $as_dirs" | ||
24840 | + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | ||
24841 | +echo "$as_me: error: cannot create directory $as_dir" >&2;} | ||
24842 | { (exit 1); exit 1; }; }; } | ||
24843 | - | ||
24844 | rm -f $ac_stdint_h | ||
24845 | mv $ac_stdint $ac_stdint_h | ||
24846 | fi | ||
24847 | ;; | ||
24848 | + | ||
24849 | esac | ||
24850 | -done | ||
24851 | -_ACEOF | ||
24852 | +done # for ac_tag | ||
24853 | |||
24854 | -cat >>$CONFIG_STATUS <<\_ACEOF | ||
24855 | |||
24856 | { (exit 0); exit 0; } | ||
24857 | _ACEOF | ||
diff --git a/meta/packages/gstreamer/gst-plugins-bad-0.10.3/ivorbisdec.patch b/meta/packages/gstreamer/gst-plugins-bad-0.10.3/ivorbisdec.patch new file mode 100644 index 0000000000..7e7afc3f6c --- /dev/null +++ b/meta/packages/gstreamer/gst-plugins-bad-0.10.3/ivorbisdec.patch | |||
@@ -0,0 +1,1365 @@ | |||
1 | --- ../gst-plugins-bad0.10-0.10.3+cvs20060918/configure.ac 2006-09-18 18:35:13.000000000 +0100 | ||
2 | +++ ./configure.ac 2006-09-21 14:55:05.000000000 +0100 | ||
3 | @@ -526,7 +526,12 @@ | ||
4 | IVORBIS_CFLAGS= | ||
5 | AC_CHECK_LIB(vorbisidec, vorbis_block_init, | ||
6 | [IVORBIS_LIBS=-lvorbisidec | ||
7 | - HAVE_IVORBIS=yes], | ||
8 | + HAVE_IVORBIS=yes | ||
9 | + case $host in | ||
10 | + arm-*-*) | ||
11 | + IVORBIS_CFLAGS="-D_ARM_ASSEM_ $IVORBIS_CFLAGS" | ||
12 | + esac | ||
13 | + ], | ||
14 | HAVE_IVORBIS=no) | ||
15 | AC_SUBST(IVORBIS_LIBS) | ||
16 | AC_SUBST(IVORBIS_CFLAGS) | ||
17 | diff -urNd ../gst-plugins-bad0.10-0.10.3+cvs20060918/ext/ivorbis/Makefile.am ext/ivorbis/Makefile.am | ||
18 | --- ../gst-plugins-bad0.10-0.10.3+cvs20060918/ext/ivorbis/Makefile.am 2005-11-21 03:21:04.000000000 +0000 | ||
19 | +++ ext/ivorbis/Makefile.am 2006-09-20 15:41:30.000000000 +0100 | ||
20 | @@ -1,7 +1,7 @@ | ||
21 | |||
22 | plugin_LTLIBRARIES = libgstivorbis.la | ||
23 | |||
24 | -libgstivorbis_la_SOURCES = vorbis.c vorbisfile.c | ||
25 | +libgstivorbis_la_SOURCES = vorbis.c vorbisfile.c vorbisdec.c | ||
26 | libgstivorbis_la_CFLAGS = $(GST_CFLAGS) $(IVORBIS_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) | ||
27 | libgstivorbis_la_LIBADD = $(IVORBIS_LIBS) \ | ||
28 | $(IVORBISFILE_LIBS) \ | ||
29 | diff -urNd ../gst-plugins-bad0.10-0.10.3+cvs20060918/ext/ivorbis/vorbis.c ext/ivorbis/vorbis.c | ||
30 | --- ../gst-plugins-bad0.10-0.10.3+cvs20060918/ext/ivorbis/vorbis.c 2006-04-01 11:09:05.000000000 +0100 | ||
31 | +++ ext/ivorbis/vorbis.c 2006-09-20 18:47:11.000000000 +0100 | ||
32 | @@ -23,9 +23,11 @@ | ||
33 | |||
34 | #include <gst/gst.h> | ||
35 | #include <tremor/ivorbiscodec.h> | ||
36 | +#include "vorbisdec.h" | ||
37 | |||
38 | -extern GType ivorbisfile_get_type (void); | ||
39 | +GST_DEBUG_CATEGORY (vorbisdec_debug); | ||
40 | |||
41 | +extern GType ivorbisfile_get_type (void); | ||
42 | |||
43 | static gboolean | ||
44 | plugin_init (GstPlugin * plugin) | ||
45 | @@ -34,6 +36,13 @@ | ||
46 | ivorbisfile_get_type ())) | ||
47 | return FALSE; | ||
48 | |||
49 | + if (!gst_element_register (plugin, "ivorbisdec", GST_RANK_SECONDARY, | ||
50 | + gst_ivorbis_dec_get_type ())) | ||
51 | + return FALSE; | ||
52 | + | ||
53 | + GST_DEBUG_CATEGORY_INIT (vorbisdec_debug, "ivorbisdec", 0, | ||
54 | + "vorbis decoding element (integer decoder)"); | ||
55 | + | ||
56 | return TRUE; | ||
57 | } | ||
58 | |||
59 | diff -urNd ../gst-plugins-bad0.10-0.10.3+cvs20060918/ext/ivorbis/vorbisdec.c ext/ivorbis/vorbisdec.c | ||
60 | --- ../gst-plugins-bad0.10-0.10.3+cvs20060918/ext/ivorbis/vorbisdec.c 1970-01-01 01:00:00.000000000 +0100 | ||
61 | +++ ext/ivorbis/vorbisdec.c 2006-09-21 14:51:25.000000000 +0100 | ||
62 | @@ -0,0 +1,1212 @@ | ||
63 | +/* GStreamer | ||
64 | + * Copyright (C) 2004 Benjamin Otte <in7y118@public.uni-hamburg.de> | ||
65 | + * | ||
66 | + * Tremor modifications <2006>: | ||
67 | + * Chris Lord, OpenedHand Ltd. <chris@openedhand.com>, http://www.o-hand.com/ | ||
68 | + * | ||
69 | + * This library is free software; you can redistribute it and/or | ||
70 | + * modify it under the terms of the GNU Library General Public | ||
71 | + * License as published by the Free Software Foundation; either | ||
72 | + * version 2 of the License, or (at your option) any later version. | ||
73 | + * | ||
74 | + * This library is distributed in the hope that it will be useful, | ||
75 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
76 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
77 | + * Library General Public License for more details. | ||
78 | + * | ||
79 | + * You should have received a copy of the GNU Library General Public | ||
80 | + * License along with this library; if not, write to the | ||
81 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
82 | + * Boston, MA 02111-1307, USA. | ||
83 | + */ | ||
84 | + | ||
85 | +/** | ||
86 | + * SECTION:element-vorbisdec | ||
87 | + * @short_description: a decoder that decodes Vorbis to raw audio | ||
88 | + * @see_also: vorbisenc, oggdemux | ||
89 | + * | ||
90 | + * <refsect2> | ||
91 | + * <para> | ||
92 | + * This element decodes a Vorbis stream to raw int audio. | ||
93 | + * <ulink url="http://www.vorbis.com/">Vorbis</ulink> is a royalty-free | ||
94 | + * audio codec maintained by the <ulink url="http://www.xiph.org/">Xiph.org | ||
95 | + * Foundation</ulink>. | ||
96 | + * </para> | ||
97 | + * <title>Example pipelines</title> | ||
98 | + * <para> | ||
99 | + * <programlisting> | ||
100 | + * gst-launch -v filesrc location=sine.ogg ! oggdemux ! vorbisdec ! audioconvert ! alsasink | ||
101 | + * </programlisting> | ||
102 | + * Decode an Ogg/Vorbis. To create an Ogg/Vorbis file refer to the documentation of vorbisenc. | ||
103 | + * </para> | ||
104 | + * </refsect2> | ||
105 | + * | ||
106 | + * Last reviewed on 2006-03-01 (0.10.4) | ||
107 | + */ | ||
108 | + | ||
109 | +#ifdef HAVE_CONFIG_H | ||
110 | +# include "config.h" | ||
111 | +#endif | ||
112 | + | ||
113 | +#include "vorbisdec.h" | ||
114 | +#include <string.h> | ||
115 | +#include <gst/audio/audio.h> | ||
116 | +#include <gst/tag/tag.h> | ||
117 | +#include <gst/audio/multichannel.h> | ||
118 | + | ||
119 | +GST_DEBUG_CATEGORY_EXTERN (vorbisdec_debug); | ||
120 | +#define GST_CAT_DEFAULT vorbisdec_debug | ||
121 | + | ||
122 | +static const GstElementDetails vorbis_dec_details = | ||
123 | +GST_ELEMENT_DETAILS ("Vorbis audio decoder", | ||
124 | + "Codec/Decoder/Audio", | ||
125 | + "decode raw vorbis streams to integer audio", | ||
126 | + "Benjamin Otte <in7y118@public.uni-hamburg.de>\n" | ||
127 | + "Chris Lord <chris@openedhand.com>"); | ||
128 | + | ||
129 | +static GstStaticPadTemplate vorbis_dec_src_factory = | ||
130 | +GST_STATIC_PAD_TEMPLATE ("src", | ||
131 | + GST_PAD_SRC, | ||
132 | + GST_PAD_ALWAYS, | ||
133 | + GST_STATIC_CAPS ("audio/x-raw-int, " | ||
134 | + "rate = (int) [ 1, MAX ], " | ||
135 | + "channels = (int) [ 1, 6 ], " | ||
136 | + "endianness = (int) BYTE_ORDER, " | ||
137 | + "width = (int) 32, " | ||
138 | + "depth = (int) 16, " | ||
139 | + "signed = (boolean) true") | ||
140 | + ); | ||
141 | + | ||
142 | +static GstStaticPadTemplate vorbis_dec_sink_factory = | ||
143 | +GST_STATIC_PAD_TEMPLATE ("sink", | ||
144 | + GST_PAD_SINK, | ||
145 | + GST_PAD_ALWAYS, | ||
146 | + GST_STATIC_CAPS ("audio/x-vorbis") | ||
147 | + ); | ||
148 | + | ||
149 | +GST_BOILERPLATE (GstIVorbisDec, gst_ivorbis_dec, GstElement, GST_TYPE_ELEMENT); | ||
150 | + | ||
151 | +static void vorbis_dec_finalize (GObject * object); | ||
152 | +static gboolean vorbis_dec_sink_event (GstPad * pad, GstEvent * event); | ||
153 | +static GstFlowReturn vorbis_dec_chain (GstPad * pad, GstBuffer * buffer); | ||
154 | +static GstStateChangeReturn vorbis_dec_change_state (GstElement * element, | ||
155 | + GstStateChange transition); | ||
156 | + | ||
157 | +static gboolean vorbis_dec_src_event (GstPad * pad, GstEvent * event); | ||
158 | +static gboolean vorbis_dec_src_query (GstPad * pad, GstQuery * query); | ||
159 | +static gboolean vorbis_dec_convert (GstPad * pad, | ||
160 | + GstFormat src_format, gint64 src_value, | ||
161 | + GstFormat * dest_format, gint64 * dest_value); | ||
162 | + | ||
163 | +static gboolean vorbis_dec_sink_query (GstPad * pad, GstQuery * query); | ||
164 | + | ||
165 | +static void | ||
166 | +gst_ivorbis_dec_base_init (gpointer g_class) | ||
167 | +{ | ||
168 | + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); | ||
169 | + GstPadTemplate *src_template, *sink_template; | ||
170 | + | ||
171 | + src_template = gst_static_pad_template_get (&vorbis_dec_src_factory); | ||
172 | + gst_element_class_add_pad_template (element_class, src_template); | ||
173 | + | ||
174 | + sink_template = gst_static_pad_template_get (&vorbis_dec_sink_factory); | ||
175 | + gst_element_class_add_pad_template (element_class, sink_template); | ||
176 | + | ||
177 | + gst_element_class_set_details (element_class, &vorbis_dec_details); | ||
178 | +} | ||
179 | + | ||
180 | +static void | ||
181 | +gst_ivorbis_dec_class_init (GstIVorbisDecClass * klass) | ||
182 | +{ | ||
183 | + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); | ||
184 | + GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); | ||
185 | + | ||
186 | + gobject_class->finalize = vorbis_dec_finalize; | ||
187 | + | ||
188 | + gstelement_class->change_state = GST_DEBUG_FUNCPTR (vorbis_dec_change_state); | ||
189 | +} | ||
190 | + | ||
191 | +static const GstQueryType * | ||
192 | +vorbis_get_query_types (GstPad * pad) | ||
193 | +{ | ||
194 | + static const GstQueryType vorbis_dec_src_query_types[] = { | ||
195 | + GST_QUERY_POSITION, | ||
196 | + GST_QUERY_DURATION, | ||
197 | + GST_QUERY_CONVERT, | ||
198 | + 0 | ||
199 | + }; | ||
200 | + | ||
201 | + return vorbis_dec_src_query_types; | ||
202 | +} | ||
203 | + | ||
204 | +static void | ||
205 | +gst_ivorbis_dec_init (GstIVorbisDec * dec, GstIVorbisDecClass * g_class) | ||
206 | +{ | ||
207 | + dec->sinkpad = gst_pad_new_from_static_template (&vorbis_dec_sink_factory, | ||
208 | + "sink"); | ||
209 | + | ||
210 | + gst_pad_set_event_function (dec->sinkpad, | ||
211 | + GST_DEBUG_FUNCPTR (vorbis_dec_sink_event)); | ||
212 | + gst_pad_set_chain_function (dec->sinkpad, | ||
213 | + GST_DEBUG_FUNCPTR (vorbis_dec_chain)); | ||
214 | + gst_pad_set_query_function (dec->sinkpad, | ||
215 | + GST_DEBUG_FUNCPTR (vorbis_dec_sink_query)); | ||
216 | + gst_element_add_pad (GST_ELEMENT (dec), dec->sinkpad); | ||
217 | + | ||
218 | + dec->srcpad = gst_pad_new_from_static_template (&vorbis_dec_src_factory, | ||
219 | + "src"); | ||
220 | + | ||
221 | + gst_pad_set_event_function (dec->srcpad, | ||
222 | + GST_DEBUG_FUNCPTR (vorbis_dec_src_event)); | ||
223 | + gst_pad_set_query_type_function (dec->srcpad, | ||
224 | + GST_DEBUG_FUNCPTR (vorbis_get_query_types)); | ||
225 | + gst_pad_set_query_function (dec->srcpad, | ||
226 | + GST_DEBUG_FUNCPTR (vorbis_dec_src_query)); | ||
227 | + gst_pad_use_fixed_caps (dec->srcpad); | ||
228 | + gst_element_add_pad (GST_ELEMENT (dec), dec->srcpad); | ||
229 | + | ||
230 | + dec->queued = NULL; | ||
231 | + dec->pendingevents = NULL; | ||
232 | + dec->taglist = NULL; | ||
233 | +} | ||
234 | + | ||
235 | +static void | ||
236 | +vorbis_dec_finalize (GObject * object) | ||
237 | +{ | ||
238 | + /* Release any possibly allocated libvorbis data. | ||
239 | + * _clear functions can safely be called multiple times | ||
240 | + */ | ||
241 | + GstIVorbisDec *vd = GST_IVORBIS_DEC (object); | ||
242 | + | ||
243 | + vorbis_block_clear (&vd->vb); | ||
244 | + vorbis_dsp_clear (&vd->vd); | ||
245 | + vorbis_comment_clear (&vd->vc); | ||
246 | + vorbis_info_clear (&vd->vi); | ||
247 | + | ||
248 | + G_OBJECT_CLASS (parent_class)->finalize (object); | ||
249 | +} | ||
250 | + | ||
251 | +static void | ||
252 | +gst_ivorbis_dec_reset (GstIVorbisDec * dec) | ||
253 | +{ | ||
254 | + GList *walk; | ||
255 | + | ||
256 | + dec->cur_timestamp = GST_CLOCK_TIME_NONE; | ||
257 | + dec->prev_timestamp = GST_CLOCK_TIME_NONE; | ||
258 | + dec->granulepos = -1; | ||
259 | + dec->discont = TRUE; | ||
260 | + gst_segment_init (&dec->segment, GST_FORMAT_TIME); | ||
261 | + | ||
262 | + for (walk = dec->queued; walk; walk = g_list_next (walk)) { | ||
263 | + gst_buffer_unref (GST_BUFFER_CAST (walk->data)); | ||
264 | + } | ||
265 | + g_list_free (dec->queued); | ||
266 | + dec->queued = NULL; | ||
267 | + | ||
268 | + for (walk = dec->pendingevents; walk; walk = g_list_next (walk)) { | ||
269 | + gst_event_unref (GST_EVENT_CAST (walk->data)); | ||
270 | + } | ||
271 | + g_list_free (dec->pendingevents); | ||
272 | + dec->pendingevents = NULL; | ||
273 | + | ||
274 | + if (dec->taglist) | ||
275 | + gst_tag_list_free (dec->taglist); | ||
276 | + dec->taglist = NULL; | ||
277 | +} | ||
278 | + | ||
279 | + | ||
280 | +static gboolean | ||
281 | +vorbis_dec_convert (GstPad * pad, | ||
282 | + GstFormat src_format, gint64 src_value, | ||
283 | + GstFormat * dest_format, gint64 * dest_value) | ||
284 | +{ | ||
285 | + gboolean res = TRUE; | ||
286 | + GstIVorbisDec *dec; | ||
287 | + guint64 scale = 1; | ||
288 | + | ||
289 | + if (src_format == *dest_format) { | ||
290 | + *dest_value = src_value; | ||
291 | + return TRUE; | ||
292 | + } | ||
293 | + | ||
294 | + dec = GST_IVORBIS_DEC (gst_pad_get_parent (pad)); | ||
295 | + | ||
296 | + if (!dec->initialized) | ||
297 | + goto no_header; | ||
298 | + | ||
299 | + if (dec->sinkpad == pad && | ||
300 | + (src_format == GST_FORMAT_BYTES || *dest_format == GST_FORMAT_BYTES)) | ||
301 | + goto no_format; | ||
302 | + | ||
303 | + switch (src_format) { | ||
304 | + case GST_FORMAT_TIME: | ||
305 | + switch (*dest_format) { | ||
306 | + case GST_FORMAT_BYTES: | ||
307 | + scale = sizeof (gint32) * dec->vi.channels; | ||
308 | + case GST_FORMAT_DEFAULT: | ||
309 | + *dest_value = | ||
310 | + scale * gst_util_uint64_scale_int (src_value, dec->vi.rate, | ||
311 | + GST_SECOND); | ||
312 | + break; | ||
313 | + default: | ||
314 | + res = FALSE; | ||
315 | + } | ||
316 | + break; | ||
317 | + case GST_FORMAT_DEFAULT: | ||
318 | + switch (*dest_format) { | ||
319 | + case GST_FORMAT_BYTES: | ||
320 | + *dest_value = src_value * sizeof (gint32) * dec->vi.channels; | ||
321 | + break; | ||
322 | + case GST_FORMAT_TIME: | ||
323 | + *dest_value = | ||
324 | + gst_util_uint64_scale_int (src_value, GST_SECOND, dec->vi.rate); | ||
325 | + break; | ||
326 | + default: | ||
327 | + res = FALSE; | ||
328 | + } | ||
329 | + break; | ||
330 | + case GST_FORMAT_BYTES: | ||
331 | + switch (*dest_format) { | ||
332 | + case GST_FORMAT_DEFAULT: | ||
333 | + *dest_value = src_value / (sizeof (gint32) * dec->vi.channels); | ||
334 | + break; | ||
335 | + case GST_FORMAT_TIME: | ||
336 | + *dest_value = gst_util_uint64_scale_int (src_value, GST_SECOND, | ||
337 | + dec->vi.rate * sizeof (gint32) * dec->vi.channels); | ||
338 | + break; | ||
339 | + default: | ||
340 | + res = FALSE; | ||
341 | + } | ||
342 | + break; | ||
343 | + default: | ||
344 | + res = FALSE; | ||
345 | + } | ||
346 | +done: | ||
347 | + gst_object_unref (dec); | ||
348 | + | ||
349 | + return res; | ||
350 | + | ||
351 | + /* ERRORS */ | ||
352 | +no_header: | ||
353 | + { | ||
354 | + GST_DEBUG_OBJECT (dec, "no header packets received"); | ||
355 | + res = FALSE; | ||
356 | + goto done; | ||
357 | + } | ||
358 | +no_format: | ||
359 | + { | ||
360 | + GST_DEBUG_OBJECT (dec, "formats unsupported"); | ||
361 | + res = FALSE; | ||
362 | + goto done; | ||
363 | + } | ||
364 | +} | ||
365 | + | ||
366 | +static gboolean | ||
367 | +vorbis_dec_src_query (GstPad * pad, GstQuery * query) | ||
368 | +{ | ||
369 | + GstIVorbisDec *dec; | ||
370 | + gboolean res = FALSE; | ||
371 | + | ||
372 | + dec = GST_IVORBIS_DEC (gst_pad_get_parent (pad)); | ||
373 | + | ||
374 | + switch (GST_QUERY_TYPE (query)) { | ||
375 | + case GST_QUERY_POSITION: | ||
376 | + { | ||
377 | + gint64 granulepos, value; | ||
378 | + GstFormat my_format, format; | ||
379 | + gint64 time; | ||
380 | + | ||
381 | + /* we start from the last seen granulepos */ | ||
382 | + granulepos = dec->granulepos; | ||
383 | + | ||
384 | + gst_query_parse_position (query, &format, NULL); | ||
385 | + | ||
386 | + /* and convert to the final format in two steps with time as the | ||
387 | + * intermediate step */ | ||
388 | + my_format = GST_FORMAT_TIME; | ||
389 | + if (!(res = | ||
390 | + vorbis_dec_convert (pad, GST_FORMAT_DEFAULT, granulepos, | ||
391 | + &my_format, &time))) | ||
392 | + goto error; | ||
393 | + | ||
394 | + /* correct for the segment values */ | ||
395 | + time = gst_segment_to_stream_time (&dec->segment, GST_FORMAT_TIME, time); | ||
396 | + | ||
397 | + GST_LOG_OBJECT (dec, | ||
398 | + "query %p: our time: %" GST_TIME_FORMAT, query, GST_TIME_ARGS (time)); | ||
399 | + | ||
400 | + /* and convert to the final format */ | ||
401 | + if (!(res = vorbis_dec_convert (pad, my_format, time, &format, &value))) | ||
402 | + goto error; | ||
403 | + | ||
404 | + gst_query_set_position (query, format, value); | ||
405 | + | ||
406 | + GST_LOG_OBJECT (dec, | ||
407 | + "query %p: we return %lld (format %u)", query, value, format); | ||
408 | + | ||
409 | + break; | ||
410 | + } | ||
411 | + case GST_QUERY_DURATION: | ||
412 | + { | ||
413 | + GstPad *peer; | ||
414 | + | ||
415 | + if (!(peer = gst_pad_get_peer (dec->sinkpad))) { | ||
416 | + GST_WARNING_OBJECT (dec, "sink pad %" GST_PTR_FORMAT " is not linked", | ||
417 | + dec->sinkpad); | ||
418 | + goto error; | ||
419 | + } | ||
420 | + | ||
421 | + res = gst_pad_query (peer, query); | ||
422 | + gst_object_unref (peer); | ||
423 | + if (!res) | ||
424 | + goto error; | ||
425 | + | ||
426 | + break; | ||
427 | + } | ||
428 | + case GST_QUERY_CONVERT: | ||
429 | + { | ||
430 | + GstFormat src_fmt, dest_fmt; | ||
431 | + gint64 src_val, dest_val; | ||
432 | + | ||
433 | + gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val); | ||
434 | + if (!(res = | ||
435 | + vorbis_dec_convert (pad, src_fmt, src_val, &dest_fmt, &dest_val))) | ||
436 | + goto error; | ||
437 | + gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val); | ||
438 | + break; | ||
439 | + } | ||
440 | + default: | ||
441 | + res = gst_pad_query_default (pad, query); | ||
442 | + break; | ||
443 | + } | ||
444 | +done: | ||
445 | + gst_object_unref (dec); | ||
446 | + | ||
447 | + return res; | ||
448 | + | ||
449 | + /* ERRORS */ | ||
450 | +error: | ||
451 | + { | ||
452 | + GST_WARNING_OBJECT (dec, "error handling query"); | ||
453 | + goto done; | ||
454 | + } | ||
455 | +} | ||
456 | + | ||
457 | +static gboolean | ||
458 | +vorbis_dec_sink_query (GstPad * pad, GstQuery * query) | ||
459 | +{ | ||
460 | + GstIVorbisDec *dec; | ||
461 | + gboolean res; | ||
462 | + | ||
463 | + dec = GST_IVORBIS_DEC (gst_pad_get_parent (pad)); | ||
464 | + | ||
465 | + switch (GST_QUERY_TYPE (query)) { | ||
466 | + case GST_QUERY_CONVERT: | ||
467 | + { | ||
468 | + GstFormat src_fmt, dest_fmt; | ||
469 | + gint64 src_val, dest_val; | ||
470 | + | ||
471 | + gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val); | ||
472 | + if (!(res = | ||
473 | + vorbis_dec_convert (pad, src_fmt, src_val, &dest_fmt, &dest_val))) | ||
474 | + goto error; | ||
475 | + gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val); | ||
476 | + break; | ||
477 | + } | ||
478 | + default: | ||
479 | + res = gst_pad_query_default (pad, query); | ||
480 | + break; | ||
481 | + } | ||
482 | + | ||
483 | +done: | ||
484 | + gst_object_unref (dec); | ||
485 | + | ||
486 | + return res; | ||
487 | + | ||
488 | + /* ERRORS */ | ||
489 | +error: | ||
490 | + { | ||
491 | + GST_DEBUG_OBJECT (dec, "error converting value"); | ||
492 | + goto done; | ||
493 | + } | ||
494 | +} | ||
495 | + | ||
496 | +static gboolean | ||
497 | +vorbis_dec_src_event (GstPad * pad, GstEvent * event) | ||
498 | +{ | ||
499 | + gboolean res = TRUE; | ||
500 | + GstIVorbisDec *dec; | ||
501 | + | ||
502 | + dec = GST_IVORBIS_DEC (gst_pad_get_parent (pad)); | ||
503 | + | ||
504 | + switch (GST_EVENT_TYPE (event)) { | ||
505 | + case GST_EVENT_SEEK: | ||
506 | + { | ||
507 | + GstFormat format, tformat; | ||
508 | + gdouble rate; | ||
509 | + GstEvent *real_seek; | ||
510 | + GstSeekFlags flags; | ||
511 | + GstSeekType cur_type, stop_type; | ||
512 | + gint64 cur, stop; | ||
513 | + gint64 tcur, tstop; | ||
514 | + | ||
515 | + gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur, | ||
516 | + &stop_type, &stop); | ||
517 | + gst_event_unref (event); | ||
518 | + | ||
519 | + /* we have to ask our peer to seek to time here as we know | ||
520 | + * nothing about how to generate a granulepos from the src | ||
521 | + * formats or anything. | ||
522 | + * | ||
523 | + * First bring the requested format to time | ||
524 | + */ | ||
525 | + tformat = GST_FORMAT_TIME; | ||
526 | + if (!(res = vorbis_dec_convert (pad, format, cur, &tformat, &tcur))) | ||
527 | + goto convert_error; | ||
528 | + if (!(res = vorbis_dec_convert (pad, format, stop, &tformat, &tstop))) | ||
529 | + goto convert_error; | ||
530 | + | ||
531 | + /* then seek with time on the peer */ | ||
532 | + real_seek = gst_event_new_seek (rate, GST_FORMAT_TIME, | ||
533 | + flags, cur_type, tcur, stop_type, tstop); | ||
534 | + | ||
535 | + res = gst_pad_push_event (dec->sinkpad, real_seek); | ||
536 | + | ||
537 | + break; | ||
538 | + } | ||
539 | + default: | ||
540 | + res = gst_pad_push_event (dec->sinkpad, event); | ||
541 | + break; | ||
542 | + } | ||
543 | +done: | ||
544 | + gst_object_unref (dec); | ||
545 | + | ||
546 | + return res; | ||
547 | + | ||
548 | + /* ERRORS */ | ||
549 | +convert_error: | ||
550 | + { | ||
551 | + GST_DEBUG_OBJECT (dec, "cannot convert start/stop for seek"); | ||
552 | + goto done; | ||
553 | + } | ||
554 | +} | ||
555 | + | ||
556 | +static gboolean | ||
557 | +vorbis_dec_sink_event (GstPad * pad, GstEvent * event) | ||
558 | +{ | ||
559 | + gboolean ret = FALSE; | ||
560 | + GstIVorbisDec *dec; | ||
561 | + | ||
562 | + dec = GST_IVORBIS_DEC (gst_pad_get_parent (pad)); | ||
563 | + | ||
564 | + GST_LOG_OBJECT (dec, "handling event"); | ||
565 | + switch (GST_EVENT_TYPE (event)) { | ||
566 | + case GST_EVENT_EOS: | ||
567 | + ret = gst_pad_push_event (dec->srcpad, event); | ||
568 | + break; | ||
569 | + case GST_EVENT_FLUSH_START: | ||
570 | + ret = gst_pad_push_event (dec->srcpad, event); | ||
571 | + break; | ||
572 | + case GST_EVENT_FLUSH_STOP: | ||
573 | + /* here we must clean any state in the decoder */ | ||
574 | +#ifdef HAVE_VORBIS_SYNTHESIS_RESTART | ||
575 | + vorbis_synthesis_restart (&dec->vd); | ||
576 | +#endif | ||
577 | + gst_ivorbis_dec_reset (dec); | ||
578 | + ret = gst_pad_push_event (dec->srcpad, event); | ||
579 | + break; | ||
580 | + case GST_EVENT_NEWSEGMENT: | ||
581 | + { | ||
582 | + GstFormat format; | ||
583 | + gdouble rate, arate; | ||
584 | + gint64 start, stop, time; | ||
585 | + gboolean update; | ||
586 | + | ||
587 | + gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format, | ||
588 | + &start, &stop, &time); | ||
589 | + | ||
590 | + /* we need time and a positive rate for now */ | ||
591 | + if (format != GST_FORMAT_TIME) | ||
592 | + goto newseg_wrong_format; | ||
593 | + | ||
594 | + if (rate <= 0.0) | ||
595 | + goto newseg_wrong_rate; | ||
596 | + | ||
597 | + GST_DEBUG_OBJECT (dec, | ||
598 | + "newsegment: update %d, rate %g, arate %g, start %" GST_TIME_FORMAT | ||
599 | + ", stop %" GST_TIME_FORMAT ", time %" GST_TIME_FORMAT, | ||
600 | + update, rate, arate, GST_TIME_ARGS (start), GST_TIME_ARGS (stop), | ||
601 | + GST_TIME_ARGS (time)); | ||
602 | + | ||
603 | + /* now configure the values */ | ||
604 | + gst_segment_set_newsegment_full (&dec->segment, update, | ||
605 | + rate, arate, format, start, stop, time); | ||
606 | + | ||
607 | + if (dec->initialized) | ||
608 | + /* and forward */ | ||
609 | + ret = gst_pad_push_event (dec->srcpad, event); | ||
610 | + else { | ||
611 | + /* store it to send once we're initialized */ | ||
612 | + dec->pendingevents = g_list_append (dec->pendingevents, event); | ||
613 | + ret = TRUE; | ||
614 | + } | ||
615 | + break; | ||
616 | + } | ||
617 | + default: | ||
618 | + ret = gst_pad_push_event (dec->srcpad, event); | ||
619 | + break; | ||
620 | + } | ||
621 | +done: | ||
622 | + gst_object_unref (dec); | ||
623 | + | ||
624 | + return ret; | ||
625 | + | ||
626 | + /* ERRORS */ | ||
627 | +newseg_wrong_format: | ||
628 | + { | ||
629 | + GST_DEBUG_OBJECT (dec, "received non TIME newsegment"); | ||
630 | + goto done; | ||
631 | + } | ||
632 | +newseg_wrong_rate: | ||
633 | + { | ||
634 | + GST_DEBUG_OBJECT (dec, "negative rates not supported yet"); | ||
635 | + goto done; | ||
636 | + } | ||
637 | +} | ||
638 | + | ||
639 | +static GstFlowReturn | ||
640 | +vorbis_handle_identification_packet (GstIVorbisDec * vd) | ||
641 | +{ | ||
642 | + GstCaps *caps; | ||
643 | + const GstAudioChannelPosition *pos = NULL; | ||
644 | + | ||
645 | + switch (vd->vi.channels) { | ||
646 | + case 1: | ||
647 | + case 2: | ||
648 | + /* nothing */ | ||
649 | + break; | ||
650 | + case 3:{ | ||
651 | + static const GstAudioChannelPosition pos3[] = { | ||
652 | + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, | ||
653 | + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, | ||
654 | + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT | ||
655 | + }; | ||
656 | + pos = pos3; | ||
657 | + break; | ||
658 | + } | ||
659 | + case 4:{ | ||
660 | + static const GstAudioChannelPosition pos4[] = { | ||
661 | + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, | ||
662 | + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, | ||
663 | + GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, | ||
664 | + GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT | ||
665 | + }; | ||
666 | + pos = pos4; | ||
667 | + break; | ||
668 | + } | ||
669 | + case 5:{ | ||
670 | + static const GstAudioChannelPosition pos5[] = { | ||
671 | + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, | ||
672 | + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, | ||
673 | + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, | ||
674 | + GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, | ||
675 | + GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT | ||
676 | + }; | ||
677 | + pos = pos5; | ||
678 | + break; | ||
679 | + } | ||
680 | + case 6:{ | ||
681 | + static const GstAudioChannelPosition pos6[] = { | ||
682 | + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, | ||
683 | + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, | ||
684 | + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, | ||
685 | + GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, | ||
686 | + GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT, | ||
687 | + GST_AUDIO_CHANNEL_POSITION_LFE | ||
688 | + }; | ||
689 | + pos = pos6; | ||
690 | + break; | ||
691 | + } | ||
692 | + default: | ||
693 | + goto channel_count_error; | ||
694 | + } | ||
695 | + | ||
696 | + caps = gst_caps_new_simple ("audio/x-raw-int", | ||
697 | + "rate", G_TYPE_INT, vd->vi.rate, | ||
698 | + "channels", G_TYPE_INT, vd->vi.channels, | ||
699 | + "endianness", G_TYPE_INT, G_BYTE_ORDER, "width", G_TYPE_INT, 32, | ||
700 | + "depth", G_TYPE_INT, 16, "signed", G_TYPE_BOOLEAN, TRUE, NULL); | ||
701 | + | ||
702 | + if (pos) { | ||
703 | + gst_audio_set_channel_positions (gst_caps_get_structure (caps, 0), pos); | ||
704 | + } | ||
705 | + gst_pad_set_caps (vd->srcpad, caps); | ||
706 | + gst_caps_unref (caps); | ||
707 | + | ||
708 | + return GST_FLOW_OK; | ||
709 | + | ||
710 | + /* ERROR */ | ||
711 | +channel_count_error: | ||
712 | + { | ||
713 | + GST_ELEMENT_ERROR (vd, STREAM, NOT_IMPLEMENTED, (NULL), | ||
714 | + ("Unsupported channel count %d", vd->vi.channels)); | ||
715 | + return GST_FLOW_ERROR; | ||
716 | + } | ||
717 | +} | ||
718 | + | ||
719 | +static GstFlowReturn | ||
720 | +vorbis_handle_comment_packet (GstIVorbisDec * vd, ogg_packet * packet) | ||
721 | +{ | ||
722 | +#if 0 | ||
723 | + guint bitrate = 0; | ||
724 | + gchar *encoder = NULL; | ||
725 | + GstTagList *list; | ||
726 | + GstBuffer *buf; | ||
727 | + | ||
728 | + GST_DEBUG_OBJECT (vd, "parsing comment packet"); | ||
729 | + | ||
730 | + buf = gst_buffer_new_and_alloc (packet->bytes); | ||
731 | + GST_BUFFER_DATA (buf) = packet->packet; | ||
732 | + | ||
733 | + list = | ||
734 | + gst_tag_list_from_vorbiscomment_buffer (buf, (guint8 *) "\003vorbis", 7, | ||
735 | + &encoder); | ||
736 | + | ||
737 | + vd->taglist = gst_tag_list_merge (vd->taglist, list, GST_TAG_MERGE_REPLACE); | ||
738 | + | ||
739 | + gst_tag_list_free (list); | ||
740 | + gst_buffer_unref (buf); | ||
741 | + | ||
742 | + if (!vd->taglist) { | ||
743 | + GST_ERROR_OBJECT (vd, "couldn't decode comments"); | ||
744 | + vd->taglist = gst_tag_list_new (); | ||
745 | + } | ||
746 | + if (encoder) { | ||
747 | + gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE, | ||
748 | + GST_TAG_ENCODER, encoder, NULL); | ||
749 | + g_free (encoder); | ||
750 | + } | ||
751 | + gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE, | ||
752 | + GST_TAG_ENCODER_VERSION, vd->vi.version, | ||
753 | + GST_TAG_AUDIO_CODEC, "Vorbis", NULL); | ||
754 | + if (vd->vi.bitrate_nominal > 0) { | ||
755 | + gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE, | ||
756 | + GST_TAG_NOMINAL_BITRATE, (guint) vd->vi.bitrate_nominal, NULL); | ||
757 | + bitrate = vd->vi.bitrate_nominal; | ||
758 | + } | ||
759 | + if (vd->vi.bitrate_upper > 0) { | ||
760 | + gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE, | ||
761 | + GST_TAG_MAXIMUM_BITRATE, (guint) vd->vi.bitrate_upper, NULL); | ||
762 | + if (!bitrate) | ||
763 | + bitrate = vd->vi.bitrate_upper; | ||
764 | + } | ||
765 | + if (vd->vi.bitrate_lower > 0) { | ||
766 | + gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE, | ||
767 | + GST_TAG_MINIMUM_BITRATE, (guint) vd->vi.bitrate_lower, NULL); | ||
768 | + if (!bitrate) | ||
769 | + bitrate = vd->vi.bitrate_lower; | ||
770 | + } | ||
771 | + if (bitrate) { | ||
772 | + gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE, | ||
773 | + GST_TAG_BITRATE, (guint) bitrate, NULL); | ||
774 | + } | ||
775 | + | ||
776 | + if (vd->initialized) { | ||
777 | + gst_element_found_tags_for_pad (GST_ELEMENT_CAST (vd), vd->srcpad, | ||
778 | + vd->taglist); | ||
779 | + vd->taglist = NULL; | ||
780 | + } else { | ||
781 | + /* Only post them as messages for the time being. * | ||
782 | + * They will be pushed on the pad once the decoder is initialized */ | ||
783 | + gst_element_post_message (GST_ELEMENT_CAST (vd), | ||
784 | + gst_message_new_tag (GST_OBJECT (vd), gst_tag_list_copy (vd->taglist))); | ||
785 | + } | ||
786 | +#endif | ||
787 | + return GST_FLOW_OK; | ||
788 | +} | ||
789 | + | ||
790 | +static GstFlowReturn | ||
791 | +vorbis_handle_type_packet (GstIVorbisDec * vd) | ||
792 | +{ | ||
793 | + GList *walk; | ||
794 | + | ||
795 | + g_assert (vd->initialized == FALSE); | ||
796 | + | ||
797 | + vorbis_synthesis_init (&vd->vd, &vd->vi); | ||
798 | + vorbis_block_init (&vd->vd, &vd->vb); | ||
799 | + vd->initialized = TRUE; | ||
800 | + | ||
801 | + if (vd->pendingevents) { | ||
802 | + for (walk = vd->pendingevents; walk; walk = g_list_next (walk)) | ||
803 | + gst_pad_push_event (vd->srcpad, GST_EVENT_CAST (walk->data)); | ||
804 | + g_list_free (vd->pendingevents); | ||
805 | + vd->pendingevents = NULL; | ||
806 | + } | ||
807 | + | ||
808 | + if (vd->taglist) { | ||
809 | + /* The tags have already been sent on the bus as messages. */ | ||
810 | + gst_pad_push_event (vd->srcpad, gst_event_new_tag (vd->taglist)); | ||
811 | + vd->taglist = NULL; | ||
812 | + } | ||
813 | + | ||
814 | + return GST_FLOW_OK; | ||
815 | +} | ||
816 | + | ||
817 | +static GstFlowReturn | ||
818 | +vorbis_handle_header_packet (GstIVorbisDec * vd, ogg_packet * packet) | ||
819 | +{ | ||
820 | + GstFlowReturn res; | ||
821 | + | ||
822 | + GST_DEBUG_OBJECT (vd, "parsing header packet"); | ||
823 | + | ||
824 | + /* Packetno = 0 if the first byte is exactly 0x01 */ | ||
825 | + packet->b_o_s = packet->packet->length ? | ||
826 | + ((packet->packet->buffer->data[0] == 0x1) ? 1 : 0) : 0; | ||
827 | + | ||
828 | + if (vorbis_synthesis_headerin (&vd->vi, &vd->vc, packet)) | ||
829 | + goto header_read_error; | ||
830 | + | ||
831 | + switch (packet->packet->length ? packet->packet->buffer->data[0] : 0x0) { | ||
832 | + case 0x01: | ||
833 | + res = vorbis_handle_identification_packet (vd); | ||
834 | + break; | ||
835 | + case 0x03: | ||
836 | + res = vorbis_handle_comment_packet (vd, packet); | ||
837 | + break; | ||
838 | + case 0x05: | ||
839 | + res = vorbis_handle_type_packet (vd); | ||
840 | + break; | ||
841 | + default: | ||
842 | + /* ignore */ | ||
843 | + g_warning ("unknown vorbis header packet found"); | ||
844 | + res = GST_FLOW_OK; | ||
845 | + break; | ||
846 | + } | ||
847 | + return res; | ||
848 | + | ||
849 | + /* ERRORS */ | ||
850 | +header_read_error: | ||
851 | + { | ||
852 | + GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE, | ||
853 | + (NULL), ("couldn't read header packet")); | ||
854 | + return GST_FLOW_ERROR; | ||
855 | + } | ||
856 | +} | ||
857 | + | ||
858 | +/* Taken from Tremor, misc.h */ | ||
859 | +#ifdef _ARM_ASSEM_ | ||
860 | +static inline ogg_int32_t CLIP_TO_15(ogg_int32_t x) { | ||
861 | + int tmp; | ||
862 | + asm volatile("subs %1, %0, #32768\n\t" | ||
863 | + "movpl %0, #0x7f00\n\t" | ||
864 | + "orrpl %0, %0, #0xff\n" | ||
865 | + "adds %1, %0, #32768\n\t" | ||
866 | + "movmi %0, #0x8000" | ||
867 | + : "+r"(x),"=r"(tmp) | ||
868 | + : | ||
869 | + : "cc"); | ||
870 | + return(x); | ||
871 | +} | ||
872 | +#else | ||
873 | +static inline ogg_int32_t CLIP_TO_15(ogg_int32_t x) { | ||
874 | + int ret=x; | ||
875 | + ret-= ((x<=32767)-1)&(x-32767); | ||
876 | + ret-= ((x>=-32768)-1)&(x+32768); | ||
877 | + return(ret); | ||
878 | +} | ||
879 | +#endif | ||
880 | + | ||
881 | +static void | ||
882 | +copy_samples (gint32 *out, ogg_int32_t **in, guint samples, gint channels) | ||
883 | +{ | ||
884 | + gint i, j; | ||
885 | + | ||
886 | + for (j = 0; j < samples; j++) { | ||
887 | + for (i = 0; i < channels; i++) { | ||
888 | + *out++ = CLIP_TO_15 (in[i][j]>>9); | ||
889 | + } | ||
890 | + } | ||
891 | +} | ||
892 | + | ||
893 | +/* clip output samples to the segment boundaries | ||
894 | + */ | ||
895 | +static gboolean | ||
896 | +vorbis_do_clip (GstIVorbisDec * dec, GstBuffer * buf) | ||
897 | +{ | ||
898 | + gint64 start, stop, cstart, cstop, diff; | ||
899 | + | ||
900 | + start = GST_BUFFER_TIMESTAMP (buf); | ||
901 | + stop = start + GST_BUFFER_DURATION (buf); | ||
902 | + | ||
903 | + if (!gst_segment_clip (&dec->segment, GST_FORMAT_TIME, | ||
904 | + start, stop, &cstart, &cstop)) | ||
905 | + goto clipped; | ||
906 | + | ||
907 | + /* see if some clipping happened */ | ||
908 | + diff = cstart - start; | ||
909 | + if (diff > 0) { | ||
910 | + GST_BUFFER_TIMESTAMP (buf) = cstart; | ||
911 | + GST_BUFFER_DURATION (buf) -= diff; | ||
912 | + | ||
913 | + /* bring clipped time to samples */ | ||
914 | + diff = gst_util_uint64_scale_int (diff, dec->vi.rate, GST_SECOND); | ||
915 | + /* samples to bytes */ | ||
916 | + diff *= (sizeof (gint32) * dec->vi.channels); | ||
917 | + GST_DEBUG_OBJECT (dec, "clipping start to %" GST_TIME_FORMAT " %" | ||
918 | + G_GUINT64_FORMAT " bytes", GST_TIME_ARGS (cstart), diff); | ||
919 | + GST_BUFFER_DATA (buf) += diff; | ||
920 | + GST_BUFFER_SIZE (buf) -= diff; | ||
921 | + } | ||
922 | + diff = stop - cstop; | ||
923 | + if (diff > 0) { | ||
924 | + GST_BUFFER_DURATION (buf) -= diff; | ||
925 | + | ||
926 | + /* bring clipped time to samples and then to bytes */ | ||
927 | + diff = gst_util_uint64_scale_int (diff, dec->vi.rate, GST_SECOND); | ||
928 | + diff *= (sizeof (gint32) * dec->vi.channels); | ||
929 | + GST_DEBUG_OBJECT (dec, "clipping stop to %" GST_TIME_FORMAT " %" | ||
930 | + G_GUINT64_FORMAT " bytes", GST_TIME_ARGS (cstop), diff); | ||
931 | + GST_BUFFER_SIZE (buf) -= diff; | ||
932 | + } | ||
933 | + | ||
934 | + return FALSE; | ||
935 | + | ||
936 | + /* dropped buffer */ | ||
937 | +clipped: | ||
938 | + { | ||
939 | + GST_DEBUG_OBJECT (dec, "clipped buffer"); | ||
940 | + gst_buffer_unref (buf); | ||
941 | + return TRUE; | ||
942 | + } | ||
943 | +} | ||
944 | + | ||
945 | +static GstFlowReturn | ||
946 | +vorbis_dec_push (GstIVorbisDec * dec, GstBuffer * buf) | ||
947 | +{ | ||
948 | + GstFlowReturn result; | ||
949 | + gint64 outoffset = GST_BUFFER_OFFSET (buf); | ||
950 | + | ||
951 | + if (outoffset == -1) { | ||
952 | + dec->queued = g_list_append (dec->queued, buf); | ||
953 | + GST_DEBUG_OBJECT (dec, "queued buffer"); | ||
954 | + result = GST_FLOW_OK; | ||
955 | + } else { | ||
956 | + if (G_UNLIKELY (dec->queued)) { | ||
957 | + gint64 size; | ||
958 | + GList *walk; | ||
959 | + | ||
960 | + GST_DEBUG_OBJECT (dec, "first buffer with offset %lld", outoffset); | ||
961 | + | ||
962 | + size = g_list_length (dec->queued); | ||
963 | + for (walk = g_list_last (dec->queued); walk; | ||
964 | + walk = g_list_previous (walk)) { | ||
965 | + GstBuffer *buffer = GST_BUFFER (walk->data); | ||
966 | + | ||
967 | + outoffset -= | ||
968 | + GST_BUFFER_SIZE (buffer) / (sizeof (gint32) * dec->vi.channels); | ||
969 | + | ||
970 | + GST_BUFFER_OFFSET (buffer) = outoffset; | ||
971 | + GST_BUFFER_TIMESTAMP (buffer) = | ||
972 | + gst_util_uint64_scale_int (outoffset, GST_SECOND, dec->vi.rate); | ||
973 | + GST_DEBUG_OBJECT (dec, "patch buffer %" G_GUINT64_FORMAT | ||
974 | + " offset %" G_GUINT64_FORMAT, size, outoffset); | ||
975 | + size--; | ||
976 | + } | ||
977 | + for (walk = dec->queued; walk; walk = g_list_next (walk)) { | ||
978 | + GstBuffer *buffer = GST_BUFFER (walk->data); | ||
979 | + | ||
980 | + /* clips or returns FALSE with buffer unreffed when completely | ||
981 | + * clipped */ | ||
982 | + if (vorbis_do_clip (dec, buffer)) | ||
983 | + continue; | ||
984 | + | ||
985 | + if (dec->discont) { | ||
986 | + GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT); | ||
987 | + dec->discont = FALSE; | ||
988 | + } | ||
989 | + /* ignore the result */ | ||
990 | + gst_pad_push (dec->srcpad, buffer); | ||
991 | + } | ||
992 | + g_list_free (dec->queued); | ||
993 | + dec->queued = NULL; | ||
994 | + } | ||
995 | + | ||
996 | + /* clip */ | ||
997 | + if (vorbis_do_clip (dec, buf)) | ||
998 | + return GST_FLOW_OK; | ||
999 | + | ||
1000 | + if (dec->discont) { | ||
1001 | + GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DISCONT); | ||
1002 | + dec->discont = FALSE; | ||
1003 | + } | ||
1004 | + result = gst_pad_push (dec->srcpad, buf); | ||
1005 | + } | ||
1006 | + | ||
1007 | + return result; | ||
1008 | +} | ||
1009 | + | ||
1010 | +static GstFlowReturn | ||
1011 | +vorbis_handle_data_packet (GstIVorbisDec * vd, ogg_packet * packet) | ||
1012 | +{ | ||
1013 | + ogg_int32_t **pcm; | ||
1014 | + guint sample_count; | ||
1015 | + GstBuffer *out; | ||
1016 | + GstFlowReturn result; | ||
1017 | + gint size; | ||
1018 | + | ||
1019 | + if (!vd->initialized) | ||
1020 | + goto not_initialized; | ||
1021 | + | ||
1022 | + /* FIXME, we should queue undecoded packets here until we get | ||
1023 | + * a timestamp, then we reverse timestamp the queued packets and | ||
1024 | + * clip them, then we decode only the ones we want and don't | ||
1025 | + * keep decoded data in memory. | ||
1026 | + * Ideally, of course, the demuxer gives us a valid timestamp on | ||
1027 | + * the first packet. | ||
1028 | + */ | ||
1029 | + | ||
1030 | + /* normal data packet */ | ||
1031 | + /* FIXME, we can skip decoding if the packet is outside of the | ||
1032 | + * segment, this is however not very trivial as we need a previous | ||
1033 | + * packet to decode the current one so we must be carefull not to | ||
1034 | + * throw away too much. For now we decode everything and clip right | ||
1035 | + * before pushing data. */ | ||
1036 | + if (G_UNLIKELY (vorbis_synthesis (&vd->vb, packet,1))) | ||
1037 | + goto could_not_read; | ||
1038 | + | ||
1039 | + if (G_UNLIKELY (vorbis_synthesis_blockin (&vd->vd, &vd->vb) < 0)) | ||
1040 | + goto not_accepted; | ||
1041 | + | ||
1042 | + /* assume all goes well here */ | ||
1043 | + result = GST_FLOW_OK; | ||
1044 | + | ||
1045 | + /* count samples ready for reading */ | ||
1046 | + if ((sample_count = vorbis_synthesis_pcmout (&vd->vd, NULL)) == 0) | ||
1047 | + goto done; | ||
1048 | + | ||
1049 | + size = sample_count * vd->vi.channels * sizeof (gint32); | ||
1050 | + | ||
1051 | + /* alloc buffer for it */ | ||
1052 | + result = | ||
1053 | + gst_pad_alloc_buffer_and_set_caps (vd->srcpad, GST_BUFFER_OFFSET_NONE, | ||
1054 | + size, GST_PAD_CAPS (vd->srcpad), &out); | ||
1055 | + if (G_UNLIKELY (result != GST_FLOW_OK)) | ||
1056 | + goto done; | ||
1057 | + | ||
1058 | + /* get samples ready for reading now, should be sample_count */ | ||
1059 | + if (G_UNLIKELY ((vorbis_synthesis_pcmout (&vd->vd, &pcm)) != sample_count)) | ||
1060 | + goto wrong_samples; | ||
1061 | + | ||
1062 | + /* copy samples in buffer */ | ||
1063 | + copy_samples ((gint32 *) GST_BUFFER_DATA (out), pcm, sample_count, | ||
1064 | + vd->vi.channels); | ||
1065 | + | ||
1066 | + GST_BUFFER_SIZE (out) = size; | ||
1067 | + GST_BUFFER_OFFSET (out) = vd->granulepos; | ||
1068 | + if (vd->granulepos != -1) { | ||
1069 | + GST_BUFFER_OFFSET_END (out) = vd->granulepos + sample_count; | ||
1070 | + GST_BUFFER_TIMESTAMP (out) = | ||
1071 | + gst_util_uint64_scale_int (vd->granulepos, GST_SECOND, vd->vi.rate); | ||
1072 | + } else { | ||
1073 | + GST_BUFFER_TIMESTAMP (out) = -1; | ||
1074 | + } | ||
1075 | + /* this should not overflow */ | ||
1076 | + GST_BUFFER_DURATION (out) = sample_count * GST_SECOND / vd->vi.rate; | ||
1077 | + | ||
1078 | + if (vd->cur_timestamp != GST_CLOCK_TIME_NONE) { | ||
1079 | + GST_BUFFER_TIMESTAMP (out) = vd->cur_timestamp; | ||
1080 | + GST_DEBUG_OBJECT (vd, | ||
1081 | + "cur_timestamp: %" GST_TIME_FORMAT " + %" GST_TIME_FORMAT " = % " | ||
1082 | + GST_TIME_FORMAT, GST_TIME_ARGS (vd->cur_timestamp), | ||
1083 | + GST_TIME_ARGS (GST_BUFFER_DURATION (out)), | ||
1084 | + GST_TIME_ARGS (vd->cur_timestamp + GST_BUFFER_DURATION (out))); | ||
1085 | + vd->cur_timestamp += GST_BUFFER_DURATION (out); | ||
1086 | + GST_BUFFER_OFFSET (out) = GST_CLOCK_TIME_TO_FRAMES (vd->cur_timestamp, | ||
1087 | + vd->vi.rate); | ||
1088 | + GST_BUFFER_OFFSET_END (out) = GST_BUFFER_OFFSET (out) + sample_count; | ||
1089 | + } | ||
1090 | + | ||
1091 | + if (vd->granulepos != -1) | ||
1092 | + vd->granulepos += sample_count; | ||
1093 | + | ||
1094 | + result = vorbis_dec_push (vd, out); | ||
1095 | + | ||
1096 | +done: | ||
1097 | + vorbis_synthesis_read (&vd->vd, sample_count); | ||
1098 | + | ||
1099 | + /* granulepos is the last sample in the packet */ | ||
1100 | + if (packet->granulepos != -1) | ||
1101 | + vd->granulepos = packet->granulepos; | ||
1102 | + | ||
1103 | + return result; | ||
1104 | + | ||
1105 | + /* ERRORS */ | ||
1106 | +not_initialized: | ||
1107 | + { | ||
1108 | + GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE, | ||
1109 | + (NULL), ("no header sent yet")); | ||
1110 | + return GST_FLOW_ERROR; | ||
1111 | + } | ||
1112 | +could_not_read: | ||
1113 | + { | ||
1114 | + GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE, | ||
1115 | + (NULL), ("couldn't read data packet")); | ||
1116 | + return GST_FLOW_ERROR; | ||
1117 | + } | ||
1118 | +not_accepted: | ||
1119 | + { | ||
1120 | + GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE, | ||
1121 | + (NULL), ("vorbis decoder did not accept data packet")); | ||
1122 | + return GST_FLOW_ERROR; | ||
1123 | + } | ||
1124 | +wrong_samples: | ||
1125 | + { | ||
1126 | + gst_buffer_unref (out); | ||
1127 | + GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE, | ||
1128 | + (NULL), ("vorbis decoder reported wrong number of samples")); | ||
1129 | + return GST_FLOW_ERROR; | ||
1130 | + } | ||
1131 | +} | ||
1132 | + | ||
1133 | +static GstFlowReturn | ||
1134 | +vorbis_dec_chain (GstPad * pad, GstBuffer * buffer) | ||
1135 | +{ | ||
1136 | + GstIVorbisDec *vd; | ||
1137 | + ogg_packet packet; | ||
1138 | + ogg_reference ref; | ||
1139 | + ogg_buffer buf; | ||
1140 | + GstFlowReturn result = GST_FLOW_OK; | ||
1141 | + GstClockTime timestamp; | ||
1142 | + guint64 offset_end; | ||
1143 | + | ||
1144 | + vd = GST_IVORBIS_DEC (gst_pad_get_parent (pad)); | ||
1145 | + | ||
1146 | + /* resync on DISCONT */ | ||
1147 | + if (G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DISCONT))) { | ||
1148 | + GST_DEBUG_OBJECT (vd, "received DISCONT buffer"); | ||
1149 | + vd->granulepos = -1; | ||
1150 | + vd->cur_timestamp = GST_CLOCK_TIME_NONE; | ||
1151 | + vd->prev_timestamp = GST_CLOCK_TIME_NONE; | ||
1152 | +#ifdef HAVE_VORBIS_SYNTHESIS_RESTART | ||
1153 | + vorbis_synthesis_restart (&vd->vd); | ||
1154 | +#endif | ||
1155 | + vd->discont = TRUE; | ||
1156 | + } | ||
1157 | + | ||
1158 | + timestamp = GST_BUFFER_TIMESTAMP (buffer); | ||
1159 | + offset_end = GST_BUFFER_OFFSET_END (buffer); | ||
1160 | + | ||
1161 | + /* only ogg has granulepos, demuxers of other container formats | ||
1162 | + * might provide us with timestamps instead (e.g. matroskademux) */ | ||
1163 | + if (offset_end == GST_BUFFER_OFFSET_NONE && timestamp != GST_CLOCK_TIME_NONE) { | ||
1164 | + /* we might get multiple consecutive buffers with the same timestamp */ | ||
1165 | + if (timestamp != vd->prev_timestamp) { | ||
1166 | + vd->cur_timestamp = timestamp; | ||
1167 | + vd->prev_timestamp = timestamp; | ||
1168 | + } | ||
1169 | + } else { | ||
1170 | + vd->cur_timestamp = GST_CLOCK_TIME_NONE; | ||
1171 | + vd->prev_timestamp = GST_CLOCK_TIME_NONE; | ||
1172 | + } | ||
1173 | + | ||
1174 | + /* make ogg_packet out of the buffer */ | ||
1175 | + buf.data = GST_BUFFER_DATA (buffer); | ||
1176 | + buf.size = GST_BUFFER_SIZE (buffer); | ||
1177 | + buf.refcount = 1; | ||
1178 | + buf.ptr.owner = NULL; | ||
1179 | + buf.ptr.next = NULL; | ||
1180 | + | ||
1181 | + ref.buffer = &buf; | ||
1182 | + ref.begin = 0; | ||
1183 | + ref.length = buf.size; | ||
1184 | + ref.next = NULL; | ||
1185 | + | ||
1186 | + packet.packet = &ref; | ||
1187 | + packet.bytes = ref.length; | ||
1188 | + packet.granulepos = offset_end; | ||
1189 | + packet.packetno = 0; /* we don't care */ | ||
1190 | + /* | ||
1191 | + * FIXME. Is there anyway to know that this is the last packet and | ||
1192 | + * set e_o_s?? | ||
1193 | + * Yes there is, keep one packet at all times and only push out when | ||
1194 | + * you receive a new one. Implement this. | ||
1195 | + */ | ||
1196 | + packet.e_o_s = 0; | ||
1197 | + | ||
1198 | + if (G_UNLIKELY (packet.bytes < 1)) | ||
1199 | + goto wrong_size; | ||
1200 | + | ||
1201 | + GST_DEBUG_OBJECT (vd, "vorbis granule: %" G_GINT64_FORMAT, | ||
1202 | + (gint64) packet.granulepos); | ||
1203 | + | ||
1204 | + /* switch depending on packet type */ | ||
1205 | + if (buf.data[0] & 1) { | ||
1206 | + if (vd->initialized) { | ||
1207 | + GST_WARNING_OBJECT (vd, "Already initialized, so ignoring header packet"); | ||
1208 | + goto done; | ||
1209 | + } | ||
1210 | + result = vorbis_handle_header_packet (vd, &packet); | ||
1211 | + } else { | ||
1212 | + result = vorbis_handle_data_packet (vd, &packet); | ||
1213 | + } | ||
1214 | + | ||
1215 | + GST_DEBUG_OBJECT (vd, "offset end: %" G_GUINT64_FORMAT, offset_end); | ||
1216 | + | ||
1217 | +done: | ||
1218 | + gst_buffer_unref (buffer); | ||
1219 | + gst_object_unref (vd); | ||
1220 | + | ||
1221 | + return result; | ||
1222 | + | ||
1223 | + /* ERRORS */ | ||
1224 | +wrong_size: | ||
1225 | + { | ||
1226 | + GST_ELEMENT_ERROR (vd, STREAM, DECODE, (NULL), ("empty buffer received")); | ||
1227 | + result = GST_FLOW_ERROR; | ||
1228 | + vd->discont = TRUE; | ||
1229 | + goto done; | ||
1230 | + } | ||
1231 | +} | ||
1232 | + | ||
1233 | +static GstStateChangeReturn | ||
1234 | +vorbis_dec_change_state (GstElement * element, GstStateChange transition) | ||
1235 | +{ | ||
1236 | + GstIVorbisDec *vd = GST_IVORBIS_DEC (element); | ||
1237 | + GstStateChangeReturn res; | ||
1238 | + | ||
1239 | + switch (transition) { | ||
1240 | + case GST_STATE_CHANGE_NULL_TO_READY: | ||
1241 | + break; | ||
1242 | + case GST_STATE_CHANGE_READY_TO_PAUSED: | ||
1243 | + vorbis_info_init (&vd->vi); | ||
1244 | + vorbis_comment_init (&vd->vc); | ||
1245 | + vd->initialized = FALSE; | ||
1246 | + gst_ivorbis_dec_reset (vd); | ||
1247 | + break; | ||
1248 | + case GST_STATE_CHANGE_PAUSED_TO_PLAYING: | ||
1249 | + break; | ||
1250 | + default: | ||
1251 | + break; | ||
1252 | + } | ||
1253 | + | ||
1254 | + res = parent_class->change_state (element, transition); | ||
1255 | + | ||
1256 | + switch (transition) { | ||
1257 | + case GST_STATE_CHANGE_PLAYING_TO_PAUSED: | ||
1258 | + break; | ||
1259 | + case GST_STATE_CHANGE_PAUSED_TO_READY: | ||
1260 | + GST_DEBUG_OBJECT (vd, "PAUSED -> READY, clearing vorbis structures"); | ||
1261 | + vorbis_block_clear (&vd->vb); | ||
1262 | + vorbis_dsp_clear (&vd->vd); | ||
1263 | + vorbis_comment_clear (&vd->vc); | ||
1264 | + vorbis_info_clear (&vd->vi); | ||
1265 | + gst_ivorbis_dec_reset (vd); | ||
1266 | + break; | ||
1267 | + case GST_STATE_CHANGE_READY_TO_NULL: | ||
1268 | + break; | ||
1269 | + default: | ||
1270 | + break; | ||
1271 | + } | ||
1272 | + | ||
1273 | + return res; | ||
1274 | +} | ||
1275 | diff -urNd ../gst-plugins-bad0.10-0.10.3+cvs20060918/ext/ivorbis/vorbisdec.h ext/ivorbis/vorbisdec.h | ||
1276 | --- ../gst-plugins-bad0.10-0.10.3+cvs20060918/ext/ivorbis/vorbisdec.h 1970-01-01 01:00:00.000000000 +0100 | ||
1277 | +++ ext/ivorbis/vorbisdec.h 2006-09-20 17:26:46.000000000 +0100 | ||
1278 | @@ -0,0 +1,87 @@ | ||
1279 | +/* -*- c-basic-offset: 2 -*- | ||
1280 | + * GStreamer | ||
1281 | + * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> | ||
1282 | + * | ||
1283 | + * Tremor modifications <2006>: | ||
1284 | + * Chris Lord, OpenedHand Ltd. <chris@openedhand.com>, http://www.o-hand.com/ | ||
1285 | + * | ||
1286 | + * This library is free software; you can redistribute it and/or | ||
1287 | + * modify it under the terms of the GNU Library General Public | ||
1288 | + * License as published by the Free Software Foundation; either | ||
1289 | + * version 2 of the License, or (at your option) any later version. | ||
1290 | + * | ||
1291 | + * This library is distributed in the hope that it will be useful, | ||
1292 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1293 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
1294 | + * Library General Public License for more details. | ||
1295 | + * | ||
1296 | + * You should have received a copy of the GNU Library General Public | ||
1297 | + * License along with this library; if not, write to the | ||
1298 | + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
1299 | + * Boston, MA 02111-1307, USA. | ||
1300 | + */ | ||
1301 | + | ||
1302 | + | ||
1303 | +#ifndef __GST_IVORBIS_DEC_H__ | ||
1304 | +#define __GST_IVORBIS_DEC_H__ | ||
1305 | + | ||
1306 | + | ||
1307 | +#include <gst/gst.h> | ||
1308 | +#include <tremor/ivorbiscodec.h> | ||
1309 | + | ||
1310 | +G_BEGIN_DECLS | ||
1311 | + | ||
1312 | +#define GST_TYPE_IVORBIS_DEC \ | ||
1313 | + (gst_ivorbis_dec_get_type()) | ||
1314 | +#define GST_IVORBIS_DEC(obj) \ | ||
1315 | + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_IVORBIS_DEC,GstIVorbisDec)) | ||
1316 | +#define GST_IVORBIS_DEC_CLASS(klass) \ | ||
1317 | + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_IVORBIS_DEC,GstIVorbisDecClass)) | ||
1318 | +#define GST_IS_IVORBIS_DEC(obj) \ | ||
1319 | + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_IVORBIS_DEC)) | ||
1320 | +#define GST_IS_IVORBIS_DEC_CLASS(klass) \ | ||
1321 | + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_IVORBIS_DEC)) | ||
1322 | + | ||
1323 | +typedef struct _GstIVorbisDec GstIVorbisDec; | ||
1324 | +typedef struct _GstIVorbisDecClass GstIVorbisDecClass; | ||
1325 | + | ||
1326 | +/** | ||
1327 | + * GstIVorbisDec: | ||
1328 | + * | ||
1329 | + * Opaque data structure. | ||
1330 | + */ | ||
1331 | +struct _GstIVorbisDec { | ||
1332 | + GstElement element; | ||
1333 | + | ||
1334 | + GstPad * sinkpad; | ||
1335 | + GstPad * srcpad; | ||
1336 | + | ||
1337 | + vorbis_dsp_state vd; | ||
1338 | + vorbis_info vi; | ||
1339 | + vorbis_comment vc; | ||
1340 | + vorbis_block vb; | ||
1341 | + guint64 granulepos; | ||
1342 | + | ||
1343 | + gboolean initialized; | ||
1344 | + | ||
1345 | + GList *queued; | ||
1346 | + | ||
1347 | + GstSegment segment; | ||
1348 | + gboolean discont; | ||
1349 | + | ||
1350 | + GstClockTime cur_timestamp; /* only used with non-ogg container formats */ | ||
1351 | + GstClockTime prev_timestamp; /* only used with non-ogg container formats */ | ||
1352 | + | ||
1353 | + GList *pendingevents; | ||
1354 | + GstTagList *taglist; | ||
1355 | +}; | ||
1356 | + | ||
1357 | +struct _GstIVorbisDecClass { | ||
1358 | + GstElementClass parent_class; | ||
1359 | +}; | ||
1360 | + | ||
1361 | +GType gst_ivorbis_dec_get_type(void); | ||
1362 | + | ||
1363 | +G_END_DECLS | ||
1364 | + | ||
1365 | +#endif /* __GST_IVORBIS_DEC_H__ */ | ||
diff --git a/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb b/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb index 003fca8aa8..a52e9654db 100644 --- a/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb +++ b/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb | |||
@@ -1,7 +1,9 @@ | |||
1 | require gst-plugins.inc | 1 | require gst-plugins.inc |
2 | DEPENDS += "gst-plugins-base libmusicbrainz tremor" | 2 | DEPENDS += "gst-plugins-base libmusicbrainz tremor" |
3 | PR = "r3" | 3 | PR = "r4" |
4 | 4 | ||
5 | EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl \ | 5 | EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl \ |
6 | --with-plugins=musicbrainz,wavpack,ivorbis" | 6 | --with-plugins=musicbrainz,wavpack,ivorbis" |
7 | 7 | ||
8 | SRC_URI += " file://ivorbisdec.patch;patch=1;pnum=0 \ | ||
9 | file://configure.patch;patch=1" | ||
diff --git a/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb b/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb index efddc37564..cf385e1a8d 100644 --- a/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb +++ b/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb | |||
@@ -7,7 +7,3 @@ PR = "r3" | |||
7 | 7 | ||
8 | EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-theora" | 8 | EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-theora" |
9 | 9 | ||
10 | do_stage() { | ||
11 | autotools_stage_all | ||
12 | } | ||
13 | |||
diff --git a/meta/packages/gstreamer/gst-plugins-good_0.10.4.bb b/meta/packages/gstreamer/gst-plugins-good_0.10.4.bb index 7ce0c390db..67664a2641 100644 --- a/meta/packages/gstreamer/gst-plugins-good_0.10.4.bb +++ b/meta/packages/gstreamer/gst-plugins-good_0.10.4.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require gst-plugins.inc | 1 | require gst-plugins.inc |
2 | DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ | 2 | DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ |
3 | speex" | 3 | speex" |
4 | PR = "r3" | 4 | PR = "r4" |
5 | 5 | ||
6 | EXTRA_OECONF += " --with-plugins=ximagesrc,cairo,flac,gconfelements,gdkpixbuf,jpeg,png,speex,taglib,avi,matroska,videofilter,autodetect,debug --disable-aalib --disable-esd --disable-shout2" | 6 | EXTRA_OECONF += " --with-plugins=ximagesrc,cairo,flac,gconfelements,gdkpixbuf,jpeg,png,speex,id3demux,avi,matroska,videofilter,autodetect,debug --disable-aalib --disable-esd --disable-shout2" |
7 | 7 | ||
diff --git a/meta/packages/gstreamer/gst-plugins.inc b/meta/packages/gstreamer/gst-plugins.inc index 754bbeb93c..0115bdfaa7 100644 --- a/meta/packages/gstreamer/gst-plugins.inc +++ b/meta/packages/gstreamer/gst-plugins.inc | |||
@@ -28,8 +28,8 @@ python populate_packages_prepend () { | |||
28 | do_split_packages(d, gst_libdir, 'libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d)) | 28 | do_split_packages(d, gst_libdir, 'libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d)) |
29 | } | 29 | } |
30 | 30 | ||
31 | #do_stage() { | 31 | do_stage() { |
32 | # autotools_stage_all | 32 | autotools_stage_all |
33 | #} | 33 | } |
34 | 34 | ||
35 | ALLOW_EMPTY = "1" | 35 | ALLOW_EMPTY = "1" |