diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-05-29 21:05:50 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-05-29 21:37:56 +0200 |
commit | 2bd740ea574d53ad83c073f93f48fe4e2a1d3edf (patch) | |
tree | cd8f05675df6ed9829c041c1cb3b3b2270bc3bee /meta-oe/recipes-support | |
parent | a0629d7a76c6c05496e4bbbc0c87b7614c05a791 (diff) | |
download | meta-openembedded-2bd740ea574d53ad83c073f93f48fe4e2a1d3edf.tar.gz |
flite-alsa: import from OE rev d4f0211e2078d5033ae0dee74664de5520d8392d
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
4 files changed, 6673 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff b/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff new file mode 100644 index 000000000..b3e4b7aae --- /dev/null +++ b/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff | |||
@@ -0,0 +1,6615 @@ | |||
1 | Index: lang/usenglish/Makefile | ||
2 | =================================================================== | ||
3 | --- flite-1.3-release/lang/usenglish/Makefile (.../flite-1.3-orig) (revision 7) | ||
4 | +++ flite-1.3-release/lang/usenglish/Makefile (.../release-1.2) (revision 7) | ||
5 | @@ -38,6 +38,7 @@ | ||
6 | DIRNAME=lang/usenglish | ||
7 | BUILD_DIRS = | ||
8 | ALL_DIRS= | ||
9 | +include $(TOP)/config/config | ||
10 | H = usenglish.h us_int_accent_cart.h us_int_tone_cart.h us_durz_cart.h \ | ||
11 | us_ffeatures.h us_phrasing_cart.h us_text.h us_f0.h us_nums_cart.h | ||
12 | SRCS = us_int_accent_cart.c us_int_tone_cart.c us_f0_model.c \ | ||
13 | @@ -45,7 +46,11 @@ | ||
14 | us_phoneset.c us_ffeatures.c us_phrasing_cart.c \ | ||
15 | us_gpos.c us_text.c us_expand.c us_postlex.c \ | ||
16 | us_nums_cart.c us_aswd.c usenglish.c | ||
17 | -OBJS = $(SRCS:.c=.o) | ||
18 | +ifdef SHFLAGS | ||
19 | +OBJS := $(SRCS:.c=.os) | ||
20 | +else | ||
21 | +OBJS := $(SRCS:.c=.o) | ||
22 | +endif | ||
23 | SCM= | ||
24 | FILES = Makefile $(SCM) $(SRCS) $(H) | ||
25 | LIBNAME = flite_usenglish | ||
26 | Index: lang/cmu_us_kal/Makefile | ||
27 | =================================================================== | ||
28 | --- flite-1.3-release/lang/cmu_us_kal/Makefile (.../flite-1.3-orig) (revision 7) | ||
29 | +++ flite-1.3-release/lang/cmu_us_kal/Makefile (.../release-1.2) (revision 7) | ||
30 | @@ -43,7 +43,12 @@ | ||
31 | cmu_us_kal_lpc.c \ | ||
32 | cmu_us_kal_res.c \ | ||
33 | cmu_us_kal_residx.c | ||
34 | -OBJS = $(SRCS:.c=.o) | ||
35 | +include $(TOP)/config/config | ||
36 | +ifdef SHFLAGS | ||
37 | +OBJS := $(SRCS:.c=.os) | ||
38 | +else | ||
39 | +OBJS := $(SRCS:.c=.o) | ||
40 | +endif | ||
41 | SCM= | ||
42 | FILES = Makefile $(SCM) $(SRCS) $(H) | ||
43 | LIBNAME = flite_cmu_us_kal | ||
44 | Index: lang/cmu_us_kal16/Makefile | ||
45 | =================================================================== | ||
46 | --- flite-1.3-release/lang/cmu_us_kal16/Makefile (.../flite-1.3-orig) (revision 7) | ||
47 | +++ flite-1.3-release/lang/cmu_us_kal16/Makefile (.../release-1.2) (revision 7) | ||
48 | @@ -44,7 +44,12 @@ | ||
49 | cmu_us_kal16_lpc.c \ | ||
50 | cmu_us_kal16_res.c \ | ||
51 | cmu_us_kal16_residx.c | ||
52 | -OBJS = $(SRCS:.c=.o) | ||
53 | +include $(TOP)/config/config | ||
54 | +ifdef SHFLAGS | ||
55 | +OBJS := $(SRCS:.c=.os) | ||
56 | +else | ||
57 | +OBJS := $(SRCS:.c=.o) | ||
58 | +endif | ||
59 | SCM= | ||
60 | FILES = Makefile $(SCM) $(SRCS) $(H) | ||
61 | LIBNAME = flite_cmu_us_kal16 | ||
62 | Index: lang/cmu_time_awb/Makefile | ||
63 | =================================================================== | ||
64 | --- flite-1.3-release/lang/cmu_time_awb/Makefile (.../flite-1.3-orig) (revision 7) | ||
65 | +++ flite-1.3-release/lang/cmu_time_awb/Makefile (.../release-1.2) (revision 7) | ||
66 | @@ -45,7 +45,12 @@ | ||
67 | cmu_time_awb_mcep.c \ | ||
68 | cmu_time_awb_lpc.c \ | ||
69 | cmu_time_awb_lex_entry.c | ||
70 | -OBJS = $(SRCS:.c=.o) | ||
71 | +include $(TOP)/config/config | ||
72 | +ifdef SHFLAGS | ||
73 | +OBJS := $(SRCS:.c=.os) | ||
74 | +else | ||
75 | +OBJS := $(SRCS:.c=.o) | ||
76 | +endif | ||
77 | SCM= | ||
78 | FILES = Makefile $(SCM) $(SRCS) $(H) | ||
79 | LIBNAME = flite_cmu_time_awb | ||
80 | Index: lang/cmulex/Makefile | ||
81 | =================================================================== | ||
82 | --- flite-1.3-release/lang/cmulex/Makefile (.../flite-1.3-orig) (revision 7) | ||
83 | +++ flite-1.3-release/lang/cmulex/Makefile (.../release-1.2) (revision 7) | ||
84 | @@ -38,13 +38,20 @@ | ||
85 | DIRNAME=lang/cmulex | ||
86 | BUILD_DIRS = | ||
87 | ALL_DIRS= | ||
88 | + | ||
89 | H = cmu_lts_model.h cmulex.h | ||
90 | SRCS = cmu_lts_rules.c cmu_lts_model.c \ | ||
91 | cmu_lex.c cmu_lex_entries.c cmu_lex_data.c | ||
92 | LEX_DATA_INCLUDES = cmu_lex_data_raw.c cmu_lex_num_bytes.c \ | ||
93 | cmu_lex_phones_huff_table.c cmu_lex_entries_huff_table.c | ||
94 | |||
95 | -OBJS = $(SRCS:.c=.o) | ||
96 | +include $(TOP)/config/config | ||
97 | +ifdef SHFLAGS | ||
98 | +OBJS := $(SRCS:.c=.os) | ||
99 | +else | ||
100 | +OBJS := $(SRCS:.c=.o) | ||
101 | +endif | ||
102 | + | ||
103 | SCRIPTS=make_cmulex | ||
104 | |||
105 | SCM= | ||
106 | Index: configure | ||
107 | =================================================================== | ||
108 | --- flite-1.3-release/configure (.../flite-1.3-orig) (revision 7) | ||
109 | +++ flite-1.3-release/configure (.../release-1.2) (revision 7) | ||
110 | @@ -1,324 +1,38 @@ | ||
111 | #! /bin/sh | ||
112 | + | ||
113 | # Guess values for system-dependent variables and create Makefiles. | ||
114 | -# Generated by GNU Autoconf 2.57. | ||
115 | +# Generated automatically using autoconf version 2.13 | ||
116 | +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. | ||
117 | # | ||
118 | -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 | ||
119 | -# Free Software Foundation, Inc. | ||
120 | # This configure script is free software; the Free Software Foundation | ||
121 | # gives unlimited permission to copy, distribute and modify it. | ||
122 | -## --------------------- ## | ||
123 | -## M4sh Initialization. ## | ||
124 | -## --------------------- ## | ||
125 | |||
126 | -# Be Bourne compatible | ||
127 | -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
128 | - emulate sh | ||
129 | - NULLCMD=: | ||
130 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
131 | - # is contrary to our usage. Disable this feature. | ||
132 | - alias -g '${1+"$@"}'='"$@"' | ||
133 | -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | ||
134 | - set -o posix | ||
135 | -fi | ||
136 | - | ||
137 | -# Support unset when possible. | ||
138 | -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then | ||
139 | - as_unset=unset | ||
140 | -else | ||
141 | - as_unset=false | ||
142 | -fi | ||
143 | - | ||
144 | - | ||
145 | -# Work around bugs in pre-3.0 UWIN ksh. | ||
146 | -$as_unset ENV MAIL MAILPATH | ||
147 | -PS1='$ ' | ||
148 | -PS2='> ' | ||
149 | -PS4='+ ' | ||
150 | - | ||
151 | -# NLS nuisances. | ||
152 | -for as_var in \ | ||
153 | - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ | ||
154 | - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | ||
155 | - LC_TELEPHONE LC_TIME | ||
156 | -do | ||
157 | - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
158 | - eval $as_var=C; export $as_var | ||
159 | - else | ||
160 | - $as_unset $as_var | ||
161 | - fi | ||
162 | -done | ||
163 | - | ||
164 | -# Required to use basename. | ||
165 | -if expr a : '\(a\)' >/dev/null 2>&1; then | ||
166 | - as_expr=expr | ||
167 | -else | ||
168 | - as_expr=false | ||
169 | -fi | ||
170 | - | ||
171 | -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then | ||
172 | - as_basename=basename | ||
173 | -else | ||
174 | - as_basename=false | ||
175 | -fi | ||
176 | - | ||
177 | - | ||
178 | -# Name of the executable. | ||
179 | -as_me=`$as_basename "$0" || | ||
180 | -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | ||
181 | - X"$0" : 'X\(//\)$' \| \ | ||
182 | - X"$0" : 'X\(/\)$' \| \ | ||
183 | - . : '\(.\)' 2>/dev/null || | ||
184 | -echo X/"$0" | | ||
185 | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } | ||
186 | - /^X\/\(\/\/\)$/{ s//\1/; q; } | ||
187 | - /^X\/\(\/\).*/{ s//\1/; q; } | ||
188 | - s/.*/./; q'` | ||
189 | - | ||
190 | - | ||
191 | -# PATH needs CR, and LINENO needs CR and PATH. | ||
192 | -# Avoid depending upon Character Ranges. | ||
193 | -as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
194 | -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
195 | -as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
196 | -as_cr_digits='0123456789' | ||
197 | -as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
198 | - | ||
199 | -# The user is always right. | ||
200 | -if test "${PATH_SEPARATOR+set}" != set; then | ||
201 | - echo "#! /bin/sh" >conf$$.sh | ||
202 | - echo "exit 0" >>conf$$.sh | ||
203 | - chmod +x conf$$.sh | ||
204 | - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
205 | - PATH_SEPARATOR=';' | ||
206 | - else | ||
207 | - PATH_SEPARATOR=: | ||
208 | - fi | ||
209 | - rm -f conf$$.sh | ||
210 | -fi | ||
211 | - | ||
212 | - | ||
213 | - as_lineno_1=$LINENO | ||
214 | - as_lineno_2=$LINENO | ||
215 | - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
216 | - test "x$as_lineno_1" != "x$as_lineno_2" && | ||
217 | - test "x$as_lineno_3" = "x$as_lineno_2" || { | ||
218 | - # Find who we are. Look in the path if we contain no path at all | ||
219 | - # relative or not. | ||
220 | - case $0 in | ||
221 | - *[\\/]* ) as_myself=$0 ;; | ||
222 | - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
223 | -for as_dir in $PATH | ||
224 | -do | ||
225 | - IFS=$as_save_IFS | ||
226 | - test -z "$as_dir" && as_dir=. | ||
227 | - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
228 | -done | ||
229 | - | ||
230 | - ;; | ||
231 | - esac | ||
232 | - # We did not find ourselves, most probably we were run as `sh COMMAND' | ||
233 | - # in which case we are not to be found in the path. | ||
234 | - if test "x$as_myself" = x; then | ||
235 | - as_myself=$0 | ||
236 | - fi | ||
237 | - if test ! -f "$as_myself"; then | ||
238 | - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 | ||
239 | - { (exit 1); exit 1; }; } | ||
240 | - fi | ||
241 | - case $CONFIG_SHELL in | ||
242 | - '') | ||
243 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
244 | -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | ||
245 | -do | ||
246 | - IFS=$as_save_IFS | ||
247 | - test -z "$as_dir" && as_dir=. | ||
248 | - for as_base in sh bash ksh sh5; do | ||
249 | - case $as_dir in | ||
250 | - /*) | ||
251 | - if ("$as_dir/$as_base" -c ' | ||
252 | - as_lineno_1=$LINENO | ||
253 | - as_lineno_2=$LINENO | ||
254 | - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
255 | - test "x$as_lineno_1" != "x$as_lineno_2" && | ||
256 | - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then | ||
257 | - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } | ||
258 | - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } | ||
259 | - CONFIG_SHELL=$as_dir/$as_base | ||
260 | - export CONFIG_SHELL | ||
261 | - exec "$CONFIG_SHELL" "$0" ${1+"$@"} | ||
262 | - fi;; | ||
263 | - esac | ||
264 | - done | ||
265 | -done | ||
266 | -;; | ||
267 | - esac | ||
268 | - | ||
269 | - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | ||
270 | - # uniformly replaced by the line number. The first 'sed' inserts a | ||
271 | - # line-number line before each line; the second 'sed' does the real | ||
272 | - # work. The second script uses 'N' to pair each line-number line | ||
273 | - # with the numbered line, and appends trailing '-' during | ||
274 | - # substitution so that $LINENO is not a special case at line end. | ||
275 | - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | ||
276 | - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) | ||
277 | - sed '=' <$as_myself | | ||
278 | - sed ' | ||
279 | - N | ||
280 | - s,$,-, | ||
281 | - : loop | ||
282 | - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, | ||
283 | - t loop | ||
284 | - s,-$,, | ||
285 | - s,^['$as_cr_digits']*\n,, | ||
286 | - ' >$as_me.lineno && | ||
287 | - chmod +x $as_me.lineno || | ||
288 | - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | ||
289 | - { (exit 1); exit 1; }; } | ||
290 | - | ||
291 | - # Don't try to exec as it changes $[0], causing all sort of problems | ||
292 | - # (the dirname of $[0] is not the place where we might find the | ||
293 | - # original and so on. Autoconf is especially sensible to this). | ||
294 | - . ./$as_me.lineno | ||
295 | - # Exit status is that of the last command. | ||
296 | - exit | ||
297 | -} | ||
298 | - | ||
299 | - | ||
300 | -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in | ||
301 | - *c*,-n*) ECHO_N= ECHO_C=' | ||
302 | -' ECHO_T=' ' ;; | ||
303 | - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; | ||
304 | - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; | ||
305 | -esac | ||
306 | - | ||
307 | -if expr a : '\(a\)' >/dev/null 2>&1; then | ||
308 | - as_expr=expr | ||
309 | -else | ||
310 | - as_expr=false | ||
311 | -fi | ||
312 | - | ||
313 | -rm -f conf$$ conf$$.exe conf$$.file | ||
314 | -echo >conf$$.file | ||
315 | -if ln -s conf$$.file conf$$ 2>/dev/null; then | ||
316 | - # We could just check for DJGPP; but this test a) works b) is more generic | ||
317 | - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). | ||
318 | - if test -f conf$$.exe; then | ||
319 | - # Don't use ln at all; we don't have any links | ||
320 | - as_ln_s='cp -p' | ||
321 | - else | ||
322 | - as_ln_s='ln -s' | ||
323 | - fi | ||
324 | -elif ln conf$$.file conf$$ 2>/dev/null; then | ||
325 | - as_ln_s=ln | ||
326 | -else | ||
327 | - as_ln_s='cp -p' | ||
328 | -fi | ||
329 | -rm -f conf$$ conf$$.exe conf$$.file | ||
330 | - | ||
331 | -if mkdir -p . 2>/dev/null; then | ||
332 | - as_mkdir_p=: | ||
333 | -else | ||
334 | - as_mkdir_p=false | ||
335 | -fi | ||
336 | - | ||
337 | -as_executable_p="test -f" | ||
338 | - | ||
339 | -# Sed expression to map a string onto a valid CPP name. | ||
340 | -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" | ||
341 | - | ||
342 | -# Sed expression to map a string onto a valid variable name. | ||
343 | -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" | ||
344 | - | ||
345 | - | ||
346 | -# IFS | ||
347 | -# We need space, tab and new line, in precisely that order. | ||
348 | -as_nl=' | ||
349 | -' | ||
350 | -IFS=" $as_nl" | ||
351 | - | ||
352 | -# CDPATH. | ||
353 | -$as_unset CDPATH | ||
354 | - | ||
355 | - | ||
356 | -# Name of the host. | ||
357 | -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, | ||
358 | -# so uname gets run too. | ||
359 | -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` | ||
360 | - | ||
361 | -exec 6>&1 | ||
362 | - | ||
363 | -# | ||
364 | -# Initializations. | ||
365 | -# | ||
366 | +# Defaults: | ||
367 | +ac_help= | ||
368 | ac_default_prefix=/usr/local | ||
369 | -ac_config_libobj_dir=. | ||
370 | -cross_compiling=no | ||
371 | -subdirs= | ||
372 | -MFLAGS= | ||
373 | -MAKEFLAGS= | ||
374 | -SHELL=${CONFIG_SHELL-/bin/sh} | ||
375 | +# Any additions from configure.in: | ||
376 | +ac_help="$ac_help | ||
377 | + --disable-shared without shared library support" | ||
378 | +ac_help="$ac_help | ||
379 | + --disable-sockets without socket support" | ||
380 | +ac_help="$ac_help | ||
381 | + --with-audio with specific audio support (none linux freebsd etc) " | ||
382 | +ac_help="$ac_help | ||
383 | + --with-lang with language " | ||
384 | +ac_help="$ac_help | ||
385 | + --with-vox with vox " | ||
386 | +ac_help="$ac_help | ||
387 | + --with-lex with lexicon " | ||
388 | |||
389 | -# Maximum number of lines to put in a shell here document. | ||
390 | -# This variable seems obsolete. It should probably be removed, and | ||
391 | -# only ac_max_sed_lines should be used. | ||
392 | -: ${ac_max_here_lines=38} | ||
393 | - | ||
394 | -# Identity of this package. | ||
395 | -PACKAGE_NAME= | ||
396 | -PACKAGE_TARNAME= | ||
397 | -PACKAGE_VERSION= | ||
398 | -PACKAGE_STRING= | ||
399 | -PACKAGE_BUGREPORT= | ||
400 | - | ||
401 | -ac_unique_file="include/flite.h" | ||
402 | -# Factoring default headers for most tests. | ||
403 | -ac_includes_default="\ | ||
404 | -#include <stdio.h> | ||
405 | -#if HAVE_SYS_TYPES_H | ||
406 | -# include <sys/types.h> | ||
407 | -#endif | ||
408 | -#if HAVE_SYS_STAT_H | ||
409 | -# include <sys/stat.h> | ||
410 | -#endif | ||
411 | -#if STDC_HEADERS | ||
412 | -# include <stdlib.h> | ||
413 | -# include <stddef.h> | ||
414 | -#else | ||
415 | -# if HAVE_STDLIB_H | ||
416 | -# include <stdlib.h> | ||
417 | -# endif | ||
418 | -#endif | ||
419 | -#if HAVE_STRING_H | ||
420 | -# if !STDC_HEADERS && HAVE_MEMORY_H | ||
421 | -# include <memory.h> | ||
422 | -# endif | ||
423 | -# include <string.h> | ||
424 | -#endif | ||
425 | -#if HAVE_STRINGS_H | ||
426 | -# include <strings.h> | ||
427 | -#endif | ||
428 | -#if HAVE_INTTYPES_H | ||
429 | -# include <inttypes.h> | ||
430 | -#else | ||
431 | -# if HAVE_STDINT_H | ||
432 | -# include <stdint.h> | ||
433 | -# endif | ||
434 | -#endif | ||
435 | -#if HAVE_UNISTD_H | ||
436 | -# include <unistd.h> | ||
437 | -#endif" | ||
438 | - | ||
439 | -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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR ac_ct_AR TARGET_OS TARGET_CPU M68KCC LEXDEFS VOXDEFS HOST_OS HOST_CPU OTHERLIBS SHFLAGS MMAPTYPE STDIOTYPE CPP EGREP AUDIODRIVER AUDIODEFS AUDIOLIBS FL_LANG FL_VOX FL_LEX LIBOBJS LTLIBOBJS' | ||
440 | -ac_subst_files='' | ||
441 | - | ||
442 | # Initialize some variables set by options. | ||
443 | -ac_init_help= | ||
444 | -ac_init_version=false | ||
445 | # The variables have the same names as the options, with | ||
446 | # dashes changed to underlines. | ||
447 | -cache_file=/dev/null | ||
448 | +build=NONE | ||
449 | +cache_file=./config.cache | ||
450 | exec_prefix=NONE | ||
451 | +host=NONE | ||
452 | no_create= | ||
453 | +nonopt=NONE | ||
454 | no_recursion= | ||
455 | prefix=NONE | ||
456 | program_prefix=NONE | ||
457 | @@ -327,15 +41,10 @@ | ||
458 | silent= | ||
459 | site= | ||
460 | srcdir= | ||
461 | +target=NONE | ||
462 | verbose= | ||
463 | x_includes=NONE | ||
464 | x_libraries=NONE | ||
465 | - | ||
466 | -# Installation directory options. | ||
467 | -# These are left unexpanded so users can "make install exec_prefix=/foo" | ||
468 | -# and all the variables that are supposed to be based on exec_prefix | ||
469 | -# by default will actually change. | ||
470 | -# Use braces instead of parens because sh, perl, etc. also accept them. | ||
471 | bindir='${exec_prefix}/bin' | ||
472 | sbindir='${exec_prefix}/sbin' | ||
473 | libexecdir='${exec_prefix}/libexec' | ||
474 | @@ -349,9 +58,17 @@ | ||
475 | infodir='${prefix}/info' | ||
476 | mandir='${prefix}/man' | ||
477 | |||
478 | +# Initialize some other variables. | ||
479 | +subdirs= | ||
480 | +MFLAGS= MAKEFLAGS= | ||
481 | +SHELL=${CONFIG_SHELL-/bin/sh} | ||
482 | +# Maximum number of lines to put in a shell here document. | ||
483 | +ac_max_here_lines=12 | ||
484 | + | ||
485 | ac_prev= | ||
486 | for ac_option | ||
487 | do | ||
488 | + | ||
489 | # If the previous option needs an argument, assign it. | ||
490 | if test -n "$ac_prev"; then | ||
491 | eval "$ac_prev=\$ac_option" | ||
492 | @@ -359,59 +76,59 @@ | ||
493 | continue | ||
494 | fi | ||
495 | |||
496 | - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` | ||
497 | + case "$ac_option" in | ||
498 | + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; | ||
499 | + *) ac_optarg= ;; | ||
500 | + esac | ||
501 | |||
502 | # Accept the important Cygnus configure options, so we can diagnose typos. | ||
503 | |||
504 | - case $ac_option in | ||
505 | + case "$ac_option" in | ||
506 | |||
507 | -bindir | --bindir | --bindi | --bind | --bin | --bi) | ||
508 | ac_prev=bindir ;; | ||
509 | -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) | ||
510 | - bindir=$ac_optarg ;; | ||
511 | + bindir="$ac_optarg" ;; | ||
512 | |||
513 | -build | --build | --buil | --bui | --bu) | ||
514 | - ac_prev=build_alias ;; | ||
515 | + ac_prev=build ;; | ||
516 | -build=* | --build=* | --buil=* | --bui=* | --bu=*) | ||
517 | - build_alias=$ac_optarg ;; | ||
518 | + build="$ac_optarg" ;; | ||
519 | |||
520 | -cache-file | --cache-file | --cache-fil | --cache-fi \ | ||
521 | | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) | ||
522 | ac_prev=cache_file ;; | ||
523 | -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ | ||
524 | | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) | ||
525 | - cache_file=$ac_optarg ;; | ||
526 | + cache_file="$ac_optarg" ;; | ||
527 | |||
528 | - --config-cache | -C) | ||
529 | - cache_file=config.cache ;; | ||
530 | - | ||
531 | -datadir | --datadir | --datadi | --datad | --data | --dat | --da) | ||
532 | ac_prev=datadir ;; | ||
533 | -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ | ||
534 | | --da=*) | ||
535 | - datadir=$ac_optarg ;; | ||
536 | + datadir="$ac_optarg" ;; | ||
537 | |||
538 | -disable-* | --disable-*) | ||
539 | - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | ||
540 | + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` | ||
541 | # Reject names that are not valid shell variable names. | ||
542 | - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && | ||
543 | - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | ||
544 | - { (exit 1); exit 1; }; } | ||
545 | - ac_feature=`echo $ac_feature | sed 's/-/_/g'` | ||
546 | - eval "enable_$ac_feature=no" ;; | ||
547 | + if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then | ||
548 | + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } | ||
549 | + fi | ||
550 | + ac_feature=`echo $ac_feature| sed 's/-/_/g'` | ||
551 | + eval "enable_${ac_feature}=no" ;; | ||
552 | |||
553 | -enable-* | --enable-*) | ||
554 | - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | ||
555 | + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` | ||
556 | # Reject names that are not valid shell variable names. | ||
557 | - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && | ||
558 | - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | ||
559 | - { (exit 1); exit 1; }; } | ||
560 | - ac_feature=`echo $ac_feature | sed 's/-/_/g'` | ||
561 | - case $ac_option in | ||
562 | - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; | ||
563 | + if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then | ||
564 | + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } | ||
565 | + fi | ||
566 | + ac_feature=`echo $ac_feature| sed 's/-/_/g'` | ||
567 | + case "$ac_option" in | ||
568 | + *=*) ;; | ||
569 | *) ac_optarg=yes ;; | ||
570 | esac | ||
571 | - eval "enable_$ac_feature='$ac_optarg'" ;; | ||
572 | + eval "enable_${ac_feature}='$ac_optarg'" ;; | ||
573 | |||
574 | -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | ||
575 | | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ | ||
576 | @@ -420,47 +137,95 @@ | ||
577 | -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ | ||
578 | | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ | ||
579 | | --exec=* | --exe=* | --ex=*) | ||
580 | - exec_prefix=$ac_optarg ;; | ||
581 | + exec_prefix="$ac_optarg" ;; | ||
582 | |||
583 | -gas | --gas | --ga | --g) | ||
584 | # Obsolete; use --with-gas. | ||
585 | with_gas=yes ;; | ||
586 | |||
587 | - -help | --help | --hel | --he | -h) | ||
588 | - ac_init_help=long ;; | ||
589 | - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) | ||
590 | - ac_init_help=recursive ;; | ||
591 | - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) | ||
592 | - ac_init_help=short ;; | ||
593 | + -help | --help | --hel | --he) | ||
594 | + # Omit some internal or obsolete options to make the list less imposing. | ||
595 | + # This message is too long to be a string in the A/UX 3.1 sh. | ||
596 | + cat << EOF | ||
597 | +Usage: configure [options] [host] | ||
598 | +Options: [defaults in brackets after descriptions] | ||
599 | +Configuration: | ||
600 | + --cache-file=FILE cache test results in FILE | ||
601 | + --help print this message | ||
602 | + --no-create do not create output files | ||
603 | + --quiet, --silent do not print \`checking...' messages | ||
604 | + --version print the version of autoconf that created configure | ||
605 | +Directory and file names: | ||
606 | + --prefix=PREFIX install architecture-independent files in PREFIX | ||
607 | + [$ac_default_prefix] | ||
608 | + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX | ||
609 | + [same as prefix] | ||
610 | + --bindir=DIR user executables in DIR [EPREFIX/bin] | ||
611 | + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] | ||
612 | + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] | ||
613 | + --datadir=DIR read-only architecture-independent data in DIR | ||
614 | + [PREFIX/share] | ||
615 | + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] | ||
616 | + --sharedstatedir=DIR modifiable architecture-independent data in DIR | ||
617 | + [PREFIX/com] | ||
618 | + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] | ||
619 | + --libdir=DIR object code libraries in DIR [EPREFIX/lib] | ||
620 | + --includedir=DIR C header files in DIR [PREFIX/include] | ||
621 | + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] | ||
622 | + --infodir=DIR info documentation in DIR [PREFIX/info] | ||
623 | + --mandir=DIR man documentation in DIR [PREFIX/man] | ||
624 | + --srcdir=DIR find the sources in DIR [configure dir or ..] | ||
625 | + --program-prefix=PREFIX prepend PREFIX to installed program names | ||
626 | + --program-suffix=SUFFIX append SUFFIX to installed program names | ||
627 | + --program-transform-name=PROGRAM | ||
628 | + run sed PROGRAM on installed program names | ||
629 | +EOF | ||
630 | + cat << EOF | ||
631 | +Host type: | ||
632 | + --build=BUILD configure for building on BUILD [BUILD=HOST] | ||
633 | + --host=HOST configure for HOST [guessed] | ||
634 | + --target=TARGET configure for TARGET [TARGET=HOST] | ||
635 | +Features and packages: | ||
636 | + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | ||
637 | + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | ||
638 | + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | ||
639 | + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | ||
640 | + --x-includes=DIR X include files are in DIR | ||
641 | + --x-libraries=DIR X library files are in DIR | ||
642 | +EOF | ||
643 | + if test -n "$ac_help"; then | ||
644 | + echo "--enable and --with options recognized:$ac_help" | ||
645 | + fi | ||
646 | + exit 0 ;; | ||
647 | |||
648 | -host | --host | --hos | --ho) | ||
649 | - ac_prev=host_alias ;; | ||
650 | + ac_prev=host ;; | ||
651 | -host=* | --host=* | --hos=* | --ho=*) | ||
652 | - host_alias=$ac_optarg ;; | ||
653 | + host="$ac_optarg" ;; | ||
654 | |||
655 | -includedir | --includedir | --includedi | --included | --include \ | ||
656 | | --includ | --inclu | --incl | --inc) | ||
657 | ac_prev=includedir ;; | ||
658 | -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ | ||
659 | | --includ=* | --inclu=* | --incl=* | --inc=*) | ||
660 | - includedir=$ac_optarg ;; | ||
661 | + includedir="$ac_optarg" ;; | ||
662 | |||
663 | -infodir | --infodir | --infodi | --infod | --info | --inf) | ||
664 | ac_prev=infodir ;; | ||
665 | -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) | ||
666 | - infodir=$ac_optarg ;; | ||
667 | + infodir="$ac_optarg" ;; | ||
668 | |||
669 | -libdir | --libdir | --libdi | --libd) | ||
670 | ac_prev=libdir ;; | ||
671 | -libdir=* | --libdir=* | --libdi=* | --libd=*) | ||
672 | - libdir=$ac_optarg ;; | ||
673 | + libdir="$ac_optarg" ;; | ||
674 | |||
675 | -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ | ||
676 | | --libexe | --libex | --libe) | ||
677 | ac_prev=libexecdir ;; | ||
678 | -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ | ||
679 | | --libexe=* | --libex=* | --libe=*) | ||
680 | - libexecdir=$ac_optarg ;; | ||
681 | + libexecdir="$ac_optarg" ;; | ||
682 | |||
683 | -localstatedir | --localstatedir | --localstatedi | --localstated \ | ||
684 | | --localstate | --localstat | --localsta | --localst \ | ||
685 | @@ -469,19 +234,19 @@ | ||
686 | -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ | ||
687 | | --localstate=* | --localstat=* | --localsta=* | --localst=* \ | ||
688 | | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) | ||
689 | - localstatedir=$ac_optarg ;; | ||
690 | + localstatedir="$ac_optarg" ;; | ||
691 | |||
692 | -mandir | --mandir | --mandi | --mand | --man | --ma | --m) | ||
693 | ac_prev=mandir ;; | ||
694 | -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) | ||
695 | - mandir=$ac_optarg ;; | ||
696 | + mandir="$ac_optarg" ;; | ||
697 | |||
698 | -nfp | --nfp | --nf) | ||
699 | # Obsolete; use --without-fp. | ||
700 | with_fp=no ;; | ||
701 | |||
702 | -no-create | --no-create | --no-creat | --no-crea | --no-cre \ | ||
703 | - | --no-cr | --no-c | -n) | ||
704 | + | --no-cr | --no-c) | ||
705 | no_create=yes ;; | ||
706 | |||
707 | -no-recursion | --no-recursion | --no-recursio | --no-recursi \ | ||
708 | @@ -495,26 +260,26 @@ | ||
709 | -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ | ||
710 | | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ | ||
711 | | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) | ||
712 | - oldincludedir=$ac_optarg ;; | ||
713 | + oldincludedir="$ac_optarg" ;; | ||
714 | |||
715 | -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) | ||
716 | ac_prev=prefix ;; | ||
717 | -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) | ||
718 | - prefix=$ac_optarg ;; | ||
719 | + prefix="$ac_optarg" ;; | ||
720 | |||
721 | -program-prefix | --program-prefix | --program-prefi | --program-pref \ | ||
722 | | --program-pre | --program-pr | --program-p) | ||
723 | ac_prev=program_prefix ;; | ||
724 | -program-prefix=* | --program-prefix=* | --program-prefi=* \ | ||
725 | | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) | ||
726 | - program_prefix=$ac_optarg ;; | ||
727 | + program_prefix="$ac_optarg" ;; | ||
728 | |||
729 | -program-suffix | --program-suffix | --program-suffi | --program-suff \ | ||
730 | | --program-suf | --program-su | --program-s) | ||
731 | ac_prev=program_suffix ;; | ||
732 | -program-suffix=* | --program-suffix=* | --program-suffi=* \ | ||
733 | | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) | ||
734 | - program_suffix=$ac_optarg ;; | ||
735 | + program_suffix="$ac_optarg" ;; | ||
736 | |||
737 | -program-transform-name | --program-transform-name \ | ||
738 | | --program-transform-nam | --program-transform-na \ | ||
739 | @@ -531,7 +296,7 @@ | ||
740 | | --program-transfo=* | --program-transf=* \ | ||
741 | | --program-trans=* | --program-tran=* \ | ||
742 | | --progr-tra=* | --program-tr=* | --program-t=*) | ||
743 | - program_transform_name=$ac_optarg ;; | ||
744 | + program_transform_name="$ac_optarg" ;; | ||
745 | |||
746 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | ||
747 | | -silent | --silent | --silen | --sile | --sil) | ||
748 | @@ -541,7 +306,7 @@ | ||
749 | ac_prev=sbindir ;; | ||
750 | -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | ||
751 | | --sbi=* | --sb=*) | ||
752 | - sbindir=$ac_optarg ;; | ||
753 | + sbindir="$ac_optarg" ;; | ||
754 | |||
755 | -sharedstatedir | --sharedstatedir | --sharedstatedi \ | ||
756 | | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ | ||
757 | @@ -552,57 +317,58 @@ | ||
758 | | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ | ||
759 | | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ | ||
760 | | --sha=* | --sh=*) | ||
761 | - sharedstatedir=$ac_optarg ;; | ||
762 | + sharedstatedir="$ac_optarg" ;; | ||
763 | |||
764 | -site | --site | --sit) | ||
765 | ac_prev=site ;; | ||
766 | -site=* | --site=* | --sit=*) | ||
767 | - site=$ac_optarg ;; | ||
768 | + site="$ac_optarg" ;; | ||
769 | |||
770 | -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) | ||
771 | ac_prev=srcdir ;; | ||
772 | -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) | ||
773 | - srcdir=$ac_optarg ;; | ||
774 | + srcdir="$ac_optarg" ;; | ||
775 | |||
776 | -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ | ||
777 | | --syscon | --sysco | --sysc | --sys | --sy) | ||
778 | ac_prev=sysconfdir ;; | ||
779 | -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | ||
780 | | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) | ||
781 | - sysconfdir=$ac_optarg ;; | ||
782 | + sysconfdir="$ac_optarg" ;; | ||
783 | |||
784 | -target | --target | --targe | --targ | --tar | --ta | --t) | ||
785 | - ac_prev=target_alias ;; | ||
786 | + ac_prev=target ;; | ||
787 | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) | ||
788 | - target_alias=$ac_optarg ;; | ||
789 | + target="$ac_optarg" ;; | ||
790 | |||
791 | -v | -verbose | --verbose | --verbos | --verbo | --verb) | ||
792 | verbose=yes ;; | ||
793 | |||
794 | - -version | --version | --versio | --versi | --vers | -V) | ||
795 | - ac_init_version=: ;; | ||
796 | + -version | --version | --versio | --versi | --vers) | ||
797 | + echo "configure generated by autoconf version 2.13" | ||
798 | + exit 0 ;; | ||
799 | |||
800 | -with-* | --with-*) | ||
801 | - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` | ||
802 | + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` | ||
803 | # Reject names that are not valid shell variable names. | ||
804 | - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && | ||
805 | - { echo "$as_me: error: invalid package name: $ac_package" >&2 | ||
806 | - { (exit 1); exit 1; }; } | ||
807 | + if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then | ||
808 | + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } | ||
809 | + fi | ||
810 | ac_package=`echo $ac_package| sed 's/-/_/g'` | ||
811 | - case $ac_option in | ||
812 | - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; | ||
813 | + case "$ac_option" in | ||
814 | + *=*) ;; | ||
815 | *) ac_optarg=yes ;; | ||
816 | esac | ||
817 | - eval "with_$ac_package='$ac_optarg'" ;; | ||
818 | + eval "with_${ac_package}='$ac_optarg'" ;; | ||
819 | |||
820 | -without-* | --without-*) | ||
821 | - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` | ||
822 | + ac_package=`echo $ac_option|sed -e 's/-*without-//'` | ||
823 | # Reject names that are not valid shell variable names. | ||
824 | - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && | ||
825 | - { echo "$as_me: error: invalid package name: $ac_package" >&2 | ||
826 | - { (exit 1); exit 1; }; } | ||
827 | - ac_package=`echo $ac_package | sed 's/-/_/g'` | ||
828 | - eval "with_$ac_package=no" ;; | ||
829 | + if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then | ||
830 | + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } | ||
831 | + fi | ||
832 | + ac_package=`echo $ac_package| sed 's/-/_/g'` | ||
833 | + eval "with_${ac_package}=no" ;; | ||
834 | |||
835 | --x) | ||
836 | # Obsolete; use --with-x. | ||
837 | @@ -613,110 +379,99 @@ | ||
838 | ac_prev=x_includes ;; | ||
839 | -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ | ||
840 | | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) | ||
841 | - x_includes=$ac_optarg ;; | ||
842 | + x_includes="$ac_optarg" ;; | ||
843 | |||
844 | -x-libraries | --x-libraries | --x-librarie | --x-librari \ | ||
845 | | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) | ||
846 | ac_prev=x_libraries ;; | ||
847 | -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ | ||
848 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) | ||
849 | - x_libraries=$ac_optarg ;; | ||
850 | + x_libraries="$ac_optarg" ;; | ||
851 | |||
852 | - -*) { echo "$as_me: error: unrecognized option: $ac_option | ||
853 | -Try \`$0 --help' for more information." >&2 | ||
854 | - { (exit 1); exit 1; }; } | ||
855 | + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } | ||
856 | ;; | ||
857 | |||
858 | - *=*) | ||
859 | - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` | ||
860 | - # Reject names that are not valid shell variable names. | ||
861 | - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && | ||
862 | - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 | ||
863 | - { (exit 1); exit 1; }; } | ||
864 | - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` | ||
865 | - eval "$ac_envvar='$ac_optarg'" | ||
866 | - export $ac_envvar ;; | ||
867 | - | ||
868 | *) | ||
869 | - # FIXME: should be removed in autoconf 3.0. | ||
870 | - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 | ||
871 | - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && | ||
872 | - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 | ||
873 | - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} | ||
874 | + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then | ||
875 | + echo "configure: warning: $ac_option: invalid host type" 1>&2 | ||
876 | + fi | ||
877 | + if test "x$nonopt" != xNONE; then | ||
878 | + { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } | ||
879 | + fi | ||
880 | + nonopt="$ac_option" | ||
881 | ;; | ||
882 | |||
883 | esac | ||
884 | done | ||
885 | |||
886 | if test -n "$ac_prev"; then | ||
887 | - ac_option=--`echo $ac_prev | sed 's/_/-/g'` | ||
888 | - { echo "$as_me: error: missing argument to $ac_option" >&2 | ||
889 | - { (exit 1); exit 1; }; } | ||
890 | + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } | ||
891 | fi | ||
892 | |||
893 | -# Be sure to have absolute paths. | ||
894 | -for ac_var in exec_prefix prefix | ||
895 | -do | ||
896 | - eval ac_val=$`echo $ac_var` | ||
897 | - case $ac_val in | ||
898 | - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; | ||
899 | - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | ||
900 | - { (exit 1); exit 1; }; };; | ||
901 | - esac | ||
902 | -done | ||
903 | +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 | ||
904 | |||
905 | -# Be sure to have absolute paths. | ||
906 | -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ | ||
907 | - localstatedir libdir includedir oldincludedir infodir mandir | ||
908 | +# File descriptor usage: | ||
909 | +# 0 standard input | ||
910 | +# 1 file creation | ||
911 | +# 2 errors and warnings | ||
912 | +# 3 some systems may open it to /dev/tty | ||
913 | +# 4 used on the Kubota Titan | ||
914 | +# 6 checking for... messages and results | ||
915 | +# 5 compiler messages saved in config.log | ||
916 | +if test "$silent" = yes; then | ||
917 | + exec 6>/dev/null | ||
918 | +else | ||
919 | + exec 6>&1 | ||
920 | +fi | ||
921 | +exec 5>./config.log | ||
922 | + | ||
923 | +echo "\ | ||
924 | +This file contains any messages produced by compilers while | ||
925 | +running configure, to aid debugging if configure makes a mistake. | ||
926 | +" 1>&5 | ||
927 | + | ||
928 | +# Strip out --no-create and --no-recursion so they do not pile up. | ||
929 | +# Also quote any args containing shell metacharacters. | ||
930 | +ac_configure_args= | ||
931 | +for ac_arg | ||
932 | do | ||
933 | - eval ac_val=$`echo $ac_var` | ||
934 | - case $ac_val in | ||
935 | - [\\/$]* | ?:[\\/]* ) ;; | ||
936 | - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | ||
937 | - { (exit 1); exit 1; }; };; | ||
938 | + case "$ac_arg" in | ||
939 | + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ | ||
940 | + | --no-cr | --no-c) ;; | ||
941 | + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ | ||
942 | + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; | ||
943 | + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) | ||
944 | + ac_configure_args="$ac_configure_args '$ac_arg'" ;; | ||
945 | + *) ac_configure_args="$ac_configure_args $ac_arg" ;; | ||
946 | esac | ||
947 | done | ||
948 | |||
949 | -# There might be people who depend on the old broken behavior: `$host' | ||
950 | -# used to hold the argument of --host etc. | ||
951 | -# FIXME: To remove some day. | ||
952 | -build=$build_alias | ||
953 | -host=$host_alias | ||
954 | -target=$target_alias | ||
955 | +# NLS nuisances. | ||
956 | +# Only set these to C if already set. These must not be set unconditionally | ||
957 | +# because not all systems understand e.g. LANG=C (notably SCO). | ||
958 | +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! | ||
959 | +# Non-C LC_CTYPE values break the ctype check. | ||
960 | +if test "${LANG+set}" = set; then LANG=C; export LANG; fi | ||
961 | +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi | ||
962 | +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi | ||
963 | +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi | ||
964 | |||
965 | -# FIXME: To remove some day. | ||
966 | -if test "x$host_alias" != x; then | ||
967 | - if test "x$build_alias" = x; then | ||
968 | - cross_compiling=maybe | ||
969 | - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. | ||
970 | - If a cross compiler is detected then cross compile mode will be used." >&2 | ||
971 | - elif test "x$build_alias" != "x$host_alias"; then | ||
972 | - cross_compiling=yes | ||
973 | - fi | ||
974 | -fi | ||
975 | +# confdefs.h avoids OS command line length limits that DEFS can exceed. | ||
976 | +rm -rf conftest* confdefs.h | ||
977 | +# AIX cpp loses on an empty file, so make sure it contains at least a newline. | ||
978 | +echo > confdefs.h | ||
979 | |||
980 | -ac_tool_prefix= | ||
981 | -test -n "$host_alias" && ac_tool_prefix=$host_alias- | ||
982 | +# A filename unique to this package, relative to the directory that | ||
983 | +# configure is in, which we can look for to find out if srcdir is correct. | ||
984 | +ac_unique_file=include/flite.h | ||
985 | |||
986 | -test "$silent" = yes && exec 6>/dev/null | ||
987 | - | ||
988 | - | ||
989 | # Find the source files, if location was not specified. | ||
990 | if test -z "$srcdir"; then | ||
991 | ac_srcdir_defaulted=yes | ||
992 | # Try the directory containing this script, then its parent. | ||
993 | - ac_confdir=`(dirname "$0") 2>/dev/null || | ||
994 | -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
995 | - X"$0" : 'X\(//\)[^/]' \| \ | ||
996 | - X"$0" : 'X\(//\)$' \| \ | ||
997 | - X"$0" : 'X\(/\)' \| \ | ||
998 | - . : '\(.\)' 2>/dev/null || | ||
999 | -echo X"$0" | | ||
1000 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
1001 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
1002 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
1003 | - /^X\(\/\).*/{ s//\1/; q; } | ||
1004 | - s/.*/./; q'` | ||
1005 | + ac_prog=$0 | ||
1006 | + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` | ||
1007 | + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. | ||
1008 | srcdir=$ac_confdir | ||
1009 | if test ! -r $srcdir/$ac_unique_file; then | ||
1010 | srcdir=.. | ||
1011 | @@ -726,441 +481,13 @@ | ||
1012 | fi | ||
1013 | if test ! -r $srcdir/$ac_unique_file; then | ||
1014 | if test "$ac_srcdir_defaulted" = yes; then | ||
1015 | - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 | ||
1016 | - { (exit 1); exit 1; }; } | ||
1017 | + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } | ||
1018 | else | ||
1019 | - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 | ||
1020 | - { (exit 1); exit 1; }; } | ||
1021 | + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } | ||
1022 | fi | ||
1023 | fi | ||
1024 | -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || | ||
1025 | - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 | ||
1026 | - { (exit 1); exit 1; }; } | ||
1027 | -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` | ||
1028 | -ac_env_build_alias_set=${build_alias+set} | ||
1029 | -ac_env_build_alias_value=$build_alias | ||
1030 | -ac_cv_env_build_alias_set=${build_alias+set} | ||
1031 | -ac_cv_env_build_alias_value=$build_alias | ||
1032 | -ac_env_host_alias_set=${host_alias+set} | ||
1033 | -ac_env_host_alias_value=$host_alias | ||
1034 | -ac_cv_env_host_alias_set=${host_alias+set} | ||
1035 | -ac_cv_env_host_alias_value=$host_alias | ||
1036 | -ac_env_target_alias_set=${target_alias+set} | ||
1037 | -ac_env_target_alias_value=$target_alias | ||
1038 | -ac_cv_env_target_alias_set=${target_alias+set} | ||
1039 | -ac_cv_env_target_alias_value=$target_alias | ||
1040 | -ac_env_CC_set=${CC+set} | ||
1041 | -ac_env_CC_value=$CC | ||
1042 | -ac_cv_env_CC_set=${CC+set} | ||
1043 | -ac_cv_env_CC_value=$CC | ||
1044 | -ac_env_CFLAGS_set=${CFLAGS+set} | ||
1045 | -ac_env_CFLAGS_value=$CFLAGS | ||
1046 | -ac_cv_env_CFLAGS_set=${CFLAGS+set} | ||
1047 | -ac_cv_env_CFLAGS_value=$CFLAGS | ||
1048 | -ac_env_LDFLAGS_set=${LDFLAGS+set} | ||
1049 | -ac_env_LDFLAGS_value=$LDFLAGS | ||
1050 | -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} | ||
1051 | -ac_cv_env_LDFLAGS_value=$LDFLAGS | ||
1052 | -ac_env_CPPFLAGS_set=${CPPFLAGS+set} | ||
1053 | -ac_env_CPPFLAGS_value=$CPPFLAGS | ||
1054 | -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} | ||
1055 | -ac_cv_env_CPPFLAGS_value=$CPPFLAGS | ||
1056 | -ac_env_CPP_set=${CPP+set} | ||
1057 | -ac_env_CPP_value=$CPP | ||
1058 | -ac_cv_env_CPP_set=${CPP+set} | ||
1059 | -ac_cv_env_CPP_value=$CPP | ||
1060 | +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` | ||
1061 | |||
1062 | -# | ||
1063 | -# Report the --help message. | ||
1064 | -# | ||
1065 | -if test "$ac_init_help" = "long"; then | ||
1066 | - # Omit some internal or obsolete options to make the list less imposing. | ||
1067 | - # This message is too long to be a string in the A/UX 3.1 sh. | ||
1068 | - cat <<_ACEOF | ||
1069 | -\`configure' configures this package to adapt to many kinds of systems. | ||
1070 | - | ||
1071 | -Usage: $0 [OPTION]... [VAR=VALUE]... | ||
1072 | - | ||
1073 | -To assign environment variables (e.g., CC, CFLAGS...), specify them as | ||
1074 | -VAR=VALUE. See below for descriptions of some of the useful variables. | ||
1075 | - | ||
1076 | -Defaults for the options are specified in brackets. | ||
1077 | - | ||
1078 | -Configuration: | ||
1079 | - -h, --help display this help and exit | ||
1080 | - --help=short display options specific to this package | ||
1081 | - --help=recursive display the short help of all the included packages | ||
1082 | - -V, --version display version information and exit | ||
1083 | - -q, --quiet, --silent do not print \`checking...' messages | ||
1084 | - --cache-file=FILE cache test results in FILE [disabled] | ||
1085 | - -C, --config-cache alias for \`--cache-file=config.cache' | ||
1086 | - -n, --no-create do not create output files | ||
1087 | - --srcdir=DIR find the sources in DIR [configure dir or \`..'] | ||
1088 | - | ||
1089 | -_ACEOF | ||
1090 | - | ||
1091 | - cat <<_ACEOF | ||
1092 | -Installation directories: | ||
1093 | - --prefix=PREFIX install architecture-independent files in PREFIX | ||
1094 | - [$ac_default_prefix] | ||
1095 | - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX | ||
1096 | - [PREFIX] | ||
1097 | - | ||
1098 | -By default, \`make install' will install all the files in | ||
1099 | -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify | ||
1100 | -an installation prefix other than \`$ac_default_prefix' using \`--prefix', | ||
1101 | -for instance \`--prefix=\$HOME'. | ||
1102 | - | ||
1103 | -For better control, use the options below. | ||
1104 | - | ||
1105 | -Fine tuning of the installation directories: | ||
1106 | - --bindir=DIR user executables [EPREFIX/bin] | ||
1107 | - --sbindir=DIR system admin executables [EPREFIX/sbin] | ||
1108 | - --libexecdir=DIR program executables [EPREFIX/libexec] | ||
1109 | - --datadir=DIR read-only architecture-independent data [PREFIX/share] | ||
1110 | - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] | ||
1111 | - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] | ||
1112 | - --localstatedir=DIR modifiable single-machine data [PREFIX/var] | ||
1113 | - --libdir=DIR object code libraries [EPREFIX/lib] | ||
1114 | - --includedir=DIR C header files [PREFIX/include] | ||
1115 | - --oldincludedir=DIR C header files for non-gcc [/usr/include] | ||
1116 | - --infodir=DIR info documentation [PREFIX/info] | ||
1117 | - --mandir=DIR man documentation [PREFIX/man] | ||
1118 | -_ACEOF | ||
1119 | - | ||
1120 | - cat <<\_ACEOF | ||
1121 | - | ||
1122 | -System types: | ||
1123 | - --build=BUILD configure for building on BUILD [guessed] | ||
1124 | - --host=HOST cross-compile to build programs to run on HOST [BUILD] | ||
1125 | - --target=TARGET configure for building compilers for TARGET [HOST] | ||
1126 | -_ACEOF | ||
1127 | -fi | ||
1128 | - | ||
1129 | -if test -n "$ac_init_help"; then | ||
1130 | - | ||
1131 | - cat <<\_ACEOF | ||
1132 | - | ||
1133 | -Optional Features: | ||
1134 | - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | ||
1135 | - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | ||
1136 | - --disable-shared without shared library support | ||
1137 | - --disable-sockets without socket support | ||
1138 | - | ||
1139 | -Optional Packages: | ||
1140 | - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | ||
1141 | - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | ||
1142 | - --with-audio with specific audio support (none linux freebsd etc) | ||
1143 | - --with-lang with language | ||
1144 | - --with-vox with vox | ||
1145 | - --with-lex with lexicon | ||
1146 | - | ||
1147 | -Some influential environment variables: | ||
1148 | - CC C compiler command | ||
1149 | - CFLAGS C compiler flags | ||
1150 | - LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a | ||
1151 | - nonstandard directory <lib dir> | ||
1152 | - CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have | ||
1153 | - headers in a nonstandard directory <include dir> | ||
1154 | - CPP C preprocessor | ||
1155 | - | ||
1156 | -Use these variables to override the choices made by `configure' or to help | ||
1157 | -it to find libraries and programs with nonstandard names/locations. | ||
1158 | - | ||
1159 | -_ACEOF | ||
1160 | -fi | ||
1161 | - | ||
1162 | -if test "$ac_init_help" = "recursive"; then | ||
1163 | - # If there are subdirs, report their specific --help. | ||
1164 | - ac_popdir=`pwd` | ||
1165 | - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue | ||
1166 | - test -d $ac_dir || continue | ||
1167 | - ac_builddir=. | ||
1168 | - | ||
1169 | -if test "$ac_dir" != .; then | ||
1170 | - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | ||
1171 | - # A "../" for each directory in $ac_dir_suffix. | ||
1172 | - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` | ||
1173 | -else | ||
1174 | - ac_dir_suffix= ac_top_builddir= | ||
1175 | -fi | ||
1176 | - | ||
1177 | -case $srcdir in | ||
1178 | - .) # No --srcdir option. We are building in place. | ||
1179 | - ac_srcdir=. | ||
1180 | - if test -z "$ac_top_builddir"; then | ||
1181 | - ac_top_srcdir=. | ||
1182 | - else | ||
1183 | - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | ||
1184 | - fi ;; | ||
1185 | - [\\/]* | ?:[\\/]* ) # Absolute path. | ||
1186 | - ac_srcdir=$srcdir$ac_dir_suffix; | ||
1187 | - ac_top_srcdir=$srcdir ;; | ||
1188 | - *) # Relative path. | ||
1189 | - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | ||
1190 | - ac_top_srcdir=$ac_top_builddir$srcdir ;; | ||
1191 | -esac | ||
1192 | -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be | ||
1193 | -# absolute. | ||
1194 | -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` | ||
1195 | -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` | ||
1196 | -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` | ||
1197 | -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` | ||
1198 | - | ||
1199 | - cd $ac_dir | ||
1200 | - # Check for guested configure; otherwise get Cygnus style configure. | ||
1201 | - if test -f $ac_srcdir/configure.gnu; then | ||
1202 | - echo | ||
1203 | - $SHELL $ac_srcdir/configure.gnu --help=recursive | ||
1204 | - elif test -f $ac_srcdir/configure; then | ||
1205 | - echo | ||
1206 | - $SHELL $ac_srcdir/configure --help=recursive | ||
1207 | - elif test -f $ac_srcdir/configure.ac || | ||
1208 | - test -f $ac_srcdir/configure.in; then | ||
1209 | - echo | ||
1210 | - $ac_configure --help | ||
1211 | - else | ||
1212 | - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 | ||
1213 | - fi | ||
1214 | - cd $ac_popdir | ||
1215 | - done | ||
1216 | -fi | ||
1217 | - | ||
1218 | -test -n "$ac_init_help" && exit 0 | ||
1219 | -if $ac_init_version; then | ||
1220 | - cat <<\_ACEOF | ||
1221 | - | ||
1222 | -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 | ||
1223 | -Free Software Foundation, Inc. | ||
1224 | -This configure script is free software; the Free Software Foundation | ||
1225 | -gives unlimited permission to copy, distribute and modify it. | ||
1226 | -_ACEOF | ||
1227 | - exit 0 | ||
1228 | -fi | ||
1229 | -exec 5>config.log | ||
1230 | -cat >&5 <<_ACEOF | ||
1231 | -This file contains any messages produced by compilers while | ||
1232 | -running configure, to aid debugging if configure makes a mistake. | ||
1233 | - | ||
1234 | -It was created by $as_me, which was | ||
1235 | -generated by GNU Autoconf 2.57. Invocation command line was | ||
1236 | - | ||
1237 | - $ $0 $@ | ||
1238 | - | ||
1239 | -_ACEOF | ||
1240 | -{ | ||
1241 | -cat <<_ASUNAME | ||
1242 | -## --------- ## | ||
1243 | -## Platform. ## | ||
1244 | -## --------- ## | ||
1245 | - | ||
1246 | -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` | ||
1247 | -uname -m = `(uname -m) 2>/dev/null || echo unknown` | ||
1248 | -uname -r = `(uname -r) 2>/dev/null || echo unknown` | ||
1249 | -uname -s = `(uname -s) 2>/dev/null || echo unknown` | ||
1250 | -uname -v = `(uname -v) 2>/dev/null || echo unknown` | ||
1251 | - | ||
1252 | -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` | ||
1253 | -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` | ||
1254 | - | ||
1255 | -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` | ||
1256 | -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` | ||
1257 | -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` | ||
1258 | -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` | ||
1259 | -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` | ||
1260 | -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` | ||
1261 | -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` | ||
1262 | - | ||
1263 | -_ASUNAME | ||
1264 | - | ||
1265 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1266 | -for as_dir in $PATH | ||
1267 | -do | ||
1268 | - IFS=$as_save_IFS | ||
1269 | - test -z "$as_dir" && as_dir=. | ||
1270 | - echo "PATH: $as_dir" | ||
1271 | -done | ||
1272 | - | ||
1273 | -} >&5 | ||
1274 | - | ||
1275 | -cat >&5 <<_ACEOF | ||
1276 | - | ||
1277 | - | ||
1278 | -## ----------- ## | ||
1279 | -## Core tests. ## | ||
1280 | -## ----------- ## | ||
1281 | - | ||
1282 | -_ACEOF | ||
1283 | - | ||
1284 | - | ||
1285 | -# Keep a trace of the command line. | ||
1286 | -# Strip out --no-create and --no-recursion so they do not pile up. | ||
1287 | -# Strip out --silent because we don't want to record it for future runs. | ||
1288 | -# Also quote any args containing shell meta-characters. | ||
1289 | -# Make two passes to allow for proper duplicate-argument suppression. | ||
1290 | -ac_configure_args= | ||
1291 | -ac_configure_args0= | ||
1292 | -ac_configure_args1= | ||
1293 | -ac_sep= | ||
1294 | -ac_must_keep_next=false | ||
1295 | -for ac_pass in 1 2 | ||
1296 | -do | ||
1297 | - for ac_arg | ||
1298 | - do | ||
1299 | - case $ac_arg in | ||
1300 | - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; | ||
1301 | - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | ||
1302 | - | -silent | --silent | --silen | --sile | --sil) | ||
1303 | - continue ;; | ||
1304 | - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) | ||
1305 | - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
1306 | - esac | ||
1307 | - case $ac_pass in | ||
1308 | - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; | ||
1309 | - 2) | ||
1310 | - ac_configure_args1="$ac_configure_args1 '$ac_arg'" | ||
1311 | - if test $ac_must_keep_next = true; then | ||
1312 | - ac_must_keep_next=false # Got value, back to normal. | ||
1313 | - else | ||
1314 | - case $ac_arg in | ||
1315 | - *=* | --config-cache | -C | -disable-* | --disable-* \ | ||
1316 | - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ | ||
1317 | - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ | ||
1318 | - | -with-* | --with-* | -without-* | --without-* | --x) | ||
1319 | - case "$ac_configure_args0 " in | ||
1320 | - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; | ||
1321 | - esac | ||
1322 | - ;; | ||
1323 | - -* ) ac_must_keep_next=true ;; | ||
1324 | - esac | ||
1325 | - fi | ||
1326 | - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" | ||
1327 | - # Get rid of the leading space. | ||
1328 | - ac_sep=" " | ||
1329 | - ;; | ||
1330 | - esac | ||
1331 | - done | ||
1332 | -done | ||
1333 | -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } | ||
1334 | -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } | ||
1335 | - | ||
1336 | -# When interrupted or exit'd, cleanup temporary files, and complete | ||
1337 | -# config.log. We remove comments because anyway the quotes in there | ||
1338 | -# would cause problems or look ugly. | ||
1339 | -# WARNING: Be sure not to use single quotes in there, as some shells, | ||
1340 | -# such as our DU 5.0 friend, will then `close' the trap. | ||
1341 | -trap 'exit_status=$? | ||
1342 | - # Save into config.log some information that might help in debugging. | ||
1343 | - { | ||
1344 | - echo | ||
1345 | - | ||
1346 | - cat <<\_ASBOX | ||
1347 | -## ---------------- ## | ||
1348 | -## Cache variables. ## | ||
1349 | -## ---------------- ## | ||
1350 | -_ASBOX | ||
1351 | - echo | ||
1352 | - # The following way of writing the cache mishandles newlines in values, | ||
1353 | -{ | ||
1354 | - (set) 2>&1 | | ||
1355 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in | ||
1356 | - *ac_space=\ *) | ||
1357 | - sed -n \ | ||
1358 | - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; | ||
1359 | - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" | ||
1360 | - ;; | ||
1361 | - *) | ||
1362 | - sed -n \ | ||
1363 | - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
1364 | - ;; | ||
1365 | - esac; | ||
1366 | -} | ||
1367 | - echo | ||
1368 | - | ||
1369 | - cat <<\_ASBOX | ||
1370 | -## ----------------- ## | ||
1371 | -## Output variables. ## | ||
1372 | -## ----------------- ## | ||
1373 | -_ASBOX | ||
1374 | - echo | ||
1375 | - for ac_var in $ac_subst_vars | ||
1376 | - do | ||
1377 | - eval ac_val=$`echo $ac_var` | ||
1378 | - echo "$ac_var='"'"'$ac_val'"'"'" | ||
1379 | - done | sort | ||
1380 | - echo | ||
1381 | - | ||
1382 | - if test -n "$ac_subst_files"; then | ||
1383 | - cat <<\_ASBOX | ||
1384 | -## ------------- ## | ||
1385 | -## Output files. ## | ||
1386 | -## ------------- ## | ||
1387 | -_ASBOX | ||
1388 | - echo | ||
1389 | - for ac_var in $ac_subst_files | ||
1390 | - do | ||
1391 | - eval ac_val=$`echo $ac_var` | ||
1392 | - echo "$ac_var='"'"'$ac_val'"'"'" | ||
1393 | - done | sort | ||
1394 | - echo | ||
1395 | - fi | ||
1396 | - | ||
1397 | - if test -s confdefs.h; then | ||
1398 | - cat <<\_ASBOX | ||
1399 | -## ----------- ## | ||
1400 | -## confdefs.h. ## | ||
1401 | -## ----------- ## | ||
1402 | -_ASBOX | ||
1403 | - echo | ||
1404 | - sed "/^$/d" confdefs.h | sort | ||
1405 | - echo | ||
1406 | - fi | ||
1407 | - test "$ac_signal" != 0 && | ||
1408 | - echo "$as_me: caught signal $ac_signal" | ||
1409 | - echo "$as_me: exit $exit_status" | ||
1410 | - } >&5 | ||
1411 | - rm -f core core.* *.core && | ||
1412 | - rm -rf conftest* confdefs* conf$$* $ac_clean_files && | ||
1413 | - exit $exit_status | ||
1414 | - ' 0 | ||
1415 | -for ac_signal in 1 2 13 15; do | ||
1416 | - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal | ||
1417 | -done | ||
1418 | -ac_signal=0 | ||
1419 | - | ||
1420 | -# confdefs.h avoids OS command line length limits that DEFS can exceed. | ||
1421 | -rm -rf conftest* confdefs.h | ||
1422 | -# AIX cpp loses on an empty file, so make sure it contains at least a newline. | ||
1423 | -echo >confdefs.h | ||
1424 | - | ||
1425 | -# Predefined preprocessor variables. | ||
1426 | - | ||
1427 | -cat >>confdefs.h <<_ACEOF | ||
1428 | -#define PACKAGE_NAME "$PACKAGE_NAME" | ||
1429 | -_ACEOF | ||
1430 | - | ||
1431 | - | ||
1432 | -cat >>confdefs.h <<_ACEOF | ||
1433 | -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" | ||
1434 | -_ACEOF | ||
1435 | - | ||
1436 | - | ||
1437 | -cat >>confdefs.h <<_ACEOF | ||
1438 | -#define PACKAGE_VERSION "$PACKAGE_VERSION" | ||
1439 | -_ACEOF | ||
1440 | - | ||
1441 | - | ||
1442 | -cat >>confdefs.h <<_ACEOF | ||
1443 | -#define PACKAGE_STRING "$PACKAGE_STRING" | ||
1444 | -_ACEOF | ||
1445 | - | ||
1446 | - | ||
1447 | -cat >>confdefs.h <<_ACEOF | ||
1448 | -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" | ||
1449 | -_ACEOF | ||
1450 | - | ||
1451 | - | ||
1452 | -# Let the site file select an alternate cache file if it wants to. | ||
1453 | # Prefer explicitly selected file to automatically selected ones. | ||
1454 | if test -z "$CONFIG_SITE"; then | ||
1455 | if test "x$prefix" != xNONE; then | ||
1456 | @@ -1171,106 +498,42 @@ | ||
1457 | fi | ||
1458 | for ac_site_file in $CONFIG_SITE; do | ||
1459 | if test -r "$ac_site_file"; then | ||
1460 | - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 | ||
1461 | -echo "$as_me: loading site script $ac_site_file" >&6;} | ||
1462 | - sed 's/^/| /' "$ac_site_file" >&5 | ||
1463 | + echo "loading site script $ac_site_file" | ||
1464 | . "$ac_site_file" | ||
1465 | fi | ||
1466 | done | ||
1467 | |||
1468 | if test -r "$cache_file"; then | ||
1469 | - # Some versions of bash will fail to source /dev/null (special | ||
1470 | - # files actually), so we avoid doing that. | ||
1471 | - if test -f "$cache_file"; then | ||
1472 | - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 | ||
1473 | -echo "$as_me: loading cache $cache_file" >&6;} | ||
1474 | - case $cache_file in | ||
1475 | - [\\/]* | ?:[\\/]* ) . $cache_file;; | ||
1476 | - *) . ./$cache_file;; | ||
1477 | - esac | ||
1478 | - fi | ||
1479 | + echo "loading cache $cache_file" | ||
1480 | + . $cache_file | ||
1481 | else | ||
1482 | - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 | ||
1483 | -echo "$as_me: creating cache $cache_file" >&6;} | ||
1484 | - >$cache_file | ||
1485 | + echo "creating cache $cache_file" | ||
1486 | + > $cache_file | ||
1487 | fi | ||
1488 | |||
1489 | -# Check that the precious variables saved in the cache have kept the same | ||
1490 | -# value. | ||
1491 | -ac_cache_corrupted=false | ||
1492 | -for ac_var in `(set) 2>&1 | | ||
1493 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do | ||
1494 | - eval ac_old_set=\$ac_cv_env_${ac_var}_set | ||
1495 | - eval ac_new_set=\$ac_env_${ac_var}_set | ||
1496 | - eval ac_old_val="\$ac_cv_env_${ac_var}_value" | ||
1497 | - eval ac_new_val="\$ac_env_${ac_var}_value" | ||
1498 | - case $ac_old_set,$ac_new_set in | ||
1499 | - set,) | ||
1500 | - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | ||
1501 | -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} | ||
1502 | - ac_cache_corrupted=: ;; | ||
1503 | - ,set) | ||
1504 | - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 | ||
1505 | -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} | ||
1506 | - ac_cache_corrupted=: ;; | ||
1507 | - ,);; | ||
1508 | - *) | ||
1509 | - if test "x$ac_old_val" != "x$ac_new_val"; then | ||
1510 | - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 | ||
1511 | -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} | ||
1512 | - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 | ||
1513 | -echo "$as_me: former value: $ac_old_val" >&2;} | ||
1514 | - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 | ||
1515 | -echo "$as_me: current value: $ac_new_val" >&2;} | ||
1516 | - ac_cache_corrupted=: | ||
1517 | - fi;; | ||
1518 | - esac | ||
1519 | - # Pass precious variables to config.status. | ||
1520 | - if test "$ac_new_set" = set; then | ||
1521 | - case $ac_new_val in | ||
1522 | - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) | ||
1523 | - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
1524 | - *) ac_arg=$ac_var=$ac_new_val ;; | ||
1525 | - esac | ||
1526 | - case " $ac_configure_args " in | ||
1527 | - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. | ||
1528 | - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; | ||
1529 | - esac | ||
1530 | - fi | ||
1531 | -done | ||
1532 | -if $ac_cache_corrupted; then | ||
1533 | - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 | ||
1534 | -echo "$as_me: error: changes in the environment can compromise the build" >&2;} | ||
1535 | - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 | ||
1536 | -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} | ||
1537 | - { (exit 1); exit 1; }; } | ||
1538 | -fi | ||
1539 | - | ||
1540 | ac_ext=c | ||
1541 | +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
1542 | ac_cpp='$CPP $CPPFLAGS' | ||
1543 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
1544 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
1545 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
1546 | +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' | ||
1547 | +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' | ||
1548 | +cross_compiling=$ac_cv_prog_cc_cross | ||
1549 | |||
1550 | +ac_exeext= | ||
1551 | +ac_objext=o | ||
1552 | +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then | ||
1553 | + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. | ||
1554 | + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then | ||
1555 | + ac_n= ac_c=' | ||
1556 | +' ac_t=' ' | ||
1557 | + else | ||
1558 | + ac_n=-n ac_c= ac_t= | ||
1559 | + fi | ||
1560 | +else | ||
1561 | + ac_n= ac_c='\c' ac_t= | ||
1562 | +fi | ||
1563 | |||
1564 | |||
1565 | |||
1566 | - | ||
1567 | - | ||
1568 | - | ||
1569 | - | ||
1570 | - | ||
1571 | - | ||
1572 | - | ||
1573 | - | ||
1574 | - | ||
1575 | - | ||
1576 | - | ||
1577 | - | ||
1578 | - | ||
1579 | - | ||
1580 | - | ||
1581 | - | ||
1582 | ac_aux_dir= | ||
1583 | for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do | ||
1584 | if test -f $ac_dir/install-sh; then | ||
1585 | @@ -1281,740 +544,312 @@ | ||
1586 | ac_aux_dir=$ac_dir | ||
1587 | ac_install_sh="$ac_aux_dir/install.sh -c" | ||
1588 | break | ||
1589 | - elif test -f $ac_dir/shtool; then | ||
1590 | - ac_aux_dir=$ac_dir | ||
1591 | - ac_install_sh="$ac_aux_dir/shtool install -c" | ||
1592 | - break | ||
1593 | fi | ||
1594 | done | ||
1595 | if test -z "$ac_aux_dir"; then | ||
1596 | - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 | ||
1597 | -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} | ||
1598 | - { (exit 1); exit 1; }; } | ||
1599 | + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } | ||
1600 | fi | ||
1601 | -ac_config_guess="$SHELL $ac_aux_dir/config.guess" | ||
1602 | -ac_config_sub="$SHELL $ac_aux_dir/config.sub" | ||
1603 | -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. | ||
1604 | +ac_config_guess=$ac_aux_dir/config.guess | ||
1605 | +ac_config_sub=$ac_aux_dir/config.sub | ||
1606 | +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. | ||
1607 | |||
1608 | -# Make sure we can run config.sub. | ||
1609 | -$ac_config_sub sun4 >/dev/null 2>&1 || | ||
1610 | - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 | ||
1611 | -echo "$as_me: error: cannot run $ac_config_sub" >&2;} | ||
1612 | - { (exit 1); exit 1; }; } | ||
1613 | |||
1614 | -echo "$as_me:$LINENO: checking build system type" >&5 | ||
1615 | -echo $ECHO_N "checking build system type... $ECHO_C" >&6 | ||
1616 | -if test "${ac_cv_build+set}" = set; then | ||
1617 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1618 | -else | ||
1619 | - ac_cv_build_alias=$build_alias | ||
1620 | -test -z "$ac_cv_build_alias" && | ||
1621 | - ac_cv_build_alias=`$ac_config_guess` | ||
1622 | -test -z "$ac_cv_build_alias" && | ||
1623 | - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 | ||
1624 | -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} | ||
1625 | - { (exit 1); exit 1; }; } | ||
1626 | -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || | ||
1627 | - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 | ||
1628 | -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} | ||
1629 | - { (exit 1); exit 1; }; } | ||
1630 | +# Do some error checking and defaulting for the host and target type. | ||
1631 | +# The inputs are: | ||
1632 | +# configure --host=HOST --target=TARGET --build=BUILD NONOPT | ||
1633 | +# | ||
1634 | +# The rules are: | ||
1635 | +# 1. You are not allowed to specify --host, --target, and nonopt at the | ||
1636 | +# same time. | ||
1637 | +# 2. Host defaults to nonopt. | ||
1638 | +# 3. If nonopt is not specified, then host defaults to the current host, | ||
1639 | +# as determined by config.guess. | ||
1640 | +# 4. Target and build default to nonopt. | ||
1641 | +# 5. If nonopt is not specified, then target and build default to host. | ||
1642 | |||
1643 | +# The aliases save the names the user supplied, while $host etc. | ||
1644 | +# will get canonicalized. | ||
1645 | +case $host---$target---$nonopt in | ||
1646 | +NONE---*---* | *---NONE---* | *---*---NONE) ;; | ||
1647 | +*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; | ||
1648 | +esac | ||
1649 | + | ||
1650 | + | ||
1651 | +# Make sure we can run config.sub. | ||
1652 | +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : | ||
1653 | +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } | ||
1654 | fi | ||
1655 | -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 | ||
1656 | -echo "${ECHO_T}$ac_cv_build" >&6 | ||
1657 | -build=$ac_cv_build | ||
1658 | -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | ||
1659 | -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | ||
1660 | -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
1661 | |||
1662 | +echo $ac_n "checking host system type""... $ac_c" 1>&6 | ||
1663 | +echo "configure:585: checking host system type" >&5 | ||
1664 | |||
1665 | -echo "$as_me:$LINENO: checking host system type" >&5 | ||
1666 | -echo $ECHO_N "checking host system type... $ECHO_C" >&6 | ||
1667 | -if test "${ac_cv_host+set}" = set; then | ||
1668 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1669 | -else | ||
1670 | - ac_cv_host_alias=$host_alias | ||
1671 | -test -z "$ac_cv_host_alias" && | ||
1672 | - ac_cv_host_alias=$ac_cv_build_alias | ||
1673 | -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || | ||
1674 | - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 | ||
1675 | -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} | ||
1676 | - { (exit 1); exit 1; }; } | ||
1677 | +host_alias=$host | ||
1678 | +case "$host_alias" in | ||
1679 | +NONE) | ||
1680 | + case $nonopt in | ||
1681 | + NONE) | ||
1682 | + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : | ||
1683 | + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } | ||
1684 | + fi ;; | ||
1685 | + *) host_alias=$nonopt ;; | ||
1686 | + esac ;; | ||
1687 | +esac | ||
1688 | |||
1689 | -fi | ||
1690 | -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 | ||
1691 | -echo "${ECHO_T}$ac_cv_host" >&6 | ||
1692 | -host=$ac_cv_host | ||
1693 | -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | ||
1694 | -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | ||
1695 | -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
1696 | +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` | ||
1697 | +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | ||
1698 | +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | ||
1699 | +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
1700 | +echo "$ac_t""$host" 1>&6 | ||
1701 | |||
1702 | +echo $ac_n "checking target system type""... $ac_c" 1>&6 | ||
1703 | +echo "configure:606: checking target system type" >&5 | ||
1704 | |||
1705 | -echo "$as_me:$LINENO: checking target system type" >&5 | ||
1706 | -echo $ECHO_N "checking target system type... $ECHO_C" >&6 | ||
1707 | -if test "${ac_cv_target+set}" = set; then | ||
1708 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1709 | -else | ||
1710 | - ac_cv_target_alias=$target_alias | ||
1711 | -test "x$ac_cv_target_alias" = "x" && | ||
1712 | - ac_cv_target_alias=$ac_cv_host_alias | ||
1713 | -ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || | ||
1714 | - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 | ||
1715 | -echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} | ||
1716 | - { (exit 1); exit 1; }; } | ||
1717 | +target_alias=$target | ||
1718 | +case "$target_alias" in | ||
1719 | +NONE) | ||
1720 | + case $nonopt in | ||
1721 | + NONE) target_alias=$host_alias ;; | ||
1722 | + *) target_alias=$nonopt ;; | ||
1723 | + esac ;; | ||
1724 | +esac | ||
1725 | |||
1726 | -fi | ||
1727 | -echo "$as_me:$LINENO: result: $ac_cv_target" >&5 | ||
1728 | -echo "${ECHO_T}$ac_cv_target" >&6 | ||
1729 | -target=$ac_cv_target | ||
1730 | -target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | ||
1731 | -target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | ||
1732 | -target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
1733 | +target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` | ||
1734 | +target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | ||
1735 | +target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | ||
1736 | +target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
1737 | +echo "$ac_t""$target" 1>&6 | ||
1738 | |||
1739 | +echo $ac_n "checking build system type""... $ac_c" 1>&6 | ||
1740 | +echo "configure:624: checking build system type" >&5 | ||
1741 | |||
1742 | -# The aliases save the names the user supplied, while $host etc. | ||
1743 | -# will get canonicalized. | ||
1744 | -test -n "$target_alias" && | ||
1745 | +build_alias=$build | ||
1746 | +case "$build_alias" in | ||
1747 | +NONE) | ||
1748 | + case $nonopt in | ||
1749 | + NONE) build_alias=$host_alias ;; | ||
1750 | + *) build_alias=$nonopt ;; | ||
1751 | + esac ;; | ||
1752 | +esac | ||
1753 | + | ||
1754 | +build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` | ||
1755 | +build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | ||
1756 | +build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | ||
1757 | +build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
1758 | +echo "$ac_t""$build" 1>&6 | ||
1759 | + | ||
1760 | +test "$host_alias" != "$target_alias" && | ||
1761 | test "$program_prefix$program_suffix$program_transform_name" = \ | ||
1762 | NONENONEs,x,x, && | ||
1763 | program_prefix=${target_alias}- | ||
1764 | -ac_ext=c | ||
1765 | -ac_cpp='$CPP $CPPFLAGS' | ||
1766 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
1767 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
1768 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
1769 | -if test -n "$ac_tool_prefix"; then | ||
1770 | - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | ||
1771 | -set dummy ${ac_tool_prefix}gcc; ac_word=$2 | ||
1772 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
1773 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
1774 | -if test "${ac_cv_prog_CC+set}" = set; then | ||
1775 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1776 | -else | ||
1777 | - if test -n "$CC"; then | ||
1778 | - ac_cv_prog_CC="$CC" # Let the user override the test. | ||
1779 | -else | ||
1780 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1781 | -for as_dir in $PATH | ||
1782 | -do | ||
1783 | - IFS=$as_save_IFS | ||
1784 | - test -z "$as_dir" && as_dir=. | ||
1785 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
1786 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1787 | - ac_cv_prog_CC="${ac_tool_prefix}gcc" | ||
1788 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1789 | - break 2 | ||
1790 | - fi | ||
1791 | -done | ||
1792 | -done | ||
1793 | |||
1794 | -fi | ||
1795 | -fi | ||
1796 | -CC=$ac_cv_prog_CC | ||
1797 | -if test -n "$CC"; then | ||
1798 | - echo "$as_me:$LINENO: result: $CC" >&5 | ||
1799 | -echo "${ECHO_T}$CC" >&6 | ||
1800 | -else | ||
1801 | - echo "$as_me:$LINENO: result: no" >&5 | ||
1802 | -echo "${ECHO_T}no" >&6 | ||
1803 | -fi | ||
1804 | - | ||
1805 | -fi | ||
1806 | -if test -z "$ac_cv_prog_CC"; then | ||
1807 | - ac_ct_CC=$CC | ||
1808 | - # Extract the first word of "gcc", so it can be a program name with args. | ||
1809 | +# Extract the first word of "gcc", so it can be a program name with args. | ||
1810 | set dummy gcc; ac_word=$2 | ||
1811 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
1812 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
1813 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
1814 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1815 | +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1816 | +echo "configure:649: checking for $ac_word" >&5 | ||
1817 | +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
1818 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
1819 | else | ||
1820 | - if test -n "$ac_ct_CC"; then | ||
1821 | - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | ||
1822 | -else | ||
1823 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1824 | -for as_dir in $PATH | ||
1825 | -do | ||
1826 | - IFS=$as_save_IFS | ||
1827 | - test -z "$as_dir" && as_dir=. | ||
1828 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
1829 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1830 | - ac_cv_prog_ac_ct_CC="gcc" | ||
1831 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1832 | - break 2 | ||
1833 | - fi | ||
1834 | -done | ||
1835 | -done | ||
1836 | - | ||
1837 | -fi | ||
1838 | -fi | ||
1839 | -ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
1840 | -if test -n "$ac_ct_CC"; then | ||
1841 | - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
1842 | -echo "${ECHO_T}$ac_ct_CC" >&6 | ||
1843 | -else | ||
1844 | - echo "$as_me:$LINENO: result: no" >&5 | ||
1845 | -echo "${ECHO_T}no" >&6 | ||
1846 | -fi | ||
1847 | - | ||
1848 | - CC=$ac_ct_CC | ||
1849 | -else | ||
1850 | - CC="$ac_cv_prog_CC" | ||
1851 | -fi | ||
1852 | - | ||
1853 | -if test -z "$CC"; then | ||
1854 | - if test -n "$ac_tool_prefix"; then | ||
1855 | - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | ||
1856 | -set dummy ${ac_tool_prefix}cc; ac_word=$2 | ||
1857 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
1858 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
1859 | -if test "${ac_cv_prog_CC+set}" = set; then | ||
1860 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1861 | -else | ||
1862 | if test -n "$CC"; then | ||
1863 | ac_cv_prog_CC="$CC" # Let the user override the test. | ||
1864 | else | ||
1865 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1866 | -for as_dir in $PATH | ||
1867 | -do | ||
1868 | - IFS=$as_save_IFS | ||
1869 | - test -z "$as_dir" && as_dir=. | ||
1870 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
1871 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1872 | - ac_cv_prog_CC="${ac_tool_prefix}cc" | ||
1873 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1874 | - break 2 | ||
1875 | - fi | ||
1876 | -done | ||
1877 | -done | ||
1878 | - | ||
1879 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | ||
1880 | + ac_dummy="$PATH" | ||
1881 | + for ac_dir in $ac_dummy; do | ||
1882 | + test -z "$ac_dir" && ac_dir=. | ||
1883 | + if test -f $ac_dir/$ac_word; then | ||
1884 | + ac_cv_prog_CC="gcc" | ||
1885 | + break | ||
1886 | + fi | ||
1887 | + done | ||
1888 | + IFS="$ac_save_ifs" | ||
1889 | fi | ||
1890 | fi | ||
1891 | -CC=$ac_cv_prog_CC | ||
1892 | +CC="$ac_cv_prog_CC" | ||
1893 | if test -n "$CC"; then | ||
1894 | - echo "$as_me:$LINENO: result: $CC" >&5 | ||
1895 | -echo "${ECHO_T}$CC" >&6 | ||
1896 | + echo "$ac_t""$CC" 1>&6 | ||
1897 | else | ||
1898 | - echo "$as_me:$LINENO: result: no" >&5 | ||
1899 | -echo "${ECHO_T}no" >&6 | ||
1900 | + echo "$ac_t""no" 1>&6 | ||
1901 | fi | ||
1902 | |||
1903 | -fi | ||
1904 | -if test -z "$ac_cv_prog_CC"; then | ||
1905 | - ac_ct_CC=$CC | ||
1906 | - # Extract the first word of "cc", so it can be a program name with args. | ||
1907 | -set dummy cc; ac_word=$2 | ||
1908 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
1909 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
1910 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
1911 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1912 | -else | ||
1913 | - if test -n "$ac_ct_CC"; then | ||
1914 | - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | ||
1915 | -else | ||
1916 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1917 | -for as_dir in $PATH | ||
1918 | -do | ||
1919 | - IFS=$as_save_IFS | ||
1920 | - test -z "$as_dir" && as_dir=. | ||
1921 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
1922 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1923 | - ac_cv_prog_ac_ct_CC="cc" | ||
1924 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1925 | - break 2 | ||
1926 | - fi | ||
1927 | -done | ||
1928 | -done | ||
1929 | - | ||
1930 | -fi | ||
1931 | -fi | ||
1932 | -ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
1933 | -if test -n "$ac_ct_CC"; then | ||
1934 | - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
1935 | -echo "${ECHO_T}$ac_ct_CC" >&6 | ||
1936 | -else | ||
1937 | - echo "$as_me:$LINENO: result: no" >&5 | ||
1938 | -echo "${ECHO_T}no" >&6 | ||
1939 | -fi | ||
1940 | - | ||
1941 | - CC=$ac_ct_CC | ||
1942 | -else | ||
1943 | - CC="$ac_cv_prog_CC" | ||
1944 | -fi | ||
1945 | - | ||
1946 | -fi | ||
1947 | if test -z "$CC"; then | ||
1948 | # Extract the first word of "cc", so it can be a program name with args. | ||
1949 | set dummy cc; ac_word=$2 | ||
1950 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
1951 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
1952 | -if test "${ac_cv_prog_CC+set}" = set; then | ||
1953 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1954 | +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1955 | +echo "configure:679: checking for $ac_word" >&5 | ||
1956 | +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
1957 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
1958 | else | ||
1959 | if test -n "$CC"; then | ||
1960 | ac_cv_prog_CC="$CC" # Let the user override the test. | ||
1961 | else | ||
1962 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | ||
1963 | ac_prog_rejected=no | ||
1964 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1965 | -for as_dir in $PATH | ||
1966 | -do | ||
1967 | - IFS=$as_save_IFS | ||
1968 | - test -z "$as_dir" && as_dir=. | ||
1969 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
1970 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1971 | - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | ||
1972 | - ac_prog_rejected=yes | ||
1973 | - continue | ||
1974 | - fi | ||
1975 | - ac_cv_prog_CC="cc" | ||
1976 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1977 | - break 2 | ||
1978 | - fi | ||
1979 | -done | ||
1980 | -done | ||
1981 | - | ||
1982 | + ac_dummy="$PATH" | ||
1983 | + for ac_dir in $ac_dummy; do | ||
1984 | + test -z "$ac_dir" && ac_dir=. | ||
1985 | + if test -f $ac_dir/$ac_word; then | ||
1986 | + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then | ||
1987 | + ac_prog_rejected=yes | ||
1988 | + continue | ||
1989 | + fi | ||
1990 | + ac_cv_prog_CC="cc" | ||
1991 | + break | ||
1992 | + fi | ||
1993 | + done | ||
1994 | + IFS="$ac_save_ifs" | ||
1995 | if test $ac_prog_rejected = yes; then | ||
1996 | # We found a bogon in the path, so make sure we never use it. | ||
1997 | set dummy $ac_cv_prog_CC | ||
1998 | shift | ||
1999 | - if test $# != 0; then | ||
2000 | + if test $# -gt 0; then | ||
2001 | # We chose a different compiler from the bogus one. | ||
2002 | # However, it has the same basename, so the bogon will be chosen | ||
2003 | # first if we set CC to just the basename; use the full file name. | ||
2004 | shift | ||
2005 | - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" | ||
2006 | + set dummy "$ac_dir/$ac_word" "$@" | ||
2007 | + shift | ||
2008 | + ac_cv_prog_CC="$@" | ||
2009 | fi | ||
2010 | fi | ||
2011 | fi | ||
2012 | fi | ||
2013 | -CC=$ac_cv_prog_CC | ||
2014 | +CC="$ac_cv_prog_CC" | ||
2015 | if test -n "$CC"; then | ||
2016 | - echo "$as_me:$LINENO: result: $CC" >&5 | ||
2017 | -echo "${ECHO_T}$CC" >&6 | ||
2018 | + echo "$ac_t""$CC" 1>&6 | ||
2019 | else | ||
2020 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2021 | -echo "${ECHO_T}no" >&6 | ||
2022 | + echo "$ac_t""no" 1>&6 | ||
2023 | fi | ||
2024 | |||
2025 | -fi | ||
2026 | -if test -z "$CC"; then | ||
2027 | - if test -n "$ac_tool_prefix"; then | ||
2028 | - for ac_prog in cl | ||
2029 | - do | ||
2030 | - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
2031 | -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
2032 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2033 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2034 | -if test "${ac_cv_prog_CC+set}" = set; then | ||
2035 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2036 | + if test -z "$CC"; then | ||
2037 | + case "`uname -s`" in | ||
2038 | + *win32* | *WIN32*) | ||
2039 | + # Extract the first word of "cl", so it can be a program name with args. | ||
2040 | +set dummy cl; ac_word=$2 | ||
2041 | +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
2042 | +echo "configure:730: checking for $ac_word" >&5 | ||
2043 | +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
2044 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
2045 | else | ||
2046 | if test -n "$CC"; then | ||
2047 | ac_cv_prog_CC="$CC" # Let the user override the test. | ||
2048 | else | ||
2049 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2050 | -for as_dir in $PATH | ||
2051 | -do | ||
2052 | - IFS=$as_save_IFS | ||
2053 | - test -z "$as_dir" && as_dir=. | ||
2054 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2055 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2056 | - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | ||
2057 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2058 | - break 2 | ||
2059 | - fi | ||
2060 | -done | ||
2061 | -done | ||
2062 | - | ||
2063 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | ||
2064 | + ac_dummy="$PATH" | ||
2065 | + for ac_dir in $ac_dummy; do | ||
2066 | + test -z "$ac_dir" && ac_dir=. | ||
2067 | + if test -f $ac_dir/$ac_word; then | ||
2068 | + ac_cv_prog_CC="cl" | ||
2069 | + break | ||
2070 | + fi | ||
2071 | + done | ||
2072 | + IFS="$ac_save_ifs" | ||
2073 | fi | ||
2074 | fi | ||
2075 | -CC=$ac_cv_prog_CC | ||
2076 | +CC="$ac_cv_prog_CC" | ||
2077 | if test -n "$CC"; then | ||
2078 | - echo "$as_me:$LINENO: result: $CC" >&5 | ||
2079 | -echo "${ECHO_T}$CC" >&6 | ||
2080 | + echo "$ac_t""$CC" 1>&6 | ||
2081 | else | ||
2082 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2083 | -echo "${ECHO_T}no" >&6 | ||
2084 | + echo "$ac_t""no" 1>&6 | ||
2085 | fi | ||
2086 | - | ||
2087 | - test -n "$CC" && break | ||
2088 | - done | ||
2089 | -fi | ||
2090 | -if test -z "$CC"; then | ||
2091 | - ac_ct_CC=$CC | ||
2092 | - for ac_prog in cl | ||
2093 | -do | ||
2094 | - # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
2095 | -set dummy $ac_prog; ac_word=$2 | ||
2096 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2097 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2098 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
2099 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2100 | -else | ||
2101 | - if test -n "$ac_ct_CC"; then | ||
2102 | - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | ||
2103 | -else | ||
2104 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2105 | -for as_dir in $PATH | ||
2106 | -do | ||
2107 | - IFS=$as_save_IFS | ||
2108 | - test -z "$as_dir" && as_dir=. | ||
2109 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2110 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2111 | - ac_cv_prog_ac_ct_CC="$ac_prog" | ||
2112 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2113 | - break 2 | ||
2114 | + ;; | ||
2115 | + esac | ||
2116 | fi | ||
2117 | -done | ||
2118 | -done | ||
2119 | - | ||
2120 | + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } | ||
2121 | fi | ||
2122 | -fi | ||
2123 | -ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
2124 | -if test -n "$ac_ct_CC"; then | ||
2125 | - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
2126 | -echo "${ECHO_T}$ac_ct_CC" >&6 | ||
2127 | -else | ||
2128 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2129 | -echo "${ECHO_T}no" >&6 | ||
2130 | -fi | ||
2131 | |||
2132 | - test -n "$ac_ct_CC" && break | ||
2133 | -done | ||
2134 | +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | ||
2135 | +echo "configure:762: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | ||
2136 | |||
2137 | - CC=$ac_ct_CC | ||
2138 | -fi | ||
2139 | +ac_ext=c | ||
2140 | +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
2141 | +ac_cpp='$CPP $CPPFLAGS' | ||
2142 | +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' | ||
2143 | +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' | ||
2144 | +cross_compiling=$ac_cv_prog_cc_cross | ||
2145 | |||
2146 | -fi | ||
2147 | +cat > conftest.$ac_ext << EOF | ||
2148 | |||
2149 | +#line 773 "configure" | ||
2150 | +#include "confdefs.h" | ||
2151 | |||
2152 | -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH | ||
2153 | -See \`config.log' for more details." >&5 | ||
2154 | -echo "$as_me: error: no acceptable C compiler found in \$PATH | ||
2155 | -See \`config.log' for more details." >&2;} | ||
2156 | - { (exit 1); exit 1; }; } | ||
2157 | - | ||
2158 | -# Provide some information about the compiler. | ||
2159 | -echo "$as_me:$LINENO:" \ | ||
2160 | - "checking for C compiler version" >&5 | ||
2161 | -ac_compiler=`set X $ac_compile; echo $2` | ||
2162 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 | ||
2163 | - (eval $ac_compiler --version </dev/null >&5) 2>&5 | ||
2164 | - ac_status=$? | ||
2165 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2166 | - (exit $ac_status); } | ||
2167 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 | ||
2168 | - (eval $ac_compiler -v </dev/null >&5) 2>&5 | ||
2169 | - ac_status=$? | ||
2170 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2171 | - (exit $ac_status); } | ||
2172 | -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 | ||
2173 | - (eval $ac_compiler -V </dev/null >&5) 2>&5 | ||
2174 | - ac_status=$? | ||
2175 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2176 | - (exit $ac_status); } | ||
2177 | - | ||
2178 | -cat >conftest.$ac_ext <<_ACEOF | ||
2179 | -#line $LINENO "configure" | ||
2180 | -/* confdefs.h. */ | ||
2181 | -_ACEOF | ||
2182 | -cat confdefs.h >>conftest.$ac_ext | ||
2183 | -cat >>conftest.$ac_ext <<_ACEOF | ||
2184 | -/* end confdefs.h. */ | ||
2185 | - | ||
2186 | -int | ||
2187 | -main () | ||
2188 | -{ | ||
2189 | - | ||
2190 | - ; | ||
2191 | - return 0; | ||
2192 | -} | ||
2193 | -_ACEOF | ||
2194 | -ac_clean_files_save=$ac_clean_files | ||
2195 | -ac_clean_files="$ac_clean_files a.out a.exe b.out" | ||
2196 | -# Try to create an executable without -o first, disregard a.out. | ||
2197 | -# It will help us diagnose broken compilers, and finding out an intuition | ||
2198 | -# of exeext. | ||
2199 | -echo "$as_me:$LINENO: checking for C compiler default output" >&5 | ||
2200 | -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 | ||
2201 | -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | ||
2202 | -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 | ||
2203 | - (eval $ac_link_default) 2>&5 | ||
2204 | - ac_status=$? | ||
2205 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2206 | - (exit $ac_status); }; then | ||
2207 | - # Find the output, starting from the most likely. This scheme is | ||
2208 | -# not robust to junk in `.', hence go to wildcards (a.*) only as a last | ||
2209 | -# resort. | ||
2210 | - | ||
2211 | -# Be careful to initialize this variable, since it used to be cached. | ||
2212 | -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. | ||
2213 | -ac_cv_exeext= | ||
2214 | -# b.out is created by i960 compilers. | ||
2215 | -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out | ||
2216 | -do | ||
2217 | - test -f "$ac_file" || continue | ||
2218 | - case $ac_file in | ||
2219 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) | ||
2220 | - ;; | ||
2221 | - conftest.$ac_ext ) | ||
2222 | - # This is the source file. | ||
2223 | - ;; | ||
2224 | - [ab].out ) | ||
2225 | - # We found the default executable, but exeext='' is most | ||
2226 | - # certainly right. | ||
2227 | - break;; | ||
2228 | - *.* ) | ||
2229 | - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
2230 | - # FIXME: I believe we export ac_cv_exeext for Libtool, | ||
2231 | - # but it would be cool to find out if it's true. Does anybody | ||
2232 | - # maintain Libtool? --akim. | ||
2233 | - export ac_cv_exeext | ||
2234 | - break;; | ||
2235 | - * ) | ||
2236 | - break;; | ||
2237 | - esac | ||
2238 | -done | ||
2239 | -else | ||
2240 | - echo "$as_me: failed program was:" >&5 | ||
2241 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
2242 | - | ||
2243 | -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables | ||
2244 | -See \`config.log' for more details." >&5 | ||
2245 | -echo "$as_me: error: C compiler cannot create executables | ||
2246 | -See \`config.log' for more details." >&2;} | ||
2247 | - { (exit 77); exit 77; }; } | ||
2248 | -fi | ||
2249 | - | ||
2250 | -ac_exeext=$ac_cv_exeext | ||
2251 | -echo "$as_me:$LINENO: result: $ac_file" >&5 | ||
2252 | -echo "${ECHO_T}$ac_file" >&6 | ||
2253 | - | ||
2254 | -# Check the compiler produces executables we can run. If not, either | ||
2255 | -# the compiler is broken, or we cross compile. | ||
2256 | -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 | ||
2257 | -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 | ||
2258 | -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 | ||
2259 | -# If not cross compiling, check that we can run a simple program. | ||
2260 | -if test "$cross_compiling" != yes; then | ||
2261 | - if { ac_try='./$ac_file' | ||
2262 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2263 | - (eval $ac_try) 2>&5 | ||
2264 | - ac_status=$? | ||
2265 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2266 | - (exit $ac_status); }; }; then | ||
2267 | - cross_compiling=no | ||
2268 | +main(){return(0);} | ||
2269 | +EOF | ||
2270 | +if { (eval echo configure:778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2271 | + ac_cv_prog_cc_works=yes | ||
2272 | + # If we can't run a trivial program, we are probably using a cross compiler. | ||
2273 | + if (./conftest; exit) 2>/dev/null; then | ||
2274 | + ac_cv_prog_cc_cross=no | ||
2275 | else | ||
2276 | - if test "$cross_compiling" = maybe; then | ||
2277 | - cross_compiling=yes | ||
2278 | - else | ||
2279 | - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. | ||
2280 | -If you meant to cross compile, use \`--host'. | ||
2281 | -See \`config.log' for more details." >&5 | ||
2282 | -echo "$as_me: error: cannot run C compiled programs. | ||
2283 | -If you meant to cross compile, use \`--host'. | ||
2284 | -See \`config.log' for more details." >&2;} | ||
2285 | - { (exit 1); exit 1; }; } | ||
2286 | - fi | ||
2287 | + ac_cv_prog_cc_cross=yes | ||
2288 | fi | ||
2289 | +else | ||
2290 | + echo "configure: failed program was:" >&5 | ||
2291 | + cat conftest.$ac_ext >&5 | ||
2292 | + ac_cv_prog_cc_works=no | ||
2293 | fi | ||
2294 | -echo "$as_me:$LINENO: result: yes" >&5 | ||
2295 | -echo "${ECHO_T}yes" >&6 | ||
2296 | +rm -fr conftest* | ||
2297 | +ac_ext=c | ||
2298 | +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
2299 | +ac_cpp='$CPP $CPPFLAGS' | ||
2300 | +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' | ||
2301 | +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' | ||
2302 | +cross_compiling=$ac_cv_prog_cc_cross | ||
2303 | |||
2304 | -rm -f a.out a.exe conftest$ac_cv_exeext b.out | ||
2305 | -ac_clean_files=$ac_clean_files_save | ||
2306 | -# Check the compiler produces executables we can run. If not, either | ||
2307 | -# the compiler is broken, or we cross compile. | ||
2308 | -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 | ||
2309 | -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 | ||
2310 | -echo "$as_me:$LINENO: result: $cross_compiling" >&5 | ||
2311 | -echo "${ECHO_T}$cross_compiling" >&6 | ||
2312 | - | ||
2313 | -echo "$as_me:$LINENO: checking for suffix of executables" >&5 | ||
2314 | -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 | ||
2315 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
2316 | - (eval $ac_link) 2>&5 | ||
2317 | - ac_status=$? | ||
2318 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2319 | - (exit $ac_status); }; then | ||
2320 | - # If both `conftest.exe' and `conftest' are `present' (well, observable) | ||
2321 | -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will | ||
2322 | -# work properly (i.e., refer to `conftest.exe'), while it won't with | ||
2323 | -# `rm'. | ||
2324 | -for ac_file in conftest.exe conftest conftest.*; do | ||
2325 | - test -f "$ac_file" || continue | ||
2326 | - case $ac_file in | ||
2327 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; | ||
2328 | - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
2329 | - export ac_cv_exeext | ||
2330 | - break;; | ||
2331 | - * ) break;; | ||
2332 | - esac | ||
2333 | -done | ||
2334 | -else | ||
2335 | - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link | ||
2336 | -See \`config.log' for more details." >&5 | ||
2337 | -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link | ||
2338 | -See \`config.log' for more details." >&2;} | ||
2339 | - { (exit 1); exit 1; }; } | ||
2340 | +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 | ||
2341 | +if test $ac_cv_prog_cc_works = no; then | ||
2342 | + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } | ||
2343 | fi | ||
2344 | +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | ||
2345 | +echo "configure:804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
2346 | +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 | ||
2347 | +cross_compiling=$ac_cv_prog_cc_cross | ||
2348 | |||
2349 | -rm -f conftest$ac_cv_exeext | ||
2350 | -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 | ||
2351 | -echo "${ECHO_T}$ac_cv_exeext" >&6 | ||
2352 | - | ||
2353 | -rm -f conftest.$ac_ext | ||
2354 | -EXEEXT=$ac_cv_exeext | ||
2355 | -ac_exeext=$EXEEXT | ||
2356 | -echo "$as_me:$LINENO: checking for suffix of object files" >&5 | ||
2357 | -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 | ||
2358 | -if test "${ac_cv_objext+set}" = set; then | ||
2359 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2360 | +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 | ||
2361 | +echo "configure:809: checking whether we are using GNU C" >&5 | ||
2362 | +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then | ||
2363 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
2364 | else | ||
2365 | - cat >conftest.$ac_ext <<_ACEOF | ||
2366 | -#line $LINENO "configure" | ||
2367 | -/* confdefs.h. */ | ||
2368 | -_ACEOF | ||
2369 | -cat confdefs.h >>conftest.$ac_ext | ||
2370 | -cat >>conftest.$ac_ext <<_ACEOF | ||
2371 | -/* end confdefs.h. */ | ||
2372 | - | ||
2373 | -int | ||
2374 | -main () | ||
2375 | -{ | ||
2376 | - | ||
2377 | - ; | ||
2378 | - return 0; | ||
2379 | -} | ||
2380 | -_ACEOF | ||
2381 | -rm -f conftest.o conftest.obj | ||
2382 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2383 | - (eval $ac_compile) 2>&5 | ||
2384 | - ac_status=$? | ||
2385 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2386 | - (exit $ac_status); }; then | ||
2387 | - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do | ||
2388 | - case $ac_file in | ||
2389 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; | ||
2390 | - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` | ||
2391 | - break;; | ||
2392 | - esac | ||
2393 | -done | ||
2394 | + cat > conftest.c <<EOF | ||
2395 | +#ifdef __GNUC__ | ||
2396 | + yes; | ||
2397 | +#endif | ||
2398 | +EOF | ||
2399 | +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
2400 | + ac_cv_prog_gcc=yes | ||
2401 | else | ||
2402 | - echo "$as_me: failed program was:" >&5 | ||
2403 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
2404 | - | ||
2405 | -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile | ||
2406 | -See \`config.log' for more details." >&5 | ||
2407 | -echo "$as_me: error: cannot compute suffix of object files: cannot compile | ||
2408 | -See \`config.log' for more details." >&2;} | ||
2409 | - { (exit 1); exit 1; }; } | ||
2410 | + ac_cv_prog_gcc=no | ||
2411 | fi | ||
2412 | - | ||
2413 | -rm -f conftest.$ac_cv_objext conftest.$ac_ext | ||
2414 | fi | ||
2415 | -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 | ||
2416 | -echo "${ECHO_T}$ac_cv_objext" >&6 | ||
2417 | -OBJEXT=$ac_cv_objext | ||
2418 | -ac_objext=$OBJEXT | ||
2419 | -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | ||
2420 | -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 | ||
2421 | -if test "${ac_cv_c_compiler_gnu+set}" = set; then | ||
2422 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2423 | -else | ||
2424 | - cat >conftest.$ac_ext <<_ACEOF | ||
2425 | -#line $LINENO "configure" | ||
2426 | -/* confdefs.h. */ | ||
2427 | -_ACEOF | ||
2428 | -cat confdefs.h >>conftest.$ac_ext | ||
2429 | -cat >>conftest.$ac_ext <<_ACEOF | ||
2430 | -/* end confdefs.h. */ | ||
2431 | |||
2432 | -int | ||
2433 | -main () | ||
2434 | -{ | ||
2435 | -#ifndef __GNUC__ | ||
2436 | - choke me | ||
2437 | -#endif | ||
2438 | +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 | ||
2439 | |||
2440 | - ; | ||
2441 | - return 0; | ||
2442 | -} | ||
2443 | -_ACEOF | ||
2444 | -rm -f conftest.$ac_objext | ||
2445 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2446 | - (eval $ac_compile) 2>&5 | ||
2447 | - ac_status=$? | ||
2448 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2449 | - (exit $ac_status); } && | ||
2450 | - { ac_try='test -s conftest.$ac_objext' | ||
2451 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2452 | - (eval $ac_try) 2>&5 | ||
2453 | - ac_status=$? | ||
2454 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2455 | - (exit $ac_status); }; }; then | ||
2456 | - ac_compiler_gnu=yes | ||
2457 | +if test $ac_cv_prog_gcc = yes; then | ||
2458 | + GCC=yes | ||
2459 | else | ||
2460 | - echo "$as_me: failed program was:" >&5 | ||
2461 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
2462 | - | ||
2463 | -ac_compiler_gnu=no | ||
2464 | + GCC= | ||
2465 | fi | ||
2466 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2467 | -ac_cv_c_compiler_gnu=$ac_compiler_gnu | ||
2468 | |||
2469 | -fi | ||
2470 | -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | ||
2471 | -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 | ||
2472 | -GCC=`test $ac_compiler_gnu = yes && echo yes` | ||
2473 | -ac_test_CFLAGS=${CFLAGS+set} | ||
2474 | -ac_save_CFLAGS=$CFLAGS | ||
2475 | -CFLAGS="-g" | ||
2476 | -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | ||
2477 | -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 | ||
2478 | -if test "${ac_cv_prog_cc_g+set}" = set; then | ||
2479 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2480 | +ac_test_CFLAGS="${CFLAGS+set}" | ||
2481 | +ac_save_CFLAGS="$CFLAGS" | ||
2482 | +CFLAGS= | ||
2483 | +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | ||
2484 | +echo "configure:837: checking whether ${CC-cc} accepts -g" >&5 | ||
2485 | +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then | ||
2486 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
2487 | else | ||
2488 | - cat >conftest.$ac_ext <<_ACEOF | ||
2489 | -#line $LINENO "configure" | ||
2490 | -/* confdefs.h. */ | ||
2491 | -_ACEOF | ||
2492 | -cat confdefs.h >>conftest.$ac_ext | ||
2493 | -cat >>conftest.$ac_ext <<_ACEOF | ||
2494 | -/* end confdefs.h. */ | ||
2495 | - | ||
2496 | -int | ||
2497 | -main () | ||
2498 | -{ | ||
2499 | - | ||
2500 | - ; | ||
2501 | - return 0; | ||
2502 | -} | ||
2503 | -_ACEOF | ||
2504 | -rm -f conftest.$ac_objext | ||
2505 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2506 | - (eval $ac_compile) 2>&5 | ||
2507 | - ac_status=$? | ||
2508 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2509 | - (exit $ac_status); } && | ||
2510 | - { ac_try='test -s conftest.$ac_objext' | ||
2511 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2512 | - (eval $ac_try) 2>&5 | ||
2513 | - ac_status=$? | ||
2514 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2515 | - (exit $ac_status); }; }; then | ||
2516 | + echo 'void f(){}' > conftest.c | ||
2517 | +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then | ||
2518 | ac_cv_prog_cc_g=yes | ||
2519 | else | ||
2520 | - echo "$as_me: failed program was:" >&5 | ||
2521 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
2522 | + ac_cv_prog_cc_g=no | ||
2523 | +fi | ||
2524 | +rm -f conftest* | ||
2525 | |||
2526 | -ac_cv_prog_cc_g=no | ||
2527 | fi | ||
2528 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2529 | -fi | ||
2530 | -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | ||
2531 | -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 | ||
2532 | + | ||
2533 | +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 | ||
2534 | if test "$ac_test_CFLAGS" = set; then | ||
2535 | - CFLAGS=$ac_save_CFLAGS | ||
2536 | + CFLAGS="$ac_save_CFLAGS" | ||
2537 | elif test $ac_cv_prog_cc_g = yes; then | ||
2538 | if test "$GCC" = yes; then | ||
2539 | CFLAGS="-g -O2" | ||
2540 | @@ -2028,304 +863,37 @@ | ||
2541 | CFLAGS= | ||
2542 | fi | ||
2543 | fi | ||
2544 | -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 | ||
2545 | -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 | ||
2546 | -if test "${ac_cv_prog_cc_stdc+set}" = set; then | ||
2547 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2548 | -else | ||
2549 | - ac_cv_prog_cc_stdc=no | ||
2550 | -ac_save_CC=$CC | ||
2551 | -cat >conftest.$ac_ext <<_ACEOF | ||
2552 | -#line $LINENO "configure" | ||
2553 | -/* confdefs.h. */ | ||
2554 | -_ACEOF | ||
2555 | -cat confdefs.h >>conftest.$ac_ext | ||
2556 | -cat >>conftest.$ac_ext <<_ACEOF | ||
2557 | -/* end confdefs.h. */ | ||
2558 | -#include <stdarg.h> | ||
2559 | -#include <stdio.h> | ||
2560 | -#include <sys/types.h> | ||
2561 | -#include <sys/stat.h> | ||
2562 | -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ | ||
2563 | -struct buf { int x; }; | ||
2564 | -FILE * (*rcsopen) (struct buf *, struct stat *, int); | ||
2565 | -static char *e (p, i) | ||
2566 | - char **p; | ||
2567 | - int i; | ||
2568 | -{ | ||
2569 | - return p[i]; | ||
2570 | -} | ||
2571 | -static char *f (char * (*g) (char **, int), char **p, ...) | ||
2572 | -{ | ||
2573 | - char *s; | ||
2574 | - va_list v; | ||
2575 | - va_start (v,p); | ||
2576 | - s = g (p, va_arg (v,int)); | ||
2577 | - va_end (v); | ||
2578 | - return s; | ||
2579 | -} | ||
2580 | -int test (int i, double x); | ||
2581 | -struct s1 {int (*f) (int a);}; | ||
2582 | -struct s2 {int (*f) (double a);}; | ||
2583 | -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); | ||
2584 | -int argc; | ||
2585 | -char **argv; | ||
2586 | -int | ||
2587 | -main () | ||
2588 | -{ | ||
2589 | -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; | ||
2590 | - ; | ||
2591 | - return 0; | ||
2592 | -} | ||
2593 | -_ACEOF | ||
2594 | -# Don't try gcc -ansi; that turns off useful extensions and | ||
2595 | -# breaks some systems' header files. | ||
2596 | -# AIX -qlanglvl=ansi | ||
2597 | -# Ultrix and OSF/1 -std1 | ||
2598 | -# HP-UX 10.20 and later -Ae | ||
2599 | -# HP-UX older versions -Aa -D_HPUX_SOURCE | ||
2600 | -# SVR4 -Xc -D__EXTENSIONS__ | ||
2601 | -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | ||
2602 | -do | ||
2603 | - CC="$ac_save_CC $ac_arg" | ||
2604 | - rm -f conftest.$ac_objext | ||
2605 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2606 | - (eval $ac_compile) 2>&5 | ||
2607 | - ac_status=$? | ||
2608 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2609 | - (exit $ac_status); } && | ||
2610 | - { ac_try='test -s conftest.$ac_objext' | ||
2611 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2612 | - (eval $ac_try) 2>&5 | ||
2613 | - ac_status=$? | ||
2614 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2615 | - (exit $ac_status); }; }; then | ||
2616 | - ac_cv_prog_cc_stdc=$ac_arg | ||
2617 | -break | ||
2618 | -else | ||
2619 | - echo "$as_me: failed program was:" >&5 | ||
2620 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
2621 | |||
2622 | -fi | ||
2623 | -rm -f conftest.$ac_objext | ||
2624 | -done | ||
2625 | -rm -f conftest.$ac_ext conftest.$ac_objext | ||
2626 | -CC=$ac_save_CC | ||
2627 | - | ||
2628 | -fi | ||
2629 | - | ||
2630 | -case "x$ac_cv_prog_cc_stdc" in | ||
2631 | - x|xno) | ||
2632 | - echo "$as_me:$LINENO: result: none needed" >&5 | ||
2633 | -echo "${ECHO_T}none needed" >&6 ;; | ||
2634 | - *) | ||
2635 | - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 | ||
2636 | -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 | ||
2637 | - CC="$CC $ac_cv_prog_cc_stdc" ;; | ||
2638 | -esac | ||
2639 | - | ||
2640 | -# Some people use a C++ compiler to compile C. Since we use `exit', | ||
2641 | -# in C++ we need to declare it. In case someone uses the same compiler | ||
2642 | -# for both compiling C and C++ we need to have the C++ compiler decide | ||
2643 | -# the declaration of exit, since it's the most demanding environment. | ||
2644 | -cat >conftest.$ac_ext <<_ACEOF | ||
2645 | -#ifndef __cplusplus | ||
2646 | - choke me | ||
2647 | -#endif | ||
2648 | -_ACEOF | ||
2649 | -rm -f conftest.$ac_objext | ||
2650 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2651 | - (eval $ac_compile) 2>&5 | ||
2652 | - ac_status=$? | ||
2653 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2654 | - (exit $ac_status); } && | ||
2655 | - { ac_try='test -s conftest.$ac_objext' | ||
2656 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2657 | - (eval $ac_try) 2>&5 | ||
2658 | - ac_status=$? | ||
2659 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2660 | - (exit $ac_status); }; }; then | ||
2661 | - for ac_declaration in \ | ||
2662 | - ''\ | ||
2663 | - '#include <stdlib.h>' \ | ||
2664 | - 'extern "C" void std::exit (int) throw (); using std::exit;' \ | ||
2665 | - 'extern "C" void std::exit (int); using std::exit;' \ | ||
2666 | - 'extern "C" void exit (int) throw ();' \ | ||
2667 | - 'extern "C" void exit (int);' \ | ||
2668 | - 'void exit (int);' | ||
2669 | -do | ||
2670 | - cat >conftest.$ac_ext <<_ACEOF | ||
2671 | -#line $LINENO "configure" | ||
2672 | -/* confdefs.h. */ | ||
2673 | -_ACEOF | ||
2674 | -cat confdefs.h >>conftest.$ac_ext | ||
2675 | -cat >>conftest.$ac_ext <<_ACEOF | ||
2676 | -/* end confdefs.h. */ | ||
2677 | -#include <stdlib.h> | ||
2678 | -$ac_declaration | ||
2679 | -int | ||
2680 | -main () | ||
2681 | -{ | ||
2682 | -exit (42); | ||
2683 | - ; | ||
2684 | - return 0; | ||
2685 | -} | ||
2686 | -_ACEOF | ||
2687 | -rm -f conftest.$ac_objext | ||
2688 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2689 | - (eval $ac_compile) 2>&5 | ||
2690 | - ac_status=$? | ||
2691 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2692 | - (exit $ac_status); } && | ||
2693 | - { ac_try='test -s conftest.$ac_objext' | ||
2694 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2695 | - (eval $ac_try) 2>&5 | ||
2696 | - ac_status=$? | ||
2697 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2698 | - (exit $ac_status); }; }; then | ||
2699 | - : | ||
2700 | +# Extract the first word of "ranlib", so it can be a program name with args. | ||
2701 | +set dummy ranlib; ac_word=$2 | ||
2702 | +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
2703 | +echo "configure:871: checking for $ac_word" >&5 | ||
2704 | +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then | ||
2705 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
2706 | else | ||
2707 | - echo "$as_me: failed program was:" >&5 | ||
2708 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
2709 | - | ||
2710 | -continue | ||
2711 | -fi | ||
2712 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2713 | - cat >conftest.$ac_ext <<_ACEOF | ||
2714 | -#line $LINENO "configure" | ||
2715 | -/* confdefs.h. */ | ||
2716 | -_ACEOF | ||
2717 | -cat confdefs.h >>conftest.$ac_ext | ||
2718 | -cat >>conftest.$ac_ext <<_ACEOF | ||
2719 | -/* end confdefs.h. */ | ||
2720 | -$ac_declaration | ||
2721 | -int | ||
2722 | -main () | ||
2723 | -{ | ||
2724 | -exit (42); | ||
2725 | - ; | ||
2726 | - return 0; | ||
2727 | -} | ||
2728 | -_ACEOF | ||
2729 | -rm -f conftest.$ac_objext | ||
2730 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2731 | - (eval $ac_compile) 2>&5 | ||
2732 | - ac_status=$? | ||
2733 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2734 | - (exit $ac_status); } && | ||
2735 | - { ac_try='test -s conftest.$ac_objext' | ||
2736 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2737 | - (eval $ac_try) 2>&5 | ||
2738 | - ac_status=$? | ||
2739 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2740 | - (exit $ac_status); }; }; then | ||
2741 | - break | ||
2742 | -else | ||
2743 | - echo "$as_me: failed program was:" >&5 | ||
2744 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
2745 | - | ||
2746 | -fi | ||
2747 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2748 | -done | ||
2749 | -rm -f conftest* | ||
2750 | -if test -n "$ac_declaration"; then | ||
2751 | - echo '#ifdef __cplusplus' >>confdefs.h | ||
2752 | - echo $ac_declaration >>confdefs.h | ||
2753 | - echo '#endif' >>confdefs.h | ||
2754 | -fi | ||
2755 | - | ||
2756 | -else | ||
2757 | - echo "$as_me: failed program was:" >&5 | ||
2758 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
2759 | - | ||
2760 | -fi | ||
2761 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
2762 | -ac_ext=c | ||
2763 | -ac_cpp='$CPP $CPPFLAGS' | ||
2764 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
2765 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
2766 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
2767 | - | ||
2768 | -if test -n "$ac_tool_prefix"; then | ||
2769 | - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. | ||
2770 | -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 | ||
2771 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2772 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2773 | -if test "${ac_cv_prog_RANLIB+set}" = set; then | ||
2774 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2775 | -else | ||
2776 | if test -n "$RANLIB"; then | ||
2777 | ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. | ||
2778 | else | ||
2779 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2780 | -for as_dir in $PATH | ||
2781 | -do | ||
2782 | - IFS=$as_save_IFS | ||
2783 | - test -z "$as_dir" && as_dir=. | ||
2784 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2785 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2786 | - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | ||
2787 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2788 | - break 2 | ||
2789 | - fi | ||
2790 | -done | ||
2791 | -done | ||
2792 | - | ||
2793 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | ||
2794 | + ac_dummy="$PATH" | ||
2795 | + for ac_dir in $ac_dummy; do | ||
2796 | + test -z "$ac_dir" && ac_dir=. | ||
2797 | + if test -f $ac_dir/$ac_word; then | ||
2798 | + ac_cv_prog_RANLIB="ranlib" | ||
2799 | + break | ||
2800 | + fi | ||
2801 | + done | ||
2802 | + IFS="$ac_save_ifs" | ||
2803 | + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" | ||
2804 | fi | ||
2805 | fi | ||
2806 | -RANLIB=$ac_cv_prog_RANLIB | ||
2807 | +RANLIB="$ac_cv_prog_RANLIB" | ||
2808 | if test -n "$RANLIB"; then | ||
2809 | - echo "$as_me:$LINENO: result: $RANLIB" >&5 | ||
2810 | -echo "${ECHO_T}$RANLIB" >&6 | ||
2811 | + echo "$ac_t""$RANLIB" 1>&6 | ||
2812 | else | ||
2813 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2814 | -echo "${ECHO_T}no" >&6 | ||
2815 | + echo "$ac_t""no" 1>&6 | ||
2816 | fi | ||
2817 | |||
2818 | -fi | ||
2819 | -if test -z "$ac_cv_prog_RANLIB"; then | ||
2820 | - ac_ct_RANLIB=$RANLIB | ||
2821 | - # Extract the first word of "ranlib", so it can be a program name with args. | ||
2822 | -set dummy ranlib; ac_word=$2 | ||
2823 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2824 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2825 | -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then | ||
2826 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2827 | -else | ||
2828 | - if test -n "$ac_ct_RANLIB"; then | ||
2829 | - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. | ||
2830 | -else | ||
2831 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2832 | -for as_dir in $PATH | ||
2833 | -do | ||
2834 | - IFS=$as_save_IFS | ||
2835 | - test -z "$as_dir" && as_dir=. | ||
2836 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2837 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2838 | - ac_cv_prog_ac_ct_RANLIB="ranlib" | ||
2839 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2840 | - break 2 | ||
2841 | - fi | ||
2842 | -done | ||
2843 | -done | ||
2844 | - | ||
2845 | - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" | ||
2846 | -fi | ||
2847 | -fi | ||
2848 | -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB | ||
2849 | -if test -n "$ac_ct_RANLIB"; then | ||
2850 | - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 | ||
2851 | -echo "${ECHO_T}$ac_ct_RANLIB" >&6 | ||
2852 | -else | ||
2853 | - echo "$as_me:$LINENO: result: no" >&5 | ||
2854 | -echo "${ECHO_T}no" >&6 | ||
2855 | -fi | ||
2856 | - | ||
2857 | - RANLIB=$ac_ct_RANLIB | ||
2858 | -else | ||
2859 | - RANLIB="$ac_cv_prog_RANLIB" | ||
2860 | -fi | ||
2861 | - | ||
2862 | # Find a good install program. We prefer a C program (faster), | ||
2863 | # so one script is as good as another. But avoid the broken or | ||
2864 | # incompatible versions: | ||
2865 | @@ -2333,306 +901,158 @@ | ||
2866 | # SunOS /usr/etc/install | ||
2867 | # IRIX /sbin/install | ||
2868 | # AIX /bin/install | ||
2869 | -# AmigaOS /C/install, which installs bootblocks on floppy discs | ||
2870 | # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag | ||
2871 | # AFS /usr/afsws/bin/install, which mishandles nonexistent args | ||
2872 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
2873 | # ./install, which can be erroneously created by make from ./install.sh. | ||
2874 | -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | ||
2875 | -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 | ||
2876 | +echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 | ||
2877 | +echo "configure:910: checking for a BSD compatible install" >&5 | ||
2878 | if test -z "$INSTALL"; then | ||
2879 | -if test "${ac_cv_path_install+set}" = set; then | ||
2880 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2881 | +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then | ||
2882 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
2883 | else | ||
2884 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2885 | -for as_dir in $PATH | ||
2886 | -do | ||
2887 | - IFS=$as_save_IFS | ||
2888 | - test -z "$as_dir" && as_dir=. | ||
2889 | - # Account for people who put trailing slashes in PATH elements. | ||
2890 | -case $as_dir/ in | ||
2891 | - ./ | .// | /cC/* | \ | ||
2892 | - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ | ||
2893 | - /usr/ucb/* ) ;; | ||
2894 | - *) | ||
2895 | - # OSF1 and SCO ODT 3.0 have their own names for install. | ||
2896 | - # Don't use installbsd from OSF since it installs stuff as root | ||
2897 | - # by default. | ||
2898 | - for ac_prog in ginstall scoinst install; do | ||
2899 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2900 | - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then | ||
2901 | - if test $ac_prog = install && | ||
2902 | - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2903 | - # AIX install. It has an incompatible calling convention. | ||
2904 | - : | ||
2905 | - elif test $ac_prog = install && | ||
2906 | - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | ||
2907 | - # program-specific install script used by HP pwplus--don't use. | ||
2908 | - : | ||
2909 | - else | ||
2910 | - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" | ||
2911 | - break 3 | ||
2912 | - fi | ||
2913 | - fi | ||
2914 | + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" | ||
2915 | + for ac_dir in $PATH; do | ||
2916 | + # Account for people who put trailing slashes in PATH elements. | ||
2917 | + case "$ac_dir/" in | ||
2918 | + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; | ||
2919 | + *) | ||
2920 | + # OSF1 and SCO ODT 3.0 have their own names for install. | ||
2921 | + # Don't use installbsd from OSF since it installs stuff as root | ||
2922 | + # by default. | ||
2923 | + for ac_prog in ginstall scoinst install; do | ||
2924 | + if test -f $ac_dir/$ac_prog; then | ||
2925 | + if test $ac_prog = install && | ||
2926 | + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then | ||
2927 | + # AIX install. It has an incompatible calling convention. | ||
2928 | + : | ||
2929 | + else | ||
2930 | + ac_cv_path_install="$ac_dir/$ac_prog -c" | ||
2931 | + break 2 | ||
2932 | + fi | ||
2933 | + fi | ||
2934 | done | ||
2935 | - done | ||
2936 | - ;; | ||
2937 | -esac | ||
2938 | -done | ||
2939 | + ;; | ||
2940 | + esac | ||
2941 | + done | ||
2942 | + IFS="$ac_save_IFS" | ||
2943 | |||
2944 | - | ||
2945 | fi | ||
2946 | if test "${ac_cv_path_install+set}" = set; then | ||
2947 | - INSTALL=$ac_cv_path_install | ||
2948 | + INSTALL="$ac_cv_path_install" | ||
2949 | else | ||
2950 | # As a last resort, use the slow shell script. We don't cache a | ||
2951 | # path for INSTALL within a source directory, because that will | ||
2952 | # break other packages using the cache if that directory is | ||
2953 | # removed, or if the path is relative. | ||
2954 | - INSTALL=$ac_install_sh | ||
2955 | + INSTALL="$ac_install_sh" | ||
2956 | fi | ||
2957 | fi | ||
2958 | -echo "$as_me:$LINENO: result: $INSTALL" >&5 | ||
2959 | -echo "${ECHO_T}$INSTALL" >&6 | ||
2960 | +echo "$ac_t""$INSTALL" 1>&6 | ||
2961 | |||
2962 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. | ||
2963 | # It thinks the first close brace ends the variable substitution. | ||
2964 | test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' | ||
2965 | |||
2966 | -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' | ||
2967 | +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' | ||
2968 | |||
2969 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | ||
2970 | |||
2971 | -if test -n "$ac_tool_prefix"; then | ||
2972 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
2973 | +if test $host != $build; then | ||
2974 | + ac_tool_prefix=${host_alias}- | ||
2975 | +else | ||
2976 | + ac_tool_prefix= | ||
2977 | +fi | ||
2978 | + | ||
2979 | +# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
2980 | set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
2981 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2982 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2983 | -if test "${ac_cv_prog_AR+set}" = set; then | ||
2984 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2985 | +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
2986 | +echo "configure:971: checking for $ac_word" >&5 | ||
2987 | +if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then | ||
2988 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
2989 | else | ||
2990 | if test -n "$AR"; then | ||
2991 | ac_cv_prog_AR="$AR" # Let the user override the test. | ||
2992 | else | ||
2993 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2994 | -for as_dir in $PATH | ||
2995 | -do | ||
2996 | - IFS=$as_save_IFS | ||
2997 | - test -z "$as_dir" && as_dir=. | ||
2998 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
2999 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3000 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
3001 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3002 | - break 2 | ||
3003 | - fi | ||
3004 | -done | ||
3005 | -done | ||
3006 | - | ||
3007 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | ||
3008 | + ac_dummy="$PATH" | ||
3009 | + for ac_dir in $ac_dummy; do | ||
3010 | + test -z "$ac_dir" && ac_dir=. | ||
3011 | + if test -f $ac_dir/$ac_word; then | ||
3012 | + ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
3013 | + break | ||
3014 | + fi | ||
3015 | + done | ||
3016 | + IFS="$ac_save_ifs" | ||
3017 | + test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" | ||
3018 | fi | ||
3019 | fi | ||
3020 | -AR=$ac_cv_prog_AR | ||
3021 | +AR="$ac_cv_prog_AR" | ||
3022 | if test -n "$AR"; then | ||
3023 | - echo "$as_me:$LINENO: result: $AR" >&5 | ||
3024 | -echo "${ECHO_T}$AR" >&6 | ||
3025 | + echo "$ac_t""$AR" 1>&6 | ||
3026 | else | ||
3027 | - echo "$as_me:$LINENO: result: no" >&5 | ||
3028 | -echo "${ECHO_T}no" >&6 | ||
3029 | + echo "$ac_t""no" 1>&6 | ||
3030 | fi | ||
3031 | |||
3032 | -fi | ||
3033 | -if test -z "$ac_cv_prog_AR"; then | ||
3034 | - ac_ct_AR=$AR | ||
3035 | - # Extract the first word of "ar", so it can be a program name with args. | ||
3036 | -set dummy ar; ac_word=$2 | ||
3037 | -echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
3038 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
3039 | -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then | ||
3040 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3041 | -else | ||
3042 | - if test -n "$ac_ct_AR"; then | ||
3043 | - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. | ||
3044 | -else | ||
3045 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3046 | -for as_dir in $PATH | ||
3047 | -do | ||
3048 | - IFS=$as_save_IFS | ||
3049 | - test -z "$as_dir" && as_dir=. | ||
3050 | - for ac_exec_ext in '' $ac_executable_extensions; do | ||
3051 | - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3052 | - ac_cv_prog_ac_ct_AR="ar" | ||
3053 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3054 | - break 2 | ||
3055 | - fi | ||
3056 | -done | ||
3057 | -done | ||
3058 | |||
3059 | -fi | ||
3060 | -fi | ||
3061 | -ac_ct_AR=$ac_cv_prog_ac_ct_AR | ||
3062 | -if test -n "$ac_ct_AR"; then | ||
3063 | - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 | ||
3064 | -echo "${ECHO_T}$ac_ct_AR" >&6 | ||
3065 | -else | ||
3066 | - echo "$as_me:$LINENO: result: no" >&5 | ||
3067 | -echo "${ECHO_T}no" >&6 | ||
3068 | -fi | ||
3069 | |||
3070 | - AR=$ac_ct_AR | ||
3071 | +echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 | ||
3072 | +echo "configure:1001: checking whether byte ordering is bigendian" >&5 | ||
3073 | +if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then | ||
3074 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
3075 | else | ||
3076 | - AR="$ac_cv_prog_AR" | ||
3077 | -fi | ||
3078 | - | ||
3079 | - | ||
3080 | -echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 | ||
3081 | -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 | ||
3082 | -if test "${ac_cv_c_bigendian+set}" = set; then | ||
3083 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3084 | -else | ||
3085 | - # See if sys/param.h defines the BYTE_ORDER macro. | ||
3086 | -cat >conftest.$ac_ext <<_ACEOF | ||
3087 | -#line $LINENO "configure" | ||
3088 | -/* confdefs.h. */ | ||
3089 | -_ACEOF | ||
3090 | -cat confdefs.h >>conftest.$ac_ext | ||
3091 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3092 | -/* end confdefs.h. */ | ||
3093 | + ac_cv_c_bigendian=unknown | ||
3094 | +# See if sys/param.h defines the BYTE_ORDER macro. | ||
3095 | +cat > conftest.$ac_ext <<EOF | ||
3096 | +#line 1008 "configure" | ||
3097 | +#include "confdefs.h" | ||
3098 | #include <sys/types.h> | ||
3099 | #include <sys/param.h> | ||
3100 | +int main() { | ||
3101 | |||
3102 | -int | ||
3103 | -main () | ||
3104 | -{ | ||
3105 | #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN | ||
3106 | bogus endian macros | ||
3107 | #endif | ||
3108 | - | ||
3109 | - ; | ||
3110 | - return 0; | ||
3111 | -} | ||
3112 | -_ACEOF | ||
3113 | -rm -f conftest.$ac_objext | ||
3114 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3115 | - (eval $ac_compile) 2>&5 | ||
3116 | - ac_status=$? | ||
3117 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3118 | - (exit $ac_status); } && | ||
3119 | - { ac_try='test -s conftest.$ac_objext' | ||
3120 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3121 | - (eval $ac_try) 2>&5 | ||
3122 | - ac_status=$? | ||
3123 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3124 | - (exit $ac_status); }; }; then | ||
3125 | +; return 0; } | ||
3126 | +EOF | ||
3127 | +if { (eval echo configure:1019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3128 | + rm -rf conftest* | ||
3129 | # It does; now see whether it defined to BIG_ENDIAN or not. | ||
3130 | -cat >conftest.$ac_ext <<_ACEOF | ||
3131 | -#line $LINENO "configure" | ||
3132 | -/* confdefs.h. */ | ||
3133 | -_ACEOF | ||
3134 | -cat confdefs.h >>conftest.$ac_ext | ||
3135 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3136 | -/* end confdefs.h. */ | ||
3137 | +cat > conftest.$ac_ext <<EOF | ||
3138 | +#line 1023 "configure" | ||
3139 | +#include "confdefs.h" | ||
3140 | #include <sys/types.h> | ||
3141 | #include <sys/param.h> | ||
3142 | +int main() { | ||
3143 | |||
3144 | -int | ||
3145 | -main () | ||
3146 | -{ | ||
3147 | #if BYTE_ORDER != BIG_ENDIAN | ||
3148 | not big endian | ||
3149 | #endif | ||
3150 | - | ||
3151 | - ; | ||
3152 | - return 0; | ||
3153 | -} | ||
3154 | -_ACEOF | ||
3155 | -rm -f conftest.$ac_objext | ||
3156 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3157 | - (eval $ac_compile) 2>&5 | ||
3158 | - ac_status=$? | ||
3159 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3160 | - (exit $ac_status); } && | ||
3161 | - { ac_try='test -s conftest.$ac_objext' | ||
3162 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3163 | - (eval $ac_try) 2>&5 | ||
3164 | - ac_status=$? | ||
3165 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3166 | - (exit $ac_status); }; }; then | ||
3167 | +; return 0; } | ||
3168 | +EOF | ||
3169 | +if { (eval echo configure:1034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3170 | + rm -rf conftest* | ||
3171 | ac_cv_c_bigendian=yes | ||
3172 | else | ||
3173 | - echo "$as_me: failed program was:" >&5 | ||
3174 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3175 | - | ||
3176 | -ac_cv_c_bigendian=no | ||
3177 | + echo "configure: failed program was:" >&5 | ||
3178 | + cat conftest.$ac_ext >&5 | ||
3179 | + rm -rf conftest* | ||
3180 | + ac_cv_c_bigendian=no | ||
3181 | fi | ||
3182 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3183 | +rm -f conftest* | ||
3184 | else | ||
3185 | - echo "$as_me: failed program was:" >&5 | ||
3186 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3187 | - | ||
3188 | -# It does not; compile a test program. | ||
3189 | -if test "$cross_compiling" = yes; then | ||
3190 | - # try to guess the endianness by grepping values into an object file | ||
3191 | - ac_cv_c_bigendian=unknown | ||
3192 | - cat >conftest.$ac_ext <<_ACEOF | ||
3193 | -#line $LINENO "configure" | ||
3194 | -/* confdefs.h. */ | ||
3195 | -_ACEOF | ||
3196 | -cat confdefs.h >>conftest.$ac_ext | ||
3197 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3198 | -/* end confdefs.h. */ | ||
3199 | -short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; | ||
3200 | -short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; | ||
3201 | -void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } | ||
3202 | -short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; | ||
3203 | -short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; | ||
3204 | -void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } | ||
3205 | -int | ||
3206 | -main () | ||
3207 | -{ | ||
3208 | - _ascii (); _ebcdic (); | ||
3209 | - ; | ||
3210 | - return 0; | ||
3211 | -} | ||
3212 | -_ACEOF | ||
3213 | -rm -f conftest.$ac_objext | ||
3214 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3215 | - (eval $ac_compile) 2>&5 | ||
3216 | - ac_status=$? | ||
3217 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3218 | - (exit $ac_status); } && | ||
3219 | - { ac_try='test -s conftest.$ac_objext' | ||
3220 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3221 | - (eval $ac_try) 2>&5 | ||
3222 | - ac_status=$? | ||
3223 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3224 | - (exit $ac_status); }; }; then | ||
3225 | - if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then | ||
3226 | - ac_cv_c_bigendian=yes | ||
3227 | + echo "configure: failed program was:" >&5 | ||
3228 | + cat conftest.$ac_ext >&5 | ||
3229 | fi | ||
3230 | -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then | ||
3231 | - if test "$ac_cv_c_bigendian" = unknown; then | ||
3232 | - ac_cv_c_bigendian=no | ||
3233 | - else | ||
3234 | - # finding both strings is unlikely to happen, but who knows? | ||
3235 | - ac_cv_c_bigendian=unknown | ||
3236 | - fi | ||
3237 | -fi | ||
3238 | +rm -f conftest* | ||
3239 | +if test $ac_cv_c_bigendian = unknown; then | ||
3240 | +if test "$cross_compiling" = yes; then | ||
3241 | + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } | ||
3242 | else | ||
3243 | - echo "$as_me: failed program was:" >&5 | ||
3244 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3245 | - | ||
3246 | -fi | ||
3247 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3248 | -else | ||
3249 | - cat >conftest.$ac_ext <<_ACEOF | ||
3250 | -#line $LINENO "configure" | ||
3251 | -/* confdefs.h. */ | ||
3252 | -_ACEOF | ||
3253 | -cat confdefs.h >>conftest.$ac_ext | ||
3254 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3255 | -/* end confdefs.h. */ | ||
3256 | -int | ||
3257 | -main () | ||
3258 | -{ | ||
3259 | + cat > conftest.$ac_ext <<EOF | ||
3260 | +#line 1054 "configure" | ||
3261 | +#include "confdefs.h" | ||
3262 | +main () { | ||
3263 | /* Are we little or big endian? From Harbison&Steele. */ | ||
3264 | union | ||
3265 | { | ||
3266 | @@ -2642,52 +1062,31 @@ | ||
3267 | u.l = 1; | ||
3268 | exit (u.c[sizeof (long) - 1] == 1); | ||
3269 | } | ||
3270 | -_ACEOF | ||
3271 | -rm -f conftest$ac_exeext | ||
3272 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3273 | - (eval $ac_link) 2>&5 | ||
3274 | - ac_status=$? | ||
3275 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3276 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
3277 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3278 | - (eval $ac_try) 2>&5 | ||
3279 | - ac_status=$? | ||
3280 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3281 | - (exit $ac_status); }; }; then | ||
3282 | +EOF | ||
3283 | +if { (eval echo configure:1067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
3284 | +then | ||
3285 | ac_cv_c_bigendian=no | ||
3286 | else | ||
3287 | - echo "$as_me: program exited with status $ac_status" >&5 | ||
3288 | -echo "$as_me: failed program was:" >&5 | ||
3289 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3290 | - | ||
3291 | -( exit $ac_status ) | ||
3292 | -ac_cv_c_bigendian=yes | ||
3293 | + echo "configure: failed program was:" >&5 | ||
3294 | + cat conftest.$ac_ext >&5 | ||
3295 | + rm -fr conftest* | ||
3296 | + ac_cv_c_bigendian=yes | ||
3297 | fi | ||
3298 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
3299 | +rm -fr conftest* | ||
3300 | fi | ||
3301 | + | ||
3302 | fi | ||
3303 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3304 | fi | ||
3305 | -echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 | ||
3306 | -echo "${ECHO_T}$ac_cv_c_bigendian" >&6 | ||
3307 | -case $ac_cv_c_bigendian in | ||
3308 | - yes) | ||
3309 | |||
3310 | -cat >>confdefs.h <<\_ACEOF | ||
3311 | +echo "$ac_t""$ac_cv_c_bigendian" 1>&6 | ||
3312 | +if test $ac_cv_c_bigendian = yes; then | ||
3313 | + cat >> confdefs.h <<\EOF | ||
3314 | #define WORDS_BIGENDIAN 1 | ||
3315 | -_ACEOF | ||
3316 | - ;; | ||
3317 | - no) | ||
3318 | - ;; | ||
3319 | - *) | ||
3320 | - { { echo "$as_me:$LINENO: error: unknown endianness | ||
3321 | -presetting ac_cv_c_bigendian=no (or yes) will help" >&5 | ||
3322 | -echo "$as_me: error: unknown endianness | ||
3323 | -presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} | ||
3324 | - { (exit 1); exit 1; }; } ;; | ||
3325 | -esac | ||
3326 | +EOF | ||
3327 | |||
3328 | +fi | ||
3329 | |||
3330 | + | ||
3331 | if test "x$GCC" = "xyes"; then | ||
3332 | CFLAGS="$CFLAGS -Wall" | ||
3333 | fi | ||
3334 | @@ -2697,14 +1096,13 @@ | ||
3335 | case "${enableval}" in | ||
3336 | yes) shared=true ;; | ||
3337 | no) shared=false ;; | ||
3338 | - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for shared options" >&5 | ||
3339 | -echo "$as_me: error: bad value ${enableval} for shared options" >&2;} | ||
3340 | - { (exit 1); exit 1; }; } ;; | ||
3341 | + *) { echo "configure: error: bad value ${enableval} for shared options" 1>&2; exit 1; } ;; | ||
3342 | esac | ||
3343 | else | ||
3344 | shared=false | ||
3345 | -fi; | ||
3346 | +fi | ||
3347 | |||
3348 | + | ||
3349 | case "$target_cpu" in | ||
3350 | i386|i486|i586|i686) | ||
3351 | TARGET_CPU=i386 | ||
3352 | @@ -2712,7 +1110,7 @@ | ||
3353 | *) | ||
3354 | TARGET_CPU=$target_cpu | ||
3355 | ;; | ||
3356 | -esac | ||
3357 | +esac | ||
3358 | TARGET_OS=$target_os | ||
3359 | |||
3360 | M68KCC= | ||
3361 | @@ -2726,7 +1124,7 @@ | ||
3362 | M68KCC=/usr/m68k-palmos/bin/gcc | ||
3363 | # Generic build is ARM or M68K (probably ARM though) | ||
3364 | CC="/usr/$TARGET_CPU-palmos/bin/gcc" | ||
3365 | - if test "$target_cpu" = "arm" | ||
3366 | + if test "$target_cpu" = "arm" | ||
3367 | then | ||
3368 | CC="$CC -fPIC -march=armv4t" | ||
3369 | fi | ||
3370 | @@ -2762,7 +1160,7 @@ | ||
3371 | *) | ||
3372 | HOST_CPU=$host_cpu | ||
3373 | ;; | ||
3374 | -esac | ||
3375 | +esac | ||
3376 | HOST_OS=$host_os | ||
3377 | |||
3378 | |||
3379 | @@ -2800,138 +1198,91 @@ | ||
3380 | case "${enableval}" in | ||
3381 | yes) sockets=true ;; | ||
3382 | no) sockets=false ;; | ||
3383 | - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for sockets options" >&5 | ||
3384 | -echo "$as_me: error: bad value ${enableval} for sockets options" >&2;} | ||
3385 | - { (exit 1); exit 1; }; } ;; | ||
3386 | + *) { echo "configure: error: bad value ${enableval} for sockets options" 1>&2; exit 1; } ;; | ||
3387 | esac | ||
3388 | else | ||
3389 | sockets=true | ||
3390 | -fi; | ||
3391 | +fi | ||
3392 | + | ||
3393 | if test "$sockets" = false; then | ||
3394 | - cat >>confdefs.h <<\_ACEOF | ||
3395 | + cat >> confdefs.h <<\EOF | ||
3396 | #define CST_NO_SOCKETS 1 | ||
3397 | -_ACEOF | ||
3398 | +EOF | ||
3399 | |||
3400 | fi | ||
3401 | |||
3402 | -cat >conftest.$ac_ext <<_ACEOF | ||
3403 | -#line $LINENO "configure" | ||
3404 | -/* confdefs.h. */ | ||
3405 | -_ACEOF | ||
3406 | -cat confdefs.h >>conftest.$ac_ext | ||
3407 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3408 | -/* end confdefs.h. */ | ||
3409 | +cat > conftest.$ac_ext <<EOF | ||
3410 | +#line 1216 "configure" | ||
3411 | +#include "confdefs.h" | ||
3412 | #include <stdio.h> | ||
3413 | -int | ||
3414 | -main () | ||
3415 | -{ | ||
3416 | +int main() { | ||
3417 | struct a { union { float b; int c; } d; }; | ||
3418 | - const struct a e = { .d={ .b=3.14 } }; | ||
3419 | - ; | ||
3420 | - return 0; | ||
3421 | -} | ||
3422 | -_ACEOF | ||
3423 | -rm -f conftest.$ac_objext | ||
3424 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3425 | - (eval $ac_compile) 2>&5 | ||
3426 | - ac_status=$? | ||
3427 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3428 | - (exit $ac_status); } && | ||
3429 | - { ac_try='test -s conftest.$ac_objext' | ||
3430 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3431 | - (eval $ac_try) 2>&5 | ||
3432 | - ac_status=$? | ||
3433 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3434 | - (exit $ac_status); }; }; then | ||
3435 | + const struct a e = { .d={ .b=3.14 } }; | ||
3436 | +; return 0; } | ||
3437 | +EOF | ||
3438 | +if { (eval echo configure:1224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3439 | + rm -rf conftest* | ||
3440 | unioninit=yes | ||
3441 | else | ||
3442 | - echo "$as_me: failed program was:" >&5 | ||
3443 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3444 | - | ||
3445 | -unioninit=no | ||
3446 | + echo "configure: failed program was:" >&5 | ||
3447 | + cat conftest.$ac_ext >&5 | ||
3448 | + rm -rf conftest* | ||
3449 | + unioninit=no | ||
3450 | fi | ||
3451 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3452 | +rm -f conftest* | ||
3453 | if test "$unioninit" = no; then | ||
3454 | - cat >>confdefs.h <<\_ACEOF | ||
3455 | + cat >> confdefs.h <<\EOF | ||
3456 | #define NO_UNION_INITIALIZATION 1 | ||
3457 | -_ACEOF | ||
3458 | +EOF | ||
3459 | |||
3460 | fi | ||
3461 | |||
3462 | -echo "$as_me:$LINENO: checking for mmap" >&5 | ||
3463 | -echo $ECHO_N "checking for mmap... $ECHO_C" >&6 | ||
3464 | -if test "${ac_cv_func_mmap+set}" = set; then | ||
3465 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3466 | +echo $ac_n "checking for mmap""... $ac_c" 1>&6 | ||
3467 | +echo "configure:1242: checking for mmap" >&5 | ||
3468 | +if eval "test \"`echo '$''{'ac_cv_func_mmap'+set}'`\" = set"; then | ||
3469 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
3470 | else | ||
3471 | - cat >conftest.$ac_ext <<_ACEOF | ||
3472 | -#line $LINENO "configure" | ||
3473 | -/* confdefs.h. */ | ||
3474 | -_ACEOF | ||
3475 | -cat confdefs.h >>conftest.$ac_ext | ||
3476 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3477 | -/* end confdefs.h. */ | ||
3478 | + cat > conftest.$ac_ext <<EOF | ||
3479 | +#line 1247 "configure" | ||
3480 | +#include "confdefs.h" | ||
3481 | /* System header to define __stub macros and hopefully few prototypes, | ||
3482 | - which can conflict with char mmap (); below. | ||
3483 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
3484 | - <limits.h> exists even on freestanding compilers. */ | ||
3485 | -#ifdef __STDC__ | ||
3486 | -# include <limits.h> | ||
3487 | -#else | ||
3488 | -# include <assert.h> | ||
3489 | -#endif | ||
3490 | + which can conflict with char mmap(); below. */ | ||
3491 | +#include <assert.h> | ||
3492 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3493 | -#ifdef __cplusplus | ||
3494 | -extern "C" | ||
3495 | -{ | ||
3496 | -#endif | ||
3497 | /* We use char because int might match the return type of a gcc2 | ||
3498 | - builtin and then its argument prototype would still apply. */ | ||
3499 | -char mmap (); | ||
3500 | + builtin and then its argument prototype would still apply. */ | ||
3501 | +char mmap(); | ||
3502 | + | ||
3503 | +int main() { | ||
3504 | + | ||
3505 | /* The GNU C library defines this for functions which it implements | ||
3506 | to always fail with ENOSYS. Some functions are actually named | ||
3507 | something starting with __ and the normal name is an alias. */ | ||
3508 | #if defined (__stub_mmap) || defined (__stub___mmap) | ||
3509 | choke me | ||
3510 | #else | ||
3511 | -char (*f) () = mmap; | ||
3512 | +mmap(); | ||
3513 | #endif | ||
3514 | -#ifdef __cplusplus | ||
3515 | -} | ||
3516 | -#endif | ||
3517 | |||
3518 | -int | ||
3519 | -main () | ||
3520 | -{ | ||
3521 | -return f != mmap; | ||
3522 | - ; | ||
3523 | - return 0; | ||
3524 | -} | ||
3525 | -_ACEOF | ||
3526 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
3527 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
3528 | - (eval $ac_link) 2>&5 | ||
3529 | - ac_status=$? | ||
3530 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3531 | - (exit $ac_status); } && | ||
3532 | - { ac_try='test -s conftest$ac_exeext' | ||
3533 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3534 | - (eval $ac_try) 2>&5 | ||
3535 | - ac_status=$? | ||
3536 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3537 | - (exit $ac_status); }; }; then | ||
3538 | - ac_cv_func_mmap=yes | ||
3539 | +; return 0; } | ||
3540 | +EOF | ||
3541 | +if { (eval echo configure:1270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3542 | + rm -rf conftest* | ||
3543 | + eval "ac_cv_func_mmap=yes" | ||
3544 | else | ||
3545 | - echo "$as_me: failed program was:" >&5 | ||
3546 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3547 | - | ||
3548 | -ac_cv_func_mmap=no | ||
3549 | + echo "configure: failed program was:" >&5 | ||
3550 | + cat conftest.$ac_ext >&5 | ||
3551 | + rm -rf conftest* | ||
3552 | + eval "ac_cv_func_mmap=no" | ||
3553 | fi | ||
3554 | -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3555 | +rm -f conftest* | ||
3556 | fi | ||
3557 | -echo "$as_me:$LINENO: result: $ac_cv_func_mmap" >&5 | ||
3558 | -echo "${ECHO_T}$ac_cv_func_mmap" >&6 | ||
3559 | -if test $ac_cv_func_mmap = yes; then | ||
3560 | + | ||
3561 | +if eval "test \"`echo '$ac_cv_func_'mmap`\" = yes"; then | ||
3562 | + echo "$ac_t""yes" 1>&6 | ||
3563 | MMAPTYPE=posix | ||
3564 | +else | ||
3565 | + echo "$ac_t""no" 1>&6 | ||
3566 | fi | ||
3567 | |||
3568 | |||
3569 | @@ -2956,1028 +1307,266 @@ | ||
3570 | |||
3571 | |||
3572 | AUDIODRIVER=none | ||
3573 | -ac_ext=c | ||
3574 | -ac_cpp='$CPP $CPPFLAGS' | ||
3575 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
3576 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
3577 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
3578 | -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 | ||
3579 | -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 | ||
3580 | +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 | ||
3581 | +echo "configure:1312: checking how to run the C preprocessor" >&5 | ||
3582 | # On Suns, sometimes $CPP names a directory. | ||
3583 | if test -n "$CPP" && test -d "$CPP"; then | ||
3584 | CPP= | ||
3585 | fi | ||
3586 | if test -z "$CPP"; then | ||
3587 | - if test "${ac_cv_prog_CPP+set}" = set; then | ||
3588 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3589 | +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then | ||
3590 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
3591 | else | ||
3592 | - # Double quotes because CPP needs to be expanded | ||
3593 | - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" | ||
3594 | - do | ||
3595 | - ac_preproc_ok=false | ||
3596 | -for ac_c_preproc_warn_flag in '' yes | ||
3597 | -do | ||
3598 | - # Use a header file that comes with gcc, so configuring glibc | ||
3599 | - # with a fresh cross-compiler works. | ||
3600 | - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
3601 | - # <limits.h> exists even on freestanding compilers. | ||
3602 | + # This must be in double quotes, not single quotes, because CPP may get | ||
3603 | + # substituted into the Makefile and "${CC-cc}" will confuse make. | ||
3604 | + CPP="${CC-cc} -E" | ||
3605 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
3606 | - # not just through cpp. "Syntax error" is here to catch this case. | ||
3607 | - cat >conftest.$ac_ext <<_ACEOF | ||
3608 | -#line $LINENO "configure" | ||
3609 | -/* confdefs.h. */ | ||
3610 | -_ACEOF | ||
3611 | -cat confdefs.h >>conftest.$ac_ext | ||
3612 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3613 | -/* end confdefs.h. */ | ||
3614 | -#ifdef __STDC__ | ||
3615 | -# include <limits.h> | ||
3616 | -#else | ||
3617 | -# include <assert.h> | ||
3618 | -#endif | ||
3619 | - Syntax error | ||
3620 | -_ACEOF | ||
3621 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
3622 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
3623 | - ac_status=$? | ||
3624 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
3625 | - rm -f conftest.er1 | ||
3626 | - cat conftest.err >&5 | ||
3627 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3628 | - (exit $ac_status); } >/dev/null; then | ||
3629 | - if test -s conftest.err; then | ||
3630 | - ac_cpp_err=$ac_c_preproc_warn_flag | ||
3631 | - else | ||
3632 | - ac_cpp_err= | ||
3633 | - fi | ||
3634 | -else | ||
3635 | - ac_cpp_err=yes | ||
3636 | -fi | ||
3637 | -if test -z "$ac_cpp_err"; then | ||
3638 | + # not just through cpp. | ||
3639 | + cat > conftest.$ac_ext <<EOF | ||
3640 | +#line 1327 "configure" | ||
3641 | +#include "confdefs.h" | ||
3642 | +#include <assert.h> | ||
3643 | +Syntax Error | ||
3644 | +EOF | ||
3645 | +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
3646 | +{ (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
3647 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
3648 | +if test -z "$ac_err"; then | ||
3649 | : | ||
3650 | else | ||
3651 | - echo "$as_me: failed program was:" >&5 | ||
3652 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3653 | - | ||
3654 | - # Broken: fails on valid input. | ||
3655 | -continue | ||
3656 | -fi | ||
3657 | -rm -f conftest.err conftest.$ac_ext | ||
3658 | - | ||
3659 | - # OK, works on sane cases. Now check whether non-existent headers | ||
3660 | - # can be detected and how. | ||
3661 | - cat >conftest.$ac_ext <<_ACEOF | ||
3662 | -#line $LINENO "configure" | ||
3663 | -/* confdefs.h. */ | ||
3664 | -_ACEOF | ||
3665 | -cat confdefs.h >>conftest.$ac_ext | ||
3666 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3667 | -/* end confdefs.h. */ | ||
3668 | -#include <ac_nonexistent.h> | ||
3669 | -_ACEOF | ||
3670 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
3671 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
3672 | - ac_status=$? | ||
3673 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
3674 | - rm -f conftest.er1 | ||
3675 | - cat conftest.err >&5 | ||
3676 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3677 | - (exit $ac_status); } >/dev/null; then | ||
3678 | - if test -s conftest.err; then | ||
3679 | - ac_cpp_err=$ac_c_preproc_warn_flag | ||
3680 | - else | ||
3681 | - ac_cpp_err= | ||
3682 | - fi | ||
3683 | -else | ||
3684 | - ac_cpp_err=yes | ||
3685 | -fi | ||
3686 | -if test -z "$ac_cpp_err"; then | ||
3687 | - # Broken: success on invalid input. | ||
3688 | -continue | ||
3689 | -else | ||
3690 | - echo "$as_me: failed program was:" >&5 | ||
3691 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3692 | - | ||
3693 | - # Passes both tests. | ||
3694 | -ac_preproc_ok=: | ||
3695 | -break | ||
3696 | -fi | ||
3697 | -rm -f conftest.err conftest.$ac_ext | ||
3698 | - | ||
3699 | -done | ||
3700 | -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | ||
3701 | -rm -f conftest.err conftest.$ac_ext | ||
3702 | -if $ac_preproc_ok; then | ||
3703 | - break | ||
3704 | -fi | ||
3705 | - | ||
3706 | - done | ||
3707 | - ac_cv_prog_CPP=$CPP | ||
3708 | - | ||
3709 | -fi | ||
3710 | - CPP=$ac_cv_prog_CPP | ||
3711 | -else | ||
3712 | - ac_cv_prog_CPP=$CPP | ||
3713 | -fi | ||
3714 | -echo "$as_me:$LINENO: result: $CPP" >&5 | ||
3715 | -echo "${ECHO_T}$CPP" >&6 | ||
3716 | -ac_preproc_ok=false | ||
3717 | -for ac_c_preproc_warn_flag in '' yes | ||
3718 | -do | ||
3719 | - # Use a header file that comes with gcc, so configuring glibc | ||
3720 | - # with a fresh cross-compiler works. | ||
3721 | - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
3722 | - # <limits.h> exists even on freestanding compilers. | ||
3723 | - # On the NeXT, cc -E runs the code through the compiler's parser, | ||
3724 | - # not just through cpp. "Syntax error" is here to catch this case. | ||
3725 | - cat >conftest.$ac_ext <<_ACEOF | ||
3726 | -#line $LINENO "configure" | ||
3727 | -/* confdefs.h. */ | ||
3728 | -_ACEOF | ||
3729 | -cat confdefs.h >>conftest.$ac_ext | ||
3730 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3731 | -/* end confdefs.h. */ | ||
3732 | -#ifdef __STDC__ | ||
3733 | -# include <limits.h> | ||
3734 | -#else | ||
3735 | -# include <assert.h> | ||
3736 | -#endif | ||
3737 | - Syntax error | ||
3738 | -_ACEOF | ||
3739 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
3740 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
3741 | - ac_status=$? | ||
3742 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
3743 | - rm -f conftest.er1 | ||
3744 | - cat conftest.err >&5 | ||
3745 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3746 | - (exit $ac_status); } >/dev/null; then | ||
3747 | - if test -s conftest.err; then | ||
3748 | - ac_cpp_err=$ac_c_preproc_warn_flag | ||
3749 | - else | ||
3750 | - ac_cpp_err= | ||
3751 | - fi | ||
3752 | -else | ||
3753 | - ac_cpp_err=yes | ||
3754 | -fi | ||
3755 | -if test -z "$ac_cpp_err"; then | ||
3756 | + echo "$ac_err" >&5 | ||
3757 | + echo "configure: failed program was:" >&5 | ||
3758 | + cat conftest.$ac_ext >&5 | ||
3759 | + rm -rf conftest* | ||
3760 | + CPP="${CC-cc} -E -traditional-cpp" | ||
3761 | + cat > conftest.$ac_ext <<EOF | ||
3762 | +#line 1344 "configure" | ||
3763 | +#include "confdefs.h" | ||
3764 | +#include <assert.h> | ||
3765 | +Syntax Error | ||
3766 | +EOF | ||
3767 | +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
3768 | +{ (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
3769 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
3770 | +if test -z "$ac_err"; then | ||
3771 | : | ||
3772 | else | ||
3773 | - echo "$as_me: failed program was:" >&5 | ||
3774 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3775 | - | ||
3776 | - # Broken: fails on valid input. | ||
3777 | -continue | ||
3778 | -fi | ||
3779 | -rm -f conftest.err conftest.$ac_ext | ||
3780 | - | ||
3781 | - # OK, works on sane cases. Now check whether non-existent headers | ||
3782 | - # can be detected and how. | ||
3783 | - cat >conftest.$ac_ext <<_ACEOF | ||
3784 | -#line $LINENO "configure" | ||
3785 | -/* confdefs.h. */ | ||
3786 | -_ACEOF | ||
3787 | -cat confdefs.h >>conftest.$ac_ext | ||
3788 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3789 | -/* end confdefs.h. */ | ||
3790 | -#include <ac_nonexistent.h> | ||
3791 | -_ACEOF | ||
3792 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
3793 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
3794 | - ac_status=$? | ||
3795 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
3796 | - rm -f conftest.er1 | ||
3797 | - cat conftest.err >&5 | ||
3798 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3799 | - (exit $ac_status); } >/dev/null; then | ||
3800 | - if test -s conftest.err; then | ||
3801 | - ac_cpp_err=$ac_c_preproc_warn_flag | ||
3802 | - else | ||
3803 | - ac_cpp_err= | ||
3804 | - fi | ||
3805 | -else | ||
3806 | - ac_cpp_err=yes | ||
3807 | -fi | ||
3808 | -if test -z "$ac_cpp_err"; then | ||
3809 | - # Broken: success on invalid input. | ||
3810 | -continue | ||
3811 | -else | ||
3812 | - echo "$as_me: failed program was:" >&5 | ||
3813 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3814 | - | ||
3815 | - # Passes both tests. | ||
3816 | -ac_preproc_ok=: | ||
3817 | -break | ||
3818 | -fi | ||
3819 | -rm -f conftest.err conftest.$ac_ext | ||
3820 | - | ||
3821 | -done | ||
3822 | -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | ||
3823 | -rm -f conftest.err conftest.$ac_ext | ||
3824 | -if $ac_preproc_ok; then | ||
3825 | + echo "$ac_err" >&5 | ||
3826 | + echo "configure: failed program was:" >&5 | ||
3827 | + cat conftest.$ac_ext >&5 | ||
3828 | + rm -rf conftest* | ||
3829 | + CPP="${CC-cc} -nologo -E" | ||
3830 | + cat > conftest.$ac_ext <<EOF | ||
3831 | +#line 1361 "configure" | ||
3832 | +#include "confdefs.h" | ||
3833 | +#include <assert.h> | ||
3834 | +Syntax Error | ||
3835 | +EOF | ||
3836 | +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
3837 | +{ (eval echo configure:1367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
3838 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
3839 | +if test -z "$ac_err"; then | ||
3840 | : | ||
3841 | else | ||
3842 | - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check | ||
3843 | -See \`config.log' for more details." >&5 | ||
3844 | -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check | ||
3845 | -See \`config.log' for more details." >&2;} | ||
3846 | - { (exit 1); exit 1; }; } | ||
3847 | + echo "$ac_err" >&5 | ||
3848 | + echo "configure: failed program was:" >&5 | ||
3849 | + cat conftest.$ac_ext >&5 | ||
3850 | + rm -rf conftest* | ||
3851 | + CPP=/lib/cpp | ||
3852 | fi | ||
3853 | - | ||
3854 | -ac_ext=c | ||
3855 | -ac_cpp='$CPP $CPPFLAGS' | ||
3856 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
3857 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
3858 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
3859 | - | ||
3860 | - | ||
3861 | -echo "$as_me:$LINENO: checking for egrep" >&5 | ||
3862 | -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 | ||
3863 | -if test "${ac_cv_prog_egrep+set}" = set; then | ||
3864 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3865 | -else | ||
3866 | - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 | ||
3867 | - then ac_cv_prog_egrep='grep -E' | ||
3868 | - else ac_cv_prog_egrep='egrep' | ||
3869 | - fi | ||
3870 | +rm -f conftest* | ||
3871 | fi | ||
3872 | -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 | ||
3873 | -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 | ||
3874 | - EGREP=$ac_cv_prog_egrep | ||
3875 | - | ||
3876 | - | ||
3877 | -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | ||
3878 | -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 | ||
3879 | -if test "${ac_cv_header_stdc+set}" = set; then | ||
3880 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3881 | -else | ||
3882 | - cat >conftest.$ac_ext <<_ACEOF | ||
3883 | -#line $LINENO "configure" | ||
3884 | -/* confdefs.h. */ | ||
3885 | -_ACEOF | ||
3886 | -cat confdefs.h >>conftest.$ac_ext | ||
3887 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3888 | -/* end confdefs.h. */ | ||
3889 | -#include <stdlib.h> | ||
3890 | -#include <stdarg.h> | ||
3891 | -#include <string.h> | ||
3892 | -#include <float.h> | ||
3893 | - | ||
3894 | -int | ||
3895 | -main () | ||
3896 | -{ | ||
3897 | - | ||
3898 | - ; | ||
3899 | - return 0; | ||
3900 | -} | ||
3901 | -_ACEOF | ||
3902 | -rm -f conftest.$ac_objext | ||
3903 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
3904 | - (eval $ac_compile) 2>&5 | ||
3905 | - ac_status=$? | ||
3906 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3907 | - (exit $ac_status); } && | ||
3908 | - { ac_try='test -s conftest.$ac_objext' | ||
3909 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3910 | - (eval $ac_try) 2>&5 | ||
3911 | - ac_status=$? | ||
3912 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3913 | - (exit $ac_status); }; }; then | ||
3914 | - ac_cv_header_stdc=yes | ||
3915 | -else | ||
3916 | - echo "$as_me: failed program was:" >&5 | ||
3917 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
3918 | - | ||
3919 | -ac_cv_header_stdc=no | ||
3920 | -fi | ||
3921 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
3922 | - | ||
3923 | -if test $ac_cv_header_stdc = yes; then | ||
3924 | - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
3925 | - cat >conftest.$ac_ext <<_ACEOF | ||
3926 | -#line $LINENO "configure" | ||
3927 | -/* confdefs.h. */ | ||
3928 | -_ACEOF | ||
3929 | -cat confdefs.h >>conftest.$ac_ext | ||
3930 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3931 | -/* end confdefs.h. */ | ||
3932 | -#include <string.h> | ||
3933 | - | ||
3934 | -_ACEOF | ||
3935 | -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
3936 | - $EGREP "memchr" >/dev/null 2>&1; then | ||
3937 | - : | ||
3938 | -else | ||
3939 | - ac_cv_header_stdc=no | ||
3940 | -fi | ||
3941 | rm -f conftest* | ||
3942 | - | ||
3943 | fi | ||
3944 | - | ||
3945 | -if test $ac_cv_header_stdc = yes; then | ||
3946 | - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
3947 | - cat >conftest.$ac_ext <<_ACEOF | ||
3948 | -#line $LINENO "configure" | ||
3949 | -/* confdefs.h. */ | ||
3950 | -_ACEOF | ||
3951 | -cat confdefs.h >>conftest.$ac_ext | ||
3952 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3953 | -/* end confdefs.h. */ | ||
3954 | -#include <stdlib.h> | ||
3955 | - | ||
3956 | -_ACEOF | ||
3957 | -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
3958 | - $EGREP "free" >/dev/null 2>&1; then | ||
3959 | - : | ||
3960 | -else | ||
3961 | - ac_cv_header_stdc=no | ||
3962 | -fi | ||
3963 | rm -f conftest* | ||
3964 | - | ||
3965 | + ac_cv_prog_CPP="$CPP" | ||
3966 | fi | ||
3967 | - | ||
3968 | -if test $ac_cv_header_stdc = yes; then | ||
3969 | - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. | ||
3970 | - if test "$cross_compiling" = yes; then | ||
3971 | - : | ||
3972 | + CPP="$ac_cv_prog_CPP" | ||
3973 | else | ||
3974 | - cat >conftest.$ac_ext <<_ACEOF | ||
3975 | -#line $LINENO "configure" | ||
3976 | -/* confdefs.h. */ | ||
3977 | -_ACEOF | ||
3978 | -cat confdefs.h >>conftest.$ac_ext | ||
3979 | -cat >>conftest.$ac_ext <<_ACEOF | ||
3980 | -/* end confdefs.h. */ | ||
3981 | -#include <ctype.h> | ||
3982 | -#if ((' ' & 0x0FF) == 0x020) | ||
3983 | -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | ||
3984 | -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
3985 | -#else | ||
3986 | -# define ISLOWER(c) \ | ||
3987 | - (('a' <= (c) && (c) <= 'i') \ | ||
3988 | - || ('j' <= (c) && (c) <= 'r') \ | ||
3989 | - || ('s' <= (c) && (c) <= 'z')) | ||
3990 | -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) | ||
3991 | -#endif | ||
3992 | - | ||
3993 | -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) | ||
3994 | -int | ||
3995 | -main () | ||
3996 | -{ | ||
3997 | - int i; | ||
3998 | - for (i = 0; i < 256; i++) | ||
3999 | - if (XOR (islower (i), ISLOWER (i)) | ||
4000 | - || toupper (i) != TOUPPER (i)) | ||
4001 | - exit(2); | ||
4002 | - exit (0); | ||
4003 | -} | ||
4004 | -_ACEOF | ||
4005 | -rm -f conftest$ac_exeext | ||
4006 | -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
4007 | - (eval $ac_link) 2>&5 | ||
4008 | - ac_status=$? | ||
4009 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4010 | - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
4011 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4012 | - (eval $ac_try) 2>&5 | ||
4013 | - ac_status=$? | ||
4014 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4015 | - (exit $ac_status); }; }; then | ||
4016 | - : | ||
4017 | -else | ||
4018 | - echo "$as_me: program exited with status $ac_status" >&5 | ||
4019 | -echo "$as_me: failed program was:" >&5 | ||
4020 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
4021 | - | ||
4022 | -( exit $ac_status ) | ||
4023 | -ac_cv_header_stdc=no | ||
4024 | + ac_cv_prog_CPP="$CPP" | ||
4025 | fi | ||
4026 | -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
4027 | -fi | ||
4028 | -fi | ||
4029 | -fi | ||
4030 | -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | ||
4031 | -echo "${ECHO_T}$ac_cv_header_stdc" >&6 | ||
4032 | -if test $ac_cv_header_stdc = yes; then | ||
4033 | +echo "$ac_t""$CPP" 1>&6 | ||
4034 | |||
4035 | -cat >>confdefs.h <<\_ACEOF | ||
4036 | -#define STDC_HEADERS 1 | ||
4037 | -_ACEOF | ||
4038 | - | ||
4039 | -fi | ||
4040 | - | ||
4041 | -# On IRIX 5.3, sys/types and inttypes.h are conflicting. | ||
4042 | - | ||
4043 | - | ||
4044 | - | ||
4045 | - | ||
4046 | - | ||
4047 | - | ||
4048 | - | ||
4049 | - | ||
4050 | - | ||
4051 | -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ | ||
4052 | - inttypes.h stdint.h unistd.h | ||
4053 | -do | ||
4054 | -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
4055 | -echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
4056 | -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
4057 | -if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
4058 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4059 | +ac_safe=`echo "sys/soundcard.h" | sed 'y%./+-%__p_%'` | ||
4060 | +echo $ac_n "checking for sys/soundcard.h""... $ac_c" 1>&6 | ||
4061 | +echo "configure:1393: checking for sys/soundcard.h" >&5 | ||
4062 | +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
4063 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
4064 | else | ||
4065 | - cat >conftest.$ac_ext <<_ACEOF | ||
4066 | -#line $LINENO "configure" | ||
4067 | -/* confdefs.h. */ | ||
4068 | -_ACEOF | ||
4069 | -cat confdefs.h >>conftest.$ac_ext | ||
4070 | -cat >>conftest.$ac_ext <<_ACEOF | ||
4071 | -/* end confdefs.h. */ | ||
4072 | -$ac_includes_default | ||
4073 | - | ||
4074 | -#include <$ac_header> | ||
4075 | -_ACEOF | ||
4076 | -rm -f conftest.$ac_objext | ||
4077 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4078 | - (eval $ac_compile) 2>&5 | ||
4079 | - ac_status=$? | ||
4080 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4081 | - (exit $ac_status); } && | ||
4082 | - { ac_try='test -s conftest.$ac_objext' | ||
4083 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4084 | - (eval $ac_try) 2>&5 | ||
4085 | - ac_status=$? | ||
4086 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4087 | - (exit $ac_status); }; }; then | ||
4088 | - eval "$as_ac_Header=yes" | ||
4089 | -else | ||
4090 | - echo "$as_me: failed program was:" >&5 | ||
4091 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
4092 | - | ||
4093 | -eval "$as_ac_Header=no" | ||
4094 | -fi | ||
4095 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4096 | -fi | ||
4097 | -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
4098 | -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4099 | -if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
4100 | - cat >>confdefs.h <<_ACEOF | ||
4101 | -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
4102 | -_ACEOF | ||
4103 | - | ||
4104 | -fi | ||
4105 | - | ||
4106 | -done | ||
4107 | - | ||
4108 | - | ||
4109 | -if test "${ac_cv_header_sys_soundcard_h+set}" = set; then | ||
4110 | - echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 | ||
4111 | -echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6 | ||
4112 | -if test "${ac_cv_header_sys_soundcard_h+set}" = set; then | ||
4113 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4114 | -fi | ||
4115 | -echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 | ||
4116 | -echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6 | ||
4117 | -else | ||
4118 | - # Is the header compilable? | ||
4119 | -echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5 | ||
4120 | -echo $ECHO_N "checking sys/soundcard.h usability... $ECHO_C" >&6 | ||
4121 | -cat >conftest.$ac_ext <<_ACEOF | ||
4122 | -#line $LINENO "configure" | ||
4123 | -/* confdefs.h. */ | ||
4124 | -_ACEOF | ||
4125 | -cat confdefs.h >>conftest.$ac_ext | ||
4126 | -cat >>conftest.$ac_ext <<_ACEOF | ||
4127 | -/* end confdefs.h. */ | ||
4128 | -$ac_includes_default | ||
4129 | + cat > conftest.$ac_ext <<EOF | ||
4130 | +#line 1398 "configure" | ||
4131 | +#include "confdefs.h" | ||
4132 | #include <sys/soundcard.h> | ||
4133 | -_ACEOF | ||
4134 | -rm -f conftest.$ac_objext | ||
4135 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4136 | - (eval $ac_compile) 2>&5 | ||
4137 | - ac_status=$? | ||
4138 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4139 | - (exit $ac_status); } && | ||
4140 | - { ac_try='test -s conftest.$ac_objext' | ||
4141 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4142 | - (eval $ac_try) 2>&5 | ||
4143 | - ac_status=$? | ||
4144 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4145 | - (exit $ac_status); }; }; then | ||
4146 | - ac_header_compiler=yes | ||
4147 | +EOF | ||
4148 | +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
4149 | +{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
4150 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
4151 | +if test -z "$ac_err"; then | ||
4152 | + rm -rf conftest* | ||
4153 | + eval "ac_cv_header_$ac_safe=yes" | ||
4154 | else | ||
4155 | - echo "$as_me: failed program was:" >&5 | ||
4156 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
4157 | - | ||
4158 | -ac_header_compiler=no | ||
4159 | + echo "$ac_err" >&5 | ||
4160 | + echo "configure: failed program was:" >&5 | ||
4161 | + cat conftest.$ac_ext >&5 | ||
4162 | + rm -rf conftest* | ||
4163 | + eval "ac_cv_header_$ac_safe=no" | ||
4164 | fi | ||
4165 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4166 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4167 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4168 | - | ||
4169 | -# Is the header present? | ||
4170 | -echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5 | ||
4171 | -echo $ECHO_N "checking sys/soundcard.h presence... $ECHO_C" >&6 | ||
4172 | -cat >conftest.$ac_ext <<_ACEOF | ||
4173 | -#line $LINENO "configure" | ||
4174 | -/* confdefs.h. */ | ||
4175 | -_ACEOF | ||
4176 | -cat confdefs.h >>conftest.$ac_ext | ||
4177 | -cat >>conftest.$ac_ext <<_ACEOF | ||
4178 | -/* end confdefs.h. */ | ||
4179 | -#include <sys/soundcard.h> | ||
4180 | -_ACEOF | ||
4181 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
4182 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
4183 | - ac_status=$? | ||
4184 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
4185 | - rm -f conftest.er1 | ||
4186 | - cat conftest.err >&5 | ||
4187 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4188 | - (exit $ac_status); } >/dev/null; then | ||
4189 | - if test -s conftest.err; then | ||
4190 | - ac_cpp_err=$ac_c_preproc_warn_flag | ||
4191 | - else | ||
4192 | - ac_cpp_err= | ||
4193 | - fi | ||
4194 | -else | ||
4195 | - ac_cpp_err=yes | ||
4196 | +rm -f conftest* | ||
4197 | fi | ||
4198 | -if test -z "$ac_cpp_err"; then | ||
4199 | - ac_header_preproc=yes | ||
4200 | -else | ||
4201 | - echo "$as_me: failed program was:" >&5 | ||
4202 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
4203 | - | ||
4204 | - ac_header_preproc=no | ||
4205 | -fi | ||
4206 | -rm -f conftest.err conftest.$ac_ext | ||
4207 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
4208 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4209 | - | ||
4210 | -# So? What about this header? | ||
4211 | -case $ac_header_compiler:$ac_header_preproc in | ||
4212 | - yes:no ) | ||
4213 | - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4214 | -echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4215 | - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 | ||
4216 | -echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} | ||
4217 | - ( | ||
4218 | - cat <<\_ASBOX | ||
4219 | -## ------------------------------------ ## | ||
4220 | -## Report this to bug-autoconf@gnu.org. ## | ||
4221 | -## ------------------------------------ ## | ||
4222 | -_ASBOX | ||
4223 | - ) | | ||
4224 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4225 | - ;; | ||
4226 | - no:yes ) | ||
4227 | - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5 | ||
4228 | -echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;} | ||
4229 | - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5 | ||
4230 | -echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;} | ||
4231 | - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 | ||
4232 | -echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} | ||
4233 | - ( | ||
4234 | - cat <<\_ASBOX | ||
4235 | -## ------------------------------------ ## | ||
4236 | -## Report this to bug-autoconf@gnu.org. ## | ||
4237 | -## ------------------------------------ ## | ||
4238 | -_ASBOX | ||
4239 | - ) | | ||
4240 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4241 | - ;; | ||
4242 | -esac | ||
4243 | -echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 | ||
4244 | -echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6 | ||
4245 | -if test "${ac_cv_header_sys_soundcard_h+set}" = set; then | ||
4246 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4247 | -else | ||
4248 | - ac_cv_header_sys_soundcard_h=$ac_header_preproc | ||
4249 | -fi | ||
4250 | -echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 | ||
4251 | -echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6 | ||
4252 | - | ||
4253 | -fi | ||
4254 | -if test $ac_cv_header_sys_soundcard_h = yes; then | ||
4255 | +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | ||
4256 | + echo "$ac_t""yes" 1>&6 | ||
4257 | AUDIODRIVER="oss" | ||
4258 | AUDIODEFS=-DCST_AUDIO_LINUX | ||
4259 | +else | ||
4260 | + echo "$ac_t""no" 1>&6 | ||
4261 | fi | ||
4262 | |||
4263 | - | ||
4264 | -if test "${ac_cv_header_machine_soundcard_h+set}" = set; then | ||
4265 | - echo "$as_me:$LINENO: checking for machine/soundcard.h" >&5 | ||
4266 | -echo $ECHO_N "checking for machine/soundcard.h... $ECHO_C" >&6 | ||
4267 | -if test "${ac_cv_header_machine_soundcard_h+set}" = set; then | ||
4268 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4269 | -fi | ||
4270 | -echo "$as_me:$LINENO: result: $ac_cv_header_machine_soundcard_h" >&5 | ||
4271 | -echo "${ECHO_T}$ac_cv_header_machine_soundcard_h" >&6 | ||
4272 | +ac_safe=`echo "machine/soundcard.h" | sed 'y%./+-%__p_%'` | ||
4273 | +echo $ac_n "checking for machine/soundcard.h""... $ac_c" 1>&6 | ||
4274 | +echo "configure:1427: checking for machine/soundcard.h" >&5 | ||
4275 | +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
4276 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
4277 | else | ||
4278 | - # Is the header compilable? | ||
4279 | -echo "$as_me:$LINENO: checking machine/soundcard.h usability" >&5 | ||
4280 | -echo $ECHO_N "checking machine/soundcard.h usability... $ECHO_C" >&6 | ||
4281 | -cat >conftest.$ac_ext <<_ACEOF | ||
4282 | -#line $LINENO "configure" | ||
4283 | -/* confdefs.h. */ | ||
4284 | -_ACEOF | ||
4285 | -cat confdefs.h >>conftest.$ac_ext | ||
4286 | -cat >>conftest.$ac_ext <<_ACEOF | ||
4287 | -/* end confdefs.h. */ | ||
4288 | -$ac_includes_default | ||
4289 | + cat > conftest.$ac_ext <<EOF | ||
4290 | +#line 1432 "configure" | ||
4291 | +#include "confdefs.h" | ||
4292 | #include <machine/soundcard.h> | ||
4293 | -_ACEOF | ||
4294 | -rm -f conftest.$ac_objext | ||
4295 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4296 | - (eval $ac_compile) 2>&5 | ||
4297 | - ac_status=$? | ||
4298 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4299 | - (exit $ac_status); } && | ||
4300 | - { ac_try='test -s conftest.$ac_objext' | ||
4301 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4302 | - (eval $ac_try) 2>&5 | ||
4303 | - ac_status=$? | ||
4304 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4305 | - (exit $ac_status); }; }; then | ||
4306 | - ac_header_compiler=yes | ||
4307 | +EOF | ||
4308 | +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
4309 | +{ (eval echo configure:1437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
4310 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
4311 | +if test -z "$ac_err"; then | ||
4312 | + rm -rf conftest* | ||
4313 | + eval "ac_cv_header_$ac_safe=yes" | ||
4314 | else | ||
4315 | - echo "$as_me: failed program was:" >&5 | ||
4316 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
4317 | - | ||
4318 | -ac_header_compiler=no | ||
4319 | + echo "$ac_err" >&5 | ||
4320 | + echo "configure: failed program was:" >&5 | ||
4321 | + cat conftest.$ac_ext >&5 | ||
4322 | + rm -rf conftest* | ||
4323 | + eval "ac_cv_header_$ac_safe=no" | ||
4324 | fi | ||
4325 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4326 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4327 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4328 | - | ||
4329 | -# Is the header present? | ||
4330 | -echo "$as_me:$LINENO: checking machine/soundcard.h presence" >&5 | ||
4331 | -echo $ECHO_N "checking machine/soundcard.h presence... $ECHO_C" >&6 | ||
4332 | -cat >conftest.$ac_ext <<_ACEOF | ||
4333 | -#line $LINENO "configure" | ||
4334 | -/* confdefs.h. */ | ||
4335 | -_ACEOF | ||
4336 | -cat confdefs.h >>conftest.$ac_ext | ||
4337 | -cat >>conftest.$ac_ext <<_ACEOF | ||
4338 | -/* end confdefs.h. */ | ||
4339 | -#include <machine/soundcard.h> | ||
4340 | -_ACEOF | ||
4341 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
4342 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
4343 | - ac_status=$? | ||
4344 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
4345 | - rm -f conftest.er1 | ||
4346 | - cat conftest.err >&5 | ||
4347 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4348 | - (exit $ac_status); } >/dev/null; then | ||
4349 | - if test -s conftest.err; then | ||
4350 | - ac_cpp_err=$ac_c_preproc_warn_flag | ||
4351 | - else | ||
4352 | - ac_cpp_err= | ||
4353 | - fi | ||
4354 | -else | ||
4355 | - ac_cpp_err=yes | ||
4356 | +rm -f conftest* | ||
4357 | fi | ||
4358 | -if test -z "$ac_cpp_err"; then | ||
4359 | - ac_header_preproc=yes | ||
4360 | -else | ||
4361 | - echo "$as_me: failed program was:" >&5 | ||
4362 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
4363 | - | ||
4364 | - ac_header_preproc=no | ||
4365 | -fi | ||
4366 | -rm -f conftest.err conftest.$ac_ext | ||
4367 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
4368 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4369 | - | ||
4370 | -# So? What about this header? | ||
4371 | -case $ac_header_compiler:$ac_header_preproc in | ||
4372 | - yes:no ) | ||
4373 | - { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4374 | -echo "$as_me: WARNING: machine/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4375 | - { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&5 | ||
4376 | -echo "$as_me: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&2;} | ||
4377 | - ( | ||
4378 | - cat <<\_ASBOX | ||
4379 | -## ------------------------------------ ## | ||
4380 | -## Report this to bug-autoconf@gnu.org. ## | ||
4381 | -## ------------------------------------ ## | ||
4382 | -_ASBOX | ||
4383 | - ) | | ||
4384 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4385 | - ;; | ||
4386 | - no:yes ) | ||
4387 | - { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: present but cannot be compiled" >&5 | ||
4388 | -echo "$as_me: WARNING: machine/soundcard.h: present but cannot be compiled" >&2;} | ||
4389 | - { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: check for missing prerequisite headers?" >&5 | ||
4390 | -echo "$as_me: WARNING: machine/soundcard.h: check for missing prerequisite headers?" >&2;} | ||
4391 | - { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&5 | ||
4392 | -echo "$as_me: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&2;} | ||
4393 | - ( | ||
4394 | - cat <<\_ASBOX | ||
4395 | -## ------------------------------------ ## | ||
4396 | -## Report this to bug-autoconf@gnu.org. ## | ||
4397 | -## ------------------------------------ ## | ||
4398 | -_ASBOX | ||
4399 | - ) | | ||
4400 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4401 | - ;; | ||
4402 | -esac | ||
4403 | -echo "$as_me:$LINENO: checking for machine/soundcard.h" >&5 | ||
4404 | -echo $ECHO_N "checking for machine/soundcard.h... $ECHO_C" >&6 | ||
4405 | -if test "${ac_cv_header_machine_soundcard_h+set}" = set; then | ||
4406 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4407 | -else | ||
4408 | - ac_cv_header_machine_soundcard_h=$ac_header_preproc | ||
4409 | -fi | ||
4410 | -echo "$as_me:$LINENO: result: $ac_cv_header_machine_soundcard_h" >&5 | ||
4411 | -echo "${ECHO_T}$ac_cv_header_machine_soundcard_h" >&6 | ||
4412 | - | ||
4413 | -fi | ||
4414 | -if test $ac_cv_header_machine_soundcard_h = yes; then | ||
4415 | +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | ||
4416 | + echo "$ac_t""yes" 1>&6 | ||
4417 | AUDIODRIVER="oss" | ||
4418 | AUDIODEFS=-DCST_AUDIO_FREEBSD | ||
4419 | +else | ||
4420 | + echo "$ac_t""no" 1>&6 | ||
4421 | fi | ||
4422 | |||
4423 | - | ||
4424 | -if test "${ac_cv_header_sys_audioio_h+set}" = set; then | ||
4425 | - echo "$as_me:$LINENO: checking for sys/audioio.h" >&5 | ||
4426 | -echo $ECHO_N "checking for sys/audioio.h... $ECHO_C" >&6 | ||
4427 | -if test "${ac_cv_header_sys_audioio_h+set}" = set; then | ||
4428 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4429 | -fi | ||
4430 | -echo "$as_me:$LINENO: result: $ac_cv_header_sys_audioio_h" >&5 | ||
4431 | -echo "${ECHO_T}$ac_cv_header_sys_audioio_h" >&6 | ||
4432 | +ac_safe=`echo "sys/audioio.h" | sed 'y%./+-%__p_%'` | ||
4433 | +echo $ac_n "checking for sys/audioio.h""... $ac_c" 1>&6 | ||
4434 | +echo "configure:1461: checking for sys/audioio.h" >&5 | ||
4435 | +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
4436 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
4437 | else | ||
4438 | - # Is the header compilable? | ||
4439 | -echo "$as_me:$LINENO: checking sys/audioio.h usability" >&5 | ||
4440 | -echo $ECHO_N "checking sys/audioio.h usability... $ECHO_C" >&6 | ||
4441 | -cat >conftest.$ac_ext <<_ACEOF | ||
4442 | -#line $LINENO "configure" | ||
4443 | -/* confdefs.h. */ | ||
4444 | -_ACEOF | ||
4445 | -cat confdefs.h >>conftest.$ac_ext | ||
4446 | -cat >>conftest.$ac_ext <<_ACEOF | ||
4447 | -/* end confdefs.h. */ | ||
4448 | -$ac_includes_default | ||
4449 | + cat > conftest.$ac_ext <<EOF | ||
4450 | +#line 1466 "configure" | ||
4451 | +#include "confdefs.h" | ||
4452 | #include <sys/audioio.h> | ||
4453 | -_ACEOF | ||
4454 | -rm -f conftest.$ac_objext | ||
4455 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4456 | - (eval $ac_compile) 2>&5 | ||
4457 | - ac_status=$? | ||
4458 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4459 | - (exit $ac_status); } && | ||
4460 | - { ac_try='test -s conftest.$ac_objext' | ||
4461 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4462 | - (eval $ac_try) 2>&5 | ||
4463 | - ac_status=$? | ||
4464 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4465 | - (exit $ac_status); }; }; then | ||
4466 | - ac_header_compiler=yes | ||
4467 | +EOF | ||
4468 | +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
4469 | +{ (eval echo configure:1471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
4470 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
4471 | +if test -z "$ac_err"; then | ||
4472 | + rm -rf conftest* | ||
4473 | + eval "ac_cv_header_$ac_safe=yes" | ||
4474 | else | ||
4475 | - echo "$as_me: failed program was:" >&5 | ||
4476 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
4477 | - | ||
4478 | -ac_header_compiler=no | ||
4479 | + echo "$ac_err" >&5 | ||
4480 | + echo "configure: failed program was:" >&5 | ||
4481 | + cat conftest.$ac_ext >&5 | ||
4482 | + rm -rf conftest* | ||
4483 | + eval "ac_cv_header_$ac_safe=no" | ||
4484 | fi | ||
4485 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4486 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4487 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4488 | - | ||
4489 | -# Is the header present? | ||
4490 | -echo "$as_me:$LINENO: checking sys/audioio.h presence" >&5 | ||
4491 | -echo $ECHO_N "checking sys/audioio.h presence... $ECHO_C" >&6 | ||
4492 | -cat >conftest.$ac_ext <<_ACEOF | ||
4493 | -#line $LINENO "configure" | ||
4494 | -/* confdefs.h. */ | ||
4495 | -_ACEOF | ||
4496 | -cat confdefs.h >>conftest.$ac_ext | ||
4497 | -cat >>conftest.$ac_ext <<_ACEOF | ||
4498 | -/* end confdefs.h. */ | ||
4499 | -#include <sys/audioio.h> | ||
4500 | -_ACEOF | ||
4501 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
4502 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
4503 | - ac_status=$? | ||
4504 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
4505 | - rm -f conftest.er1 | ||
4506 | - cat conftest.err >&5 | ||
4507 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4508 | - (exit $ac_status); } >/dev/null; then | ||
4509 | - if test -s conftest.err; then | ||
4510 | - ac_cpp_err=$ac_c_preproc_warn_flag | ||
4511 | - else | ||
4512 | - ac_cpp_err= | ||
4513 | - fi | ||
4514 | -else | ||
4515 | - ac_cpp_err=yes | ||
4516 | +rm -f conftest* | ||
4517 | fi | ||
4518 | -if test -z "$ac_cpp_err"; then | ||
4519 | - ac_header_preproc=yes | ||
4520 | -else | ||
4521 | - echo "$as_me: failed program was:" >&5 | ||
4522 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
4523 | - | ||
4524 | - ac_header_preproc=no | ||
4525 | -fi | ||
4526 | -rm -f conftest.err conftest.$ac_ext | ||
4527 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
4528 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4529 | - | ||
4530 | -# So? What about this header? | ||
4531 | -case $ac_header_compiler:$ac_header_preproc in | ||
4532 | - yes:no ) | ||
4533 | - { echo "$as_me:$LINENO: WARNING: sys/audioio.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4534 | -echo "$as_me: WARNING: sys/audioio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4535 | - { echo "$as_me:$LINENO: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&5 | ||
4536 | -echo "$as_me: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&2;} | ||
4537 | - ( | ||
4538 | - cat <<\_ASBOX | ||
4539 | -## ------------------------------------ ## | ||
4540 | -## Report this to bug-autoconf@gnu.org. ## | ||
4541 | -## ------------------------------------ ## | ||
4542 | -_ASBOX | ||
4543 | - ) | | ||
4544 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4545 | - ;; | ||
4546 | - no:yes ) | ||
4547 | - { echo "$as_me:$LINENO: WARNING: sys/audioio.h: present but cannot be compiled" >&5 | ||
4548 | -echo "$as_me: WARNING: sys/audioio.h: present but cannot be compiled" >&2;} | ||
4549 | - { echo "$as_me:$LINENO: WARNING: sys/audioio.h: check for missing prerequisite headers?" >&5 | ||
4550 | -echo "$as_me: WARNING: sys/audioio.h: check for missing prerequisite headers?" >&2;} | ||
4551 | - { echo "$as_me:$LINENO: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&5 | ||
4552 | -echo "$as_me: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&2;} | ||
4553 | - ( | ||
4554 | - cat <<\_ASBOX | ||
4555 | -## ------------------------------------ ## | ||
4556 | -## Report this to bug-autoconf@gnu.org. ## | ||
4557 | -## ------------------------------------ ## | ||
4558 | -_ASBOX | ||
4559 | - ) | | ||
4560 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4561 | - ;; | ||
4562 | -esac | ||
4563 | -echo "$as_me:$LINENO: checking for sys/audioio.h" >&5 | ||
4564 | -echo $ECHO_N "checking for sys/audioio.h... $ECHO_C" >&6 | ||
4565 | -if test "${ac_cv_header_sys_audioio_h+set}" = set; then | ||
4566 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4567 | -else | ||
4568 | - ac_cv_header_sys_audioio_h=$ac_header_preproc | ||
4569 | -fi | ||
4570 | -echo "$as_me:$LINENO: result: $ac_cv_header_sys_audioio_h" >&5 | ||
4571 | -echo "${ECHO_T}$ac_cv_header_sys_audioio_h" >&6 | ||
4572 | - | ||
4573 | -fi | ||
4574 | -if test $ac_cv_header_sys_audioio_h = yes; then | ||
4575 | +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | ||
4576 | + echo "$ac_t""yes" 1>&6 | ||
4577 | AUDIODRIVER="sun" | ||
4578 | AUDIODEFS=-DCST_AUDIO_SUNOS | ||
4579 | +else | ||
4580 | + echo "$ac_t""no" 1>&6 | ||
4581 | fi | ||
4582 | |||
4583 | - | ||
4584 | -if test "${ac_cv_header_mmsystem_h+set}" = set; then | ||
4585 | - echo "$as_me:$LINENO: checking for mmsystem.h" >&5 | ||
4586 | -echo $ECHO_N "checking for mmsystem.h... $ECHO_C" >&6 | ||
4587 | -if test "${ac_cv_header_mmsystem_h+set}" = set; then | ||
4588 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4589 | -fi | ||
4590 | -echo "$as_me:$LINENO: result: $ac_cv_header_mmsystem_h" >&5 | ||
4591 | -echo "${ECHO_T}$ac_cv_header_mmsystem_h" >&6 | ||
4592 | + ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` | ||
4593 | +echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 | ||
4594 | +echo "configure:1495: checking for alsa/asoundlib.h" >&5 | ||
4595 | +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
4596 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
4597 | else | ||
4598 | - # Is the header compilable? | ||
4599 | -echo "$as_me:$LINENO: checking mmsystem.h usability" >&5 | ||
4600 | -echo $ECHO_N "checking mmsystem.h usability... $ECHO_C" >&6 | ||
4601 | -cat >conftest.$ac_ext <<_ACEOF | ||
4602 | -#line $LINENO "configure" | ||
4603 | -/* confdefs.h. */ | ||
4604 | -_ACEOF | ||
4605 | -cat confdefs.h >>conftest.$ac_ext | ||
4606 | -cat >>conftest.$ac_ext <<_ACEOF | ||
4607 | -/* end confdefs.h. */ | ||
4608 | -$ac_includes_default | ||
4609 | -#include <mmsystem.h> | ||
4610 | -_ACEOF | ||
4611 | -rm -f conftest.$ac_objext | ||
4612 | -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
4613 | - (eval $ac_compile) 2>&5 | ||
4614 | - ac_status=$? | ||
4615 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4616 | - (exit $ac_status); } && | ||
4617 | - { ac_try='test -s conftest.$ac_objext' | ||
4618 | - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4619 | - (eval $ac_try) 2>&5 | ||
4620 | - ac_status=$? | ||
4621 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4622 | - (exit $ac_status); }; }; then | ||
4623 | - ac_header_compiler=yes | ||
4624 | + cat > conftest.$ac_ext <<EOF | ||
4625 | +#line 1500 "configure" | ||
4626 | +#include "confdefs.h" | ||
4627 | +#include <alsa/asoundlib.h> | ||
4628 | +EOF | ||
4629 | +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
4630 | +{ (eval echo configure:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
4631 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
4632 | +if test -z "$ac_err"; then | ||
4633 | + rm -rf conftest* | ||
4634 | + eval "ac_cv_header_$ac_safe=yes" | ||
4635 | else | ||
4636 | - echo "$as_me: failed program was:" >&5 | ||
4637 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
4638 | - | ||
4639 | -ac_header_compiler=no | ||
4640 | + echo "$ac_err" >&5 | ||
4641 | + echo "configure: failed program was:" >&5 | ||
4642 | + cat conftest.$ac_ext >&5 | ||
4643 | + rm -rf conftest* | ||
4644 | + eval "ac_cv_header_$ac_safe=no" | ||
4645 | fi | ||
4646 | -rm -f conftest.$ac_objext conftest.$ac_ext | ||
4647 | -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
4648 | -echo "${ECHO_T}$ac_header_compiler" >&6 | ||
4649 | - | ||
4650 | -# Is the header present? | ||
4651 | -echo "$as_me:$LINENO: checking mmsystem.h presence" >&5 | ||
4652 | -echo $ECHO_N "checking mmsystem.h presence... $ECHO_C" >&6 | ||
4653 | -cat >conftest.$ac_ext <<_ACEOF | ||
4654 | -#line $LINENO "configure" | ||
4655 | -/* confdefs.h. */ | ||
4656 | -_ACEOF | ||
4657 | -cat confdefs.h >>conftest.$ac_ext | ||
4658 | -cat >>conftest.$ac_ext <<_ACEOF | ||
4659 | -/* end confdefs.h. */ | ||
4660 | -#include <mmsystem.h> | ||
4661 | -_ACEOF | ||
4662 | -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
4663 | - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
4664 | - ac_status=$? | ||
4665 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
4666 | - rm -f conftest.er1 | ||
4667 | - cat conftest.err >&5 | ||
4668 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4669 | - (exit $ac_status); } >/dev/null; then | ||
4670 | - if test -s conftest.err; then | ||
4671 | - ac_cpp_err=$ac_c_preproc_warn_flag | ||
4672 | - else | ||
4673 | - ac_cpp_err= | ||
4674 | - fi | ||
4675 | -else | ||
4676 | - ac_cpp_err=yes | ||
4677 | +rm -f conftest* | ||
4678 | fi | ||
4679 | -if test -z "$ac_cpp_err"; then | ||
4680 | - ac_header_preproc=yes | ||
4681 | +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | ||
4682 | + echo "$ac_t""yes" 1>&6 | ||
4683 | + AUDIODRIVER="alsa" | ||
4684 | + AUDIODEFS=-DCST_AUDIO_ALSA | ||
4685 | + AUDIOLIBS=-lasound | ||
4686 | else | ||
4687 | - echo "$as_me: failed program was:" >&5 | ||
4688 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
4689 | - | ||
4690 | - ac_header_preproc=no | ||
4691 | + echo "$ac_t""no" 1>&6 | ||
4692 | fi | ||
4693 | -rm -f conftest.err conftest.$ac_ext | ||
4694 | -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
4695 | -echo "${ECHO_T}$ac_header_preproc" >&6 | ||
4696 | |||
4697 | -# So? What about this header? | ||
4698 | -case $ac_header_compiler:$ac_header_preproc in | ||
4699 | - yes:no ) | ||
4700 | - { echo "$as_me:$LINENO: WARNING: mmsystem.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
4701 | -echo "$as_me: WARNING: mmsystem.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
4702 | - { echo "$as_me:$LINENO: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&5 | ||
4703 | -echo "$as_me: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&2;} | ||
4704 | - ( | ||
4705 | - cat <<\_ASBOX | ||
4706 | -## ------------------------------------ ## | ||
4707 | -## Report this to bug-autoconf@gnu.org. ## | ||
4708 | -## ------------------------------------ ## | ||
4709 | -_ASBOX | ||
4710 | - ) | | ||
4711 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4712 | - ;; | ||
4713 | - no:yes ) | ||
4714 | - { echo "$as_me:$LINENO: WARNING: mmsystem.h: present but cannot be compiled" >&5 | ||
4715 | -echo "$as_me: WARNING: mmsystem.h: present but cannot be compiled" >&2;} | ||
4716 | - { echo "$as_me:$LINENO: WARNING: mmsystem.h: check for missing prerequisite headers?" >&5 | ||
4717 | -echo "$as_me: WARNING: mmsystem.h: check for missing prerequisite headers?" >&2;} | ||
4718 | - { echo "$as_me:$LINENO: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&5 | ||
4719 | -echo "$as_me: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&2;} | ||
4720 | - ( | ||
4721 | - cat <<\_ASBOX | ||
4722 | -## ------------------------------------ ## | ||
4723 | -## Report this to bug-autoconf@gnu.org. ## | ||
4724 | -## ------------------------------------ ## | ||
4725 | -_ASBOX | ||
4726 | - ) | | ||
4727 | - sed "s/^/$as_me: WARNING: /" >&2 | ||
4728 | - ;; | ||
4729 | -esac | ||
4730 | -echo "$as_me:$LINENO: checking for mmsystem.h" >&5 | ||
4731 | -echo $ECHO_N "checking for mmsystem.h... $ECHO_C" >&6 | ||
4732 | -if test "${ac_cv_header_mmsystem_h+set}" = set; then | ||
4733 | - echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4734 | +ac_safe=`echo "mmsystem.h" | sed 'y%./+-%__p_%'` | ||
4735 | +echo $ac_n "checking for mmsystem.h""... $ac_c" 1>&6 | ||
4736 | +echo "configure:1530: checking for mmsystem.h" >&5 | ||
4737 | +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
4738 | + echo $ac_n "(cached) $ac_c" 1>&6 | ||
4739 | else | ||
4740 | - ac_cv_header_mmsystem_h=$ac_header_preproc | ||
4741 | + cat > conftest.$ac_ext <<EOF | ||
4742 | +#line 1535 "configure" | ||
4743 | +#include "confdefs.h" | ||
4744 | +#include <mmsystem.h> | ||
4745 | +EOF | ||
4746 | +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
4747 | +{ (eval echo configure:1540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
4748 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
4749 | +if test -z "$ac_err"; then | ||
4750 | + rm -rf conftest* | ||
4751 | + eval "ac_cv_header_$ac_safe=yes" | ||
4752 | +else | ||
4753 | + echo "$ac_err" >&5 | ||
4754 | + echo "configure: failed program was:" >&5 | ||
4755 | + cat conftest.$ac_ext >&5 | ||
4756 | + rm -rf conftest* | ||
4757 | + eval "ac_cv_header_$ac_safe=no" | ||
4758 | fi | ||
4759 | -echo "$as_me:$LINENO: result: $ac_cv_header_mmsystem_h" >&5 | ||
4760 | -echo "${ECHO_T}$ac_cv_header_mmsystem_h" >&6 | ||
4761 | - | ||
4762 | +rm -f conftest* | ||
4763 | fi | ||
4764 | -if test $ac_cv_header_mmsystem_h = yes; then | ||
4765 | +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | ||
4766 | + echo "$ac_t""yes" 1>&6 | ||
4767 | AUDIODRIVER="wince" | ||
4768 | AUDIODEFS=-DCST_AUDIO_WINCE | ||
4769 | AUDIOLIBS=-lwinmm | ||
4770 | +else | ||
4771 | + echo "$ac_t""no" 1>&6 | ||
4772 | fi | ||
4773 | |||
4774 | |||
4775 | - | ||
4776 | - | ||
4777 | # Check whether --with-audio or --without-audio was given. | ||
4778 | if test "${with_audio+set}" = set; then | ||
4779 | withval="$with_audio" | ||
4780 | - AUDIODRIVER=$with_audio | ||
4781 | -fi; | ||
4782 | + AUDIODRIVER=$with_audio | ||
4783 | +fi | ||
4784 | |||
4785 | + | ||
4786 | if test "x$AUDIODEFS" = x; then | ||
4787 | case "$AUDIODRIVER" in | ||
4788 | linux|oss) | ||
4789 | @@ -4006,34 +1595,34 @@ | ||
4790 | |||
4791 | |||
4792 | |||
4793 | - | ||
4794 | # Check whether --with-lang or --without-lang was given. | ||
4795 | if test "${with_lang+set}" = set; then | ||
4796 | withval="$with_lang" | ||
4797 | - FL_LANG=$with_lang | ||
4798 | -fi; | ||
4799 | + FL_LANG=$with_lang | ||
4800 | +fi | ||
4801 | + | ||
4802 | if test "x$with_lang" = "x"; then | ||
4803 | FL_LANG="usenglish" | ||
4804 | fi | ||
4805 | |||
4806 | |||
4807 | - | ||
4808 | # Check whether --with-vox or --without-vox was given. | ||
4809 | if test "${with_vox+set}" = set; then | ||
4810 | withval="$with_vox" | ||
4811 | - FL_VOX=$with_vox | ||
4812 | -fi; | ||
4813 | + FL_VOX=$with_vox | ||
4814 | +fi | ||
4815 | + | ||
4816 | if test "x$with_vox" = "x"; then | ||
4817 | FL_VOX="cmu_us_kal" | ||
4818 | fi | ||
4819 | |||
4820 | |||
4821 | - | ||
4822 | # Check whether --with-lex or --without-lex was given. | ||
4823 | if test "${with_lex+set}" = set; then | ||
4824 | withval="$with_lex" | ||
4825 | - FL_LEX=$with_lex | ||
4826 | -fi; | ||
4827 | + FL_LEX=$with_lex | ||
4828 | +fi | ||
4829 | + | ||
4830 | if test "x$with_lex" = "x"; then | ||
4831 | FL_LEX="cmulex" | ||
4832 | fi | ||
4833 | @@ -4041,921 +1630,300 @@ | ||
4834 | |||
4835 | |||
4836 | |||
4837 | - ac_config_files="$ac_config_files config/config config/system.mak" | ||
4838 | -cat >confcache <<\_ACEOF | ||
4839 | +trap '' 1 2 15 | ||
4840 | +cat > confcache <<\EOF | ||
4841 | # This file is a shell script that caches the results of configure | ||
4842 | # tests run on this system so they can be shared between configure | ||
4843 | -# scripts and configure runs, see configure's option --config-cache. | ||
4844 | -# It is not useful on other systems. If it contains results you don't | ||
4845 | -# want to keep, you may remove or edit it. | ||
4846 | +# scripts and configure runs. It is not useful on other systems. | ||
4847 | +# If it contains results you don't want to keep, you may remove or edit it. | ||
4848 | # | ||
4849 | -# config.status only pays attention to the cache file if you give it | ||
4850 | -# the --recheck option to rerun configure. | ||
4851 | +# By default, configure uses ./config.cache as the cache file, | ||
4852 | +# creating it if it does not exist already. You can give configure | ||
4853 | +# the --cache-file=FILE option to use a different cache file; that is | ||
4854 | +# what configure does when it calls configure scripts in | ||
4855 | +# subdirectories, so they share the cache. | ||
4856 | +# Giving --cache-file=/dev/null disables caching, for debugging configure. | ||
4857 | +# config.status only pays attention to the cache file if you give it the | ||
4858 | +# --recheck option to rerun configure. | ||
4859 | # | ||
4860 | -# `ac_cv_env_foo' variables (set or unset) will be overridden when | ||
4861 | -# loading this file, other *unset* `ac_cv_foo' will be assigned the | ||
4862 | -# following values. | ||
4863 | - | ||
4864 | -_ACEOF | ||
4865 | - | ||
4866 | +EOF | ||
4867 | # The following way of writing the cache mishandles newlines in values, | ||
4868 | # but we know of no workaround that is simple, portable, and efficient. | ||
4869 | # So, don't put newlines in cache variables' values. | ||
4870 | # Ultrix sh set writes to stderr and can't be redirected directly, | ||
4871 | # and sets the high bit in the cache file unless we assign to the vars. | ||
4872 | -{ | ||
4873 | - (set) 2>&1 | | ||
4874 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in | ||
4875 | - *ac_space=\ *) | ||
4876 | - # `set' does not quote correctly, so add quotes (double-quote | ||
4877 | - # substitution turns \\\\ into \\, and sed turns \\ into \). | ||
4878 | - sed -n \ | ||
4879 | - "s/'/'\\\\''/g; | ||
4880 | - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" | ||
4881 | - ;; | ||
4882 | - *) | ||
4883 | - # `set' quotes correctly as required by POSIX, so do not add quotes. | ||
4884 | - sed -n \ | ||
4885 | - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
4886 | - ;; | ||
4887 | - esac; | ||
4888 | -} | | ||
4889 | - sed ' | ||
4890 | - t clear | ||
4891 | - : clear | ||
4892 | - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ | ||
4893 | - t end | ||
4894 | - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ | ||
4895 | - : end' >>confcache | ||
4896 | -if diff $cache_file confcache >/dev/null 2>&1; then :; else | ||
4897 | +(set) 2>&1 | | ||
4898 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in | ||
4899 | + *ac_space=\ *) | ||
4900 | + # `set' does not quote correctly, so add quotes (double-quote substitution | ||
4901 | + # turns \\\\ into \\, and sed turns \\ into \). | ||
4902 | + sed -n \ | ||
4903 | + -e "s/'/'\\\\''/g" \ | ||
4904 | + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" | ||
4905 | + ;; | ||
4906 | + *) | ||
4907 | + # `set' quotes correctly as required by POSIX, so do not add quotes. | ||
4908 | + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' | ||
4909 | + ;; | ||
4910 | + esac >> confcache | ||
4911 | +if cmp -s $cache_file confcache; then | ||
4912 | + : | ||
4913 | +else | ||
4914 | if test -w $cache_file; then | ||
4915 | - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" | ||
4916 | - cat confcache >$cache_file | ||
4917 | + echo "updating cache $cache_file" | ||
4918 | + cat confcache > $cache_file | ||
4919 | else | ||
4920 | echo "not updating unwritable cache $cache_file" | ||
4921 | fi | ||
4922 | fi | ||
4923 | rm -f confcache | ||
4924 | |||
4925 | +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 | ||
4926 | + | ||
4927 | test "x$prefix" = xNONE && prefix=$ac_default_prefix | ||
4928 | # Let make expand exec_prefix. | ||
4929 | test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' | ||
4930 | |||
4931 | -# VPATH may cause trouble with some makes, so we remove $(srcdir), | ||
4932 | -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and | ||
4933 | -# trailing colons and then remove the whole line if VPATH becomes empty | ||
4934 | -# (actually we leave an empty line to preserve line numbers). | ||
4935 | +# Any assignment to VPATH causes Sun make to only execute | ||
4936 | +# the first set of double-colon rules, so remove it if not needed. | ||
4937 | +# If there is a colon in the path, we need to keep it. | ||
4938 | if test "x$srcdir" = x.; then | ||
4939 | - ac_vpsub='/^[ ]*VPATH[ ]*=/{ | ||
4940 | -s/:*\$(srcdir):*/:/; | ||
4941 | -s/:*\${srcdir}:*/:/; | ||
4942 | -s/:*@srcdir@:*/:/; | ||
4943 | -s/^\([^=]*=[ ]*\):*/\1/; | ||
4944 | -s/:*$//; | ||
4945 | -s/^[^=]*=[ ]*$//; | ||
4946 | -}' | ||
4947 | + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' | ||
4948 | fi | ||
4949 | |||
4950 | +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 | ||
4951 | + | ||
4952 | # Transform confdefs.h into DEFS. | ||
4953 | # Protect against shell expansion while executing Makefile rules. | ||
4954 | # Protect against Makefile macro expansion. | ||
4955 | -# | ||
4956 | -# If the first sed substitution is executed (which looks for macros that | ||
4957 | -# take arguments), then we branch to the quote section. Otherwise, | ||
4958 | -# look for a macro that doesn't take arguments. | ||
4959 | -cat >confdef2opt.sed <<\_ACEOF | ||
4960 | -t clear | ||
4961 | -: clear | ||
4962 | -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g | ||
4963 | -t quote | ||
4964 | -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g | ||
4965 | -t quote | ||
4966 | -d | ||
4967 | -: quote | ||
4968 | -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g | ||
4969 | -s,\[,\\&,g | ||
4970 | -s,\],\\&,g | ||
4971 | -s,\$,$$,g | ||
4972 | -p | ||
4973 | -_ACEOF | ||
4974 | -# We use echo to avoid assuming a particular line-breaking character. | ||
4975 | -# The extra dot is to prevent the shell from consuming trailing | ||
4976 | -# line-breaks from the sub-command output. A line-break within | ||
4977 | -# single-quotes doesn't work because, if this script is created in a | ||
4978 | -# platform that uses two characters for line-breaks (e.g., DOS), tr | ||
4979 | -# would break. | ||
4980 | -ac_LF_and_DOT=`echo; echo .` | ||
4981 | -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` | ||
4982 | -rm -f confdef2opt.sed | ||
4983 | +cat > conftest.defs <<\EOF | ||
4984 | +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g | ||
4985 | +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g | ||
4986 | +s%\[%\\&%g | ||
4987 | +s%\]%\\&%g | ||
4988 | +s%\$%$$%g | ||
4989 | +EOF | ||
4990 | +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` | ||
4991 | +rm -f conftest.defs | ||
4992 | |||
4993 | |||
4994 | -ac_libobjs= | ||
4995 | -ac_ltlibobjs= | ||
4996 | -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue | ||
4997 | - # 1. Remove the extension, and $U if already installed. | ||
4998 | - ac_i=`echo "$ac_i" | | ||
4999 | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` | ||
5000 | - # 2. Add them. | ||
5001 | - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" | ||
5002 | - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' | ||
5003 | -done | ||
5004 | -LIBOBJS=$ac_libobjs | ||
5005 | - | ||
5006 | -LTLIBOBJS=$ac_ltlibobjs | ||
5007 | - | ||
5008 | - | ||
5009 | - | ||
5010 | +# Without the "./", some shells look in PATH for config.status. | ||
5011 | : ${CONFIG_STATUS=./config.status} | ||
5012 | -ac_clean_files_save=$ac_clean_files | ||
5013 | -ac_clean_files="$ac_clean_files $CONFIG_STATUS" | ||
5014 | -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 | ||
5015 | -echo "$as_me: creating $CONFIG_STATUS" >&6;} | ||
5016 | -cat >$CONFIG_STATUS <<_ACEOF | ||
5017 | -#! $SHELL | ||
5018 | -# Generated by $as_me. | ||
5019 | + | ||
5020 | +echo creating $CONFIG_STATUS | ||
5021 | +rm -f $CONFIG_STATUS | ||
5022 | +cat > $CONFIG_STATUS <<EOF | ||
5023 | +#! /bin/sh | ||
5024 | +# Generated automatically by configure. | ||
5025 | # Run this file to recreate the current configuration. | ||
5026 | +# This directory was configured as follows, | ||
5027 | +# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: | ||
5028 | +# | ||
5029 | +# $0 $ac_configure_args | ||
5030 | +# | ||
5031 | # Compiler output produced by configure, useful for debugging | ||
5032 | -# configure, is in config.log if it exists. | ||
5033 | +# configure, is in ./config.log if it exists. | ||
5034 | |||
5035 | -debug=false | ||
5036 | -ac_cs_recheck=false | ||
5037 | -ac_cs_silent=false | ||
5038 | -SHELL=\${CONFIG_SHELL-$SHELL} | ||
5039 | -_ACEOF | ||
5040 | - | ||
5041 | -cat >>$CONFIG_STATUS <<\_ACEOF | ||
5042 | -## --------------------- ## | ||
5043 | -## M4sh Initialization. ## | ||
5044 | -## --------------------- ## | ||
5045 | - | ||
5046 | -# Be Bourne compatible | ||
5047 | -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
5048 | - emulate sh | ||
5049 | - NULLCMD=: | ||
5050 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
5051 | - # is contrary to our usage. Disable this feature. | ||
5052 | - alias -g '${1+"$@"}'='"$@"' | ||
5053 | -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | ||
5054 | - set -o posix | ||
5055 | -fi | ||
5056 | - | ||
5057 | -# Support unset when possible. | ||
5058 | -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then | ||
5059 | - as_unset=unset | ||
5060 | -else | ||
5061 | - as_unset=false | ||
5062 | -fi | ||
5063 | - | ||
5064 | - | ||
5065 | -# Work around bugs in pre-3.0 UWIN ksh. | ||
5066 | -$as_unset ENV MAIL MAILPATH | ||
5067 | -PS1='$ ' | ||
5068 | -PS2='> ' | ||
5069 | -PS4='+ ' | ||
5070 | - | ||
5071 | -# NLS nuisances. | ||
5072 | -for as_var in \ | ||
5073 | - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ | ||
5074 | - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | ||
5075 | - LC_TELEPHONE LC_TIME | ||
5076 | +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" | ||
5077 | +for ac_option | ||
5078 | do | ||
5079 | - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
5080 | - eval $as_var=C; export $as_var | ||
5081 | - else | ||
5082 | - $as_unset $as_var | ||
5083 | - fi | ||
5084 | + case "\$ac_option" in | ||
5085 | + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) | ||
5086 | + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" | ||
5087 | + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; | ||
5088 | + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) | ||
5089 | + echo "$CONFIG_STATUS generated by autoconf version 2.13" | ||
5090 | + exit 0 ;; | ||
5091 | + -help | --help | --hel | --he | --h) | ||
5092 | + echo "\$ac_cs_usage"; exit 0 ;; | ||
5093 | + *) echo "\$ac_cs_usage"; exit 1 ;; | ||
5094 | + esac | ||
5095 | done | ||
5096 | |||
5097 | -# Required to use basename. | ||
5098 | -if expr a : '\(a\)' >/dev/null 2>&1; then | ||
5099 | - as_expr=expr | ||
5100 | -else | ||
5101 | - as_expr=false | ||
5102 | -fi | ||
5103 | +ac_given_srcdir=$srcdir | ||
5104 | +ac_given_INSTALL="$INSTALL" | ||
5105 | |||
5106 | -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then | ||
5107 | - as_basename=basename | ||
5108 | -else | ||
5109 | - as_basename=false | ||
5110 | -fi | ||
5111 | +trap 'rm -fr `echo "config/config config/system.mak" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 | ||
5112 | +EOF | ||
5113 | +cat >> $CONFIG_STATUS <<EOF | ||
5114 | |||
5115 | +# Protect against being on the right side of a sed subst in config.status. | ||
5116 | +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; | ||
5117 | + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF | ||
5118 | +$ac_vpsub | ||
5119 | +$extrasub | ||
5120 | +s%@SHELL@%$SHELL%g | ||
5121 | +s%@CFLAGS@%$CFLAGS%g | ||
5122 | +s%@CPPFLAGS@%$CPPFLAGS%g | ||
5123 | +s%@CXXFLAGS@%$CXXFLAGS%g | ||
5124 | +s%@FFLAGS@%$FFLAGS%g | ||
5125 | +s%@DEFS@%$DEFS%g | ||
5126 | +s%@LDFLAGS@%$LDFLAGS%g | ||
5127 | +s%@LIBS@%$LIBS%g | ||
5128 | +s%@exec_prefix@%$exec_prefix%g | ||
5129 | +s%@prefix@%$prefix%g | ||
5130 | +s%@program_transform_name@%$program_transform_name%g | ||
5131 | +s%@bindir@%$bindir%g | ||
5132 | +s%@sbindir@%$sbindir%g | ||
5133 | +s%@libexecdir@%$libexecdir%g | ||
5134 | +s%@datadir@%$datadir%g | ||
5135 | +s%@sysconfdir@%$sysconfdir%g | ||
5136 | +s%@sharedstatedir@%$sharedstatedir%g | ||
5137 | +s%@localstatedir@%$localstatedir%g | ||
5138 | +s%@libdir@%$libdir%g | ||
5139 | +s%@includedir@%$includedir%g | ||
5140 | +s%@oldincludedir@%$oldincludedir%g | ||
5141 | +s%@infodir@%$infodir%g | ||
5142 | +s%@mandir@%$mandir%g | ||
5143 | +s%@host@%$host%g | ||
5144 | +s%@host_alias@%$host_alias%g | ||
5145 | +s%@host_cpu@%$host_cpu%g | ||
5146 | +s%@host_vendor@%$host_vendor%g | ||
5147 | +s%@host_os@%$host_os%g | ||
5148 | +s%@target@%$target%g | ||
5149 | +s%@target_alias@%$target_alias%g | ||
5150 | +s%@target_cpu@%$target_cpu%g | ||
5151 | +s%@target_vendor@%$target_vendor%g | ||
5152 | +s%@target_os@%$target_os%g | ||
5153 | +s%@build@%$build%g | ||
5154 | +s%@build_alias@%$build_alias%g | ||
5155 | +s%@build_cpu@%$build_cpu%g | ||
5156 | +s%@build_vendor@%$build_vendor%g | ||
5157 | +s%@build_os@%$build_os%g | ||
5158 | +s%@CC@%$CC%g | ||
5159 | +s%@RANLIB@%$RANLIB%g | ||
5160 | +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g | ||
5161 | +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g | ||
5162 | +s%@INSTALL_DATA@%$INSTALL_DATA%g | ||
5163 | +s%@AR@%$AR%g | ||
5164 | +s%@TARGET_OS@%$TARGET_OS%g | ||
5165 | +s%@TARGET_CPU@%$TARGET_CPU%g | ||
5166 | +s%@M68KCC@%$M68KCC%g | ||
5167 | +s%@LEXDEFS@%$LEXDEFS%g | ||
5168 | +s%@VOXDEFS@%$VOXDEFS%g | ||
5169 | +s%@HOST_OS@%$HOST_OS%g | ||
5170 | +s%@HOST_CPU@%$HOST_CPU%g | ||
5171 | +s%@OTHERLIBS@%$OTHERLIBS%g | ||
5172 | +s%@SHFLAGS@%$SHFLAGS%g | ||
5173 | +s%@MMAPTYPE@%$MMAPTYPE%g | ||
5174 | +s%@STDIOTYPE@%$STDIOTYPE%g | ||
5175 | +s%@CPP@%$CPP%g | ||
5176 | +s%@AUDIODRIVER@%$AUDIODRIVER%g | ||
5177 | +s%@AUDIODEFS@%$AUDIODEFS%g | ||
5178 | +s%@AUDIOLIBS@%$AUDIOLIBS%g | ||
5179 | +s%@FL_LANG@%$FL_LANG%g | ||
5180 | +s%@FL_VOX@%$FL_VOX%g | ||
5181 | +s%@FL_LEX@%$FL_LEX%g | ||
5182 | +s%@EXEEXT@%$EXEEXT%g | ||
5183 | |||
5184 | -# Name of the executable. | ||
5185 | -as_me=`$as_basename "$0" || | ||
5186 | -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | ||
5187 | - X"$0" : 'X\(//\)$' \| \ | ||
5188 | - X"$0" : 'X\(/\)$' \| \ | ||
5189 | - . : '\(.\)' 2>/dev/null || | ||
5190 | -echo X/"$0" | | ||
5191 | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } | ||
5192 | - /^X\/\(\/\/\)$/{ s//\1/; q; } | ||
5193 | - /^X\/\(\/\).*/{ s//\1/; q; } | ||
5194 | - s/.*/./; q'` | ||
5195 | +CEOF | ||
5196 | +EOF | ||
5197 | |||
5198 | +cat >> $CONFIG_STATUS <<\EOF | ||
5199 | |||
5200 | -# PATH needs CR, and LINENO needs CR and PATH. | ||
5201 | -# Avoid depending upon Character Ranges. | ||
5202 | -as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
5203 | -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
5204 | -as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
5205 | -as_cr_digits='0123456789' | ||
5206 | -as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
5207 | - | ||
5208 | -# The user is always right. | ||
5209 | -if test "${PATH_SEPARATOR+set}" != set; then | ||
5210 | - echo "#! /bin/sh" >conf$$.sh | ||
5211 | - echo "exit 0" >>conf$$.sh | ||
5212 | - chmod +x conf$$.sh | ||
5213 | - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
5214 | - PATH_SEPARATOR=';' | ||
5215 | +# Split the substitutions into bite-sized pieces for seds with | ||
5216 | +# small command number limits, like on Digital OSF/1 and HP-UX. | ||
5217 | +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. | ||
5218 | +ac_file=1 # Number of current file. | ||
5219 | +ac_beg=1 # First line for current file. | ||
5220 | +ac_end=$ac_max_sed_cmds # Line after last line for current file. | ||
5221 | +ac_more_lines=: | ||
5222 | +ac_sed_cmds="" | ||
5223 | +while $ac_more_lines; do | ||
5224 | + if test $ac_beg -gt 1; then | ||
5225 | + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file | ||
5226 | else | ||
5227 | - PATH_SEPARATOR=: | ||
5228 | + sed "${ac_end}q" conftest.subs > conftest.s$ac_file | ||
5229 | fi | ||
5230 | - rm -f conf$$.sh | ||
5231 | -fi | ||
5232 | - | ||
5233 | - | ||
5234 | - as_lineno_1=$LINENO | ||
5235 | - as_lineno_2=$LINENO | ||
5236 | - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
5237 | - test "x$as_lineno_1" != "x$as_lineno_2" && | ||
5238 | - test "x$as_lineno_3" = "x$as_lineno_2" || { | ||
5239 | - # Find who we are. Look in the path if we contain no path at all | ||
5240 | - # relative or not. | ||
5241 | - case $0 in | ||
5242 | - *[\\/]* ) as_myself=$0 ;; | ||
5243 | - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
5244 | -for as_dir in $PATH | ||
5245 | -do | ||
5246 | - IFS=$as_save_IFS | ||
5247 | - test -z "$as_dir" && as_dir=. | ||
5248 | - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
5249 | -done | ||
5250 | - | ||
5251 | - ;; | ||
5252 | - esac | ||
5253 | - # We did not find ourselves, most probably we were run as `sh COMMAND' | ||
5254 | - # in which case we are not to be found in the path. | ||
5255 | - if test "x$as_myself" = x; then | ||
5256 | - as_myself=$0 | ||
5257 | - fi | ||
5258 | - if test ! -f "$as_myself"; then | ||
5259 | - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 | ||
5260 | -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} | ||
5261 | - { (exit 1); exit 1; }; } | ||
5262 | - fi | ||
5263 | - case $CONFIG_SHELL in | ||
5264 | - '') | ||
5265 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
5266 | -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | ||
5267 | -do | ||
5268 | - IFS=$as_save_IFS | ||
5269 | - test -z "$as_dir" && as_dir=. | ||
5270 | - for as_base in sh bash ksh sh5; do | ||
5271 | - case $as_dir in | ||
5272 | - /*) | ||
5273 | - if ("$as_dir/$as_base" -c ' | ||
5274 | - as_lineno_1=$LINENO | ||
5275 | - as_lineno_2=$LINENO | ||
5276 | - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
5277 | - test "x$as_lineno_1" != "x$as_lineno_2" && | ||
5278 | - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then | ||
5279 | - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } | ||
5280 | - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } | ||
5281 | - CONFIG_SHELL=$as_dir/$as_base | ||
5282 | - export CONFIG_SHELL | ||
5283 | - exec "$CONFIG_SHELL" "$0" ${1+"$@"} | ||
5284 | - fi;; | ||
5285 | - esac | ||
5286 | - done | ||
5287 | -done | ||
5288 | -;; | ||
5289 | - esac | ||
5290 | - | ||
5291 | - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | ||
5292 | - # uniformly replaced by the line number. The first 'sed' inserts a | ||
5293 | - # line-number line before each line; the second 'sed' does the real | ||
5294 | - # work. The second script uses 'N' to pair each line-number line | ||
5295 | - # with the numbered line, and appends trailing '-' during | ||
5296 | - # substitution so that $LINENO is not a special case at line end. | ||
5297 | - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | ||
5298 | - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) | ||
5299 | - sed '=' <$as_myself | | ||
5300 | - sed ' | ||
5301 | - N | ||
5302 | - s,$,-, | ||
5303 | - : loop | ||
5304 | - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, | ||
5305 | - t loop | ||
5306 | - s,-$,, | ||
5307 | - s,^['$as_cr_digits']*\n,, | ||
5308 | - ' >$as_me.lineno && | ||
5309 | - chmod +x $as_me.lineno || | ||
5310 | - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 | ||
5311 | -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} | ||
5312 | - { (exit 1); exit 1; }; } | ||
5313 | - | ||
5314 | - # Don't try to exec as it changes $[0], causing all sort of problems | ||
5315 | - # (the dirname of $[0] is not the place where we might find the | ||
5316 | - # original and so on. Autoconf is especially sensible to this). | ||
5317 | - . ./$as_me.lineno | ||
5318 | - # Exit status is that of the last command. | ||
5319 | - exit | ||
5320 | -} | ||
5321 | - | ||
5322 | - | ||
5323 | -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in | ||
5324 | - *c*,-n*) ECHO_N= ECHO_C=' | ||
5325 | -' ECHO_T=' ' ;; | ||
5326 | - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; | ||
5327 | - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; | ||
5328 | -esac | ||
5329 | - | ||
5330 | -if expr a : '\(a\)' >/dev/null 2>&1; then | ||
5331 | - as_expr=expr | ||
5332 | -else | ||
5333 | - as_expr=false | ||
5334 | -fi | ||
5335 | - | ||
5336 | -rm -f conf$$ conf$$.exe conf$$.file | ||
5337 | -echo >conf$$.file | ||
5338 | -if ln -s conf$$.file conf$$ 2>/dev/null; then | ||
5339 | - # We could just check for DJGPP; but this test a) works b) is more generic | ||
5340 | - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). | ||
5341 | - if test -f conf$$.exe; then | ||
5342 | - # Don't use ln at all; we don't have any links | ||
5343 | - as_ln_s='cp -p' | ||
5344 | + if test ! -s conftest.s$ac_file; then | ||
5345 | + ac_more_lines=false | ||
5346 | + rm -f conftest.s$ac_file | ||
5347 | else | ||
5348 | - as_ln_s='ln -s' | ||
5349 | + if test -z "$ac_sed_cmds"; then | ||
5350 | + ac_sed_cmds="sed -f conftest.s$ac_file" | ||
5351 | + else | ||
5352 | + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" | ||
5353 | + fi | ||
5354 | + ac_file=`expr $ac_file + 1` | ||
5355 | + ac_beg=$ac_end | ||
5356 | + ac_end=`expr $ac_end + $ac_max_sed_cmds` | ||
5357 | fi | ||
5358 | -elif ln conf$$.file conf$$ 2>/dev/null; then | ||
5359 | - as_ln_s=ln | ||
5360 | -else | ||
5361 | - as_ln_s='cp -p' | ||
5362 | -fi | ||
5363 | -rm -f conf$$ conf$$.exe conf$$.file | ||
5364 | - | ||
5365 | -if mkdir -p . 2>/dev/null; then | ||
5366 | - as_mkdir_p=: | ||
5367 | -else | ||
5368 | - as_mkdir_p=false | ||
5369 | -fi | ||
5370 | - | ||
5371 | -as_executable_p="test -f" | ||
5372 | - | ||
5373 | -# Sed expression to map a string onto a valid CPP name. | ||
5374 | -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" | ||
5375 | - | ||
5376 | -# Sed expression to map a string onto a valid variable name. | ||
5377 | -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" | ||
5378 | - | ||
5379 | - | ||
5380 | -# IFS | ||
5381 | -# We need space, tab and new line, in precisely that order. | ||
5382 | -as_nl=' | ||
5383 | -' | ||
5384 | -IFS=" $as_nl" | ||
5385 | - | ||
5386 | -# CDPATH. | ||
5387 | -$as_unset CDPATH | ||
5388 | - | ||
5389 | -exec 6>&1 | ||
5390 | - | ||
5391 | -# Open the log real soon, to keep \$[0] and so on meaningful, and to | ||
5392 | -# report actual input values of CONFIG_FILES etc. instead of their | ||
5393 | -# values after options handling. Logging --version etc. is OK. | ||
5394 | -exec 5>>config.log | ||
5395 | -{ | ||
5396 | - echo | ||
5397 | - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX | ||
5398 | -## Running $as_me. ## | ||
5399 | -_ASBOX | ||
5400 | -} >&5 | ||
5401 | -cat >&5 <<_CSEOF | ||
5402 | - | ||
5403 | -This file was extended by $as_me, which was | ||
5404 | -generated by GNU Autoconf 2.57. Invocation command line was | ||
5405 | - | ||
5406 | - CONFIG_FILES = $CONFIG_FILES | ||
5407 | - CONFIG_HEADERS = $CONFIG_HEADERS | ||
5408 | - CONFIG_LINKS = $CONFIG_LINKS | ||
5409 | - CONFIG_COMMANDS = $CONFIG_COMMANDS | ||
5410 | - $ $0 $@ | ||
5411 | - | ||
5412 | -_CSEOF | ||
5413 | -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 | ||
5414 | -echo >&5 | ||
5415 | -_ACEOF | ||
5416 | - | ||
5417 | -# Files that config.status was made for. | ||
5418 | -if test -n "$ac_config_files"; then | ||
5419 | - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS | ||
5420 | -fi | ||
5421 | - | ||
5422 | -if test -n "$ac_config_headers"; then | ||
5423 | - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS | ||
5424 | -fi | ||
5425 | - | ||
5426 | -if test -n "$ac_config_links"; then | ||
5427 | - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS | ||
5428 | -fi | ||
5429 | - | ||
5430 | -if test -n "$ac_config_commands"; then | ||
5431 | - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS | ||
5432 | -fi | ||
5433 | - | ||
5434 | -cat >>$CONFIG_STATUS <<\_ACEOF | ||
5435 | - | ||
5436 | -ac_cs_usage="\ | ||
5437 | -\`$as_me' instantiates files from templates according to the | ||
5438 | -current configuration. | ||
5439 | - | ||
5440 | -Usage: $0 [OPTIONS] [FILE]... | ||
5441 | - | ||
5442 | - -h, --help print this help, then exit | ||
5443 | - -V, --version print version number, then exit | ||
5444 | - -q, --quiet do not print progress messages | ||
5445 | - -d, --debug don't remove temporary files | ||
5446 | - --recheck update $as_me by reconfiguring in the same conditions | ||
5447 | - --file=FILE[:TEMPLATE] | ||
5448 | - instantiate the configuration file FILE | ||
5449 | - | ||
5450 | -Configuration files: | ||
5451 | -$config_files | ||
5452 | - | ||
5453 | -Report bugs to <bug-autoconf@gnu.org>." | ||
5454 | -_ACEOF | ||
5455 | - | ||
5456 | -cat >>$CONFIG_STATUS <<_ACEOF | ||
5457 | -ac_cs_version="\\ | ||
5458 | -config.status | ||
5459 | -configured by $0, generated by GNU Autoconf 2.57, | ||
5460 | - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" | ||
5461 | - | ||
5462 | -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 | ||
5463 | -Free Software Foundation, Inc. | ||
5464 | -This config.status script is free software; the Free Software Foundation | ||
5465 | -gives unlimited permission to copy, distribute and modify it." | ||
5466 | -srcdir=$srcdir | ||
5467 | -INSTALL="$INSTALL" | ||
5468 | -_ACEOF | ||
5469 | - | ||
5470 | -cat >>$CONFIG_STATUS <<\_ACEOF | ||
5471 | -# If no file are specified by the user, then we need to provide default | ||
5472 | -# value. By we need to know if files were specified by the user. | ||
5473 | -ac_need_defaults=: | ||
5474 | -while test $# != 0 | ||
5475 | -do | ||
5476 | - case $1 in | ||
5477 | - --*=*) | ||
5478 | - ac_option=`expr "x$1" : 'x\([^=]*\)='` | ||
5479 | - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` | ||
5480 | - ac_shift=: | ||
5481 | - ;; | ||
5482 | - -*) | ||
5483 | - ac_option=$1 | ||
5484 | - ac_optarg=$2 | ||
5485 | - ac_shift=shift | ||
5486 | - ;; | ||
5487 | - *) # This is not an option, so the user has probably given explicit | ||
5488 | - # arguments. | ||
5489 | - ac_option=$1 | ||
5490 | - ac_need_defaults=false;; | ||
5491 | - esac | ||
5492 | - | ||
5493 | - case $ac_option in | ||
5494 | - # Handling of the options. | ||
5495 | -_ACEOF | ||
5496 | -cat >>$CONFIG_STATUS <<\_ACEOF | ||
5497 | - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) | ||
5498 | - ac_cs_recheck=: ;; | ||
5499 | - --version | --vers* | -V ) | ||
5500 | - echo "$ac_cs_version"; exit 0 ;; | ||
5501 | - --he | --h) | ||
5502 | - # Conflict between --help and --header | ||
5503 | - { { echo "$as_me:$LINENO: error: ambiguous option: $1 | ||
5504 | -Try \`$0 --help' for more information." >&5 | ||
5505 | -echo "$as_me: error: ambiguous option: $1 | ||
5506 | -Try \`$0 --help' for more information." >&2;} | ||
5507 | - { (exit 1); exit 1; }; };; | ||
5508 | - --help | --hel | -h ) | ||
5509 | - echo "$ac_cs_usage"; exit 0 ;; | ||
5510 | - --debug | --d* | -d ) | ||
5511 | - debug=: ;; | ||
5512 | - --file | --fil | --fi | --f ) | ||
5513 | - $ac_shift | ||
5514 | - CONFIG_FILES="$CONFIG_FILES $ac_optarg" | ||
5515 | - ac_need_defaults=false;; | ||
5516 | - --header | --heade | --head | --hea ) | ||
5517 | - $ac_shift | ||
5518 | - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" | ||
5519 | - ac_need_defaults=false;; | ||
5520 | - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | ||
5521 | - | -silent | --silent | --silen | --sile | --sil | --si | --s) | ||
5522 | - ac_cs_silent=: ;; | ||
5523 | - | ||
5524 | - # This is an error. | ||
5525 | - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 | ||
5526 | -Try \`$0 --help' for more information." >&5 | ||
5527 | -echo "$as_me: error: unrecognized option: $1 | ||
5528 | -Try \`$0 --help' for more information." >&2;} | ||
5529 | - { (exit 1); exit 1; }; } ;; | ||
5530 | - | ||
5531 | - *) ac_config_targets="$ac_config_targets $1" ;; | ||
5532 | - | ||
5533 | - esac | ||
5534 | - shift | ||
5535 | done | ||
5536 | - | ||
5537 | -ac_configure_extra_args= | ||
5538 | - | ||
5539 | -if $ac_cs_silent; then | ||
5540 | - exec 6>/dev/null | ||
5541 | - ac_configure_extra_args="$ac_configure_extra_args --silent" | ||
5542 | +if test -z "$ac_sed_cmds"; then | ||
5543 | + ac_sed_cmds=cat | ||
5544 | fi | ||
5545 | +EOF | ||
5546 | |||
5547 | -_ACEOF | ||
5548 | -cat >>$CONFIG_STATUS <<_ACEOF | ||
5549 | -if \$ac_cs_recheck; then | ||
5550 | - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 | ||
5551 | - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | ||
5552 | -fi | ||
5553 | +cat >> $CONFIG_STATUS <<EOF | ||
5554 | |||
5555 | -_ACEOF | ||
5556 | - | ||
5557 | - | ||
5558 | - | ||
5559 | - | ||
5560 | - | ||
5561 | -cat >>$CONFIG_STATUS <<\_ACEOF | ||
5562 | -for ac_config_target in $ac_config_targets | ||
5563 | -do | ||
5564 | - case "$ac_config_target" in | ||
5565 | - # Handling of arguments. | ||
5566 | - "config/config" ) CONFIG_FILES="$CONFIG_FILES config/config" ;; | ||
5567 | - "config/system.mak" ) CONFIG_FILES="$CONFIG_FILES config/system.mak" ;; | ||
5568 | - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 | ||
5569 | -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} | ||
5570 | - { (exit 1); exit 1; }; };; | ||
5571 | +CONFIG_FILES=\${CONFIG_FILES-"config/config config/system.mak"} | ||
5572 | +EOF | ||
5573 | +cat >> $CONFIG_STATUS <<\EOF | ||
5574 | +for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then | ||
5575 | + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | ||
5576 | + case "$ac_file" in | ||
5577 | + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` | ||
5578 | + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; | ||
5579 | + *) ac_file_in="${ac_file}.in" ;; | ||
5580 | esac | ||
5581 | -done | ||
5582 | |||
5583 | -# If the user did not use the arguments to specify the items to instantiate, | ||
5584 | -# then the envvar interface is used. Set only those that are not. | ||
5585 | -# We use the long form for the default assignment because of an extremely | ||
5586 | -# bizarre bug on SunOS 4.1.3. | ||
5587 | -if $ac_need_defaults; then | ||
5588 | - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files | ||
5589 | -fi | ||
5590 | + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. | ||
5591 | |||
5592 | -# Have a temporary directory for convenience. Make it in the build tree | ||
5593 | -# simply because there is no reason to put it here, and in addition, | ||
5594 | -# creating and moving files from /tmp can sometimes cause problems. | ||
5595 | -# Create a temporary directory, and hook for its removal unless debugging. | ||
5596 | -$debug || | ||
5597 | -{ | ||
5598 | - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 | ||
5599 | - trap '{ (exit 1); exit 1; }' 1 2 13 15 | ||
5600 | -} | ||
5601 | - | ||
5602 | -# Create a (secure) tmp directory for tmp files. | ||
5603 | - | ||
5604 | -{ | ||
5605 | - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && | ||
5606 | - test -n "$tmp" && test -d "$tmp" | ||
5607 | -} || | ||
5608 | -{ | ||
5609 | - tmp=./confstat$$-$RANDOM | ||
5610 | - (umask 077 && mkdir $tmp) | ||
5611 | -} || | ||
5612 | -{ | ||
5613 | - echo "$me: cannot create a temporary directory in ." >&2 | ||
5614 | - { (exit 1); exit 1; } | ||
5615 | -} | ||
5616 | - | ||
5617 | -_ACEOF | ||
5618 | - | ||
5619 | -cat >>$CONFIG_STATUS <<_ACEOF | ||
5620 | - | ||
5621 | -# | ||
5622 | -# CONFIG_FILES section. | ||
5623 | -# | ||
5624 | - | ||
5625 | -# No need to generate the scripts if there are no CONFIG_FILES. | ||
5626 | -# This happens for instance when ./config.status config.h | ||
5627 | -if test -n "\$CONFIG_FILES"; then | ||
5628 | - # Protect against being on the right side of a sed subst in config.status. | ||
5629 | - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; | ||
5630 | - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF | ||
5631 | -s,@SHELL@,$SHELL,;t t | ||
5632 | -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t | ||
5633 | -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t | ||
5634 | -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t | ||
5635 | -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t | ||
5636 | -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t | ||
5637 | -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t | ||
5638 | -s,@exec_prefix@,$exec_prefix,;t t | ||
5639 | -s,@prefix@,$prefix,;t t | ||
5640 | -s,@program_transform_name@,$program_transform_name,;t t | ||
5641 | -s,@bindir@,$bindir,;t t | ||
5642 | -s,@sbindir@,$sbindir,;t t | ||
5643 | -s,@libexecdir@,$libexecdir,;t t | ||
5644 | -s,@datadir@,$datadir,;t t | ||
5645 | -s,@sysconfdir@,$sysconfdir,;t t | ||
5646 | -s,@sharedstatedir@,$sharedstatedir,;t t | ||
5647 | -s,@localstatedir@,$localstatedir,;t t | ||
5648 | -s,@libdir@,$libdir,;t t | ||
5649 | -s,@includedir@,$includedir,;t t | ||
5650 | -s,@oldincludedir@,$oldincludedir,;t t | ||
5651 | -s,@infodir@,$infodir,;t t | ||
5652 | -s,@mandir@,$mandir,;t t | ||
5653 | -s,@build_alias@,$build_alias,;t t | ||
5654 | -s,@host_alias@,$host_alias,;t t | ||
5655 | -s,@target_alias@,$target_alias,;t t | ||
5656 | -s,@DEFS@,$DEFS,;t t | ||
5657 | -s,@ECHO_C@,$ECHO_C,;t t | ||
5658 | -s,@ECHO_N@,$ECHO_N,;t t | ||
5659 | -s,@ECHO_T@,$ECHO_T,;t t | ||
5660 | -s,@LIBS@,$LIBS,;t t | ||
5661 | -s,@build@,$build,;t t | ||
5662 | -s,@build_cpu@,$build_cpu,;t t | ||
5663 | -s,@build_vendor@,$build_vendor,;t t | ||
5664 | -s,@build_os@,$build_os,;t t | ||
5665 | -s,@host@,$host,;t t | ||
5666 | -s,@host_cpu@,$host_cpu,;t t | ||
5667 | -s,@host_vendor@,$host_vendor,;t t | ||
5668 | -s,@host_os@,$host_os,;t t | ||
5669 | -s,@target@,$target,;t t | ||
5670 | -s,@target_cpu@,$target_cpu,;t t | ||
5671 | -s,@target_vendor@,$target_vendor,;t t | ||
5672 | -s,@target_os@,$target_os,;t t | ||
5673 | -s,@CC@,$CC,;t t | ||
5674 | -s,@CFLAGS@,$CFLAGS,;t t | ||
5675 | -s,@LDFLAGS@,$LDFLAGS,;t t | ||
5676 | -s,@CPPFLAGS@,$CPPFLAGS,;t t | ||
5677 | -s,@ac_ct_CC@,$ac_ct_CC,;t t | ||
5678 | -s,@EXEEXT@,$EXEEXT,;t t | ||
5679 | -s,@OBJEXT@,$OBJEXT,;t t | ||
5680 | -s,@RANLIB@,$RANLIB,;t t | ||
5681 | -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t | ||
5682 | -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t | ||
5683 | -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t | ||
5684 | -s,@INSTALL_DATA@,$INSTALL_DATA,;t t | ||
5685 | -s,@AR@,$AR,;t t | ||
5686 | -s,@ac_ct_AR@,$ac_ct_AR,;t t | ||
5687 | -s,@TARGET_OS@,$TARGET_OS,;t t | ||
5688 | -s,@TARGET_CPU@,$TARGET_CPU,;t t | ||
5689 | -s,@M68KCC@,$M68KCC,;t t | ||
5690 | -s,@LEXDEFS@,$LEXDEFS,;t t | ||
5691 | -s,@VOXDEFS@,$VOXDEFS,;t t | ||
5692 | -s,@HOST_OS@,$HOST_OS,;t t | ||
5693 | -s,@HOST_CPU@,$HOST_CPU,;t t | ||
5694 | -s,@OTHERLIBS@,$OTHERLIBS,;t t | ||
5695 | -s,@SHFLAGS@,$SHFLAGS,;t t | ||
5696 | -s,@MMAPTYPE@,$MMAPTYPE,;t t | ||
5697 | -s,@STDIOTYPE@,$STDIOTYPE,;t t | ||
5698 | -s,@CPP@,$CPP,;t t | ||
5699 | -s,@EGREP@,$EGREP,;t t | ||
5700 | -s,@AUDIODRIVER@,$AUDIODRIVER,;t t | ||
5701 | -s,@AUDIODEFS@,$AUDIODEFS,;t t | ||
5702 | -s,@AUDIOLIBS@,$AUDIOLIBS,;t t | ||
5703 | -s,@FL_LANG@,$FL_LANG,;t t | ||
5704 | -s,@FL_VOX@,$FL_VOX,;t t | ||
5705 | -s,@FL_LEX@,$FL_LEX,;t t | ||
5706 | -s,@LIBOBJS@,$LIBOBJS,;t t | ||
5707 | -s,@LTLIBOBJS@,$LTLIBOBJS,;t t | ||
5708 | -CEOF | ||
5709 | - | ||
5710 | -_ACEOF | ||
5711 | - | ||
5712 | - cat >>$CONFIG_STATUS <<\_ACEOF | ||
5713 | - # Split the substitutions into bite-sized pieces for seds with | ||
5714 | - # small command number limits, like on Digital OSF/1 and HP-UX. | ||
5715 | - ac_max_sed_lines=48 | ||
5716 | - ac_sed_frag=1 # Number of current file. | ||
5717 | - ac_beg=1 # First line for current file. | ||
5718 | - ac_end=$ac_max_sed_lines # Line after last line for current file. | ||
5719 | - ac_more_lines=: | ||
5720 | - ac_sed_cmds= | ||
5721 | - while $ac_more_lines; do | ||
5722 | - if test $ac_beg -gt 1; then | ||
5723 | - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag | ||
5724 | - else | ||
5725 | - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag | ||
5726 | - fi | ||
5727 | - if test ! -s $tmp/subs.frag; then | ||
5728 | - ac_more_lines=false | ||
5729 | - else | ||
5730 | - # The purpose of the label and of the branching condition is to | ||
5731 | - # speed up the sed processing (if there are no `@' at all, there | ||
5732 | - # is no need to browse any of the substitutions). | ||
5733 | - # These are the two extra sed commands mentioned above. | ||
5734 | - (echo ':t | ||
5735 | - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed | ||
5736 | - if test -z "$ac_sed_cmds"; then | ||
5737 | - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" | ||
5738 | - else | ||
5739 | - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" | ||
5740 | - fi | ||
5741 | - ac_sed_frag=`expr $ac_sed_frag + 1` | ||
5742 | - ac_beg=$ac_end | ||
5743 | - ac_end=`expr $ac_end + $ac_max_sed_lines` | ||
5744 | - fi | ||
5745 | - done | ||
5746 | - if test -z "$ac_sed_cmds"; then | ||
5747 | - ac_sed_cmds=cat | ||
5748 | + # Remove last slash and all that follows it. Not all systems have dirname. | ||
5749 | + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` | ||
5750 | + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then | ||
5751 | + # The file is in a subdirectory. | ||
5752 | + test ! -d "$ac_dir" && mkdir "$ac_dir" | ||
5753 | + ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" | ||
5754 | + # A "../" for each directory in $ac_dir_suffix. | ||
5755 | + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` | ||
5756 | + else | ||
5757 | + ac_dir_suffix= ac_dots= | ||
5758 | fi | ||
5759 | -fi # test -n "$CONFIG_FILES" | ||
5760 | |||
5761 | -_ACEOF | ||
5762 | -cat >>$CONFIG_STATUS <<\_ACEOF | ||
5763 | -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue | ||
5764 | - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | ||
5765 | - case $ac_file in | ||
5766 | - - | *:- | *:-:* ) # input from stdin | ||
5767 | - cat >$tmp/stdin | ||
5768 | - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
5769 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
5770 | - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
5771 | - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
5772 | - * ) ac_file_in=$ac_file.in ;; | ||
5773 | + case "$ac_given_srcdir" in | ||
5774 | + .) srcdir=. | ||
5775 | + if test -z "$ac_dots"; then top_srcdir=. | ||
5776 | + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; | ||
5777 | + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; | ||
5778 | + *) # Relative path. | ||
5779 | + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" | ||
5780 | + top_srcdir="$ac_dots$ac_given_srcdir" ;; | ||
5781 | esac | ||
5782 | |||
5783 | - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. | ||
5784 | - ac_dir=`(dirname "$ac_file") 2>/dev/null || | ||
5785 | -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
5786 | - X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
5787 | - X"$ac_file" : 'X\(//\)$' \| \ | ||
5788 | - X"$ac_file" : 'X\(/\)' \| \ | ||
5789 | - . : '\(.\)' 2>/dev/null || | ||
5790 | -echo X"$ac_file" | | ||
5791 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
5792 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
5793 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
5794 | - /^X\(\/\).*/{ s//\1/; q; } | ||
5795 | - s/.*/./; q'` | ||
5796 | - { if $as_mkdir_p; then | ||
5797 | - mkdir -p "$ac_dir" | ||
5798 | - else | ||
5799 | - as_dir="$ac_dir" | ||
5800 | - as_dirs= | ||
5801 | - while test ! -d "$as_dir"; do | ||
5802 | - as_dirs="$as_dir $as_dirs" | ||
5803 | - as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
5804 | -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
5805 | - X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
5806 | - X"$as_dir" : 'X\(//\)$' \| \ | ||
5807 | - X"$as_dir" : 'X\(/\)' \| \ | ||
5808 | - . : '\(.\)' 2>/dev/null || | ||
5809 | -echo X"$as_dir" | | ||
5810 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
5811 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
5812 | - /^X\(\/\/\)$/{ s//\1/; q; } | ||
5813 | - /^X\(\/\).*/{ s//\1/; q; } | ||
5814 | - s/.*/./; q'` | ||
5815 | - done | ||
5816 | - test ! -n "$as_dirs" || mkdir $as_dirs | ||
5817 | - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 | ||
5818 | -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} | ||
5819 | - { (exit 1); exit 1; }; }; } | ||
5820 | + case "$ac_given_INSTALL" in | ||
5821 | + [/$]*) INSTALL="$ac_given_INSTALL" ;; | ||
5822 | + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; | ||
5823 | + esac | ||
5824 | |||
5825 | - ac_builddir=. | ||
5826 | - | ||
5827 | -if test "$ac_dir" != .; then | ||
5828 | - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | ||
5829 | - # A "../" for each directory in $ac_dir_suffix. | ||
5830 | - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` | ||
5831 | -else | ||
5832 | - ac_dir_suffix= ac_top_builddir= | ||
5833 | -fi | ||
5834 | - | ||
5835 | -case $srcdir in | ||
5836 | - .) # No --srcdir option. We are building in place. | ||
5837 | - ac_srcdir=. | ||
5838 | - if test -z "$ac_top_builddir"; then | ||
5839 | - ac_top_srcdir=. | ||
5840 | - else | ||
5841 | - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | ||
5842 | - fi ;; | ||
5843 | - [\\/]* | ?:[\\/]* ) # Absolute path. | ||
5844 | - ac_srcdir=$srcdir$ac_dir_suffix; | ||
5845 | - ac_top_srcdir=$srcdir ;; | ||
5846 | - *) # Relative path. | ||
5847 | - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | ||
5848 | - ac_top_srcdir=$ac_top_builddir$srcdir ;; | ||
5849 | -esac | ||
5850 | -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be | ||
5851 | -# absolute. | ||
5852 | -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` | ||
5853 | -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` | ||
5854 | -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` | ||
5855 | -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` | ||
5856 | - | ||
5857 | - | ||
5858 | - case $INSTALL in | ||
5859 | - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; | ||
5860 | - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; | ||
5861 | + echo creating "$ac_file" | ||
5862 | + rm -f "$ac_file" | ||
5863 | + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." | ||
5864 | + case "$ac_file" in | ||
5865 | + *Makefile*) ac_comsub="1i\\ | ||
5866 | +# $configure_input" ;; | ||
5867 | + *) ac_comsub= ;; | ||
5868 | esac | ||
5869 | |||
5870 | - if test x"$ac_file" != x-; then | ||
5871 | - { echo "$as_me:$LINENO: creating $ac_file" >&5 | ||
5872 | -echo "$as_me: creating $ac_file" >&6;} | ||
5873 | - rm -f "$ac_file" | ||
5874 | - fi | ||
5875 | - # Let's still pretend it is `configure' which instantiates (i.e., don't | ||
5876 | - # use $as_me), people would be surprised to read: | ||
5877 | - # /* config.h. Generated by config.status. */ | ||
5878 | - if test x"$ac_file" = x-; then | ||
5879 | - configure_input= | ||
5880 | - else | ||
5881 | - configure_input="$ac_file. " | ||
5882 | - fi | ||
5883 | - configure_input=$configure_input"Generated from `echo $ac_file_in | | ||
5884 | - sed 's,.*/,,'` by configure." | ||
5885 | + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` | ||
5886 | + sed -e "$ac_comsub | ||
5887 | +s%@configure_input@%$configure_input%g | ||
5888 | +s%@srcdir@%$srcdir%g | ||
5889 | +s%@top_srcdir@%$top_srcdir%g | ||
5890 | +s%@INSTALL@%$INSTALL%g | ||
5891 | +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file | ||
5892 | +fi; done | ||
5893 | +rm -f conftest.s* | ||
5894 | |||
5895 | - # First look for the input files in the build tree, otherwise in the | ||
5896 | - # src tree. | ||
5897 | - ac_file_inputs=`IFS=: | ||
5898 | - for f in $ac_file_in; do | ||
5899 | - case $f in | ||
5900 | - -) echo $tmp/stdin ;; | ||
5901 | - [\\/$]*) | ||
5902 | - # Absolute (can't be DOS-style, as IFS=:) | ||
5903 | - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
5904 | -echo "$as_me: error: cannot find input file: $f" >&2;} | ||
5905 | - { (exit 1); exit 1; }; } | ||
5906 | - echo $f;; | ||
5907 | - *) # Relative | ||
5908 | - if test -f "$f"; then | ||
5909 | - # Build tree | ||
5910 | - echo $f | ||
5911 | - elif test -f "$srcdir/$f"; then | ||
5912 | - # Source tree | ||
5913 | - echo $srcdir/$f | ||
5914 | - else | ||
5915 | - # /dev/null tree | ||
5916 | - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
5917 | -echo "$as_me: error: cannot find input file: $f" >&2;} | ||
5918 | - { (exit 1); exit 1; }; } | ||
5919 | - fi;; | ||
5920 | - esac | ||
5921 | - done` || { (exit 1); exit 1; } | ||
5922 | -_ACEOF | ||
5923 | -cat >>$CONFIG_STATUS <<_ACEOF | ||
5924 | - sed "$ac_vpsub | ||
5925 | -$extrasub | ||
5926 | -_ACEOF | ||
5927 | -cat >>$CONFIG_STATUS <<\_ACEOF | ||
5928 | -:t | ||
5929 | -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b | ||
5930 | -s,@configure_input@,$configure_input,;t t | ||
5931 | -s,@srcdir@,$ac_srcdir,;t t | ||
5932 | -s,@abs_srcdir@,$ac_abs_srcdir,;t t | ||
5933 | -s,@top_srcdir@,$ac_top_srcdir,;t t | ||
5934 | -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t | ||
5935 | -s,@builddir@,$ac_builddir,;t t | ||
5936 | -s,@abs_builddir@,$ac_abs_builddir,;t t | ||
5937 | -s,@top_builddir@,$ac_top_builddir,;t t | ||
5938 | -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t | ||
5939 | -s,@INSTALL@,$ac_INSTALL,;t t | ||
5940 | -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out | ||
5941 | - rm -f $tmp/stdin | ||
5942 | - if test x"$ac_file" != x-; then | ||
5943 | - mv $tmp/out $ac_file | ||
5944 | - else | ||
5945 | - cat $tmp/out | ||
5946 | - rm -f $tmp/out | ||
5947 | - fi | ||
5948 | +EOF | ||
5949 | +cat >> $CONFIG_STATUS <<EOF | ||
5950 | |||
5951 | -done | ||
5952 | -_ACEOF | ||
5953 | +EOF | ||
5954 | +cat >> $CONFIG_STATUS <<\EOF | ||
5955 | |||
5956 | -cat >>$CONFIG_STATUS <<\_ACEOF | ||
5957 | - | ||
5958 | -{ (exit 0); exit 0; } | ||
5959 | -_ACEOF | ||
5960 | +exit 0 | ||
5961 | +EOF | ||
5962 | chmod +x $CONFIG_STATUS | ||
5963 | -ac_clean_files=$ac_clean_files_save | ||
5964 | +rm -fr confdefs* $ac_clean_files | ||
5965 | +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 | ||
5966 | |||
5967 | - | ||
5968 | -# configure is writing to config.log, and then calls config.status. | ||
5969 | -# config.status does its own redirection, appending to config.log. | ||
5970 | -# Unfortunately, on DOS this fails, as config.log is still kept open | ||
5971 | -# by configure, so config.status won't be able to write to it; its | ||
5972 | -# output is simply discarded. So we exec the FD to /dev/null, | ||
5973 | -# effectively closing config.log, so it can be properly (re)opened and | ||
5974 | -# appended to by config.status. When coming back to configure, we | ||
5975 | -# need to make the FD available again. | ||
5976 | -if test "$no_create" != yes; then | ||
5977 | - ac_cs_success=: | ||
5978 | - ac_config_status_args= | ||
5979 | - test "$silent" = yes && | ||
5980 | - ac_config_status_args="$ac_config_status_args --quiet" | ||
5981 | - exec 5>/dev/null | ||
5982 | - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false | ||
5983 | - exec 5>>config.log | ||
5984 | - # Use ||, not &&, to avoid exiting from the if with $? = 1, which | ||
5985 | - # would make configure fail if this is the last instruction. | ||
5986 | - $ac_cs_success || { (exit 1); exit 1; } | ||
5987 | -fi | ||
5988 | - | ||
5989 | Index: configure.in | ||
5990 | =================================================================== | ||
5991 | --- flite-1.3-release/configure.in (.../flite-1.3-orig) (revision 7) | ||
5992 | +++ flite-1.3-release/configure.in (.../release-1.2) (revision 7) | ||
5993 | @@ -206,10 +206,10 @@ | ||
5994 | AC_CHECK_HEADER(sys/audioio.h, | ||
5995 | [AUDIODRIVER="sun" | ||
5996 | AUDIODEFS=-DCST_AUDIO_SUNOS]) | ||
5997 | -dnl AC_CHECK_HEADER(sys/asoundlib.h, | ||
5998 | -dnl [AUDIODRIVER="alsa" | ||
5999 | -dnl AUDIODEFS=-DCST_AUDIO_ALSA | ||
6000 | -dnl AUDIOLIBS=-lasound]) | ||
6001 | + AC_CHECK_HEADER(alsa/asoundlib.h, | ||
6002 | + [AUDIODRIVER="alsa" | ||
6003 | + AUDIODEFS=-DCST_AUDIO_ALSA | ||
6004 | + AUDIOLIBS=-lasound]) | ||
6005 | AC_CHECK_HEADER(mmsystem.h, | ||
6006 | [AUDIODRIVER="wince" | ||
6007 | AUDIODEFS=-DCST_AUDIO_WINCE | ||
6008 | Index: src/hrg/Makefile | ||
6009 | =================================================================== | ||
6010 | --- flite-1.3-release/src/hrg/Makefile (.../flite-1.3-orig) (revision 7) | ||
6011 | +++ flite-1.3-release/src/hrg/Makefile (.../release-1.2) (revision 7) | ||
6012 | @@ -39,9 +39,14 @@ | ||
6013 | BUILD_DIRS = | ||
6014 | ALL_DIRS= | ||
6015 | H = | ||
6016 | +include $(TOP)/config/config | ||
6017 | SRCS = cst_utterance.c cst_relation.c cst_item.c cst_ffeature.c \ | ||
6018 | cst_rel_io.c | ||
6019 | -OBJS = $(SRCS:.c=.o) | ||
6020 | +ifdef SHFLAGS | ||
6021 | +OBJS := $(SRCS:.c=.os) | ||
6022 | +else | ||
6023 | +OBJS := $(SRCS:.c=.o) | ||
6024 | +endif | ||
6025 | FILES = Makefile $(H) $(SRCS) | ||
6026 | LIBNAME = flite | ||
6027 | |||
6028 | Index: src/utils/Makefile | ||
6029 | =================================================================== | ||
6030 | --- flite-1.3-release/src/utils/Makefile (.../flite-1.3-orig) (revision 7) | ||
6031 | +++ flite-1.3-release/src/utils/Makefile (.../release-1.2) (revision 7) | ||
6032 | @@ -44,8 +44,13 @@ | ||
6033 | cst_tokenstream.c cst_val.c cst_features.c \ | ||
6034 | cst_endian.c cst_socket.c cst_val_const.c \ | ||
6035 | cst_val_user.c cst_args.c | ||
6036 | +ifdef SHFLAGS | ||
6037 | +OBJS := $(SRCS:.c=.os) $(MMAPTYPE:%=cst_mmap_%.os) \ | ||
6038 | + $(STDIOTYPE:%=cst_file_%.os) | ||
6039 | +else | ||
6040 | OBJS := $(SRCS:.c=.o) $(MMAPTYPE:%=cst_mmap_%.o) \ | ||
6041 | $(STDIOTYPE:%=cst_file_%.o) | ||
6042 | +endif | ||
6043 | FILES = Makefile $(H) $(SRCS) \ | ||
6044 | cst_mmap_posix.c cst_mmap_win32.c cst_mmap_none.c \ | ||
6045 | cst_file_stdio.c cst_file_wince.c cst_file_palmos.c | ||
6046 | Index: src/audio/au_alsa.c | ||
6047 | =================================================================== | ||
6048 | --- flite-1.3-release/src/audio/au_alsa.c (.../flite-1.3-orig) (revision 0) | ||
6049 | +++ flite-1.3-release/src/audio/au_alsa.c (.../release-1.2) (revision 7) | ||
6050 | @@ -0,0 +1,311 @@ | ||
6051 | +/*************************************************************************/ | ||
6052 | +/* */ | ||
6053 | +/* Language Technologies Institute */ | ||
6054 | +/* Carnegie Mellon University */ | ||
6055 | +/* Copyright (c) 2000 */ | ||
6056 | +/* All Rights Reserved. */ | ||
6057 | +/* */ | ||
6058 | +/* Permission is hereby granted, free of charge, to use and distribute */ | ||
6059 | +/* this software and its documentation without restriction, including */ | ||
6060 | +/* without limitation the rights to use, copy, modify, merge, publish, */ | ||
6061 | +/* distribute, sublicense, and/or sell copies of this work, and to */ | ||
6062 | +/* permit persons to whom this work is furnished to do so, subject to */ | ||
6063 | +/* the following conditions: */ | ||
6064 | +/* 1. The code must retain the above copyright notice, this list of */ | ||
6065 | +/* conditions and the following disclaimer. */ | ||
6066 | +/* 2. Any modifications must be clearly marked as such. */ | ||
6067 | +/* 3. Original authors' names are not deleted. */ | ||
6068 | +/* 4. The authors' names are not used to endorse or promote products */ | ||
6069 | +/* derived from this software without specific prior written */ | ||
6070 | +/* permission. */ | ||
6071 | +/* */ | ||
6072 | +/* CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK */ | ||
6073 | +/* DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING */ | ||
6074 | +/* ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT */ | ||
6075 | +/* SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE */ | ||
6076 | +/* FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES */ | ||
6077 | +/* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN */ | ||
6078 | +/* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, */ | ||
6079 | +/* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF */ | ||
6080 | +/* THIS SOFTWARE. */ | ||
6081 | +/* */ | ||
6082 | +/*********************************************************************** */ | ||
6083 | +/* Author: Lukas Loehrer ( */ | ||
6084 | +/* Date: January 2005 */ | ||
6085 | +/*************************************************************************/ | ||
6086 | +/* */ | ||
6087 | +/* Native access to alsa audio devices on Linux */ | ||
6088 | +/* Tested with libasound version 1.0.10 */ | ||
6089 | +/*************************************************************************/ | ||
6090 | + | ||
6091 | +#include <stdlib.h> | ||
6092 | +#include <unistd.h> | ||
6093 | +#include <sys/types.h> | ||
6094 | +#include <assert.h> | ||
6095 | +#include <errno.h> | ||
6096 | + | ||
6097 | +#include "cst_string.h" | ||
6098 | +#include "cst_wave.h" | ||
6099 | +#include "cst_audio.h" | ||
6100 | + | ||
6101 | +#include <alsa/asoundlib.h> | ||
6102 | + | ||
6103 | + | ||
6104 | +/*static char *pcm_dev_name = "hw:0,0"; */ | ||
6105 | +static char *pcm_dev_name ="default"; | ||
6106 | + | ||
6107 | +static inline void print_pcm_state(snd_pcm_t *handle, char *msg) | ||
6108 | +{ | ||
6109 | + fprintf(stderr, "PCM state at %s = %s\n", msg, | ||
6110 | + snd_pcm_state_name(snd_pcm_state(handle))); | ||
6111 | +} | ||
6112 | + | ||
6113 | +cst_audiodev *audio_open_alsa(int sps, int channels, cst_audiofmt fmt) | ||
6114 | +{ | ||
6115 | + cst_audiodev *ad; | ||
6116 | + unsigned int real_rate; | ||
6117 | + int err; | ||
6118 | + | ||
6119 | + /* alsa specific stuff */ | ||
6120 | + snd_pcm_t *pcm_handle; | ||
6121 | + snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK; | ||
6122 | + snd_pcm_hw_params_t *hwparams; | ||
6123 | + snd_pcm_format_t format; | ||
6124 | + snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED; | ||
6125 | + | ||
6126 | + /* Allocate the snd_pcm_hw_params_t structure on the stack. */ | ||
6127 | + snd_pcm_hw_params_alloca(&hwparams); | ||
6128 | + | ||
6129 | + /* Open pcm device */ | ||
6130 | + err = snd_pcm_open(&pcm_handle, pcm_dev_name, stream, 0); | ||
6131 | + if (err < 0) | ||
6132 | + { | ||
6133 | + cst_errmsg("audio_open_alsa: failed to open audio device %s. %s\n", | ||
6134 | + pcm_dev_name, snd_strerror(err)); | ||
6135 | + return NULL; | ||
6136 | + } | ||
6137 | + | ||
6138 | + /* Init hwparams with full configuration space */ | ||
6139 | + err = snd_pcm_hw_params_any(pcm_handle, hwparams); | ||
6140 | + if (err < 0) | ||
6141 | + { | ||
6142 | + snd_pcm_close(pcm_handle); | ||
6143 | + cst_errmsg("audio_open_alsa: failed to get hardware parameters from audio device. %s\n", snd_strerror(err)); | ||
6144 | + return NULL; | ||
6145 | + } | ||
6146 | + | ||
6147 | + /* Set access mode */ | ||
6148 | + err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, access); | ||
6149 | + if (err < 0) | ||
6150 | + { | ||
6151 | + snd_pcm_close(pcm_handle); | ||
6152 | + cst_errmsg("audio_open_alsa: failed to set access mode. %s.\n", snd_strerror(err)); | ||
6153 | + return NULL; | ||
6154 | + } | ||
6155 | + | ||
6156 | + /* Determine matching alsa sample format */ | ||
6157 | + /* This could be implemented in a more */ | ||
6158 | + /* flexible way (byte order conversion). */ | ||
6159 | + switch (fmt) | ||
6160 | + { | ||
6161 | + case CST_AUDIO_LINEAR16: | ||
6162 | + if (CST_LITTLE_ENDIAN) | ||
6163 | + format = SND_PCM_FORMAT_S16_LE; | ||
6164 | + else | ||
6165 | + format = SND_PCM_FORMAT_S16_BE; | ||
6166 | + break; | ||
6167 | + case CST_AUDIO_LINEAR8: | ||
6168 | + format = SND_PCM_FORMAT_U8; | ||
6169 | + break; | ||
6170 | + case CST_AUDIO_MULAW: | ||
6171 | + format = SND_PCM_FORMAT_MU_LAW; | ||
6172 | + break; | ||
6173 | + default: | ||
6174 | + snd_pcm_close(pcm_handle); | ||
6175 | + cst_errmsg("audio_open_alsa: failed to find suitable format.\n"); | ||
6176 | + return NULL; | ||
6177 | + break; | ||
6178 | + } | ||
6179 | + | ||
6180 | + /* Set samble format */ | ||
6181 | + err = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format); | ||
6182 | + if (err <0) | ||
6183 | + { | ||
6184 | + snd_pcm_close(pcm_handle); | ||
6185 | + cst_errmsg("audio_open_alsa: failed to set format. %s.\n", snd_strerror(err)); | ||
6186 | + return NULL; | ||
6187 | + } | ||
6188 | + | ||
6189 | + /* Set sample rate near the disired rate */ | ||
6190 | + real_rate = sps; | ||
6191 | + err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &real_rate, 0); | ||
6192 | + if (err < 0) | ||
6193 | + { | ||
6194 | + snd_pcm_close(pcm_handle); | ||
6195 | + cst_errmsg("audio_open_alsa: failed to set sample rate near %d. %s.\n", sps, snd_strerror(err)); | ||
6196 | + return NULL; | ||
6197 | + } | ||
6198 | + /*FIXME: This is probably too strict */ | ||
6199 | + assert(sps == real_rate); | ||
6200 | + | ||
6201 | + /* Set number of channels */ | ||
6202 | + assert(channels >0); | ||
6203 | + err = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, channels); | ||
6204 | + if (err < 0) | ||
6205 | + { | ||
6206 | + snd_pcm_close(pcm_handle); | ||
6207 | + cst_errmsg("audio_open_alsa: failed to set number of channels to %d. %s.\n", channels, snd_strerror(err)); | ||
6208 | + return NULL; | ||
6209 | + } | ||
6210 | + | ||
6211 | + /* Commit hardware parameters */ | ||
6212 | + err = snd_pcm_hw_params(pcm_handle, hwparams); | ||
6213 | + if (err < 0) | ||
6214 | + { | ||
6215 | + snd_pcm_close(pcm_handle); | ||
6216 | + cst_errmsg("audio_open_alsa: failed to set hw parameters. %s.\n", snd_strerror(err)); | ||
6217 | + return NULL; | ||
6218 | + } | ||
6219 | + | ||
6220 | + /* Make sure the device is ready to accept data */ | ||
6221 | + assert(snd_pcm_state(pcm_handle) == SND_PCM_STATE_PREPARED); | ||
6222 | + | ||
6223 | + /* Write hardware parameters to flite audio device data structure */ | ||
6224 | + ad = cst_alloc(cst_audiodev, 1); | ||
6225 | + assert(ad != NULL); | ||
6226 | + ad->real_sps = ad->sps = sps; | ||
6227 | + ad->real_channels = ad->channels = channels; | ||
6228 | + ad->real_fmt = ad->fmt = fmt; | ||
6229 | + ad->platform_data = (void *) pcm_handle; | ||
6230 | + | ||
6231 | + return ad; | ||
6232 | +} | ||
6233 | + | ||
6234 | +int audio_close_alsa(cst_audiodev *ad) | ||
6235 | +{ | ||
6236 | + int result; | ||
6237 | + snd_pcm_t *pcm_handle; | ||
6238 | + | ||
6239 | + if (ad == NULL) | ||
6240 | + return 0; | ||
6241 | + | ||
6242 | + pcm_handle = (snd_pcm_t *) ad->platform_data; | ||
6243 | + result = snd_pcm_close(pcm_handle); | ||
6244 | + if (result < 0) | ||
6245 | + { | ||
6246 | + cst_errmsg("audio_close_alsa: Error: %s.\n", snd_strerror(result)); | ||
6247 | + } | ||
6248 | + cst_free(ad); | ||
6249 | + return result; | ||
6250 | +} | ||
6251 | + | ||
6252 | +/* Returns zero if recovery was successful. */ | ||
6253 | +static int recover_from_error(snd_pcm_t *pcm_handle, ssize_t res) | ||
6254 | +{ | ||
6255 | + if (res == -EPIPE) /* xrun */ | ||
6256 | + { | ||
6257 | + res = snd_pcm_prepare(pcm_handle); | ||
6258 | + if (res < 0) | ||
6259 | + { | ||
6260 | + /* Failed to recover from xrun */ | ||
6261 | + cst_errmsg("recover_from_write_error: failed to recover from xrun. %s\n.", snd_strerror(res)); | ||
6262 | + return res; | ||
6263 | + } | ||
6264 | + } | ||
6265 | + else if (res == -ESTRPIPE) /* Suspend */ | ||
6266 | + { | ||
6267 | + while ((res = snd_pcm_resume(pcm_handle)) == -EAGAIN) | ||
6268 | + { | ||
6269 | + snd_pcm_wait(pcm_handle, 1000); | ||
6270 | + } | ||
6271 | + if (res < 0) | ||
6272 | + { | ||
6273 | + res = snd_pcm_prepare(pcm_handle); | ||
6274 | + if (res <0) | ||
6275 | + { | ||
6276 | + /* Resume failed */ | ||
6277 | + cst_errmsg("audio_recover_from_write_error: failed to resume after suspend. %s\n.", snd_strerror(res)); | ||
6278 | + return res; | ||
6279 | + } | ||
6280 | + } | ||
6281 | + } | ||
6282 | + else if (res < 0) | ||
6283 | + { | ||
6284 | + /* Unknown failure */ | ||
6285 | + cst_errmsg("audio_recover_from_write_error: %s.\n", snd_strerror(res)); | ||
6286 | + return res; | ||
6287 | + } | ||
6288 | + return 0; | ||
6289 | +} | ||
6290 | + | ||
6291 | +int audio_write_alsa(cst_audiodev *ad, void *samples, int num_bytes) | ||
6292 | +{ | ||
6293 | + size_t frame_size; | ||
6294 | + ssize_t num_frames, res; | ||
6295 | + snd_pcm_t *pcm_handle; | ||
6296 | + char *buf = (char *) samples; | ||
6297 | + | ||
6298 | + /* Determine frame size in bytes */ | ||
6299 | + frame_size = audio_bps(ad->real_fmt) * ad->real_channels; | ||
6300 | + /* Require that only complete frames are handed in */ | ||
6301 | + assert((num_bytes % frame_size) == 0); | ||
6302 | + num_frames = num_bytes / frame_size; | ||
6303 | + pcm_handle = (snd_pcm_t *) ad->platform_data; | ||
6304 | + | ||
6305 | + while (num_frames > 0) | ||
6306 | + { | ||
6307 | + res = snd_pcm_writei(pcm_handle, buf, num_frames); | ||
6308 | + if (res != num_frames) | ||
6309 | + { | ||
6310 | + if (res == -EAGAIN || (res > 0 && res < num_frames)) | ||
6311 | + { | ||
6312 | + snd_pcm_wait(pcm_handle, 100); | ||
6313 | + } | ||
6314 | + else if (recover_from_error(pcm_handle, res) < 0) | ||
6315 | + { | ||
6316 | + return -1; | ||
6317 | + } | ||
6318 | + } | ||
6319 | + | ||
6320 | + if (res >0) | ||
6321 | + { | ||
6322 | + num_frames -= res; | ||
6323 | + buf += res * frame_size; | ||
6324 | + } | ||
6325 | + } | ||
6326 | + return num_bytes; | ||
6327 | +} | ||
6328 | + | ||
6329 | +int audio_flush_alsa(cst_audiodev *ad) | ||
6330 | +{ | ||
6331 | + int result; | ||
6332 | + result = snd_pcm_drain((snd_pcm_t *) ad->platform_data); | ||
6333 | + if (result < 0) | ||
6334 | + { | ||
6335 | + cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result)); | ||
6336 | + } | ||
6337 | + /* Prepare device for more data */ | ||
6338 | + result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data); | ||
6339 | +if (result < 0) | ||
6340 | + { | ||
6341 | + cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result)); | ||
6342 | + } | ||
6343 | + return result; | ||
6344 | +} | ||
6345 | + | ||
6346 | +int audio_drain_alsa(cst_audiodev *ad) | ||
6347 | +{ | ||
6348 | + int result; | ||
6349 | + result = snd_pcm_drop((snd_pcm_t *) ad->platform_data); | ||
6350 | + if (result < 0) | ||
6351 | + { | ||
6352 | + cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result)); | ||
6353 | + } | ||
6354 | +/* Prepare device for more data */ | ||
6355 | + result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data); | ||
6356 | +if (result < 0) | ||
6357 | + { | ||
6358 | + cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result)); | ||
6359 | + } | ||
6360 | + return result; | ||
6361 | +} | ||
6362 | Index: src/audio/Makefile | ||
6363 | =================================================================== | ||
6364 | --- flite-1.3-release/src/audio/Makefile (.../flite-1.3-orig) (revision 7) | ||
6365 | +++ flite-1.3-release/src/audio/Makefile (.../release-1.2) (revision 7) | ||
6366 | @@ -43,9 +43,13 @@ | ||
6367 | |||
6368 | BASESRCS = auclient.c auserver.c audio.c | ||
6369 | SRCS = $(BASESRCS) $(AUDIODRIVER:%=au_%.c) | ||
6370 | -OBJS = $(SRCS:.c=.o) | ||
6371 | +ifdef SHFLAGS | ||
6372 | +OBJS := $(SRCS:.c=.os) | ||
6373 | +else | ||
6374 | +OBJS := $(SRCS:.c=.o) | ||
6375 | +endif | ||
6376 | FILES = Makefile $(H) $(BASESRCS) au_command.c au_none.c \ | ||
6377 | - au_oss.c au_sun.c au_wince.c au_palmos.c | ||
6378 | + au_oss.c au_sun.c au_wince.c au_palmos.c au_alsa.c | ||
6379 | LIBNAME = flite | ||
6380 | |||
6381 | LOCAL_INCLUDES = -I. $(AUDIODEFS) | ||
6382 | Index: src/lexicon/Makefile | ||
6383 | =================================================================== | ||
6384 | --- flite-1.3-release/src/lexicon/Makefile (.../flite-1.3-orig) (revision 7) | ||
6385 | +++ flite-1.3-release/src/lexicon/Makefile (.../release-1.2) (revision 7) | ||
6386 | @@ -38,8 +38,13 @@ | ||
6387 | DIRNAME=src/lexicon | ||
6388 | BUILD_DIRS = | ||
6389 | ALL_DIRS= | ||
6390 | +include $(TOP)/config/config | ||
6391 | SRCS = cst_lexicon.c cst_lts.c cst_lts_rewrites.c | ||
6392 | -OBJS = $(SRCS:.c=.o) | ||
6393 | +ifdef SHFLAGS | ||
6394 | +OBJS := $(SRCS:.c=.os) | ||
6395 | +else | ||
6396 | +OBJS := $(SRCS:.c=.o) | ||
6397 | +endif | ||
6398 | FILES = Makefile $(SRCS) | ||
6399 | LIBNAME = flite | ||
6400 | |||
6401 | Index: src/synth/Makefile | ||
6402 | =================================================================== | ||
6403 | --- flite-1.3-release/src/synth/Makefile (.../flite-1.3-orig) (revision 7) | ||
6404 | +++ flite-1.3-release/src/synth/Makefile (.../release-1.2) (revision 7) | ||
6405 | @@ -38,9 +38,14 @@ | ||
6406 | DIRNAME=src/synth | ||
6407 | BUILD_DIRS = | ||
6408 | ALL_DIRS= | ||
6409 | +include $(TOP)/config/config | ||
6410 | SRCS = cst_synth.c cst_utt_utils.c cst_voice.c cst_phoneset.c \ | ||
6411 | flite.c | ||
6412 | -OBJS = $(SRCS:.c=.o) | ||
6413 | +ifdef SHFLAGS | ||
6414 | +OBJS := $(SRCS:.c=.os) | ||
6415 | +else | ||
6416 | +OBJS := $(SRCS:.c=.o) | ||
6417 | +endif | ||
6418 | FILES = Makefile $(SRCS) | ||
6419 | LIBNAME = flite | ||
6420 | |||
6421 | Index: src/speech/Makefile | ||
6422 | =================================================================== | ||
6423 | --- flite-1.3-release/src/speech/Makefile (.../flite-1.3-orig) (revision 7) | ||
6424 | +++ flite-1.3-release/src/speech/Makefile (.../release-1.2) (revision 7) | ||
6425 | @@ -39,9 +39,14 @@ | ||
6426 | BUILD_DIRS = | ||
6427 | ALL_DIRS= | ||
6428 | H = | ||
6429 | +include $(TOP)/config/config | ||
6430 | SRCS = cst_wave.c cst_wave_io.c cst_track.c cst_track_io.c \ | ||
6431 | cst_wave_utils.c cst_lpcres.c rateconv.c | ||
6432 | -OBJS = $(SRCS:.c=.o) | ||
6433 | +ifdef SHFLAGS | ||
6434 | +OBJS := $(SRCS:.c=.os) | ||
6435 | +else | ||
6436 | +OBJS := $(SRCS:.c=.o) | ||
6437 | +endif | ||
6438 | FILES = Makefile $(H) $(SRCS) | ||
6439 | LIBNAME = flite | ||
6440 | |||
6441 | Index: src/wavesynth/Makefile | ||
6442 | =================================================================== | ||
6443 | --- flite-1.3-release/src/wavesynth/Makefile (.../flite-1.3-orig) (revision 7) | ||
6444 | +++ flite-1.3-release/src/wavesynth/Makefile (.../release-1.2) (revision 7) | ||
6445 | @@ -38,9 +38,14 @@ | ||
6446 | DIRNAME=src/wavesynth | ||
6447 | BUILD_DIRS = | ||
6448 | ALL_DIRS= | ||
6449 | +include $(TOP)/config/config | ||
6450 | SRCS = cst_units.c cst_sigpr.c cst_clunits.c cst_diphone.c \ | ||
6451 | cst_sigprFP.c cst_sts.c cst_reflpc.c | ||
6452 | -OBJS = $(SRCS:.c=.o) | ||
6453 | +ifdef SHFLAGS | ||
6454 | +OBJS := $(SRCS:.c=.os) | ||
6455 | +else | ||
6456 | +OBJS := $(SRCS:.c=.o) | ||
6457 | +endif | ||
6458 | LIBNAME = flite | ||
6459 | FILES = Makefile $(SRCS) | ||
6460 | |||
6461 | Index: src/regex/Makefile | ||
6462 | =================================================================== | ||
6463 | --- flite-1.3-release/src/regex/Makefile (.../flite-1.3-orig) (revision 7) | ||
6464 | +++ flite-1.3-release/src/regex/Makefile (.../release-1.2) (revision 7) | ||
6465 | @@ -42,8 +42,13 @@ | ||
6466 | DIRNAME=src/regex | ||
6467 | BUILD_DIRS = | ||
6468 | ALL_DIRS= | ||
6469 | +include $(TOP)/config/config | ||
6470 | SRCS = cst_regex.c regexp.c regsub.c | ||
6471 | -OBJS = $(SRCS:.c=.o) | ||
6472 | +ifdef SHFLAGS | ||
6473 | +OBJS := $(SRCS:.c=.os) | ||
6474 | +else | ||
6475 | +OBJS := $(SRCS:.c=.o) | ||
6476 | +endif | ||
6477 | FILES = Makefile $(H) $(SRCS) | ||
6478 | LIBNAME = flite | ||
6479 | |||
6480 | Index: src/stats/Makefile | ||
6481 | =================================================================== | ||
6482 | --- flite-1.3-release/src/stats/Makefile (.../flite-1.3-orig) (revision 7) | ||
6483 | +++ flite-1.3-release/src/stats/Makefile (.../release-1.2) (revision 7) | ||
6484 | @@ -39,8 +39,13 @@ | ||
6485 | BUILD_DIRS = | ||
6486 | ALL_DIRS= | ||
6487 | H = | ||
6488 | +include $(TOP)/config/config | ||
6489 | SRCS = cst_cart.c cst_viterbi.c cst_ss.c | ||
6490 | -OBJS = $(SRCS:.c=.o) | ||
6491 | +ifdef SHFLAGS | ||
6492 | +OBJS := $(SRCS:.c=.os) | ||
6493 | +else | ||
6494 | +OBJS := $(SRCS:.c=.o) | ||
6495 | +endif | ||
6496 | FILES = Makefile $(H) $(SRCS) | ||
6497 | LIBNAME = flite | ||
6498 | |||
6499 | Index: config/common_make_rules | ||
6500 | =================================================================== | ||
6501 | --- flite-1.3-release/config/common_make_rules (.../flite-1.3-orig) (revision 7) | ||
6502 | +++ flite-1.3-release/config/common_make_rules (.../release-1.2) (revision 7) | ||
6503 | @@ -73,12 +73,13 @@ | ||
6504 | ifdef SHFLAGS | ||
6505 | SOOBJS = $(OBJS:.o=.os) | ||
6506 | FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%) | ||
6507 | -ifdef LIBNAME | ||
6508 | -ALL += $(OBJDIR)/.build_so | ||
6509 | +#ifdef LIBNAME | ||
6510 | +#ALL += $(OBJDIR)/.build_so | ||
6511 | +#endif | ||
6512 | endif | ||
6513 | -endif | ||
6514 | ifdef LIBNAME | ||
6515 | ALL += $(OBJDIR)/.build_lib | ||
6516 | +ALL += $(OBJDIR)/.build_so | ||
6517 | endif | ||
6518 | # Only do some directories when you are not cross compiling | ||
6519 | ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) | ||
6520 | @@ -117,14 +118,17 @@ | ||
6521 | @ touch $(OBJDIR)/.build_so | ||
6522 | |||
6523 | # Used in the lib/ directory and in building new voices | ||
6524 | -$(OBJDIR)/%.so: %.shared.a | ||
6525 | +#$(OBJDIR)/%.so: %.shared.a | ||
6526 | +%.so: %.shared.a | ||
6527 | @ echo making $@ | ||
6528 | @ rm -rf shared_os && mkdir shared_os | ||
6529 | @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} | ||
6530 | @ (cd shared_os && ar x ../$<) | ||
6531 | @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) | ||
6532 | - @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} | ||
6533 | - @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ | ||
6534 | + #@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} | ||
6535 | + #@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ | ||
6536 | + @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} | ||
6537 | + @ ln -s $@.${PROJECT_SHLIB_VERSION} $@ | ||
6538 | @ rm -rf shared_os | ||
6539 | |||
6540 | $(OBJDIR)/.make_build_dirs: | ||
6541 | Index: lib/Makefile | ||
6542 | =================================================================== | ||
6543 | --- flite-1.3-release/lib/Makefile (.../flite-1.3-orig) (revision 0) | ||
6544 | +++ flite-1.3-release/lib/Makefile (.../release-1.2) (revision 7) | ||
6545 | @@ -0,0 +1,70 @@ | ||
6546 | +########################################################################### | ||
6547 | +## ## | ||
6548 | +## Language Technologies Institute ## | ||
6549 | +## Carnegie Mellon University ## | ||
6550 | +## Copyright (c) 1999 ## | ||
6551 | +## All Rights Reserved. ## | ||
6552 | +## ## | ||
6553 | +## Permission is hereby granted, free of charge, to use and distribute ## | ||
6554 | +## this software and its documentation without restriction, including ## | ||
6555 | +## without limitation the rights to use, copy, modify, merge, publish, ## | ||
6556 | +## distribute, sublicense, and/or sell copies of this work, and to ## | ||
6557 | +## permit persons to whom this work is furnished to do so, subject to ## | ||
6558 | +## the following conditions: ## | ||
6559 | +## 1. The code must retain the above copyright notice, this list of ## | ||
6560 | +## conditions and the following disclaimer. ## | ||
6561 | +## 2. Any modifications must be clearly marked as such. ## | ||
6562 | +## 3. Original authors' names are not deleted. ## | ||
6563 | +## 4. The authors' names are not used to endorse or promote products ## | ||
6564 | +## derived from this software without specific prior written ## | ||
6565 | +## permission. ## | ||
6566 | +## ## | ||
6567 | +## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ## | ||
6568 | +## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## | ||
6569 | +## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## | ||
6570 | +## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ## | ||
6571 | +## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## | ||
6572 | +## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## | ||
6573 | +## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## | ||
6574 | +## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## | ||
6575 | +## THIS SOFTWARE. ## | ||
6576 | +## ## | ||
6577 | +########################################################################### | ||
6578 | +## ## | ||
6579 | +## FLITE libraries ## | ||
6580 | +## ## | ||
6581 | +########################################################################### | ||
6582 | +TOP=.. | ||
6583 | +DIRNAME=lib | ||
6584 | +BUILD_DIRS = | ||
6585 | +ALL_DIRS= | ||
6586 | +FILES = Makefile | ||
6587 | +LIBNAMES = flite flite_cmulex flite_usenglish \ | ||
6588 | + flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb | ||
6589 | + | ||
6590 | +STATICLIBS= $(LIBNAMES:%=lib%.a) | ||
6591 | +SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a) | ||
6592 | +#SHAREDLIBS = $(LIBNAMES:%=lib%.so) | ||
6593 | +SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so) | ||
6594 | +VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \ | ||
6595 | + $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION}) | ||
6596 | +ALL_LIBS = $(STATICLIBS) $(SHAREDLIBS) $(VERSIONSHAREDLIBS) | ||
6597 | + | ||
6598 | +ALL = shared_libs | ||
6599 | + | ||
6600 | +LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION} | ||
6601 | + | ||
6602 | +include $(TOP)/config/common_make_rules | ||
6603 | + | ||
6604 | +ifdef SHFLAGS | ||
6605 | +shared_libs: $(SHAREDLIBS) | ||
6606 | +else | ||
6607 | +shared_libs: nothing | ||
6608 | +endif | ||
6609 | + | ||
6610 | +install: | ||
6611 | + @ cp -vf $(LIBDIR)/* . | ||
6612 | + @ $(MAKE) shared_libs | ||
6613 | + @ echo ARLIBS: $(SHAREDARLIBS) | ||
6614 | + @ echo SHARLIBS: $(SHAREDLIBS) | ||
6615 | + @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -) | ||
diff --git a/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch b/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch new file mode 100644 index 000000000..e1e7aed50 --- /dev/null +++ b/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | --- flite-1.3-release/configure.in.old 2008-01-06 02:17:47.000000000 -0600 | ||
2 | +++ flite-1.3-release/configure.in 2008-01-06 02:19:56.000000000 -0600 | ||
3 | @@ -220,7 +220,8 @@ dnl allow the user to override the one d | ||
4 | dnl | ||
5 | AC_ARG_WITH( audio, | ||
6 | [ --with-audio with specific audio support (none linux freebsd etc) ], | ||
7 | - AUDIODRIVER=$with_audio ) | ||
8 | + [AUDIODRIVER=$with_audio | ||
9 | + AUDIODEFS=]) | ||
10 | |||
11 | if test "x$AUDIODEFS" = x; then | ||
12 | case "$AUDIODRIVER" in | ||
diff --git a/meta-oe/recipes-support/flite/flite-alsa_1.3.bb b/meta-oe/recipes-support/flite/flite-alsa_1.3.bb new file mode 100644 index 000000000..51012e673 --- /dev/null +++ b/meta-oe/recipes-support/flite/flite-alsa_1.3.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | require flite.inc | ||
2 | |||
3 | PR = "r1" | ||
4 | |||
5 | EXTRA_OECONF = "--with-audio=alsa --enable-shared" | ||
6 | |||
7 | SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.gz \ | ||
8 | file://flite-1.3-alsa_support-1.2.diff \ | ||
9 | file://flite-alsa-1.3-configure-with-audio.patch" | ||
10 | |||
11 | SRC_URI[md5sum] = "ae0aca1cb7b4801f4372f3a75a9e52b5" | ||
12 | SRC_URI[sha256sum] = "922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b" | ||
diff --git a/meta-oe/recipes-support/flite/flite.inc b/meta-oe/recipes-support/flite/flite.inc new file mode 100644 index 000000000..401c83639 --- /dev/null +++ b/meta-oe/recipes-support/flite/flite.inc | |||
@@ -0,0 +1,34 @@ | |||
1 | DESCRIPTION = "flite - the festival light speech synthesizer" | ||
2 | PRIORITY = "optional" | ||
3 | HOMEPAGE = "http://www.speech.cs.cmu.edu/flite/" | ||
4 | SECTION = "console/utils" | ||
5 | LICENSE = "flite" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=68a16b1ee49c96c36f232ccdcd287650" | ||
7 | DEPENDS = "alsa-oss" | ||
8 | |||
9 | PARALLEL_MAKE = "" | ||
10 | |||
11 | S = "${WORKDIR}/flite-${PV}-release" | ||
12 | |||
13 | CFLAGS += " -lasound " | ||
14 | |||
15 | inherit autotools | ||
16 | |||
17 | PACKAGES += "lib${PN} lib${PN}-vox8 lib${PN}-vox16" | ||
18 | |||
19 | FILES_${PN} = "${bindir}" | ||
20 | |||
21 | FILES_lib${PN} ="${libdir}/libflite.so.* \ | ||
22 | ${libdir}/libflite_cmu_time_awb.so.* \ | ||
23 | ${libdir}/libflite_cmulex.so.* \ | ||
24 | ${libdir}/libflite_usenglish.so.*" | ||
25 | |||
26 | FILES_lib${PN}-vox8 = "${libdir}/libflite_cmu_us_kal.so.*" | ||
27 | |||
28 | FILES_lib${PN}-vox16 = "${libdir}/libflite_cmu_us_kal16.so.*" | ||
29 | |||
30 | LEAD_SONAME = "libflite.so" | ||
31 | |||
32 | do_install() { | ||
33 | oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install | ||
34 | } | ||