diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/flite | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/flite')
-rw-r--r-- | packages/flite/flite-1.2/configure-with-audio.patch | 20 | ||||
-rw-r--r-- | packages/flite/flite-1.2/fix-read-only-assignments.patch | 16 | ||||
-rw-r--r-- | packages/flite/flite-1.3/flite-1.3-Makefile.patch | 405 | ||||
-rw-r--r-- | packages/flite/flite-1.3/flite-1.3-configure-with-audio.patch | 12 | ||||
-rw-r--r-- | packages/flite/flite-1.3/flite-1.3-fix-read-only-assignments.patch | 15 | ||||
-rw-r--r-- | packages/flite/flite-alsa-1.2/flite-1.2-alsa_support-1.2.diff | 512 | ||||
-rw-r--r-- | packages/flite/flite-alsa-1.2/flite-alsa-1.2-configure-with-audio.patch | 12 | ||||
-rw-r--r-- | packages/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff | 6615 | ||||
-rw-r--r-- | packages/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch | 12 | ||||
-rw-r--r-- | packages/flite/flite-alsa_1.2.bb | 10 | ||||
-rw-r--r-- | packages/flite/flite-alsa_1.3.bb | 11 | ||||
-rw-r--r-- | packages/flite/flite.inc | 45 | ||||
-rw-r--r-- | packages/flite/flite_1.2.bb | 9 | ||||
-rw-r--r-- | packages/flite/flite_1.3.bb | 10 |
14 files changed, 0 insertions, 7704 deletions
diff --git a/packages/flite/flite-1.2/configure-with-audio.patch b/packages/flite/flite-1.2/configure-with-audio.patch deleted file mode 100644 index 4f320ac068..0000000000 --- a/packages/flite/flite-1.2/configure-with-audio.patch +++ /dev/null @@ -1,20 +0,0 @@ -*** flite-1.2-release/configure.in~ Tue Feb 18 01:45:45 2003 ---- flite-1.2-release/configure.in Mon Jul 18 22:01:25 2005 -*************** -*** 144,150 **** - dnl - AC_ARG_WITH( audio, - [ --with-audio with specific audio support (none linux freebsd etc) ], -! AUDIODRIVER=$with_audio ) - - if test "x$AUDIODEFS" = x; then - case "$AUDIODRIVER" in ---- 144,151 ---- - dnl - AC_ARG_WITH( audio, - [ --with-audio with specific audio support (none linux freebsd etc) ], -! [AUDIODRIVER=$with_audio -! AUDIODEFS=]) - - if test "x$AUDIODEFS" = x; then - case "$AUDIODRIVER" in diff --git a/packages/flite/flite-1.2/fix-read-only-assignments.patch b/packages/flite/flite-1.2/fix-read-only-assignments.patch deleted file mode 100644 index ec241c51f5..0000000000 --- a/packages/flite/flite-1.2/fix-read-only-assignments.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -urN flite-1.2-release.orig/include/cst_sts.h flite-1.2-release/include/cst_sts.h ---- flite-1.2-release.orig/include/cst_sts.h 2002-12-23 16:55:05.000000000 +0100 -+++ flite-1.2-release/include/cst_sts.h 2004-10-04 21:10:22.000000000 +0200 -@@ -47,9 +47,9 @@ - /* else where, this information plus the indexes in the Unit relation */ - /* allow reconstruction of the signal itself */ - struct cst_sts_struct { -- const unsigned short *frame; -- const int size; /* in samples */ -- const unsigned char *residual; -+ unsigned short *frame; -+ int size; /* in samples */ -+ unsigned char *residual; - }; - typedef struct cst_sts_struct cst_sts; - diff --git a/packages/flite/flite-1.3/flite-1.3-Makefile.patch b/packages/flite/flite-1.3/flite-1.3-Makefile.patch deleted file mode 100644 index 9a1a82e13b..0000000000 --- a/packages/flite/flite-1.3/flite-1.3-Makefile.patch +++ /dev/null @@ -1,405 +0,0 @@ -Index: lang/usenglish/Makefile -=================================================================== ---- flite-1.3-release/lang/usenglish/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/usenglish/Makefile (.../release-1.2) (revision 7) -@@ -38,6 +38,7 @@ - DIRNAME=lang/usenglish - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - H = usenglish.h us_int_accent_cart.h us_int_tone_cart.h us_durz_cart.h \ - us_ffeatures.h us_phrasing_cart.h us_text.h us_f0.h us_nums_cart.h - SRCS = us_int_accent_cart.c us_int_tone_cart.c us_f0_model.c \ -@@ -45,7 +46,11 @@ - us_phoneset.c us_ffeatures.c us_phrasing_cart.c \ - us_gpos.c us_text.c us_expand.c us_postlex.c \ - us_nums_cart.c us_aswd.c usenglish.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_usenglish - -Index: lang/cmu_us_kal/Makefile -=================================================================== ---- flite-1.3-release/lang/cmu_us_kal/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmu_us_kal/Makefile (.../release-1.2) (revision 7) -@@ -43,7 +43,12 @@ - cmu_us_kal_lpc.c \ - cmu_us_kal_res.c \ - cmu_us_kal_residx.c --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_cmu_us_kal - -Index: lang/cmu_us_kal16/Makefile -=================================================================== ---- flite-1.3-release/lang/cmu_us_kal16/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmu_us_kal16/Makefile (.../release-1.2) (revision 7) -@@ -44,7 +44,12 @@ - cmu_us_kal16_lpc.c \ - cmu_us_kal16_res.c \ - cmu_us_kal16_residx.c --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_cmu_us_kal16 - -Index: lang/cmu_time_awb/Makefile -=================================================================== ---- flite-1.3-release/lang/cmu_time_awb/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmu_time_awb/Makefile (.../release-1.2) (revision 7) -@@ -45,7 +45,12 @@ - cmu_time_awb_mcep.c \ - cmu_time_awb_lpc.c \ - cmu_time_awb_lex_entry.c --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_cmu_time_awb - -Index: lang/cmulex/Makefile -=================================================================== ---- flite-1.3-release/lang/cmulex/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmulex/Makefile (.../release-1.2) (revision 7) -@@ -38,13 +38,20 @@ - DIRNAME=lang/cmulex - BUILD_DIRS = - ALL_DIRS= -+ - H = cmu_lts_model.h cmulex.h - SRCS = cmu_lts_rules.c cmu_lts_model.c \ - cmu_lex.c cmu_lex_entries.c cmu_lex_data.c - LEX_DATA_INCLUDES = cmu_lex_data_raw.c cmu_lex_num_bytes.c \ - cmu_lex_phones_huff_table.c cmu_lex_entries_huff_table.c - --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif -+ - SCRIPTS=make_cmulex - - SCM= - -Index: src/hrg/Makefile -=================================================================== ---- flite-1.3-release/src/hrg/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/hrg/Makefile (.../release-1.2) (revision 7) -@@ -39,9 +39,14 @@ - BUILD_DIRS = - ALL_DIRS= - H = -+include $(TOP)/config/config - SRCS = cst_utterance.c cst_relation.c cst_item.c cst_ffeature.c \ - cst_rel_io.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: src/utils/Makefile -=================================================================== ---- flite-1.3-release/src/utils/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/utils/Makefile (.../release-1.2) (revision 7) -@@ -44,8 +44,13 @@ - cst_tokenstream.c cst_val.c cst_features.c \ - cst_endian.c cst_socket.c cst_val_const.c \ - cst_val_user.c cst_args.c -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) $(MMAPTYPE:%=cst_mmap_%.os) \ -+ $(STDIOTYPE:%=cst_file_%.os) -+else - OBJS := $(SRCS:.c=.o) $(MMAPTYPE:%=cst_mmap_%.o) \ - $(STDIOTYPE:%=cst_file_%.o) -+endif - FILES = Makefile $(H) $(SRCS) \ - cst_mmap_posix.c cst_mmap_win32.c cst_mmap_none.c \ - cst_file_stdio.c cst_file_wince.c cst_file_palmos.c - -Index: src/audio/Makefile -=================================================================== ---- flite-1.3-release/src/audio/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/audio/Makefile (.../release-1.2) (revision 7) -@@ -43,9 +43,13 @@ - - BASESRCS = auclient.c auserver.c audio.c - SRCS = $(BASESRCS) $(AUDIODRIVER:%=au_%.c) --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(BASESRCS) au_command.c au_none.c \ -- au_oss.c au_sun.c au_wince.c au_palmos.c -+ au_oss.c au_sun.c au_wince.c au_palmos.c au_alsa.c - LIBNAME = flite - - LOCAL_INCLUDES = -I. $(AUDIODEFS) - -Index: src/lexicon/Makefile -=================================================================== ---- flite-1.3-release/src/lexicon/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/lexicon/Makefile (.../release-1.2) (revision 7) -@@ -38,8 +38,13 @@ - DIRNAME=src/lexicon - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_lexicon.c cst_lts.c cst_lts_rewrites.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(SRCS) - LIBNAME = flite - -Index: src/synth/Makefile -=================================================================== ---- flite-1.3-release/src/synth/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/synth/Makefile (.../release-1.2) (revision 7) -@@ -38,9 +38,14 @@ - DIRNAME=src/synth - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_synth.c cst_utt_utils.c cst_voice.c cst_phoneset.c \ - flite.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(SRCS) - LIBNAME = flite - -Index: src/speech/Makefile -=================================================================== ---- flite-1.3-release/src/speech/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/speech/Makefile (.../release-1.2) (revision 7) -@@ -39,9 +39,14 @@ - BUILD_DIRS = - ALL_DIRS= - H = -+include $(TOP)/config/config - SRCS = cst_wave.c cst_wave_io.c cst_track.c cst_track_io.c \ - cst_wave_utils.c cst_lpcres.c rateconv.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: src/wavesynth/Makefile -=================================================================== ---- flite-1.3-release/src/wavesynth/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/wavesynth/Makefile (.../release-1.2) (revision 7) -@@ -38,9 +38,14 @@ - DIRNAME=src/wavesynth - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_units.c cst_sigpr.c cst_clunits.c cst_diphone.c \ - cst_sigprFP.c cst_sts.c cst_reflpc.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - LIBNAME = flite - FILES = Makefile $(SRCS) - -Index: src/regex/Makefile -=================================================================== ---- flite-1.3-release/src/regex/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/regex/Makefile (.../release-1.2) (revision 7) -@@ -42,8 +42,13 @@ - DIRNAME=src/regex - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_regex.c regexp.c regsub.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: src/stats/Makefile -=================================================================== ---- flite-1.3-release/src/stats/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/stats/Makefile (.../release-1.2) (revision 7) -@@ -39,8 +39,13 @@ - BUILD_DIRS = - ALL_DIRS= - H = -+include $(TOP)/config/config - SRCS = cst_cart.c cst_viterbi.c cst_ss.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: config/common_make_rules -=================================================================== ---- flite-1.3-release/config/common_make_rules (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/config/common_make_rules (.../release-1.2) (revision 7) -@@ -73,12 +73,13 @@ - ifdef SHFLAGS - SOOBJS = $(OBJS:.o=.os) - FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%) --ifdef LIBNAME --ALL += $(OBJDIR)/.build_so -+#ifdef LIBNAME -+#ALL += $(OBJDIR)/.build_so -+#endif - endif --endif - ifdef LIBNAME - ALL += $(OBJDIR)/.build_lib -+ALL += $(OBJDIR)/.build_so - endif - # Only do some directories when you are not cross compiling - ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) -@@ -117,14 +118,17 @@ - @ touch $(OBJDIR)/.build_so - - # Used in the lib/ directory and in building new voices --$(OBJDIR)/%.so: %.shared.a -+#$(OBJDIR)/%.so: %.shared.a -+%.so: %.shared.a - @ echo making $@ - @ rm -rf shared_os && mkdir shared_os - @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} - @ (cd shared_os && ar x ../$<) - @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) -- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} -- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ -+ #@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} -+ #@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ -+ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} -+ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@ - @ rm -rf shared_os - - $(OBJDIR)/.make_build_dirs: - -Index: lib/Makefile -=================================================================== ---- flite-1.3-release/lib/Makefile (.../flite-1.3-orig) (revision 0) -+++ flite-1.3-release/lib/Makefile (.../release-1.2) (revision 7) -@@ -0,0 +1,70 @@ -+########################################################################### -+## ## -+## Language Technologies Institute ## -+## Carnegie Mellon University ## -+## Copyright (c) 1999 ## -+## All Rights Reserved. ## -+## ## -+## Permission is hereby granted, free of charge, to use and distribute ## -+## this software and its documentation without restriction, including ## -+## without limitation the rights to use, copy, modify, merge, publish, ## -+## distribute, sublicense, and/or sell copies of this work, and to ## -+## permit persons to whom this work is furnished to do so, subject to ## -+## the following conditions: ## -+## 1. The code must retain the above copyright notice, this list of ## -+## conditions and the following disclaimer. ## -+## 2. Any modifications must be clearly marked as such. ## -+## 3. Original authors' names are not deleted. ## -+## 4. The authors' names are not used to endorse or promote products ## -+## derived from this software without specific prior written ## -+## permission. ## -+## ## -+## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ## -+## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## -+## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## -+## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ## -+## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## -+## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## -+## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## -+## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## -+## THIS SOFTWARE. ## -+## ## -+########################################################################### -+## ## -+## FLITE libraries ## -+## ## -+########################################################################### -+TOP=.. -+DIRNAME=lib -+BUILD_DIRS = -+ALL_DIRS= -+FILES = Makefile -+LIBNAMES = flite flite_cmulex flite_usenglish \ -+ flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb -+ -+STATICLIBS= $(LIBNAMES:%=lib%.a) -+SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a) -+#SHAREDLIBS = $(LIBNAMES:%=lib%.so) -+SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so) -+VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \ -+ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION}) -+ALL_LIBS = $(STATICLIBS) $(SHAREDLIBS) $(VERSIONSHAREDLIBS) -+ -+ALL = shared_libs -+ -+LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION} -+ -+include $(TOP)/config/common_make_rules -+ -+ifdef SHFLAGS -+shared_libs: $(SHAREDLIBS) -+else -+shared_libs: nothing -+endif -+ -+install: -+ @ cp -vf $(LIBDIR)/* . -+ @ $(MAKE) shared_libs -+ @ echo ARLIBS: $(SHAREDARLIBS) -+ @ echo SHARLIBS: $(SHAREDLIBS) -+ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -) diff --git a/packages/flite/flite-1.3/flite-1.3-configure-with-audio.patch b/packages/flite/flite-1.3/flite-1.3-configure-with-audio.patch deleted file mode 100644 index 3c077530f6..0000000000 --- a/packages/flite/flite-1.3/flite-1.3-configure-with-audio.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- flite-1.3-release/configure.in.old 2008-01-05 10:14:57.000000000 -0600 -+++ flite-1.3-release/configure.in 2008-01-05 10:15:38.000000000 -0600 -@@ -220,7 +220,8 @@ dnl allow the user to override the one d - dnl - AC_ARG_WITH( audio, - [ --with-audio with specific audio support (none linux freebsd etc) ], -- AUDIODRIVER=$with_audio ) -+ [AUDIODRIVER=$with_audio -+ AUDIODEFS=]) - - if test "x$AUDIODEFS" = x; then - case "$AUDIODRIVER" in diff --git a/packages/flite/flite-1.3/flite-1.3-fix-read-only-assignments.patch b/packages/flite/flite-1.3/flite-1.3-fix-read-only-assignments.patch deleted file mode 100644 index da8c88370f..0000000000 --- a/packages/flite/flite-1.3/flite-1.3-fix-read-only-assignments.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- flite-1.3-release/include/cst_sts.h.old 2008-01-05 10:09:35.000000000 -0600 -+++ flite-1.3-release/include/cst_sts.h 2008-01-05 10:08:38.000000000 -0600 -@@ -45,9 +45,9 @@ - /* else where, this information plus the indexes in the Unit relation */ - /* allow reconstruction of the signal itself */ - struct cst_sts_struct { -- const unsigned short *frame; -- const int size; /* in samples */ -- const unsigned char *residual; -+ unsigned short *frame; -+ int size; /* in samples */ -+ unsigned char *residual; - }; - typedef struct cst_sts_struct cst_sts; - diff --git a/packages/flite/flite-alsa-1.2/flite-1.2-alsa_support-1.2.diff b/packages/flite/flite-alsa-1.2/flite-1.2-alsa_support-1.2.diff deleted file mode 100644 index 3d2753a01f..0000000000 --- a/packages/flite/flite-alsa-1.2/flite-1.2-alsa_support-1.2.diff +++ /dev/null @@ -1,512 +0,0 @@ -Index: configure -=================================================================== ---- flite-1.2-release/configure (.../flite-1.2-orig) (revision 10) -+++ flite-1.2-release/configure (.../release-v1.2) (revision 10) -@@ -1415,16 +1415,16 @@ - echo "$ac_t""no" 1>&6 - fi - --ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6 --echo "configure:1421: checking for sys/asoundlib.h" >&5 -+ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 -+echo "configure:1421: checking for alsa/asoundlib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 1426 "configure" - #include "confdefs.h" --#include <sys/asoundlib.h> -+#include <alsa/asoundlib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:1431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -1445,23 +1445,24 @@ - echo "$ac_t""yes" 1>&6 - AUDIODRIVER="alsa" - AUDIODEFS=-DCST_AUDIO_ALSA -+ AUDIOLIBS=-lasound - else - echo "$ac_t""no" 1>&6 - fi - - ac_safe=`echo "mmsystem.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for mmsystem.h""... $ac_c" 1>&6 --echo "configure:1455: checking for mmsystem.h" >&5 -+echo "configure:1456: checking for mmsystem.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1460 "configure" -+#line 1461 "configure" - #include "confdefs.h" - #include <mmsystem.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -Index: include/cst_sts.h -=================================================================== ---- flite-1.2-release/include/cst_sts.h (.../flite-1.2-orig) (revision 10) -+++ flite-1.2-release/include/cst_sts.h (.../release-v1.2) (revision 10) -@@ -47,9 +47,9 @@ - /* else where, this information plus the indexes in the Unit relation */ - /* allow reconstruction of the signal itself */ - struct cst_sts_struct { -- const unsigned short *frame; -- const int size; /* in samples */ -- const unsigned char *residual; -+ unsigned short *frame; -+ int size; /* in samples */ -+ unsigned char *residual; - }; - typedef struct cst_sts_struct cst_sts; - -Index: configure.in -=================================================================== ---- flite-1.2-release/configure.in (.../flite-1.2-orig) (revision 10) -+++ flite-1.2-release/configure.in (.../release-v1.2) (revision 10) -@@ -131,9 +131,10 @@ - AC_CHECK_HEADER(sys/audioio.h, - [AUDIODRIVER="sun" - AUDIODEFS=-DCST_AUDIO_SUNOS]) --AC_CHECK_HEADER(sys/asoundlib.h, -+AC_CHECK_HEADER(alsa/asoundlib.h, - [AUDIODRIVER="alsa" -- AUDIODEFS=-DCST_AUDIO_ALSA]) -+ AUDIODEFS=-DCST_AUDIO_ALSA -+ AUDIOLIBS=-lasound]) - AC_CHECK_HEADER(mmsystem.h, - [AUDIODRIVER="wince" - AUDIODEFS=-DCST_AUDIO_WINCE -Index: src/audio/au_alsa.c -=================================================================== ---- flite-1.2-release/src/audio/au_alsa.c (.../flite-1.2-orig) (revision 10) -+++ flite-1.2-release/src/audio/au_alsa.c (.../release-v1.2) (revision 10) -@@ -2,7 +2,7 @@ - /* */ - /* Language Technologies Institute */ - /* Carnegie Mellon University */ --/* Copyright (c) 2001 */ -+/* Copyright (c) 2000 */ - /* All Rights Reserved. */ - /* */ - /* Permission is hereby granted, free of charge, to use and distribute */ -@@ -29,158 +29,283 @@ - /* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF */ - /* THIS SOFTWARE. */ - /* */ -+/*********************************************************************** */ -+/* Author: Lukas Loehrer ( */ -+/* Date: January 2005 */ - /*************************************************************************/ --/* Author: Geoff Harrison (mandrake@cepstral.com) */ --/* Date: Sepetember 2001 */ --/*************************************************************************/ - /* */ --/* Access to ALSA audio devices */ --/* */ -+/* Native access to alsa audio devices on Linux */ -+/* Tested with libasound version 1.0.10 */ - /*************************************************************************/ - --#include <stdio.h> - #include <stdlib.h> - #include <unistd.h> - #include <sys/types.h> -+#include <assert.h> -+#include <errno.h> -+ - #include "cst_string.h" - #include "cst_wave.h" - #include "cst_audio.h" - --#include <sys/asoundlib.h> -+#include <alsa/asoundlib.h> - --#include <sys/stat.h> --#include <fcntl.h> - --static int alsa_card = 0, alsa_device = 0; -+/*static char *pcm_dev_name = "hw:0,0"; */ -+static char *pcm_dev_name ="default"; - -+static inline void print_pcm_state(snd_pcm_t *handle, char *msg) -+{ -+ fprintf(stderr, "PCM state at %s = %s\n", msg, -+ snd_pcm_state_name(snd_pcm_state(handle))); -+} -+ - cst_audiodev *audio_open_alsa(int sps, int channels, cst_audiofmt fmt) - { -- snd_pcm_channel_info_t pinfo; -- snd_pcm_channel_params_t params; -- snd_pcm_channel_setup_t setup; -- snd_pcm_t *pcm; -- cst_audiodev *ad; -- int err; -+ cst_audiodev *ad; -+ unsigned int real_rate; -+ int err; - --#ifdef __QNXNTO__ -- if (snd_pcm_open_preferred(&pcm,&alsa_card,&alsa_device,SND_PCM_OPEN_PLAYBACK) < 0) -- { -- cst_errmsg("alsa_audio: failed to open audio device\n"); -- cst_error(); -- } -- if (snd_pcm_plugin_set_disable(pcm,PLUGIN_DISABLE_MMAP) < 0) -- { -- cst_errmsg("alsa_audio: failed to disable mmap\n"); -- snd_pcm_close(pcm); -- cst_error(); -- } --#else -- if (snd_pcm_open(&pcm,alsa_card,alsa_device,SND_PCM_OPEN_PLAYBACK) < 0) -- { -- cst_errmsg("alsa_audio: failed to open audio device\n"); -- cst_error(); -- } --#endif -+ /* alsa specific stuff */ -+ snd_pcm_t *pcm_handle; -+ snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK; -+ snd_pcm_hw_params_t *hwparams; -+ snd_pcm_format_t format; -+ snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED; - -+ /* Allocate the snd_pcm_hw_params_t structure on the stack. */ -+ snd_pcm_hw_params_alloca(&hwparams); - -- memset(&pinfo, 0, sizeof(pinfo)); -- memset(¶ms, 0, sizeof(params)); -- memset(&setup, 0, sizeof(setup)); -+ /* Open pcm device */ -+ err = snd_pcm_open(&pcm_handle, pcm_dev_name, stream, 0); -+ if (err < 0) -+ { -+ cst_errmsg("audio_open_alsa: failed to open audio device %s. %s\n", -+ pcm_dev_name, snd_strerror(err)); -+ return NULL; -+ } - -- pinfo.channel = SND_PCM_CHANNEL_PLAYBACK; -- snd_pcm_plugin_info(pcm,&pinfo); -+ /* Init hwparams with full configuration space */ -+ err = snd_pcm_hw_params_any(pcm_handle, hwparams); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to get hardware parameters from audio device. %s\n", snd_strerror(err)); -+ return NULL; -+ } - -- params.mode = SND_PCM_MODE_BLOCK; -- params.channel = SND_PCM_CHANNEL_PLAYBACK; -- params.start_mode = SND_PCM_START_DATA; -- params.stop_mode = SND_PCM_STOP_STOP; -+ /* Set access mode */ -+ err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, access); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set access mode. %s.\n", snd_strerror(err)); -+ return NULL; -+ } - -- params.buf.block.frag_size = pinfo.max_fragment_size; -- params.buf.block.frags_max = 1; -- params.buf.block.frags_min = 1; -- -- params.format.interleave = 1; -- params.format.rate = sps; -- params.format.voices = channels; -- -- switch (fmt) -- { -- case CST_AUDIO_LINEAR16: -+ /* Determine matching alsa sample format */ -+ /* This could be implemented in a more */ -+ /* flexible way (byte order conversion). */ -+ switch (fmt) -+ { -+ case CST_AUDIO_LINEAR16: - if (CST_LITTLE_ENDIAN) -- params.format.format = SND_PCM_SFMT_S16_LE; -+ format = SND_PCM_FORMAT_S16_LE; - else -- params.format.format = SND_PCM_SFMT_S16_BE; -+ format = SND_PCM_FORMAT_S16_BE; - break; -- case CST_AUDIO_LINEAR8: -- params.format.format = SND_PCM_SFMT_U8; -+ case CST_AUDIO_LINEAR8: -+ format = SND_PCM_FORMAT_U8; - break; -- case CST_AUDIO_MULAW: -- params.format.format = SND_PCM_SFMT_MU_LAW; -+ case CST_AUDIO_MULAW: -+ format = SND_PCM_FORMAT_MU_LAW; - break; -- } -+ default: -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to find suitable format.\n"); -+ return NULL; -+ break; -+ } - -- if((err = snd_pcm_plugin_params(pcm,¶ms)) < 0) -- { -- cst_errmsg("alsa_audio params setting failed: %s\n",snd_strerror(err)); -- snd_pcm_close(pcm); -- cst_error(); -- } -- if((err = snd_pcm_plugin_setup(pcm,SND_PCM_CHANNEL_PLAYBACK)) > 0) { -- cst_errmsg("alsa_audio sound prepare setting failed: %s\n",snd_strerror(err)); -- snd_pcm_close(pcm); -- cst_error(); -- } -- if((err = snd_pcm_plugin_prepare(pcm,SND_PCM_CHANNEL_PLAYBACK)) > 0) { -- cst_errmsg("alsa_audio sound prepare setting failed: %s\n",snd_strerror(err)); -- snd_pcm_close(pcm); -- cst_error(); -- } -+ /* Set samble format */ -+ err = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format); -+ if (err <0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set format. %s.\n", snd_strerror(err)); -+ return NULL; -+ } - -- pinfo.channel = SND_PCM_CHANNEL_PLAYBACK; -- snd_pcm_plugin_info(pcm,&pinfo); -+ /* Set sample rate near the disired rate */ -+ real_rate = sps; -+ err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &real_rate, 0); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set sample rate near %d. %s.\n", sps, snd_strerror(err)); -+ return NULL; -+ } -+ /*FIXME: This is probably too strict */ -+ assert(sps == real_rate); - -- ad = cst_alloc(cst_audiodev, 1); -- ad->platform_data = pcm; -- ad->sps = ad->real_sps = sps; -- ad->channels = ad->real_channels = channels; -- ad->fmt = ad->real_fmt = fmt; -+ /* Set number of channels */ -+ assert(channels >0); -+ err = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, channels); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set number of channels to %d. %s.\n", channels, snd_strerror(err)); -+ return NULL; -+ } - -- return ad; -+ /* Commit hardware parameters */ -+ err = snd_pcm_hw_params(pcm_handle, hwparams); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set hw parameters. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Make sure the device is ready to accept data */ -+ assert(snd_pcm_state(pcm_handle) == SND_PCM_STATE_PREPARED); -+ -+ /* Write hardware parameters to flite audio device data structure */ -+ ad = cst_alloc(cst_audiodev, 1); -+ assert(ad != NULL); -+ ad->real_sps = ad->sps = sps; -+ ad->real_channels = ad->channels = channels; -+ ad->real_fmt = ad->fmt = fmt; -+ ad->platform_data = (void *) pcm_handle; -+ -+ return ad; - } - - int audio_close_alsa(cst_audiodev *ad) - { -- snd_pcm_t *pcm; -+ int result; -+ snd_pcm_t *pcm_handle; - -- if (ad == NULL) -- return 0; -+ if (ad == NULL) -+ return 0; - -- pcm = ad->platform_data; -- snd_pcm_plugin_flush(pcm,0); -- snd_pcm_close(pcm); -- cst_free(ad); -+ pcm_handle = (snd_pcm_t *) ad->platform_data; -+ result = snd_pcm_close(pcm_handle); -+ if (result < 0) -+ { -+ cst_errmsg("audio_close_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ cst_free(ad); -+ return result; -+} - -- return 0; -+/* Returns zero if recovery was successful. */ -+static int recover_from_error(snd_pcm_t *pcm_handle, ssize_t res) -+{ -+ if (res == -EPIPE) /* xrun */ -+ { -+ res = snd_pcm_prepare(pcm_handle); -+ if (res < 0) -+ { -+ /* Failed to recover from xrun */ -+ cst_errmsg("recover_from_write_error: failed to recover from xrun. %s\n.", snd_strerror(res)); -+ return res; -+ } -+ } -+ else if (res == -ESTRPIPE) /* Suspend */ -+ { -+ while ((res = snd_pcm_resume(pcm_handle)) == -EAGAIN) -+ { -+ snd_pcm_wait(pcm_handle, 1000); -+ } -+ if (res < 0) -+ { -+ res = snd_pcm_prepare(pcm_handle); -+ if (res <0) -+ { -+ /* Resume failed */ -+ cst_errmsg("audio_recover_from_write_error: failed to resume after suspend. %s\n.", snd_strerror(res)); -+ return res; -+ } -+ } -+ } -+ else if (res < 0) -+ { -+ /* Unknown failure */ -+ cst_errmsg("audio_recover_from_write_error: %s.\n", snd_strerror(res)); -+ return res; -+ } -+ return 0; - } - - int audio_write_alsa(cst_audiodev *ad, void *samples, int num_bytes) - { -- snd_pcm_t *pcm = ad->platform_data; -+ size_t frame_size; -+ ssize_t num_frames, res; -+ snd_pcm_t *pcm_handle; -+ char *buf = (char *) samples; - -- return snd_pcm_plugin_write(pcm,samples,num_bytes); -+ /* Determine frame size in bytes */ -+ frame_size = audio_bps(ad->real_fmt) * ad->real_channels; -+ /* Require that only complete frames are handed in */ -+ assert((num_bytes % frame_size) == 0); -+ num_frames = num_bytes / frame_size; -+ pcm_handle = (snd_pcm_t *) ad->platform_data; -+ -+ while (num_frames > 0) -+ { -+ res = snd_pcm_writei(pcm_handle, buf, num_frames); -+ if (res != num_frames) -+ { -+ if (res == -EAGAIN || (res > 0 && res < num_frames)) -+ { -+ snd_pcm_wait(pcm_handle, 100); -+ } -+ else if (recover_from_error(pcm_handle, res) < 0) -+ { -+ return -1; -+ } -+ } -+ -+ if (res >0) -+ { -+ num_frames -= res; -+ buf += res * frame_size; -+ } -+ } -+ return num_bytes; - } - - int audio_flush_alsa(cst_audiodev *ad) - { -- snd_pcm_t *pcm = ad->platform_data; -- -- return snd_pcm_plugin_flush(pcm,0); -+ int result; -+ result = snd_pcm_drain((snd_pcm_t *) ad->platform_data); -+ if (result < 0) -+ { -+ cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ /* Prepare device for more data */ -+ result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data); -+if (result < 0) -+ { -+ cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ return result; - } - - int audio_drain_alsa(cst_audiodev *ad) - { -- snd_pcm_t *pcm = ad->platform_data; -- -- return snd_pcm_plugin_playback_drain(pcm); -+ int result; -+ result = snd_pcm_drop((snd_pcm_t *) ad->platform_data); -+ if (result < 0) -+ { -+ cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+/* Prepare device for more data */ -+ result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data); -+if (result < 0) -+ { -+ cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ return result; - } -- -Index: doc/Makefile -=================================================================== ---- flite-1.2-release/doc/Makefile (.../flite-1.2-orig) (revision 10) -+++ flite-1.2-release/doc/Makefile (.../release-v1.2) (revision 10) -@@ -53,6 +53,7 @@ - @ if [ ! -d html ] ; \ - then mkdir -p html ; fi - (cd html; texi2html -number -split_chapter ../flite.texi) -+ mv html/flite/*.html html/ && rmdir html/flite - @ for i in html/*.html ; \ - do \ - sed 's/<BODY>/<BODY bgcolor="#ffffff">/' $$i >ttt.html; \ -Index: config/common_make_rules -=================================================================== ---- flite-1.2-release/config/common_make_rules (.../flite-1.2-orig) (revision 10) -+++ flite-1.2-release/config/common_make_rules (.../release-v1.2) (revision 10) -@@ -88,7 +88,7 @@ - @ rm -rf shared_os && mkdir shared_os - @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} - @ (cd shared_os && ar x ../$<) -- @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) -+ @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(AUDIOLIBS)) - @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} - @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ - @ rm -rf shared_os diff --git a/packages/flite/flite-alsa-1.2/flite-alsa-1.2-configure-with-audio.patch b/packages/flite/flite-alsa-1.2/flite-alsa-1.2-configure-with-audio.patch deleted file mode 100644 index b344877d04..0000000000 --- a/packages/flite/flite-alsa-1.2/flite-alsa-1.2-configure-with-audio.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- flite-1.2-release/configure.in.old 2008-01-06 02:30:57.000000000 -0600 -+++ flite-1.2-release/configure.in 2008-01-06 02:31:32.000000000 -0600 -@@ -145,7 +145,8 @@ dnl allow the user to override the one d - dnl - AC_ARG_WITH( audio, - [ --with-audio with specific audio support (none linux freebsd etc) ], -- AUDIODRIVER=$with_audio ) -+ [AUDIODRIVER=$with_audio -+ AUDIODEFS=]) - - if test "x$AUDIODEFS" = x; then - case "$AUDIODRIVER" in diff --git a/packages/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff b/packages/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff deleted file mode 100644 index b3e4b7aae4..0000000000 --- a/packages/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff +++ /dev/null @@ -1,6615 +0,0 @@ -Index: lang/usenglish/Makefile -=================================================================== ---- flite-1.3-release/lang/usenglish/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/usenglish/Makefile (.../release-1.2) (revision 7) -@@ -38,6 +38,7 @@ - DIRNAME=lang/usenglish - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - H = usenglish.h us_int_accent_cart.h us_int_tone_cart.h us_durz_cart.h \ - us_ffeatures.h us_phrasing_cart.h us_text.h us_f0.h us_nums_cart.h - SRCS = us_int_accent_cart.c us_int_tone_cart.c us_f0_model.c \ -@@ -45,7 +46,11 @@ - us_phoneset.c us_ffeatures.c us_phrasing_cart.c \ - us_gpos.c us_text.c us_expand.c us_postlex.c \ - us_nums_cart.c us_aswd.c usenglish.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_usenglish -Index: lang/cmu_us_kal/Makefile -=================================================================== ---- flite-1.3-release/lang/cmu_us_kal/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmu_us_kal/Makefile (.../release-1.2) (revision 7) -@@ -43,7 +43,12 @@ - cmu_us_kal_lpc.c \ - cmu_us_kal_res.c \ - cmu_us_kal_residx.c --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_cmu_us_kal -Index: lang/cmu_us_kal16/Makefile -=================================================================== ---- flite-1.3-release/lang/cmu_us_kal16/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmu_us_kal16/Makefile (.../release-1.2) (revision 7) -@@ -44,7 +44,12 @@ - cmu_us_kal16_lpc.c \ - cmu_us_kal16_res.c \ - cmu_us_kal16_residx.c --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_cmu_us_kal16 -Index: lang/cmu_time_awb/Makefile -=================================================================== ---- flite-1.3-release/lang/cmu_time_awb/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmu_time_awb/Makefile (.../release-1.2) (revision 7) -@@ -45,7 +45,12 @@ - cmu_time_awb_mcep.c \ - cmu_time_awb_lpc.c \ - cmu_time_awb_lex_entry.c --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - SCM= - FILES = Makefile $(SCM) $(SRCS) $(H) - LIBNAME = flite_cmu_time_awb -Index: lang/cmulex/Makefile -=================================================================== ---- flite-1.3-release/lang/cmulex/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/lang/cmulex/Makefile (.../release-1.2) (revision 7) -@@ -38,13 +38,20 @@ - DIRNAME=lang/cmulex - BUILD_DIRS = - ALL_DIRS= -+ - H = cmu_lts_model.h cmulex.h - SRCS = cmu_lts_rules.c cmu_lts_model.c \ - cmu_lex.c cmu_lex_entries.c cmu_lex_data.c - LEX_DATA_INCLUDES = cmu_lex_data_raw.c cmu_lex_num_bytes.c \ - cmu_lex_phones_huff_table.c cmu_lex_entries_huff_table.c - --OBJS = $(SRCS:.c=.o) -+include $(TOP)/config/config -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif -+ - SCRIPTS=make_cmulex - - SCM= -Index: configure -=================================================================== ---- flite-1.3-release/configure (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/configure (.../release-1.2) (revision 7) -@@ -1,324 +1,38 @@ - #! /bin/sh -+ - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.57. -+# Generated automatically using autoconf version 2.13 -+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. - # --# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --# Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix --fi -- --# Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false --fi -- -- --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH --PS1='$ ' --PS2='> ' --PS4='+ ' -- --# NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi --done -- --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -- as_basename=basename --else -- as_basename=false --fi -- -- --# Name of the executable. --as_me=`$as_basename "$0" || --$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -- --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; --esac -- --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln --else -- as_ln_s='cp -p' --fi --rm -f conf$$ conf$$.exe conf$$.file -- --if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: --else -- as_mkdir_p=false --fi -- --as_executable_p="test -f" -- --# Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -- --# Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -- -- --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -- --# Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, --# so uname gets run too. --ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -- --exec 6>&1 -- --# --# Initializations. --# -+# Defaults: -+ac_help= - ac_default_prefix=/usr/local --ac_config_libobj_dir=. --cross_compiling=no --subdirs= --MFLAGS= --MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -+# Any additions from configure.in: -+ac_help="$ac_help -+ --disable-shared without shared library support" -+ac_help="$ac_help -+ --disable-sockets without socket support" -+ac_help="$ac_help -+ --with-audio with specific audio support (none linux freebsd etc) " -+ac_help="$ac_help -+ --with-lang with language " -+ac_help="$ac_help -+ --with-vox with vox " -+ac_help="$ac_help -+ --with-lex with lexicon " - --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} -- --# Identity of this package. --PACKAGE_NAME= --PACKAGE_TARNAME= --PACKAGE_VERSION= --PACKAGE_STRING= --PACKAGE_BUGREPORT= -- --ac_unique_file="include/flite.h" --# Factoring default headers for most tests. --ac_includes_default="\ --#include <stdio.h> --#if HAVE_SYS_TYPES_H --# include <sys/types.h> --#endif --#if HAVE_SYS_STAT_H --# include <sys/stat.h> --#endif --#if STDC_HEADERS --# include <stdlib.h> --# include <stddef.h> --#else --# if HAVE_STDLIB_H --# include <stdlib.h> --# endif --#endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H --# include <memory.h> --# endif --# include <string.h> --#endif --#if HAVE_STRINGS_H --# include <strings.h> --#endif --#if HAVE_INTTYPES_H --# include <inttypes.h> --#else --# if HAVE_STDINT_H --# include <stdint.h> --# endif --#endif --#if HAVE_UNISTD_H --# include <unistd.h> --#endif" -- --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' --ac_subst_files='' -- - # Initialize some variables set by options. --ac_init_help= --ac_init_version=false - # The variables have the same names as the options, with - # dashes changed to underlines. --cache_file=/dev/null -+build=NONE -+cache_file=./config.cache - exec_prefix=NONE -+host=NONE - no_create= -+nonopt=NONE - no_recursion= - prefix=NONE - program_prefix=NONE -@@ -327,15 +41,10 @@ - silent= - site= - srcdir= -+target=NONE - verbose= - x_includes=NONE - x_libraries=NONE -- --# Installation directory options. --# These are left unexpanded so users can "make install exec_prefix=/foo" --# and all the variables that are supposed to be based on exec_prefix --# by default will actually change. --# Use braces instead of parens because sh, perl, etc. also accept them. - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' -@@ -349,9 +58,17 @@ - infodir='${prefix}/info' - mandir='${prefix}/man' - -+# Initialize some other variables. -+subdirs= -+MFLAGS= MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} -+# Maximum number of lines to put in a shell here document. -+ac_max_here_lines=12 -+ - ac_prev= - for ac_option - do -+ - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" -@@ -359,59 +76,59 @@ - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case "$ac_option" in -+ -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) ac_optarg= ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -- bindir=$ac_optarg ;; -+ bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) -- ac_prev=build_alias ;; -+ ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) -- build_alias=$ac_optarg ;; -+ build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -- cache_file=$ac_optarg ;; -+ cache_file="$ac_optarg" ;; - -- --config-cache | -C) -- cache_file=config.cache ;; -- - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) -- datadir=$ac_optarg ;; -+ datadir="$ac_optarg" ;; - - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then -+ { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } -+ fi -+ ac_feature=`echo $ac_feature| sed 's/-/_/g'` -+ eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -+ if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then -+ { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } -+ fi -+ ac_feature=`echo $ac_feature| sed 's/-/_/g'` -+ case "$ac_option" in -+ *=*) ;; - *) ac_optarg=yes ;; - esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -420,47 +137,95 @@ - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) -- exec_prefix=$ac_optarg ;; -+ exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - -- -help | --help | --hel | --he | -h) -- ac_init_help=long ;; -- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) -- ac_init_help=recursive ;; -- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) -- ac_init_help=short ;; -+ -help | --help | --hel | --he) -+ # Omit some internal or obsolete options to make the list less imposing. -+ # This message is too long to be a string in the A/UX 3.1 sh. -+ cat << EOF -+Usage: configure [options] [host] -+Options: [defaults in brackets after descriptions] -+Configuration: -+ --cache-file=FILE cache test results in FILE -+ --help print this message -+ --no-create do not create output files -+ --quiet, --silent do not print \`checking...' messages -+ --version print the version of autoconf that created configure -+Directory and file names: -+ --prefix=PREFIX install architecture-independent files in PREFIX -+ [$ac_default_prefix] -+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -+ [same as prefix] -+ --bindir=DIR user executables in DIR [EPREFIX/bin] -+ --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] -+ --libexecdir=DIR program executables in DIR [EPREFIX/libexec] -+ --datadir=DIR read-only architecture-independent data in DIR -+ [PREFIX/share] -+ --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data in DIR -+ [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] -+ --libdir=DIR object code libraries in DIR [EPREFIX/lib] -+ --includedir=DIR C header files in DIR [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] -+ --infodir=DIR info documentation in DIR [PREFIX/info] -+ --mandir=DIR man documentation in DIR [PREFIX/man] -+ --srcdir=DIR find the sources in DIR [configure dir or ..] -+ --program-prefix=PREFIX prepend PREFIX to installed program names -+ --program-suffix=SUFFIX append SUFFIX to installed program names -+ --program-transform-name=PROGRAM -+ run sed PROGRAM on installed program names -+EOF -+ cat << EOF -+Host type: -+ --build=BUILD configure for building on BUILD [BUILD=HOST] -+ --host=HOST configure for HOST [guessed] -+ --target=TARGET configure for TARGET [TARGET=HOST] -+Features and packages: -+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --x-includes=DIR X include files are in DIR -+ --x-libraries=DIR X library files are in DIR -+EOF -+ if test -n "$ac_help"; then -+ echo "--enable and --with options recognized:$ac_help" -+ fi -+ exit 0 ;; - - -host | --host | --hos | --ho) -- ac_prev=host_alias ;; -+ ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) -- host_alias=$ac_optarg ;; -+ host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) -- includedir=$ac_optarg ;; -+ includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -- infodir=$ac_optarg ;; -+ infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) -- libdir=$ac_optarg ;; -+ libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) -- libexecdir=$ac_optarg ;; -+ libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ -@@ -469,19 +234,19 @@ - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -- localstatedir=$ac_optarg ;; -+ localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -- mandir=$ac_optarg ;; -+ mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c | -n) -+ | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -@@ -495,26 +260,26 @@ - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -- oldincludedir=$ac_optarg ;; -+ oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -- prefix=$ac_optarg ;; -+ prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) -- program_prefix=$ac_optarg ;; -+ program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) -- program_suffix=$ac_optarg ;; -+ program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ -@@ -531,7 +296,7 @@ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) -- program_transform_name=$ac_optarg ;; -+ program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) -@@ -541,7 +306,7 @@ - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) -- sbindir=$ac_optarg ;; -+ sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -@@ -552,57 +317,58 @@ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) -- sharedstatedir=$ac_optarg ;; -+ sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) -- site=$ac_optarg ;; -+ site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -- srcdir=$ac_optarg ;; -+ srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -- sysconfdir=$ac_optarg ;; -+ sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) -- ac_prev=target_alias ;; -+ ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -- target_alias=$ac_optarg ;; -+ target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - -- -version | --version | --versio | --versi | --vers | -V) -- ac_init_version=: ;; -+ -version | --version | --versio | --versi | --vers) -+ echo "configure generated by autoconf version 2.13" -+ exit 0 ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -+ if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then -+ { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } -+ fi - ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -+ case "$ac_option" in -+ *=*) ;; - *) ac_optarg=yes ;; - esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then -+ { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } -+ fi -+ ac_package=`echo $ac_package| sed 's/-/_/g'` -+ eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. -@@ -613,110 +379,99 @@ - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) -- x_includes=$ac_optarg ;; -+ x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) -- x_libraries=$ac_optarg ;; -+ x_libraries="$ac_optarg" ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - -- *=*) -- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` -- # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -- export $ac_envvar ;; -- - *) -- # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then -+ echo "configure: warning: $ac_option: invalid host type" 1>&2 -+ fi -+ if test "x$nonopt" != xNONE; then -+ { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } -+ fi -+ nonopt="$ac_option" - ;; - - esac - done - - if test -n "$ac_prev"; then -- ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -- esac --done -+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# File descriptor usage: -+# 0 standard input -+# 1 file creation -+# 2 errors and warnings -+# 3 some systems may open it to /dev/tty -+# 4 used on the Kubota Titan -+# 6 checking for... messages and results -+# 5 compiler messages saved in config.log -+if test "$silent" = yes; then -+ exec 6>/dev/null -+else -+ exec 6>&1 -+fi -+exec 5>./config.log -+ -+echo "\ -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+" 1>&5 -+ -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Also quote any args containing shell metacharacters. -+ac_configure_args= -+for ac_arg - do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ case "$ac_arg" in -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c) ;; -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; -+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) -+ ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac - done - --# There might be people who depend on the old broken behavior: `$host' --# used to hold the argument of --host etc. --# FIXME: To remove some day. --build=$build_alias --host=$host_alias --target=$target_alias -+# NLS nuisances. -+# Only set these to C if already set. These must not be set unconditionally -+# because not all systems understand e.g. LANG=C (notably SCO). -+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -+# Non-C LC_CTYPE values break the ctype check. -+if test "${LANG+set}" = set; then LANG=C; export LANG; fi -+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - --# FIXME: To remove some day. --if test "x$host_alias" != x; then -- if test "x$build_alias" = x; then -- cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 -- elif test "x$build_alias" != "x$host_alias"; then -- cross_compiling=yes -- fi --fi -+# confdefs.h avoids OS command line length limits that DEFS can exceed. -+rm -rf conftest* confdefs.h -+# AIX cpp loses on an empty file, so make sure it contains at least a newline. -+echo > confdefs.h - --ac_tool_prefix= --test -n "$host_alias" && ac_tool_prefix=$host_alias- -+# A filename unique to this package, relative to the directory that -+# configure is in, which we can look for to find out if srcdir is correct. -+ac_unique_file=include/flite.h - --test "$silent" = yes && exec 6>/dev/null -- -- - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ ac_prog=$0 -+ ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` -+ test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. -@@ -726,441 +481,13 @@ - fi - if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -+ { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -+ { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi - fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - --# --# Report the --help message. --# --if test "$ac_init_help" = "long"; then -- # Omit some internal or obsolete options to make the list less imposing. -- # This message is too long to be a string in the A/UX 3.1 sh. -- cat <<_ACEOF --\`configure' configures this package to adapt to many kinds of systems. -- --Usage: $0 [OPTION]... [VAR=VALUE]... -- --To assign environment variables (e.g., CC, CFLAGS...), specify them as --VAR=VALUE. See below for descriptions of some of the useful variables. -- --Defaults for the options are specified in brackets. -- --Configuration: -- -h, --help display this help and exit -- --help=short display options specific to this package -- --help=recursive display the short help of all the included packages -- -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -- --cache-file=FILE cache test results in FILE [disabled] -- -C, --config-cache alias for \`--cache-file=config.cache' -- -n, --no-create do not create output files -- --srcdir=DIR find the sources in DIR [configure dir or \`..'] -- --_ACEOF -- -- cat <<_ACEOF --Installation directories: -- --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -- --By default, \`make install' will install all the files in --\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify --an installation prefix other than \`$ac_default_prefix' using \`--prefix', --for instance \`--prefix=\$HOME'. -- --For better control, use the options below. -- --Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] --_ACEOF -- -- cat <<\_ACEOF -- --System types: -- --build=BUILD configure for building on BUILD [guessed] -- --host=HOST cross-compile to build programs to run on HOST [BUILD] -- --target=TARGET configure for building compilers for TARGET [HOST] --_ACEOF --fi -- --if test -n "$ac_init_help"; then -- -- cat <<\_ACEOF -- --Optional Features: -- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -- --disable-shared without shared library support -- --disable-sockets without socket support -- --Optional Packages: -- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -- --with-audio with specific audio support (none linux freebsd etc) -- --with-lang with language -- --with-vox with vox -- --with-lex with lexicon -- --Some influential environment variables: -- CC C compiler command -- CFLAGS C compiler flags -- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a -- nonstandard directory <lib dir> -- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have -- headers in a nonstandard directory <include dir> -- CPP C preprocessor -- --Use these variables to override the choices made by `configure' or to help --it to find libraries and programs with nonstandard names/locations. -- --_ACEOF --fi -- --if test "$ac_init_help" = "recursive"; then -- # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` -- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -- ac_builddir=. -- --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -- --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -- -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -- else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -- done --fi -- --test -n "$ac_init_help" && exit 0 --if $ac_init_version; then -- cat <<\_ACEOF -- --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --Free Software Foundation, Inc. --This configure script is free software; the Free Software Foundation --gives unlimited permission to copy, distribute and modify it. --_ACEOF -- exit 0 --fi --exec 5>config.log --cat >&5 <<_ACEOF --This file contains any messages produced by compilers while --running configure, to aid debugging if configure makes a mistake. -- --It was created by $as_me, which was --generated by GNU Autoconf 2.57. Invocation command line was -- -- $ $0 $@ -- --_ACEOF --{ --cat <<_ASUNAME --## --------- ## --## Platform. ## --## --------- ## -- --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` --uname -r = `(uname -r) 2>/dev/null || echo unknown` --uname -s = `(uname -s) 2>/dev/null || echo unknown` --uname -v = `(uname -v) 2>/dev/null || echo unknown` -- --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -- --/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` --/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` --/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` --/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` --/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` --/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -- --_ASUNAME -- --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -- --} >&5 -- --cat >&5 <<_ACEOF -- -- --## ----------- ## --## Core tests. ## --## ----------- ## -- --_ACEOF -- -- --# Keep a trace of the command line. --# Strip out --no-create and --no-recursion so they do not pile up. --# Strip out --silent because we don't want to record it for future runs. --# Also quote any args containing shell meta-characters. --# Make two passes to allow for proper duplicate-argument suppression. --ac_configure_args= --ac_configure_args0= --ac_configure_args1= --ac_sep= --ac_must_keep_next=false --for ac_pass in 1 2 --do -- for ac_arg -- do -- case $ac_arg in -- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -- | -silent | --silent | --silen | --sile | --sil) -- continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -- 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -- if test $ac_must_keep_next = true; then -- ac_must_keep_next=false # Got value, back to normal. -- else -- case $ac_arg in -- *=* | --config-cache | -C | -disable-* | --disable-* \ -- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -- | -with-* | --with-* | -without-* | --without-* | --x) -- case "$ac_configure_args0 " in -- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -- esac -- ;; -- -* ) ac_must_keep_next=true ;; -- esac -- fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -- ;; -- esac -- done --done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -- --# When interrupted or exit'd, cleanup temporary files, and complete --# config.log. We remove comments because anyway the quotes in there --# would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. --trap 'exit_status=$? -- # Save into config.log some information that might help in debugging. -- { -- echo -- -- cat <<\_ASBOX --## ---------------- ## --## Cache variables. ## --## ---------------- ## --_ASBOX -- echo -- # The following way of writing the cache mishandles newlines in values, --{ -- (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -- *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -- ;; -- esac; --} -- echo -- -- cat <<\_ASBOX --## ----------------- ## --## Output variables. ## --## ----------------- ## --_ASBOX -- echo -- for ac_var in $ac_subst_vars -- do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -- done | sort -- echo -- -- if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## --_ASBOX -- echo -- for ac_var in $ac_subst_files -- do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -- done | sort -- echo -- fi -- -- if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## --## confdefs.h. ## --## ----------- ## --_ASBOX -- echo -- sed "/^$/d" confdefs.h | sort -- echo -- fi -- test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -- } >&5 -- rm -f core core.* *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -- exit $exit_status -- ' 0 --for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal --done --ac_signal=0 -- --# confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -- --# Predefined preprocessor variables. -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_NAME "$PACKAGE_NAME" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_TARNAME "$PACKAGE_TARNAME" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_VERSION "$PACKAGE_VERSION" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_STRING "$PACKAGE_STRING" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" --_ACEOF -- -- --# Let the site file select an alternate cache file if it wants to. - # Prefer explicitly selected file to automatically selected ones. - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then -@@ -1171,106 +498,42 @@ - fi - for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -- sed 's/^/| /' "$ac_site_file" >&5 -+ echo "loading site script $ac_site_file" - . "$ac_site_file" - fi - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -- case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -- esac -- fi -+ echo "loading cache $cache_file" -+ . $cache_file - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -- >$cache_file -+ echo "creating cache $cache_file" -+ > $cache_file - fi - --# Check that the precious variables saved in the cache have kept the same --# value. --ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -- eval ac_old_set=\$ac_cv_env_${ac_var}_set -- eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -- case $ac_old_set,$ac_new_set in -- set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -- ac_cache_corrupted=: ;; -- ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -- ac_cache_corrupted=: ;; -- ,);; -- *) -- if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -- fi;; -- esac -- # Pass precious variables to config.status. -- if test "$ac_new_set" = set; then -- case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -- *) ac_arg=$ac_var=$ac_new_val ;; -- esac -- case " $ac_configure_args " in -- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -- esac -- fi --done --if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } --fi -- - ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross - -+ac_exeext= -+ac_objext=o -+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then -+ # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. -+ if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then -+ ac_n= ac_c=' -+' ac_t=' ' -+ else -+ ac_n=-n ac_c= ac_t= -+ fi -+else -+ ac_n= ac_c='\c' ac_t= -+fi - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then -@@ -1281,740 +544,312 @@ - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/shtool install -c" -- break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -- { (exit 1); exit 1; }; } -+ { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ac_config_guess=$ac_aux_dir/config.guess -+ac_config_sub=$ac_aux_dir/config.sub -+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - --# Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -- { (exit 1); exit 1; }; } - --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 --if test "${ac_cv_build+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -- { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+# Do some error checking and defaulting for the host and target type. -+# The inputs are: -+# configure --host=HOST --target=TARGET --build=BUILD NONOPT -+# -+# The rules are: -+# 1. You are not allowed to specify --host, --target, and nonopt at the -+# same time. -+# 2. Host defaults to nonopt. -+# 3. If nonopt is not specified, then host defaults to the current host, -+# as determined by config.guess. -+# 4. Target and build default to nonopt. -+# 5. If nonopt is not specified, then target and build default to host. - -+# The aliases save the names the user supplied, while $host etc. -+# will get canonicalized. -+case $host---$target---$nonopt in -+NONE---*---* | *---NONE---* | *---*---NONE) ;; -+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; -+esac -+ -+ -+# Make sure we can run config.sub. -+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } - fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 --build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -+echo $ac_n "checking host system type""... $ac_c" 1>&6 -+echo "configure:585: checking host system type" >&5 - --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 --if test "${ac_cv_host+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+host_alias=$host -+case "$host_alias" in -+NONE) -+ case $nonopt in -+ NONE) -+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : -+ else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } -+ fi ;; -+ *) host_alias=$nonopt ;; -+ esac ;; -+esac - --fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 --host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$host" 1>&6 - -+echo $ac_n "checking target system type""... $ac_c" 1>&6 -+echo "configure:606: checking target system type" >&5 - --echo "$as_me:$LINENO: checking target system type" >&5 --echo $ECHO_N "checking target system type... $ECHO_C" >&6 --if test "${ac_cv_target+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_target_alias=$target_alias --test "x$ac_cv_target_alias" = "x" && -- ac_cv_target_alias=$ac_cv_host_alias --ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+target_alias=$target -+case "$target_alias" in -+NONE) -+ case $nonopt in -+ NONE) target_alias=$host_alias ;; -+ *) target_alias=$nonopt ;; -+ esac ;; -+esac - --fi --echo "$as_me:$LINENO: result: $ac_cv_target" >&5 --echo "${ECHO_T}$ac_cv_target" >&6 --target=$ac_cv_target --target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$target" 1>&6 - -+echo $ac_n "checking build system type""... $ac_c" 1>&6 -+echo "configure:624: checking build system type" >&5 - --# The aliases save the names the user supplied, while $host etc. --# will get canonicalized. --test -n "$target_alias" && -+build_alias=$build -+case "$build_alias" in -+NONE) -+ case $nonopt in -+ NONE) build_alias=$host_alias ;; -+ *) build_alias=$nonopt ;; -+ esac ;; -+esac -+ -+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$build" 1>&6 -+ -+test "$host_alias" != "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. --set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$CC"; then -- ac_cv_prog_CC="$CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done - --fi --fi --CC=$ac_cv_prog_CC --if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "gcc", so it can be a program name with args. -+# Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:649: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi -- --if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. --set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="gcc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" - fi - fi --CC=$ac_cv_prog_CC -+CC="$ac_cv_prog_CC" - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ echo "$ac_t""$CC" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi - --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi -- --fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:679: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then -- ac_prog_rejected=yes -- continue -- fi -- ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift -- if test $# != 0; then -+ if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift -- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" -+ set dummy "$ac_dir/$ac_word" "$@" -+ shift -+ ac_cv_prog_CC="$@" - fi - fi - fi - fi --CC=$ac_cv_prog_CC -+CC="$ac_cv_prog_CC" - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ echo "$ac_t""$CC" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi - --fi --if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -- do -- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. --set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if test -z "$CC"; then -+ case "`uname -s`" in -+ *win32* | *WIN32*) -+ # Extract the first word of "cl", so it can be a program name with args. -+set dummy cl; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:730: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="cl" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" - fi - fi --CC=$ac_cv_prog_CC -+CC="$ac_cv_prog_CC" - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ echo "$ac_t""$CC" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi -- -- test -n "$CC" && break -- done --fi --if test -z "$CC"; then -- ac_ct_CC=$CC -- for ac_prog in cl --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -+ ;; -+ esac - fi --done --done -- -+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } - fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi - -- test -n "$ac_ct_CC" && break --done -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:762: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - -- CC=$ac_ct_CC --fi -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross - --fi -+cat > conftest.$ac_ext << EOF - -+#line 773 "configure" -+#include "confdefs.h" - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- --# Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 -- (eval $ac_compiler --version </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 -- (eval $ac_compiler -v </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 -- (eval $ac_compiler -V </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -- --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" --# Try to create an executable without -o first, disregard a.out. --# It will help us diagnose broken compilers, and finding out an intuition --# of exeext. --echo "$as_me:$LINENO: checking for C compiler default output" >&5 --echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -- --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out --do -- test -f "$ac_file" || continue -- case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -- ;; -- [ab].out ) -- # We found the default executable, but exeext='' is most -- # certainly right. -- break;; -- *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -- break;; -- * ) -- break;; -- esac --done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } --fi -- --ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 -- --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -+main(){return(0);} -+EOF -+if { (eval echo configure:778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_cc_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cc_cross=no - else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- fi -+ ac_cv_prog_cc_cross=yes - fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cc_works=no - fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+rm -fr conftest* -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross - --rm -f a.out a.exe conftest$ac_cv_exeext b.out --ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # If both `conftest.exe' and `conftest' are `present' (well, observable) --# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will --# work properly (i.e., refer to `conftest.exe'), while it won't with --# `rm'. --for ac_file in conftest.exe conftest conftest.*; do -- test -f "$ac_file" || continue -- case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext -- break;; -- * ) break;; -- esac --done --else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -+if test $ac_cv_prog_cc_works = no; then -+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cc_cross - --rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -- --rm -f conftest.$ac_ext --EXEEXT=$ac_cv_exeext --ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 --if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -+echo "configure:809: checking whether we are using GNU C" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -- case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` -- break;; -- esac --done -+ cat > conftest.c <<EOF -+#ifdef __GNUC__ -+ yes; -+#endif -+EOF -+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 -+ ac_cv_prog_gcc=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ ac_cv_prog_gcc=no - fi -- --rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 --OBJEXT=$ac_cv_objext --ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --int --main () --{ --#ifndef __GNUC__ -- choke me --#endif -+echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_compiler_gnu=yes -+if test $ac_cv_prog_gcc = yes; then -+ GCC=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ GCC= - fi --rm -f conftest.$ac_objext conftest.$ac_ext --ac_cv_c_compiler_gnu=$ac_compiler_gnu - --fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 --GCC=`test $ac_compiler_gnu = yes && echo yes` --ac_test_CFLAGS=${CFLAGS+set} --ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ac_test_CFLAGS="${CFLAGS+set}" -+ac_save_CFLAGS="$CFLAGS" -+CFLAGS= -+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -+echo "configure:837: checking whether ${CC-cc} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ echo 'void f(){}' > conftest.c -+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_prog_cc_g=no -+fi -+rm -f conftest* - --ac_cv_prog_cc_g=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+ -+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then -- CFLAGS=$ac_save_CFLAGS -+ CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" -@@ -2028,304 +863,37 @@ - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_prog_cc_stdc=no --ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdarg.h> --#include <stdio.h> --#include <sys/types.h> --#include <sys/stat.h> --/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ --struct buf { int x; }; --FILE * (*rcsopen) (struct buf *, struct stat *, int); --static char *e (p, i) -- char **p; -- int i; --{ -- return p[i]; --} --static char *f (char * (*g) (char **, int), char **p, ...) --{ -- char *s; -- va_list v; -- va_start (v,p); -- s = g (p, va_arg (v,int)); -- va_end (v); -- return s; --} --int test (int i, double x); --struct s1 {int (*f) (int a);}; --struct s2 {int (*f) (double a);}; --int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); --int argc; --char **argv; --int --main () --{ --return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -- ; -- return 0; --} --_ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" --do -- CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --fi --rm -f conftest.$ac_objext --done --rm -f conftest.$ac_ext conftest.$ac_objext --CC=$ac_save_CC -- --fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -- *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; --esac -- --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- ''\ -- '#include <stdlib.h>' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : -+# Extract the first word of "ranlib", so it can be a program name with args. -+set dummy ranlib; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:871: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.$ac_objext conftest.$ac_ext --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. --set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_RANLIB="ranlib" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" - fi - fi --RANLIB=$ac_cv_prog_RANLIB -+RANLIB="$ac_cv_prog_RANLIB" - if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+ echo "$ac_t""$RANLIB" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi - --fi --if test -z "$ac_cv_prog_RANLIB"; then -- ac_ct_RANLIB=$RANLIB -- # Extract the first word of "ranlib", so it can be a program name with args. --set dummy ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_RANLIB"; then -- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_RANLIB="ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" --fi --fi --ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB --if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- RANLIB=$ac_ct_RANLIB --else -- RANLIB="$ac_cv_prog_RANLIB" --fi -- - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or - # incompatible versions: -@@ -2333,306 +901,158 @@ - # SunOS /usr/etc/install - # IRIX /sbin/install - # AIX /bin/install --# AmigaOS /C/install, which installs bootblocks on floppy discs - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -+echo "configure:910: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in -- ./ | .// | /cC/* | \ -- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- /usr/ucb/* ) ;; -- *) -- # OSF1 and SCO ODT 3.0 have their own names for install. -- # Don't use installbsd from OSF since it installs stuff as root -- # by default. -- for ac_prog in ginstall scoinst install; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -- if test $ac_prog = install && -- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # AIX install. It has an incompatible calling convention. -- : -- elif test $ac_prog = install && -- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # program-specific install script used by HP pwplus--don't use. -- : -- else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -- fi -+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" -+ for ac_dir in $PATH; do -+ # Account for people who put trailing slashes in PATH elements. -+ case "$ac_dir/" in -+ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do -+ if test -f $ac_dir/$ac_prog; then -+ if test $ac_prog = install && -+ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then -+ # AIX install. It has an incompatible calling convention. -+ : -+ else -+ ac_cv_path_install="$ac_dir/$ac_prog -c" -+ break 2 -+ fi -+ fi - done -- done -- ;; --esac --done -+ ;; -+ esac -+ done -+ IFS="$ac_save_IFS" - -- - fi - if test "${ac_cv_path_install+set}" = set; then -- INSTALL=$ac_cv_path_install -+ INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. -- INSTALL=$ac_install_sh -+ INSTALL="$ac_install_sh" - fi - fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+echo "$ac_t""$INSTALL" 1>&6 - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. - test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -+if test $host != $build; then -+ ac_tool_prefix=${host_alias}- -+else -+ ac_tool_prefix= -+fi -+ -+# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_AR+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:971: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_AR="${ac_tool_prefix}ar" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" - fi - fi --AR=$ac_cv_prog_AR -+AR="$ac_cv_prog_AR" - if test -n "$AR"; then -- echo "$as_me:$LINENO: result: $AR" >&5 --echo "${ECHO_T}$AR" >&6 -+ echo "$ac_t""$AR" 1>&6 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$ac_t""no" 1>&6 - fi - --fi --if test -z "$ac_cv_prog_AR"; then -- ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_AR+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_AR"; then -- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done - --fi --fi --ac_ct_AR=$ac_cv_prog_ac_ct_AR --if test -n "$ac_ct_AR"; then -- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 --echo "${ECHO_T}$ac_ct_AR" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi - -- AR=$ac_ct_AR -+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -+echo "configure:1001: checking whether byte ordering is bigendian" >&5 -+if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- AR="$ac_cv_prog_AR" --fi -- -- --echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 --echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 --if test "${ac_cv_c_bigendian+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- # See if sys/param.h defines the BYTE_ORDER macro. --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ ac_cv_c_bigendian=unknown -+# See if sys/param.h defines the BYTE_ORDER macro. -+cat > conftest.$ac_ext <<EOF -+#line 1008 "configure" -+#include "confdefs.h" - #include <sys/types.h> - #include <sys/param.h> -+int main() { - --int --main () --{ - #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros - #endif -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+; return 0; } -+EOF -+if { (eval echo configure:1019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* - # It does; now see whether it defined to BIG_ENDIAN or not. --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+cat > conftest.$ac_ext <<EOF -+#line 1023 "configure" -+#include "confdefs.h" - #include <sys/types.h> - #include <sys/param.h> -+int main() { - --int --main () --{ - #if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+; return 0; } -+EOF -+if { (eval echo configure:1034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* - ac_cv_c_bigendian=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_c_bigendian=no -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_c_bigendian=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest* - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --# It does not; compile a test program. --if test "$cross_compiling" = yes; then -- # try to guess the endianness by grepping values into an object file -- ac_cv_c_bigendian=unknown -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; --short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; --void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } --short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; --short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; --void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } --int --main () --{ -- _ascii (); _ebcdic (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then -- ac_cv_c_bigendian=yes -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - fi --if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then -- if test "$ac_cv_c_bigendian" = unknown; then -- ac_cv_c_bigendian=no -- else -- # finding both strings is unlikely to happen, but who knows? -- ac_cv_c_bigendian=unknown -- fi --fi -+rm -f conftest* -+if test $ac_cv_c_bigendian = unknown; then -+if test "$cross_compiling" = yes; then -+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.$ac_objext conftest.$ac_ext --else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --int --main () --{ -+ cat > conftest.$ac_ext <<EOF -+#line 1054 "configure" -+#include "confdefs.h" -+main () { - /* Are we little or big endian? From Harbison&Steele. */ - union - { -@@ -2642,52 +1062,31 @@ - u.l = 1; - exit (u.c[sizeof (long) - 1] == 1); - } --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+EOF -+if { (eval echo configure:1067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - ac_cv_c_bigendian=no - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --ac_cv_c_bigendian=yes -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_c_bigendian=yes - fi --rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -fr conftest* - fi -+ - fi --rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 --echo "${ECHO_T}$ac_cv_c_bigendian" >&6 --case $ac_cv_c_bigendian in -- yes) - --cat >>confdefs.h <<\_ACEOF -+echo "$ac_t""$ac_cv_c_bigendian" 1>&6 -+if test $ac_cv_c_bigendian = yes; then -+ cat >> confdefs.h <<\EOF - #define WORDS_BIGENDIAN 1 --_ACEOF -- ;; -- no) -- ;; -- *) -- { { echo "$as_me:$LINENO: error: unknown endianness --presetting ac_cv_c_bigendian=no (or yes) will help" >&5 --echo "$as_me: error: unknown endianness --presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} -- { (exit 1); exit 1; }; } ;; --esac -+EOF - -+fi - -+ - if test "x$GCC" = "xyes"; then - CFLAGS="$CFLAGS -Wall" - fi -@@ -2697,14 +1096,13 @@ - case "${enableval}" in - yes) shared=true ;; - no) shared=false ;; -- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for shared options" >&5 --echo "$as_me: error: bad value ${enableval} for shared options" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *) { echo "configure: error: bad value ${enableval} for shared options" 1>&2; exit 1; } ;; - esac - else - shared=false --fi; -+fi - -+ - case "$target_cpu" in - i386|i486|i586|i686) - TARGET_CPU=i386 -@@ -2712,7 +1110,7 @@ - *) - TARGET_CPU=$target_cpu - ;; --esac -+esac - TARGET_OS=$target_os - - M68KCC= -@@ -2726,7 +1124,7 @@ - M68KCC=/usr/m68k-palmos/bin/gcc - # Generic build is ARM or M68K (probably ARM though) - CC="/usr/$TARGET_CPU-palmos/bin/gcc" -- if test "$target_cpu" = "arm" -+ if test "$target_cpu" = "arm" - then - CC="$CC -fPIC -march=armv4t" - fi -@@ -2762,7 +1160,7 @@ - *) - HOST_CPU=$host_cpu - ;; --esac -+esac - HOST_OS=$host_os - - -@@ -2800,138 +1198,91 @@ - case "${enableval}" in - yes) sockets=true ;; - no) sockets=false ;; -- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for sockets options" >&5 --echo "$as_me: error: bad value ${enableval} for sockets options" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *) { echo "configure: error: bad value ${enableval} for sockets options" 1>&2; exit 1; } ;; - esac - else - sockets=true --fi; -+fi -+ - if test "$sockets" = false; then -- cat >>confdefs.h <<\_ACEOF -+ cat >> confdefs.h <<\EOF - #define CST_NO_SOCKETS 1 --_ACEOF -+EOF - - fi - --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+cat > conftest.$ac_ext <<EOF -+#line 1216 "configure" -+#include "confdefs.h" - #include <stdio.h> --int --main () --{ -+int main() { - struct a { union { float b; int c; } d; }; -- const struct a e = { .d={ .b=3.14 } }; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ const struct a e = { .d={ .b=3.14 } }; -+; return 0; } -+EOF -+if { (eval echo configure:1224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* - unioninit=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --unioninit=no -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ unioninit=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest* - if test "$unioninit" = no; then -- cat >>confdefs.h <<\_ACEOF -+ cat >> confdefs.h <<\EOF - #define NO_UNION_INITIALIZATION 1 --_ACEOF -+EOF - - fi - --echo "$as_me:$LINENO: checking for mmap" >&5 --echo $ECHO_N "checking for mmap... $ECHO_C" >&6 --if test "${ac_cv_func_mmap+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+echo $ac_n "checking for mmap""... $ac_c" 1>&6 -+echo "configure:1242: checking for mmap" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_mmap'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ cat > conftest.$ac_ext <<EOF -+#line 1247 "configure" -+#include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char mmap (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -+ which can conflict with char mmap(); below. */ -+#include <assert.h> - /* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif - /* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char mmap (); -+ builtin and then its argument prototype would still apply. */ -+char mmap(); -+ -+int main() { -+ - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ - #if defined (__stub_mmap) || defined (__stub___mmap) - choke me - #else --char (*f) () = mmap; -+mmap(); - #endif --#ifdef __cplusplus --} --#endif - --int --main () --{ --return f != mmap; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_mmap=yes -+; return 0; } -+EOF -+if { (eval echo configure:1270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_mmap=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_func_mmap=no -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_mmap=no" - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest* - fi --echo "$as_me:$LINENO: result: $ac_cv_func_mmap" >&5 --echo "${ECHO_T}$ac_cv_func_mmap" >&6 --if test $ac_cv_func_mmap = yes; then -+ -+if eval "test \"`echo '$ac_cv_func_'mmap`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - MMAPTYPE=posix -+else -+ echo "$ac_t""no" 1>&6 - fi - - -@@ -2956,1028 +1307,266 @@ - - - AUDIODRIVER=none --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:1312: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- # Double quotes because CPP needs to be expanded -- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -- do -- ac_preproc_ok=false --for ac_c_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -+ # This must be in double quotes, not single quotes, because CPP may get -+ # substituted into the Makefile and "${CC-cc}" will confuse make. -+ CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ # not just through cpp. -+ cat > conftest.$ac_ext <<EOF -+#line 1327 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then - : - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether non-existent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- # Broken: success on invalid input. --continue --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- break --fi -- -- done -- ac_cv_prog_CPP=$CPP -- --fi -- CPP=$ac_cv_prog_CPP --else -- ac_cv_prog_CPP=$CPP --fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 --ac_preproc_ok=false --for ac_c_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -E -traditional-cpp" -+ cat > conftest.$ac_ext <<EOF -+#line 1344 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then - : - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether non-existent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- # Broken: success on invalid input. --continue --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -nologo -E" -+ cat > conftest.$ac_ext <<EOF -+#line 1361 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then - : - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP=/lib/cpp - fi -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -- fi -+rm -f conftest* - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep -- -- --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> --#include <stdarg.h> --#include <string.h> --#include <float.h> -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_header_stdc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_header_stdc=no --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- --if test $ac_cv_header_stdc = yes; then -- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <string.h> -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi - rm -f conftest* -- - fi -- --if test $ac_cv_header_stdc = yes; then -- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi - rm -f conftest* -- -+ ac_cv_prog_CPP="$CPP" - fi -- --if test $ac_cv_header_stdc = yes; then -- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -- : -+ CPP="$ac_cv_prog_CPP" - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ctype.h> --#if ((' ' & 0x0FF) == 0x020) --# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) --#else --# define ISLOWER(c) \ -- (('a' <= (c) && (c) <= 'i') \ -- || ('j' <= (c) && (c) <= 'r') \ -- || ('s' <= (c) && (c) <= 'z')) --# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) --#endif -- --#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) --int --main () --{ -- int i; -- for (i = 0; i < 256; i++) -- if (XOR (islower (i), ISLOWER (i)) -- || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); --} --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --ac_cv_header_stdc=no -+ ac_cv_prog_CPP="$CPP" - fi --rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi --fi --fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 --if test $ac_cv_header_stdc = yes; then -+echo "$ac_t""$CPP" 1>&6 - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -- --fi -- --# On IRIX 5.3, sys/types and inttypes.h are conflicting. -- -- -- -- -- -- -- -- -- --for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ac_safe=`echo "sys/soundcard.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for sys/soundcard.h""... $ac_c" 1>&6 -+echo "configure:1393: checking for sys/soundcard.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- --if test "${ac_cv_header_sys_soundcard_h+set}" = set; then -- echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 --echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_soundcard_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5 --echo $ECHO_N "checking sys/soundcard.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -+ cat > conftest.$ac_ext <<EOF -+#line 1398 "configure" -+#include "confdefs.h" - #include <sys/soundcard.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5 --echo $ECHO_N "checking sys/soundcard.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/soundcard.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes -+rm -f conftest* - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 --echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_soundcard_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_sys_soundcard_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6 -- --fi --if test $ac_cv_header_sys_soundcard_h = yes; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - AUDIODRIVER="oss" - AUDIODEFS=-DCST_AUDIO_LINUX -+else -+ echo "$ac_t""no" 1>&6 - fi - -- --if test "${ac_cv_header_machine_soundcard_h+set}" = set; then -- echo "$as_me:$LINENO: checking for machine/soundcard.h" >&5 --echo $ECHO_N "checking for machine/soundcard.h... $ECHO_C" >&6 --if test "${ac_cv_header_machine_soundcard_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_machine_soundcard_h" >&5 --echo "${ECHO_T}$ac_cv_header_machine_soundcard_h" >&6 -+ac_safe=`echo "machine/soundcard.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for machine/soundcard.h""... $ac_c" 1>&6 -+echo "configure:1427: checking for machine/soundcard.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- # Is the header compilable? --echo "$as_me:$LINENO: checking machine/soundcard.h usability" >&5 --echo $ECHO_N "checking machine/soundcard.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -+ cat > conftest.$ac_ext <<EOF -+#line 1432 "configure" -+#include "confdefs.h" - #include <machine/soundcard.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking machine/soundcard.h presence" >&5 --echo $ECHO_N "checking machine/soundcard.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <machine/soundcard.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes -+rm -f conftest* - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: machine/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: machine/soundcard.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: machine/soundcard.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for machine/soundcard.h" >&5 --echo $ECHO_N "checking for machine/soundcard.h... $ECHO_C" >&6 --if test "${ac_cv_header_machine_soundcard_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_machine_soundcard_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_machine_soundcard_h" >&5 --echo "${ECHO_T}$ac_cv_header_machine_soundcard_h" >&6 -- --fi --if test $ac_cv_header_machine_soundcard_h = yes; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - AUDIODRIVER="oss" - AUDIODEFS=-DCST_AUDIO_FREEBSD -+else -+ echo "$ac_t""no" 1>&6 - fi - -- --if test "${ac_cv_header_sys_audioio_h+set}" = set; then -- echo "$as_me:$LINENO: checking for sys/audioio.h" >&5 --echo $ECHO_N "checking for sys/audioio.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_audioio_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_audioio_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_audioio_h" >&6 -+ac_safe=`echo "sys/audioio.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for sys/audioio.h""... $ac_c" 1>&6 -+echo "configure:1461: checking for sys/audioio.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- # Is the header compilable? --echo "$as_me:$LINENO: checking sys/audioio.h usability" >&5 --echo $ECHO_N "checking sys/audioio.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -+ cat > conftest.$ac_ext <<EOF -+#line 1466 "configure" -+#include "confdefs.h" - #include <sys/audioio.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking sys/audioio.h presence" >&5 --echo $ECHO_N "checking sys/audioio.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/audioio.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes -+rm -f conftest* - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: sys/audioio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: sys/audioio.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: sys/audioio.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for sys/audioio.h" >&5 --echo $ECHO_N "checking for sys/audioio.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_audioio_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_sys_audioio_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_audioio_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_audioio_h" >&6 -- --fi --if test $ac_cv_header_sys_audioio_h = yes; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - AUDIODRIVER="sun" - AUDIODEFS=-DCST_AUDIO_SUNOS -+else -+ echo "$ac_t""no" 1>&6 - fi - -- --if test "${ac_cv_header_mmsystem_h+set}" = set; then -- echo "$as_me:$LINENO: checking for mmsystem.h" >&5 --echo $ECHO_N "checking for mmsystem.h... $ECHO_C" >&6 --if test "${ac_cv_header_mmsystem_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_mmsystem_h" >&5 --echo "${ECHO_T}$ac_cv_header_mmsystem_h" >&6 -+ ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 -+echo "configure:1495: checking for alsa/asoundlib.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- # Is the header compilable? --echo "$as_me:$LINENO: checking mmsystem.h usability" >&5 --echo $ECHO_N "checking mmsystem.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <mmsystem.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -+ cat > conftest.$ac_ext <<EOF -+#line 1500 "configure" -+#include "confdefs.h" -+#include <alsa/asoundlib.h> -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking mmsystem.h presence" >&5 --echo $ECHO_N "checking mmsystem.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <mmsystem.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes -+rm -f conftest* - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ AUDIODRIVER="alsa" -+ AUDIODEFS=-DCST_AUDIO_ALSA -+ AUDIOLIBS=-lasound - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no -+ echo "$ac_t""no" 1>&6 - fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: mmsystem.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: mmsystem.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: mmsystem.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------ ## --## Report this to bug-autoconf@gnu.org. ## --## ------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for mmsystem.h" >&5 --echo $ECHO_N "checking for mmsystem.h... $ECHO_C" >&6 --if test "${ac_cv_header_mmsystem_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ac_safe=`echo "mmsystem.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for mmsystem.h""... $ac_c" 1>&6 -+echo "configure:1530: checking for mmsystem.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_cv_header_mmsystem_h=$ac_header_preproc -+ cat > conftest.$ac_ext <<EOF -+#line 1535 "configure" -+#include "confdefs.h" -+#include <mmsystem.h> -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" - fi --echo "$as_me:$LINENO: result: $ac_cv_header_mmsystem_h" >&5 --echo "${ECHO_T}$ac_cv_header_mmsystem_h" >&6 -- -+rm -f conftest* - fi --if test $ac_cv_header_mmsystem_h = yes; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - AUDIODRIVER="wince" - AUDIODEFS=-DCST_AUDIO_WINCE - AUDIOLIBS=-lwinmm -+else -+ echo "$ac_t""no" 1>&6 - fi - - -- -- - # Check whether --with-audio or --without-audio was given. - if test "${with_audio+set}" = set; then - withval="$with_audio" -- AUDIODRIVER=$with_audio --fi; -+ AUDIODRIVER=$with_audio -+fi - -+ - if test "x$AUDIODEFS" = x; then - case "$AUDIODRIVER" in - linux|oss) -@@ -4006,34 +1595,34 @@ - - - -- - # Check whether --with-lang or --without-lang was given. - if test "${with_lang+set}" = set; then - withval="$with_lang" -- FL_LANG=$with_lang --fi; -+ FL_LANG=$with_lang -+fi -+ - if test "x$with_lang" = "x"; then - FL_LANG="usenglish" - fi - - -- - # Check whether --with-vox or --without-vox was given. - if test "${with_vox+set}" = set; then - withval="$with_vox" -- FL_VOX=$with_vox --fi; -+ FL_VOX=$with_vox -+fi -+ - if test "x$with_vox" = "x"; then - FL_VOX="cmu_us_kal" - fi - - -- - # Check whether --with-lex or --without-lex was given. - if test "${with_lex+set}" = set; then - withval="$with_lex" -- FL_LEX=$with_lex --fi; -+ FL_LEX=$with_lex -+fi -+ - if test "x$with_lex" = "x"; then - FL_LEX="cmulex" - fi -@@ -4041,921 +1630,300 @@ - - - -- ac_config_files="$ac_config_files config/config config/system.mak" --cat >confcache <<\_ACEOF -+trap '' 1 2 15 -+cat > confcache <<\EOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure --# scripts and configure runs, see configure's option --config-cache. --# It is not useful on other systems. If it contains results you don't --# want to keep, you may remove or edit it. -+# scripts and configure runs. It is not useful on other systems. -+# If it contains results you don't want to keep, you may remove or edit it. - # --# config.status only pays attention to the cache file if you give it --# the --recheck option to rerun configure. -+# By default, configure uses ./config.cache as the cache file, -+# creating it if it does not exist already. You can give configure -+# the --cache-file=FILE option to use a different cache file; that is -+# what configure does when it calls configure scripts in -+# subdirectories, so they share the cache. -+# Giving --cache-file=/dev/null disables caching, for debugging configure. -+# config.status only pays attention to the cache file if you give it the -+# --recheck option to rerun configure. - # --# `ac_cv_env_foo' variables (set or unset) will be overridden when --# loading this file, other *unset* `ac_cv_foo' will be assigned the --# following values. -- --_ACEOF -- -+EOF - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. - # So, don't put newlines in cache variables' values. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -- (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -- sed -n \ -- "s/'/'\\\\''/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -- *) -- # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -- ;; -- esac; --} | -- sed ' -- t clear -- : clear -- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ -- t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -+(set) 2>&1 | -+ case `(ac_space=' '; set | grep ac_space) 2>&1` in -+ *ac_space=\ *) -+ # `set' does not quote correctly, so add quotes (double-quote substitution -+ # turns \\\\ into \\, and sed turns \\ into \). -+ sed -n \ -+ -e "s/'/'\\\\''/g" \ -+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" -+ ;; -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' -+ ;; -+ esac >> confcache -+if cmp -s $cache_file confcache; then -+ : -+else - if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -- cat confcache >$cache_file -+ echo "updating cache $cache_file" -+ cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi - fi - rm -f confcache - -+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 -+ - test "x$prefix" = xNONE && prefix=$ac_default_prefix - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). -+# Any assignment to VPATH causes Sun make to only execute -+# the first set of double-colon rules, so remove it if not needed. -+# If there is a colon in the path, we need to keep it. - if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' -+ ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' - fi - -+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 -+ - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. --# --# If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, --# look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g --t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g --t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+cat > conftest.defs <<\EOF -+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -+s%\[%\\&%g -+s%\]%\\&%g -+s%\$%$$%g -+EOF -+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -+rm -f conftest.defs - - --ac_libobjs= --ac_ltlibobjs= --for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue -- # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' --done --LIBOBJS=$ac_libobjs -- --LTLIBOBJS=$ac_ltlibobjs -- -- -- -+# Without the "./", some shells look in PATH for config.status. - : ${CONFIG_STATUS=./config.status} --ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF --#! $SHELL --# Generated by $as_me. -+ -+echo creating $CONFIG_STATUS -+rm -f $CONFIG_STATUS -+cat > $CONFIG_STATUS <<EOF -+#! /bin/sh -+# Generated automatically by configure. - # Run this file to recreate the current configuration. -+# This directory was configured as follows, -+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+# -+# $0 $ac_configure_args -+# - # Compiler output produced by configure, useful for debugging --# configure, is in config.log if it exists. -+# configure, is in ./config.log if it exists. - --debug=false --ac_cs_recheck=false --ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF -- --cat >>$CONFIG_STATUS <<\_ACEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -- --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix --fi -- --# Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false --fi -- -- --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH --PS1='$ ' --PS2='> ' --PS4='+ ' -- --# NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME -+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -+for ac_option - do -- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi -+ case "\$ac_option" in -+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" -+ exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -+ -version | --version | --versio | --versi | --vers | --ver | --ve | --v) -+ echo "$CONFIG_STATUS generated by autoconf version 2.13" -+ exit 0 ;; -+ -help | --help | --hel | --he | --h) -+ echo "\$ac_cs_usage"; exit 0 ;; -+ *) echo "\$ac_cs_usage"; exit 1 ;; -+ esac - done - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -+ac_given_srcdir=$srcdir -+ac_given_INSTALL="$INSTALL" - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -- as_basename=basename --else -- as_basename=false --fi -+trap 'rm -fr `echo "config/config config/system.mak" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -+EOF -+cat >> $CONFIG_STATUS <<EOF - -+# Protect against being on the right side of a sed subst in config.status. -+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; -+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF -+$ac_vpsub -+$extrasub -+s%@SHELL@%$SHELL%g -+s%@CFLAGS@%$CFLAGS%g -+s%@CPPFLAGS@%$CPPFLAGS%g -+s%@CXXFLAGS@%$CXXFLAGS%g -+s%@FFLAGS@%$FFLAGS%g -+s%@DEFS@%$DEFS%g -+s%@LDFLAGS@%$LDFLAGS%g -+s%@LIBS@%$LIBS%g -+s%@exec_prefix@%$exec_prefix%g -+s%@prefix@%$prefix%g -+s%@program_transform_name@%$program_transform_name%g -+s%@bindir@%$bindir%g -+s%@sbindir@%$sbindir%g -+s%@libexecdir@%$libexecdir%g -+s%@datadir@%$datadir%g -+s%@sysconfdir@%$sysconfdir%g -+s%@sharedstatedir@%$sharedstatedir%g -+s%@localstatedir@%$localstatedir%g -+s%@libdir@%$libdir%g -+s%@includedir@%$includedir%g -+s%@oldincludedir@%$oldincludedir%g -+s%@infodir@%$infodir%g -+s%@mandir@%$mandir%g -+s%@host@%$host%g -+s%@host_alias@%$host_alias%g -+s%@host_cpu@%$host_cpu%g -+s%@host_vendor@%$host_vendor%g -+s%@host_os@%$host_os%g -+s%@target@%$target%g -+s%@target_alias@%$target_alias%g -+s%@target_cpu@%$target_cpu%g -+s%@target_vendor@%$target_vendor%g -+s%@target_os@%$target_os%g -+s%@build@%$build%g -+s%@build_alias@%$build_alias%g -+s%@build_cpu@%$build_cpu%g -+s%@build_vendor@%$build_vendor%g -+s%@build_os@%$build_os%g -+s%@CC@%$CC%g -+s%@RANLIB@%$RANLIB%g -+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -+s%@INSTALL_DATA@%$INSTALL_DATA%g -+s%@AR@%$AR%g -+s%@TARGET_OS@%$TARGET_OS%g -+s%@TARGET_CPU@%$TARGET_CPU%g -+s%@M68KCC@%$M68KCC%g -+s%@LEXDEFS@%$LEXDEFS%g -+s%@VOXDEFS@%$VOXDEFS%g -+s%@HOST_OS@%$HOST_OS%g -+s%@HOST_CPU@%$HOST_CPU%g -+s%@OTHERLIBS@%$OTHERLIBS%g -+s%@SHFLAGS@%$SHFLAGS%g -+s%@MMAPTYPE@%$MMAPTYPE%g -+s%@STDIOTYPE@%$STDIOTYPE%g -+s%@CPP@%$CPP%g -+s%@AUDIODRIVER@%$AUDIODRIVER%g -+s%@AUDIODEFS@%$AUDIODEFS%g -+s%@AUDIOLIBS@%$AUDIOLIBS%g -+s%@FL_LANG@%$FL_LANG%g -+s%@FL_VOX@%$FL_VOX%g -+s%@FL_LEX@%$FL_LEX%g -+s%@EXEEXT@%$EXEEXT%g - --# Name of the executable. --as_me=`$as_basename "$0" || --$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+CEOF -+EOF - -+cat >> $CONFIG_STATUS <<\EOF - --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -+# Split the substitutions into bite-sized pieces for seds with -+# small command number limits, like on Digital OSF/1 and HP-UX. -+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -+ac_file=1 # Number of current file. -+ac_beg=1 # First line for current file. -+ac_end=$ac_max_sed_cmds # Line after last line for current file. -+ac_more_lines=: -+ac_sed_cmds="" -+while $ac_more_lines; do -+ if test $ac_beg -gt 1; then -+ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else -- PATH_SEPARATOR=: -+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; --esac -- --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -+ if test ! -s conftest.s$ac_file; then -+ ac_more_lines=false -+ rm -f conftest.s$ac_file - else -- as_ln_s='ln -s' -+ if test -z "$ac_sed_cmds"; then -+ ac_sed_cmds="sed -f conftest.s$ac_file" -+ else -+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" -+ fi -+ ac_file=`expr $ac_file + 1` -+ ac_beg=$ac_end -+ ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln --else -- as_ln_s='cp -p' --fi --rm -f conf$$ conf$$.exe conf$$.file -- --if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: --else -- as_mkdir_p=false --fi -- --as_executable_p="test -f" -- --# Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -- --# Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -- -- --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- --exec 6>&1 -- --# Open the log real soon, to keep \$[0] and so on meaningful, and to --# report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- --This file was extended by $as_me, which was --generated by GNU Autoconf 2.57. Invocation command line was -- -- CONFIG_FILES = $CONFIG_FILES -- CONFIG_HEADERS = $CONFIG_HEADERS -- CONFIG_LINKS = $CONFIG_LINKS -- CONFIG_COMMANDS = $CONFIG_COMMANDS -- $ $0 $@ -- --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 --_ACEOF -- --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -- --cat >>$CONFIG_STATUS <<\_ACEOF -- --ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -- --Usage: $0 [OPTIONS] [FILE]... -- -- -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -- -d, --debug don't remove temporary files -- --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -- --Configuration files: --$config_files -- --Report bugs to <bug-autoconf@gnu.org>." --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF --ac_cs_version="\\ --config.status --configured by $0, generated by GNU Autoconf 2.57, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -- --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. --This config.status script is free software; the Free Software Foundation --gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir --INSTALL="$INSTALL" --_ACEOF -- --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. --ac_need_defaults=: --while test $# != 0 --do -- case $1 in -- --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -- ac_shift=: -- ;; -- -*) -- ac_option=$1 -- ac_optarg=$2 -- ac_shift=shift -- ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; -- esac -- -- case $ac_option in -- # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -- ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -- debug=: ;; -- --file | --fil | --fi | --f ) -- $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -- ac_need_defaults=false;; -- --header | --heade | --head | --hea ) -- $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -- ac_need_defaults=false;; -- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -- | -silent | --silent | --silen | --sile | --sil | --si | --s) -- ac_cs_silent=: ;; -- -- # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -- -- *) ac_config_targets="$ac_config_targets $1" ;; -- -- esac -- shift - done -- --ac_configure_extra_args= -- --if $ac_cs_silent; then -- exec 6>/dev/null -- ac_configure_extra_args="$ac_configure_extra_args --silent" -+if test -z "$ac_sed_cmds"; then -+ ac_sed_cmds=cat - fi -+EOF - --_ACEOF --cat >>$CONFIG_STATUS <<_ACEOF --if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion --fi -+cat >> $CONFIG_STATUS <<EOF - --_ACEOF -- -- -- -- -- --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_config_target in $ac_config_targets --do -- case "$ac_config_target" in -- # Handling of arguments. -- "config/config" ) CONFIG_FILES="$CONFIG_FILES config/config" ;; -- "config/system.mak" ) CONFIG_FILES="$CONFIG_FILES config/system.mak" ;; -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+CONFIG_FILES=\${CONFIG_FILES-"config/config config/system.mak"} -+EOF -+cat >> $CONFIG_STATUS <<\EOF -+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then -+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -+ case "$ac_file" in -+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` -+ ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; -+ *) ac_file_in="${ac_file}.in" ;; - esac --done - --# If the user did not use the arguments to specify the items to instantiate, --# then the envvar interface is used. Set only those that are not. --# We use the long form for the default assignment because of an extremely --# bizarre bug on SunOS 4.1.3. --if $ac_need_defaults; then -- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files --fi -+ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - --# Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, --# creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. --$debug || --{ -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 --} -- --# Create a (secure) tmp directory for tmp files. -- --{ -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" --} || --{ -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) --} || --{ -- echo "$me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } --} -- --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF -- --# --# CONFIG_FILES section. --# -- --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@target@,$target,;t t --s,@target_cpu@,$target_cpu,;t t --s,@target_vendor@,$target_vendor,;t t --s,@target_os@,$target_os,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t --s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t --s,@INSTALL_DATA@,$INSTALL_DATA,;t t --s,@AR@,$AR,;t t --s,@ac_ct_AR@,$ac_ct_AR,;t t --s,@TARGET_OS@,$TARGET_OS,;t t --s,@TARGET_CPU@,$TARGET_CPU,;t t --s,@M68KCC@,$M68KCC,;t t --s,@LEXDEFS@,$LEXDEFS,;t t --s,@VOXDEFS@,$VOXDEFS,;t t --s,@HOST_OS@,$HOST_OS,;t t --s,@HOST_CPU@,$HOST_CPU,;t t --s,@OTHERLIBS@,$OTHERLIBS,;t t --s,@SHFLAGS@,$SHFLAGS,;t t --s,@MMAPTYPE@,$MMAPTYPE,;t t --s,@STDIOTYPE@,$STDIOTYPE,;t t --s,@CPP@,$CPP,;t t --s,@EGREP@,$EGREP,;t t --s,@AUDIODRIVER@,$AUDIODRIVER,;t t --s,@AUDIODEFS@,$AUDIODEFS,;t t --s,@AUDIOLIBS@,$AUDIOLIBS,;t t --s,@FL_LANG@,$FL_LANG,;t t --s,@FL_VOX@,$FL_VOX,;t t --s,@FL_LEX@,$FL_LEX,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF -- --_ACEOF -- -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -- fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -+ # Remove last slash and all that follows it. Not all systems have dirname. -+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` -+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then -+ # The file is in a subdirectory. -+ test ! -d "$ac_dir" && mkdir "$ac_dir" -+ ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" -+ # A "../" for each directory in $ac_dir_suffix. -+ ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` -+ else -+ ac_dir_suffix= ac_dots= - fi --fi # test -n "$CONFIG_FILES" - --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+ case "$ac_given_srcdir" in -+ .) srcdir=. -+ if test -z "$ac_dots"; then top_srcdir=. -+ else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; -+ /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; -+ *) # Relative path. -+ srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" -+ top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+ case "$ac_given_INSTALL" in -+ [/$]*) INSTALL="$ac_given_INSTALL" ;; -+ *) INSTALL="$ac_dots$ac_given_INSTALL" ;; -+ esac - -- ac_builddir=. -- --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -- --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -- -- -- case $INSTALL in -- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -+ echo creating "$ac_file" -+ rm -f "$ac_file" -+ configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." -+ case "$ac_file" in -+ *Makefile*) ac_comsub="1i\\ -+# $configure_input" ;; -+ *) ac_comsub= ;; - esac - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` -+ sed -e "$ac_comsub -+s%@configure_input@%$configure_input%g -+s%@srcdir@%$srcdir%g -+s%@top_srcdir@%$top_srcdir%g -+s%@INSTALL@%$INSTALL%g -+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -+fi; done -+rm -f conftest.s* - -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo $f;; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo $f -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo $srcdir/$f -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } --_ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub --$extrasub --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --:t --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --s,@INSTALL@,$ac_INSTALL,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -+EOF -+cat >> $CONFIG_STATUS <<EOF - --done --_ACEOF -+EOF -+cat >> $CONFIG_STATUS <<\EOF - --cat >>$CONFIG_STATUS <<\_ACEOF -- --{ (exit 0); exit 0; } --_ACEOF -+exit 0 -+EOF - chmod +x $CONFIG_STATUS --ac_clean_files=$ac_clean_files_save -+rm -fr confdefs* $ac_clean_files -+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - -- --# configure is writing to config.log, and then calls config.status. --# config.status does its own redirection, appending to config.log. --# Unfortunately, on DOS this fails, as config.log is still kept open --# by configure, so config.status won't be able to write to it; its --# output is simply discarded. So we exec the FD to /dev/null, --# effectively closing config.log, so it can be properly (re)opened and --# appended to by config.status. When coming back to configure, we --# need to make the FD available again. --if test "$no_create" != yes; then -- ac_cs_success=: -- ac_config_status_args= -- test "$silent" = yes && -- ac_config_status_args="$ac_config_status_args --quiet" -- exec 5>/dev/null -- $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false -- exec 5>>config.log -- # Use ||, not &&, to avoid exiting from the if with $? = 1, which -- # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } --fi -- -Index: configure.in -=================================================================== ---- flite-1.3-release/configure.in (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/configure.in (.../release-1.2) (revision 7) -@@ -206,10 +206,10 @@ - AC_CHECK_HEADER(sys/audioio.h, - [AUDIODRIVER="sun" - AUDIODEFS=-DCST_AUDIO_SUNOS]) --dnl AC_CHECK_HEADER(sys/asoundlib.h, --dnl [AUDIODRIVER="alsa" --dnl AUDIODEFS=-DCST_AUDIO_ALSA --dnl AUDIOLIBS=-lasound]) -+ AC_CHECK_HEADER(alsa/asoundlib.h, -+ [AUDIODRIVER="alsa" -+ AUDIODEFS=-DCST_AUDIO_ALSA -+ AUDIOLIBS=-lasound]) - AC_CHECK_HEADER(mmsystem.h, - [AUDIODRIVER="wince" - AUDIODEFS=-DCST_AUDIO_WINCE -Index: src/hrg/Makefile -=================================================================== ---- flite-1.3-release/src/hrg/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/hrg/Makefile (.../release-1.2) (revision 7) -@@ -39,9 +39,14 @@ - BUILD_DIRS = - ALL_DIRS= - H = -+include $(TOP)/config/config - SRCS = cst_utterance.c cst_relation.c cst_item.c cst_ffeature.c \ - cst_rel_io.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: src/utils/Makefile -=================================================================== ---- flite-1.3-release/src/utils/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/utils/Makefile (.../release-1.2) (revision 7) -@@ -44,8 +44,13 @@ - cst_tokenstream.c cst_val.c cst_features.c \ - cst_endian.c cst_socket.c cst_val_const.c \ - cst_val_user.c cst_args.c -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) $(MMAPTYPE:%=cst_mmap_%.os) \ -+ $(STDIOTYPE:%=cst_file_%.os) -+else - OBJS := $(SRCS:.c=.o) $(MMAPTYPE:%=cst_mmap_%.o) \ - $(STDIOTYPE:%=cst_file_%.o) -+endif - FILES = Makefile $(H) $(SRCS) \ - cst_mmap_posix.c cst_mmap_win32.c cst_mmap_none.c \ - cst_file_stdio.c cst_file_wince.c cst_file_palmos.c -Index: src/audio/au_alsa.c -=================================================================== ---- flite-1.3-release/src/audio/au_alsa.c (.../flite-1.3-orig) (revision 0) -+++ flite-1.3-release/src/audio/au_alsa.c (.../release-1.2) (revision 7) -@@ -0,0 +1,311 @@ -+/*************************************************************************/ -+/* */ -+/* Language Technologies Institute */ -+/* Carnegie Mellon University */ -+/* Copyright (c) 2000 */ -+/* All Rights Reserved. */ -+/* */ -+/* Permission is hereby granted, free of charge, to use and distribute */ -+/* this software and its documentation without restriction, including */ -+/* without limitation the rights to use, copy, modify, merge, publish, */ -+/* distribute, sublicense, and/or sell copies of this work, and to */ -+/* permit persons to whom this work is furnished to do so, subject to */ -+/* the following conditions: */ -+/* 1. The code must retain the above copyright notice, this list of */ -+/* conditions and the following disclaimer. */ -+/* 2. Any modifications must be clearly marked as such. */ -+/* 3. Original authors' names are not deleted. */ -+/* 4. The authors' names are not used to endorse or promote products */ -+/* derived from this software without specific prior written */ -+/* permission. */ -+/* */ -+/* CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK */ -+/* DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING */ -+/* ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT */ -+/* SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE */ -+/* FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES */ -+/* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN */ -+/* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, */ -+/* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF */ -+/* THIS SOFTWARE. */ -+/* */ -+/*********************************************************************** */ -+/* Author: Lukas Loehrer ( */ -+/* Date: January 2005 */ -+/*************************************************************************/ -+/* */ -+/* Native access to alsa audio devices on Linux */ -+/* Tested with libasound version 1.0.10 */ -+/*************************************************************************/ -+ -+#include <stdlib.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <assert.h> -+#include <errno.h> -+ -+#include "cst_string.h" -+#include "cst_wave.h" -+#include "cst_audio.h" -+ -+#include <alsa/asoundlib.h> -+ -+ -+/*static char *pcm_dev_name = "hw:0,0"; */ -+static char *pcm_dev_name ="default"; -+ -+static inline void print_pcm_state(snd_pcm_t *handle, char *msg) -+{ -+ fprintf(stderr, "PCM state at %s = %s\n", msg, -+ snd_pcm_state_name(snd_pcm_state(handle))); -+} -+ -+cst_audiodev *audio_open_alsa(int sps, int channels, cst_audiofmt fmt) -+{ -+ cst_audiodev *ad; -+ unsigned int real_rate; -+ int err; -+ -+ /* alsa specific stuff */ -+ snd_pcm_t *pcm_handle; -+ snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK; -+ snd_pcm_hw_params_t *hwparams; -+ snd_pcm_format_t format; -+ snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED; -+ -+ /* Allocate the snd_pcm_hw_params_t structure on the stack. */ -+ snd_pcm_hw_params_alloca(&hwparams); -+ -+ /* Open pcm device */ -+ err = snd_pcm_open(&pcm_handle, pcm_dev_name, stream, 0); -+ if (err < 0) -+ { -+ cst_errmsg("audio_open_alsa: failed to open audio device %s. %s\n", -+ pcm_dev_name, snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Init hwparams with full configuration space */ -+ err = snd_pcm_hw_params_any(pcm_handle, hwparams); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to get hardware parameters from audio device. %s\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Set access mode */ -+ err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, access); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set access mode. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Determine matching alsa sample format */ -+ /* This could be implemented in a more */ -+ /* flexible way (byte order conversion). */ -+ switch (fmt) -+ { -+ case CST_AUDIO_LINEAR16: -+ if (CST_LITTLE_ENDIAN) -+ format = SND_PCM_FORMAT_S16_LE; -+ else -+ format = SND_PCM_FORMAT_S16_BE; -+ break; -+ case CST_AUDIO_LINEAR8: -+ format = SND_PCM_FORMAT_U8; -+ break; -+ case CST_AUDIO_MULAW: -+ format = SND_PCM_FORMAT_MU_LAW; -+ break; -+ default: -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to find suitable format.\n"); -+ return NULL; -+ break; -+ } -+ -+ /* Set samble format */ -+ err = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format); -+ if (err <0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set format. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Set sample rate near the disired rate */ -+ real_rate = sps; -+ err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &real_rate, 0); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set sample rate near %d. %s.\n", sps, snd_strerror(err)); -+ return NULL; -+ } -+ /*FIXME: This is probably too strict */ -+ assert(sps == real_rate); -+ -+ /* Set number of channels */ -+ assert(channels >0); -+ err = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, channels); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set number of channels to %d. %s.\n", channels, snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Commit hardware parameters */ -+ err = snd_pcm_hw_params(pcm_handle, hwparams); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set hw parameters. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Make sure the device is ready to accept data */ -+ assert(snd_pcm_state(pcm_handle) == SND_PCM_STATE_PREPARED); -+ -+ /* Write hardware parameters to flite audio device data structure */ -+ ad = cst_alloc(cst_audiodev, 1); -+ assert(ad != NULL); -+ ad->real_sps = ad->sps = sps; -+ ad->real_channels = ad->channels = channels; -+ ad->real_fmt = ad->fmt = fmt; -+ ad->platform_data = (void *) pcm_handle; -+ -+ return ad; -+} -+ -+int audio_close_alsa(cst_audiodev *ad) -+{ -+ int result; -+ snd_pcm_t *pcm_handle; -+ -+ if (ad == NULL) -+ return 0; -+ -+ pcm_handle = (snd_pcm_t *) ad->platform_data; -+ result = snd_pcm_close(pcm_handle); -+ if (result < 0) -+ { -+ cst_errmsg("audio_close_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ cst_free(ad); -+ return result; -+} -+ -+/* Returns zero if recovery was successful. */ -+static int recover_from_error(snd_pcm_t *pcm_handle, ssize_t res) -+{ -+ if (res == -EPIPE) /* xrun */ -+ { -+ res = snd_pcm_prepare(pcm_handle); -+ if (res < 0) -+ { -+ /* Failed to recover from xrun */ -+ cst_errmsg("recover_from_write_error: failed to recover from xrun. %s\n.", snd_strerror(res)); -+ return res; -+ } -+ } -+ else if (res == -ESTRPIPE) /* Suspend */ -+ { -+ while ((res = snd_pcm_resume(pcm_handle)) == -EAGAIN) -+ { -+ snd_pcm_wait(pcm_handle, 1000); -+ } -+ if (res < 0) -+ { -+ res = snd_pcm_prepare(pcm_handle); -+ if (res <0) -+ { -+ /* Resume failed */ -+ cst_errmsg("audio_recover_from_write_error: failed to resume after suspend. %s\n.", snd_strerror(res)); -+ return res; -+ } -+ } -+ } -+ else if (res < 0) -+ { -+ /* Unknown failure */ -+ cst_errmsg("audio_recover_from_write_error: %s.\n", snd_strerror(res)); -+ return res; -+ } -+ return 0; -+} -+ -+int audio_write_alsa(cst_audiodev *ad, void *samples, int num_bytes) -+{ -+ size_t frame_size; -+ ssize_t num_frames, res; -+ snd_pcm_t *pcm_handle; -+ char *buf = (char *) samples; -+ -+ /* Determine frame size in bytes */ -+ frame_size = audio_bps(ad->real_fmt) * ad->real_channels; -+ /* Require that only complete frames are handed in */ -+ assert((num_bytes % frame_size) == 0); -+ num_frames = num_bytes / frame_size; -+ pcm_handle = (snd_pcm_t *) ad->platform_data; -+ -+ while (num_frames > 0) -+ { -+ res = snd_pcm_writei(pcm_handle, buf, num_frames); -+ if (res != num_frames) -+ { -+ if (res == -EAGAIN || (res > 0 && res < num_frames)) -+ { -+ snd_pcm_wait(pcm_handle, 100); -+ } -+ else if (recover_from_error(pcm_handle, res) < 0) -+ { -+ return -1; -+ } -+ } -+ -+ if (res >0) -+ { -+ num_frames -= res; -+ buf += res * frame_size; -+ } -+ } -+ return num_bytes; -+} -+ -+int audio_flush_alsa(cst_audiodev *ad) -+{ -+ int result; -+ result = snd_pcm_drain((snd_pcm_t *) ad->platform_data); -+ if (result < 0) -+ { -+ cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ /* Prepare device for more data */ -+ result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data); -+if (result < 0) -+ { -+ cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ return result; -+} -+ -+int audio_drain_alsa(cst_audiodev *ad) -+{ -+ int result; -+ result = snd_pcm_drop((snd_pcm_t *) ad->platform_data); -+ if (result < 0) -+ { -+ cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+/* Prepare device for more data */ -+ result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data); -+if (result < 0) -+ { -+ cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ return result; -+} -Index: src/audio/Makefile -=================================================================== ---- flite-1.3-release/src/audio/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/audio/Makefile (.../release-1.2) (revision 7) -@@ -43,9 +43,13 @@ - - BASESRCS = auclient.c auserver.c audio.c - SRCS = $(BASESRCS) $(AUDIODRIVER:%=au_%.c) --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(BASESRCS) au_command.c au_none.c \ -- au_oss.c au_sun.c au_wince.c au_palmos.c -+ au_oss.c au_sun.c au_wince.c au_palmos.c au_alsa.c - LIBNAME = flite - - LOCAL_INCLUDES = -I. $(AUDIODEFS) -Index: src/lexicon/Makefile -=================================================================== ---- flite-1.3-release/src/lexicon/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/lexicon/Makefile (.../release-1.2) (revision 7) -@@ -38,8 +38,13 @@ - DIRNAME=src/lexicon - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_lexicon.c cst_lts.c cst_lts_rewrites.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(SRCS) - LIBNAME = flite - -Index: src/synth/Makefile -=================================================================== ---- flite-1.3-release/src/synth/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/synth/Makefile (.../release-1.2) (revision 7) -@@ -38,9 +38,14 @@ - DIRNAME=src/synth - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_synth.c cst_utt_utils.c cst_voice.c cst_phoneset.c \ - flite.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(SRCS) - LIBNAME = flite - -Index: src/speech/Makefile -=================================================================== ---- flite-1.3-release/src/speech/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/speech/Makefile (.../release-1.2) (revision 7) -@@ -39,9 +39,14 @@ - BUILD_DIRS = - ALL_DIRS= - H = -+include $(TOP)/config/config - SRCS = cst_wave.c cst_wave_io.c cst_track.c cst_track_io.c \ - cst_wave_utils.c cst_lpcres.c rateconv.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: src/wavesynth/Makefile -=================================================================== ---- flite-1.3-release/src/wavesynth/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/wavesynth/Makefile (.../release-1.2) (revision 7) -@@ -38,9 +38,14 @@ - DIRNAME=src/wavesynth - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_units.c cst_sigpr.c cst_clunits.c cst_diphone.c \ - cst_sigprFP.c cst_sts.c cst_reflpc.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - LIBNAME = flite - FILES = Makefile $(SRCS) - -Index: src/regex/Makefile -=================================================================== ---- flite-1.3-release/src/regex/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/regex/Makefile (.../release-1.2) (revision 7) -@@ -42,8 +42,13 @@ - DIRNAME=src/regex - BUILD_DIRS = - ALL_DIRS= -+include $(TOP)/config/config - SRCS = cst_regex.c regexp.c regsub.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: src/stats/Makefile -=================================================================== ---- flite-1.3-release/src/stats/Makefile (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/src/stats/Makefile (.../release-1.2) (revision 7) -@@ -39,8 +39,13 @@ - BUILD_DIRS = - ALL_DIRS= - H = -+include $(TOP)/config/config - SRCS = cst_cart.c cst_viterbi.c cst_ss.c --OBJS = $(SRCS:.c=.o) -+ifdef SHFLAGS -+OBJS := $(SRCS:.c=.os) -+else -+OBJS := $(SRCS:.c=.o) -+endif - FILES = Makefile $(H) $(SRCS) - LIBNAME = flite - -Index: config/common_make_rules -=================================================================== ---- flite-1.3-release/config/common_make_rules (.../flite-1.3-orig) (revision 7) -+++ flite-1.3-release/config/common_make_rules (.../release-1.2) (revision 7) -@@ -73,12 +73,13 @@ - ifdef SHFLAGS - SOOBJS = $(OBJS:.o=.os) - FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%) --ifdef LIBNAME --ALL += $(OBJDIR)/.build_so -+#ifdef LIBNAME -+#ALL += $(OBJDIR)/.build_so -+#endif - endif --endif - ifdef LIBNAME - ALL += $(OBJDIR)/.build_lib -+ALL += $(OBJDIR)/.build_so - endif - # Only do some directories when you are not cross compiling - ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) -@@ -117,14 +118,17 @@ - @ touch $(OBJDIR)/.build_so - - # Used in the lib/ directory and in building new voices --$(OBJDIR)/%.so: %.shared.a -+#$(OBJDIR)/%.so: %.shared.a -+%.so: %.shared.a - @ echo making $@ - @ rm -rf shared_os && mkdir shared_os - @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} - @ (cd shared_os && ar x ../$<) - @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) -- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} -- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ -+ #@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} -+ #@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ -+ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} -+ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@ - @ rm -rf shared_os - - $(OBJDIR)/.make_build_dirs: -Index: lib/Makefile -=================================================================== ---- flite-1.3-release/lib/Makefile (.../flite-1.3-orig) (revision 0) -+++ flite-1.3-release/lib/Makefile (.../release-1.2) (revision 7) -@@ -0,0 +1,70 @@ -+########################################################################### -+## ## -+## Language Technologies Institute ## -+## Carnegie Mellon University ## -+## Copyright (c) 1999 ## -+## All Rights Reserved. ## -+## ## -+## Permission is hereby granted, free of charge, to use and distribute ## -+## this software and its documentation without restriction, including ## -+## without limitation the rights to use, copy, modify, merge, publish, ## -+## distribute, sublicense, and/or sell copies of this work, and to ## -+## permit persons to whom this work is furnished to do so, subject to ## -+## the following conditions: ## -+## 1. The code must retain the above copyright notice, this list of ## -+## conditions and the following disclaimer. ## -+## 2. Any modifications must be clearly marked as such. ## -+## 3. Original authors' names are not deleted. ## -+## 4. The authors' names are not used to endorse or promote products ## -+## derived from this software without specific prior written ## -+## permission. ## -+## ## -+## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ## -+## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## -+## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## -+## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ## -+## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## -+## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## -+## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## -+## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## -+## THIS SOFTWARE. ## -+## ## -+########################################################################### -+## ## -+## FLITE libraries ## -+## ## -+########################################################################### -+TOP=.. -+DIRNAME=lib -+BUILD_DIRS = -+ALL_DIRS= -+FILES = Makefile -+LIBNAMES = flite flite_cmulex flite_usenglish \ -+ flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb -+ -+STATICLIBS= $(LIBNAMES:%=lib%.a) -+SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a) -+#SHAREDLIBS = $(LIBNAMES:%=lib%.so) -+SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so) -+VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \ -+ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION}) -+ALL_LIBS = $(STATICLIBS) $(SHAREDLIBS) $(VERSIONSHAREDLIBS) -+ -+ALL = shared_libs -+ -+LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION} -+ -+include $(TOP)/config/common_make_rules -+ -+ifdef SHFLAGS -+shared_libs: $(SHAREDLIBS) -+else -+shared_libs: nothing -+endif -+ -+install: -+ @ cp -vf $(LIBDIR)/* . -+ @ $(MAKE) shared_libs -+ @ echo ARLIBS: $(SHAREDARLIBS) -+ @ echo SHARLIBS: $(SHAREDLIBS) -+ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -) diff --git a/packages/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch b/packages/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch deleted file mode 100644 index e1e7aed508..0000000000 --- a/packages/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- flite-1.3-release/configure.in.old 2008-01-06 02:17:47.000000000 -0600 -+++ flite-1.3-release/configure.in 2008-01-06 02:19:56.000000000 -0600 -@@ -220,7 +220,8 @@ dnl allow the user to override the one d - dnl - AC_ARG_WITH( audio, - [ --with-audio with specific audio support (none linux freebsd etc) ], -- AUDIODRIVER=$with_audio ) -+ [AUDIODRIVER=$with_audio -+ AUDIODEFS=]) - - if test "x$AUDIODEFS" = x; then - case "$AUDIODRIVER" in diff --git a/packages/flite/flite-alsa_1.2.bb b/packages/flite/flite-alsa_1.2.bb deleted file mode 100644 index 92db8c34f9..0000000000 --- a/packages/flite/flite-alsa_1.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require flite.inc - -PR = "r1" - -EXTRA_OECONF = "--with-audio=alsa --enable-shared" - -SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \ -# file://fix-read-only-assignments.patch;patch=1 \ # included in the alsa patch -#source http://homepage.hispeed.ch/loehrer/downloads/flite-1.2-alsa_support-1.2.diff.bz2 \ - file://flite-1.2-alsa_support-1.2.diff;patch=1" diff --git a/packages/flite/flite-alsa_1.3.bb b/packages/flite/flite-alsa_1.3.bb deleted file mode 100644 index 438fe38e0e..0000000000 --- a/packages/flite/flite-alsa_1.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -require flite.inc - -PR = "r1" - -EXTRA_OECONF = "--with-audio=alsa --enable-shared" - -SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.gz \ -# file://fix-read-only-assignments.patch;patch=1 \ # fixed elsewhere in 1.3 release? -#source http://homepage.hispeed.ch/loehrer/downloads/flite-1.3-alsa_support-1.2.diff.bz2 \ - file://flite-1.3-alsa_support-1.2.diff;patch=1 \ - file://flite-alsa-1.3-configure-with-audio.patch;patch=1" diff --git a/packages/flite/flite.inc b/packages/flite/flite.inc deleted file mode 100644 index 60a9d04419..0000000000 --- a/packages/flite/flite.inc +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "flite - the festival light speech synthesizer" -PRIORITY = "optional" -HOMEPAGE = "http://www.speech.cs.cmu.edu/flite/" -SECTION = "console/utils" -LICENSE = "flite" -DEPENDS = "alsa-oss" - -PARALLEL_MAKE = "" - -S = "${WORKDIR}/flite-${PV}-release" - -CFLAGS += " -lasound " - -inherit autotools - -PACKAGES += "lib${PN} lib${PN}-vox8 lib${PN}-vox16" - -FILES_${PN} = "${bindir}" - -FILES_lib${PN} ="${libdir}/libflite.so.* \ - ${libdir}/libflite_cmu_time_awb.so.* \ - ${libdir}/libflite_cmulex.so.* \ - ${libdir}/libflite_usenglish.so.*" - -FILES_lib${PN}-vox8 = "${libdir}/libflite_cmu_us_kal.so.*" - -FILES_lib${PN}-vox16 = "${libdir}/libflite_cmu_us_kal16.so.*" - -LEAD_SONAME = "libflite.so" - -do_install() { - oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install -} - -do_stage () { - install -d ${STAGING_INCDIR}/flite - install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/flite/ - - oe_libinstall -C lib -a -so libflite ${STAGING_LIBDIR} - oe_libinstall -C lib -a -so libflite_cmu_time_awb ${STAGING_LIBDIR} - oe_libinstall -C lib -a -so libflite_cmulex ${STAGING_LIBDIR} - oe_libinstall -C lib -a -so libflite_usenglish ${STAGING_LIBDIR} - oe_libinstall -C lib -a -so libflite_cmu_us_kal ${STAGING_LIBDIR} - oe_libinstall -C lib -a -so libflite_cmu_us_kal16 ${STAGING_LIBDIR} -} diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb deleted file mode 100644 index 7169663ce7..0000000000 --- a/packages/flite/flite_1.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require flite.inc - -PR = "r5" - -EXTRA_OECONF = "--with-audio=oss --enable-shared" - -SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \ - file://fix-read-only-assignments.patch;patch=1 \ - file://configure-with-audio.patch;patch=1" diff --git a/packages/flite/flite_1.3.bb b/packages/flite/flite_1.3.bb deleted file mode 100644 index 360ccb0c23..0000000000 --- a/packages/flite/flite_1.3.bb +++ /dev/null @@ -1,10 +0,0 @@ -require flite.inc - -PR = "r3" - -EXTRA_OECONF = "--with-audio=oss --enable-shared" - -SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.gz \ - file://flite-1.3-Makefile.patch;patch=1 \ -# file://flite-1.3-fix-read-only-assignments.patch;patch=1 \ # fixed elsewhere in 1.3 release? - file://flite-1.3-configure-with-audio.patch;patch=1" |