ref: acc3489e9bc94a63880f92e46d9755ce190a8a65
parent: 7590072160e1322e61a641ce5d5a08ecddefe8c7
author: jching <jching>
date: Sat Aug 24 07:20:59 EDT 2002
ALSA 0.9.X support.
--- a/configure
+++ b/configure
@@ -1,160 +1,59 @@
#! /bin/sh
-# From configure.in 1.3.
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52d.
-#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-# 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
+# From configure.in 1.3
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-# 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"
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then- emulate sh
- NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then- set -o posix
-fi
-# Name of the executable.
-as_me=`echo "$0" |sed 's,.*[\\/],,'`
-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
-
-as_executable_p="test -f"
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
-# NLS nuisances.
-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export 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
-
+# Guess values for system-dependent variables and create Makefiles.
+# Generated automatically using autoconf version 2.13
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
-# Initializations.
-#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# Defaults:
+ac_help=
ac_default_prefix=/usr/local
-cross_compiling=no
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}+# Any additions from configure.in:
+ac_help="$ac_help
+ --enable-old-rate Use old rate code"
+ac_help="$ac_help
+ --disable-fast-ulaw Disable fast ulaw compression (-32K memory)"
+ac_help="$ac_help
+ --disable-fast-alaw Disable fast alaw compression (-32K memory)"
+ac_help="$ac_help
+ --disable-gsm Disable internal GSM support"
+ac_help="$ac_help
+ --with-alsa-dsp Force support for /dev/snd/pcmABXY (ALSA)"
+ac_help="$ac_help
+ --with-oss-dsp Force support for /dev/dsp (OSS)"
+ac_help="$ac_help
+ --with-sun-audio Force support for /dev/audio (SUN, etc)"
+ac_help="$ac_help
+ --with-ogg-vorbislib Location of Ogg Vorbis libraries (=dir)"
+ac_help="$ac_help
+ --with-ogg-vorbisinc Location of Ogg Vorbis headers (=dir)"
+ac_help="$ac_help
+ --with-madlib Location of MAD (MP3 Audio Decoder) libraries (=dir)"
+ac_help="$ac_help
+ --with-madinc Location of MAD (MP3 Audio Decoder) headers (=dir)"
+ac_help="$ac_help
+ --with-lamelib Location of LAME (LAME Ain't an MP3 Encoder) libraries (=dir)"
+ac_help="$ac_help
+ --with-lameinc Location of LAME (LAME Ain't an MP3 Encoder) headers (=dir)"
-# 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}-
-ac_unique_file="sox.c"
-# 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"
-
# 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
@@ -163,15 +62,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'@@ -185,16 +79,17 @@
infodir='${prefix}/info' mandir='${prefix}/man'-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+# 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"
@@ -202,21 +97,24 @@
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)
@@ -223,38 +121,35 @@
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- \
@@ -263,23 +158,71 @@
-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)
@@ -286,17 +229,17 @@
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)
@@ -303,7 +246,7 @@
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 \
@@ -312,12 +255,12 @@
-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.
@@ -338,12 +281,12 @@
-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)
@@ -350,7 +293,7 @@
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)
@@ -357,7 +300,7 @@
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 \
@@ -374,7 +317,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)
@@ -384,7 +327,7 @@
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
| --sbi=* | --sb=*)
- sbindir=$ac_optarg ;;
+ sbindir="$ac_optarg" ;;
-sharedstatedir | --sharedstatedir | --sharedstatedi \
| --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -395,17 +338,17 @@
| --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)
@@ -412,40 +355,41 @@
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.
@@ -456,7 +400,7 @@
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)
@@ -463,29 +407,19 @@
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
@@ -492,62 +426,72 @@
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 path 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 path 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.
-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: should be removed in autoconf 3.0.
-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=sox.c
-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_prog=$0
- ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
+ 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
@@ -558,339 +502,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
-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 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]
- --enable-old-rate Use old rate code
- --disable-fast-ulaw Disable fast ulaw compression (-32K memory)
- --disable-fast-alaw Disable fast alaw compression (-32K memory)
- --disable-gsm Disable internal GSM support
-
-Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-alsa-dsp Force support for /dev/snd/pcmABXY (ALSA)
- --with-oss-dsp Force support for /dev/dsp (OSS)
- --with-sun-audio Force support for /dev/audio (SUN, etc)
- --with-ogg-vorbislib Location of Ogg Vorbis libraries (=dir)
- --with-ogg-vorbisinc Location of Ogg Vorbis headers (=dir)
- --with-madlib Location of MAD (MP3 Audio Decoder) libraries (=dir)
- --with-madinc Location of MAD (MP3 Audio Decoder) headers (=dir)
- --with-lamelib Location of LAME (LAME Ain't an MP3 Encoder) libraries (=dir)
- --with-lameinc Location of LAME (LAME Ain't an MP3 Encoder) headers (=dir)
-
-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
- cd $ac_dir
- 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
-
- # 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
-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.52d. 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`
-
-PATH = $PATH
-
-_ASUNAME
-} >&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.
-# Also quote any args containing shell meta-characters.
-ac_configure_args=
-ac_sep=
-for ac_arg
-do
- 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_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
- ac_sep=" " ;;
- *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
- ac_sep=" " ;;
- esac
- # Get rid of the leading space.
-done
-
-# 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
- if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
- echo
- sed "/^$/d" confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
- } >&5
- rm -rf conftest* confdefs* core core.* *.core 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
-
-# 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
@@ -901,113 +519,49 @@
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
- { echo "$as_me:904: 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:915: 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:923: 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:939: 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:943: 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:949: 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:951: former value: $ac_old_val" >&5-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:953: 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. It doesn't matter if
- # we pass some twice (in addition to the command line arguments).
- if test "$ac_new_set" = set; then
- case $ac_new_val in
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
- ac_configure_args="$ac_configure_args '$ac_arg'"
- ;;
- *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
- ;;
- esac
- fi
-done
-if $ac_cache_corrupted; then
- { echo "$as_me:972: 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:974: 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
-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
-echo "#! $SHELL" >conftest.sh
-echo "exit 0" >>conftest.sh
-chmod +x conftest.sh
-if { (echo "$as_me:994: PATH=\".;.\"; conftest.sh") >&5- (PATH=".;."; conftest.sh) 2>&5
- ac_status=$?
- echo "$as_me:997: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- ac_path_separator=';'
+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_path_separator=:
+ ac_n= ac_c='\c' ac_t=
fi
-PATH_SEPARATOR="$ac_path_separator"
-rm -f conftest.sh
+
+
+
# Check whether --enable-old_rate or --disable-old_rate was given.
if test "${enable_old_rate+set}" = set; thenenableval="$enable_old_rate"
+ :
+fi
-fi;
# Check whether --enable-fast_ulaw or --disable-fast_ulaw was given.
if test "${enable_fast_ulaw+set}" = set; then@@ -1015,8 +569,9 @@
enable_fast_ulaw=$enableval
else
enable_fast_ulaw=yes
-fi;
+fi
+
# Check whether --enable-fast_alaw or --disable-fast_alaw was given.
if test "${enable_fast_alaw+set}" = set; thenenableval="$enable_fast_alaw"
@@ -1023,8 +578,9 @@
enable_fast_alaw=$enableval
else
enable_fast_alaw=yes
-fi;
+fi
+
# Check whether --enable-gsm or --disable-gsm was given.
if test "${enable_gsm+set}" = set; thenenableval="$enable_gsm"
@@ -1031,8 +587,9 @@
enable_gsm=$enableval
else
enable_gsm=yes
-fi;
+fi
+
# Check whether --with-alsa_dsp or --without-alsa_dsp was given.
if test "${with_alsa_dsp+set}" = set; thenwithval="$with_alsa_dsp"
@@ -1039,8 +596,9 @@
alsa_dsp="$withval"
else
alsa_dsp=auto
-fi;
+fi
+
# Check whether --with-oss_dsp or --without-oss_dsp was given.
if test "${with_oss_dsp+set}" = set; thenwithval="$with_oss_dsp"
@@ -1047,8 +605,9 @@
oss_dsp="$withval"
else
oss_dsp=auto
-fi;
+fi
+
# Check whether --with-sun_audio or --without-sun_audio was given.
if test "${with_sun_audio+set}" = set; thenwithval="$with_sun_audio"
@@ -1055,8 +614,9 @@
sun_audio="$withval"
else
sun_audio=auto
-fi;
+fi
+
# Check whether --with-ogg_vorbislib or --without-ogg_vorbislib was given.
if test "${with_ogg_vorbislib+set}" = set; thenwithval="$with_ogg_vorbislib"
@@ -1063,8 +623,9 @@
ogg_vorbislib="$withval"
else
ogg_vorbislib=auto
-fi;
+fi
+
# Check whether --with-ogg_vorbisinc or --without-ogg_vorbisinc was given.
if test "${with_ogg_vorbisinc+set}" = set; thenwithval="$with_ogg_vorbisinc"
@@ -1071,8 +632,9 @@
ogg_vorbisinc="$withval"
else
ogg_vorbisinc=auto
-fi;
+fi
+
# Check whether --with-madlib or --without-madlib was given.
if test "${with_madlib+set}" = set; thenwithval="$with_madlib"
@@ -1079,8 +641,9 @@
madlib="$withval"
else
madlib=auto
-fi;
+fi
+
# Check whether --with-madinc or --without-madinc was given.
if test "${with_madinc+set}" = set; thenwithval="$with_madinc"
@@ -1087,8 +650,9 @@
madinc="$withval"
else
madinc=auto
-fi;
+fi
+
# Check whether --with-lamelib or --without-lamelib was given.
if test "${with_lamelib+set}" = set; thenwithval="$with_lamelib"
@@ -1095,8 +659,9 @@
lamelib="$withval"
else
lamelib=auto
-fi;
+fi
+
# Check whether --with-lameinc or --without-lameinc was given.
if test "${with_lameinc+set}" = set; thenwithval="$with_lameinc"
@@ -1103,198 +668,74 @@
lameinc="$withval"
else
lameinc=auto
-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
-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:1116: 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
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}gcc"-echo "$as_me:1131: found $ac_dir/$ac_word" >&5
-break
-done
-
fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:1139: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6-else
- echo "$as_me:1142: 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:1151: 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:678: 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
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1166: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:1174: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6-else
- echo "$as_me:1177: 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:1190: 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
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}cc"-echo "$as_me:1205: found $ac_dir/$ac_word" >&5
-break
-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:1213: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6+ echo "$ac_t""$CC" 1>&6
else
- echo "$as_me:1216: 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:1225: 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
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1240: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:1248: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6-else
- echo "$as_me:1251: 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:1264: 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:708: 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
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-fi
-ac_cv_prog_CC="cc"
-echo "$as_me:1284: found $ac_dir/$ac_word" >&5
-break
-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
- set dummy "$ac_dir/$ac_word" ${1+"$@"}+ set dummy "$ac_dir/$ac_word" "$@"
shift
ac_cv_prog_CC="$@"
fi
@@ -1301,406 +742,143 @@
fi
fi
fi
-CC=$ac_cv_prog_CC
+CC="$ac_cv_prog_CC"
if test -n "$CC"; then
- echo "$as_me:1306: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6+ echo "$ac_t""$CC" 1>&6
else
- echo "$as_me:1309: 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:1320: 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:759: 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
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1335: found $ac_dir/$ac_word" >&5
-break
-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:1343: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6+ echo "$ac_t""$CC" 1>&6
else
- echo "$as_me:1346: result: no" >&5
-echo "${ECHO_T}no" >&6+ echo "$ac_t""no" 1>&6
fi
-
- test -n "$CC" && break
- done
+ ;;
+ esac
+ fi
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }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:1359: 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
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1374: found $ac_dir/$ac_word" >&5
-break
-done
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:1382: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6-else
- echo "$as_me:1385: result: no" >&5
-echo "${ECHO_T}no" >&6-fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:791: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- test -n "$ac_ct_CC" && break
-done
+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
- CC=$ac_ct_CC
-fi
+cat > conftest.$ac_ext << EOF
-fi
-
-test -z "$CC" && { { echo "$as_me:1397: error: no acceptable cc found in \$PATH" >&5-echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }-
-# Provide some information about the compiler.
-echo "$as_me:1402:" \
- "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1405: \"$ac_compiler --version </dev/null >&5\"") >&5- (eval $ac_compiler --version </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:1408: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:1410: \"$ac_compiler -v </dev/null >&5\"") >&5- (eval $ac_compiler -v </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:1413: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:1415: \"$ac_compiler -V </dev/null >&5\"") >&5- (eval $ac_compiler -V </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:1418: \$? = $ac_status" >&5
- (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-#line 1422 "configure"
+#line 802 "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe"
-# 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:1444: 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:1447: \"$ac_link_default\"") >&5- (eval $ac_link_default) 2>&5
- ac_status=$?
- echo "$as_me:1450: \$? = $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.
-for ac_file in `ls a.exe conftest.exe 2>/dev/null;
- ls a.out conftest 2>/dev/null;
- ls a.* conftest.* 2>/dev/null`; do
- case $ac_file in
- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;;
- a.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 --akim.
- export ac_cv_exeext
- break;;
- * ) break;;
- esac
-done
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1473: error: C compiler cannot create executables" >&5-echo "$as_me: error: C compiler cannot create executables" >&2;}
- { (exit 77); exit 77; }; }-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:1479: 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:1484: 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:1490: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:1493: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cross_compiling=no
+main(){return(0);}+EOF
+if { (eval echo configure:807: \"$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:1500: error: cannot run C compiled programs.-If you meant to cross compile, use \`--host'." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'." >&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:1508: 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
-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:1515: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1517: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6-
-echo "$as_me:1520: checking for executable suffix" >&5
-echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1522: \"$ac_link\"") >&5- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:1525: \$? = $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 `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
- case $ac_file in
- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
- break;;
- * ) break;;
- esac
-done
-else
- { { echo "$as_me:1541: error: cannot compute EXEEXT: cannot compile and link" >&5-echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&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:833: 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:1547: 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:1553: checking for object suffix" >&5
-echo $ECHO_N "checking for object suffix... $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:838: 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 1559 "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }+ cat > conftest.c <<EOF
+#ifdef __GNUC__
+ yes;
#endif
-int
-main ()
-{-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1577: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:1580: \$? = $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 ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-done
+EOF
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:847: \"$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
-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1592: error: cannot compute OBJEXT: cannot compile" >&5-echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
- { (exit 1); exit 1; }; }+ ac_cv_prog_gcc=no
fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:1599: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:1603: 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 1609 "configure"
-#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-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:1630: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:1633: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:1636: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:1639: \$? = $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
-cat 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:1651: 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:1657: 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:866: 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 1663 "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1681: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:1684: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:1687: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:1690: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ echo 'void f(){}' > conftest.c+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; thenac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
+ ac_cv_prog_cc_g=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+
fi
-echo "$as_me:1700: 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"
@@ -1714,203 +892,37 @@
CFLAGS=
fi
fi
-# 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:1727: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:1730: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:1733: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:1736: \$? = $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 1748 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-$ac_declaration
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1767: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:1770: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:1773: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:1776: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-continue
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-#line 1786 "configure"
-#include "confdefs.h"
-$ac_declaration
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1804: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:1807: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:1810: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:1813: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
-else
- echo "$as_me: failed program was:" >&5
-cat 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
+# 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:900: 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
-cat 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:1843: 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
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"-echo "$as_me:1858: found $ac_dir/$ac_word" >&5
-break
-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:1866: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6+ echo "$ac_t""$RANLIB" 1>&6
else
- echo "$as_me:1869: 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:1878: 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
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:1893: found $ac_dir/$ac_word" >&5
-break
-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:1902: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6-else
- echo "$as_me:1905: result: no" >&5
-echo "${ECHO_T}no" >&6-fi
-
- RANLIB=$ac_ct_RANLIB
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then
@@ -1921,20 +933,14 @@
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:1931: 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.
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -1943,39 +949,31 @@
# 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:1951: 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:958: 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
- ac_save_IFS=$IFS; IFS=$ac_path_separator
+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"for ac_dir in $PATH; do
- IFS=$ac_save_IFS
# Account for people who put trailing slashes in PATH elements.
- case $ac_dir/ in
- / | ./ | .// | /cC/* \
- | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
- | /usr/ucb/* ) ;;
+ 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 $as_executable_p "$ac_dir/$ac_prog"; then
+ if test -f $ac_dir/$ac_prog; then
if test $ac_prog = install &&
- grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
:
- elif test $ac_prog = install &&
- grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
else
ac_cv_path_install="$ac_dir/$ac_prog -c"
break 2
@@ -1985,357 +983,255 @@
;;
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:2000: 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'-echo "$as_me:2011: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
- echo "$as_me:2015: result: yes" >&5
-echo "${ECHO_T}yes" >&6+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+echo "configure:1011: checking whether ln -s works" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- echo "$as_me:2018: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6+ rm -f conftestdata
+if ln -s X conftestdata 2>/dev/null
+then
+ rm -f conftestdata
+ ac_cv_prog_LN_S="ln -s"
+else
+ ac_cv_prog_LN_S=ln
fi
+fi
+LN_S="$ac_cv_prog_LN_S"
+if test "$ac_cv_prog_LN_S" = "ln -s"; then
+ echo "$ac_t""yes" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+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:2027: 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:1032: 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.
+ # 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 2048 "configure"
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+#line 1047 "configure"
#include "confdefs.h"
#include <assert.h>
- Syntax error
-_ACEOF
-if { (eval echo "$as_me:2053: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:2059: \$? = $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
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1053: \"$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
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
cat 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 2082 "configure"
+ rm -rf conftest*
+ CPP="${CC-cc} -E -traditional-cpp"+ cat > conftest.$ac_ext <<EOF
+#line 1064 "configure"
#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:2086: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:2092: \$? = $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
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1070: \"$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
- 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
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
cat 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:2129: 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.
- # 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 2139 "configure"
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"+ cat > conftest.$ac_ext <<EOF
+#line 1081 "configure"
#include "confdefs.h"
#include <assert.h>
- Syntax error
-_ACEOF
-if { (eval echo "$as_me:2144: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:2150: \$? = $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
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1087: \"$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
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
- # Broken: fails on valid input.
-continue
+ rm -rf conftest*
+ CPP=/lib/cpp
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 2173 "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:2177: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:2183: \$? = $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
- # Broken: success on invalid input.
-continue
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- # Passes both tests.
-ac_preproc_ok=:
-break
+rm -f conftest*
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
- :
+rm -f conftest*
+ ac_cv_prog_CPP="$CPP"
+fi
+ CPP="$ac_cv_prog_CPP"
else
- { { echo "$as_me:2211: error: C preprocessor \"$CPP\" fails sanity check" >&5-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
- { (exit 1); exit 1; }; }+ ac_cv_prog_CPP="$CPP"
fi
+echo "$ac_t""$CPP" 1>&6
-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
-
for ac_prog in sed
do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
+# 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:2226: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_SED+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1116: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_SED'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$SED"; then
ac_cv_prog_SED="$SED" # Let the user override the test.
else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_SED="$ac_prog"
-echo "$as_me:2241: found $ac_dir/$ac_word" >&5
-break
-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_SED="$ac_prog"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
fi
fi
-SED=$ac_cv_prog_SED
+SED="$ac_cv_prog_SED"
if test -n "$SED"; then
- echo "$as_me:2249: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6+ echo "$ac_t""$SED" 1>&6
else
- echo "$as_me:2252: result: no" >&5
-echo "${ECHO_T}no" >&6+ echo "$ac_t""no" 1>&6
fi
- test -n "$SED" && break
+test -n "$SED" && break
done
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:2261: error: cannot run $ac_config_sub" >&5-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
- { (exit 1); exit 1; }; }-echo "$as_me:2265: 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:2274: 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:2278: 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; }; }-fi
-echo "$as_me:2283: 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/'`
+# 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.
-echo "$as_me:2290: 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:2299: 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; }; }+# 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:2304: 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/'`
-echo "$as_me:2311: 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:2320: 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; }; }+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:1174: checking host system type" >&5
-fi
-echo "$as_me:2325: 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/'`
+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
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
+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:1195: checking target system type" >&5
+
+target_alias=$target
+case "$target_alias" in
+NONE)
+ case $nonopt in
+ NONE) target_alias=$host_alias ;;
+ *) target_alias=$nonopt ;;
+ esac ;;
+esac
+
+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:1213: checking build system type" >&5
+
+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}-+
case "$target" in
*cygwin* )
CFLAGS="$CFLAGS -mno-cygwin"
@@ -2343,57 +1239,46 @@
LDFLAGS="$LDFLAGS -mno-cygwin"
esac
-echo "$as_me:2346: 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
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:1244: checking for ANSI C header files" >&5
+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line 2352 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 1249 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <float.h>
-
-_ACEOF
-if { (eval echo "$as_me:2360: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:2366: \$? = $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
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1257: \"$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*
ac_cv_header_stdc=yes
else
- echo "$as_me: failed program was:" >&5
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
+ rm -rf conftest*
ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*
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 2388 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 1274 "configure"
#include "confdefs.h"
#include <string.h>
-
-_ACEOF
+EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "memchr" >/dev/null 2>&1; then
:
else
+ rm -rf conftest*
ac_cv_header_stdc=no
fi
rm -f conftest*
@@ -2402,16 +1287,16 @@
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 2406 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 1292 "configure"
#include "confdefs.h"
#include <stdlib.h>
-
-_ACEOF
+EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "free" >/dev/null 2>&1; then
:
else
+ rm -rf conftest*
ac_cv_header_stdc=no
fi
rm -f conftest*
@@ -2420,383 +1305,147 @@
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
+if test "$cross_compiling" = yes; then
:
else
- cat >conftest.$ac_ext <<_ACEOF
-#line 2427 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 1313 "configure"
#include "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 ISLOWER(c) ('a' <= (c) && (c) <= 'z')+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
#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:2453: \"$ac_link\"") >&5- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:2456: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'- { (eval echo "$as_me:2458: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2461: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+int main () { int i; for (i = 0; i < 256; i++)+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+if { (eval echo configure:1324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null+then
:
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ ac_cv_header_stdc=no
fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*
fi
+
fi
fi
-echo "$as_me:2474: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6-if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+ cat >> confdefs.h <<\EOF
#define STDC_HEADERS 1
-_ACEOF
+EOF
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
+for ac_hdr in getopt.h fcntl.h limits.h malloc.h unistd.h byteswap.h errno.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:2490: 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 "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1351: checking for $ac_hdr" >&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 2496 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 1356 "configure"
#include "confdefs.h"
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2503: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2506: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2509: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2512: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_Header=yes"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1361: \"$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
-cat conftest.$ac_ext >&5
-eval "$as_ac_Header=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
+rm -f conftest*
fi
-echo "$as_me:2522: 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
-
-for ac_header in getopt.h fcntl.h limits.h malloc.h unistd.h byteswap.h errno.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then- echo "$as_me:2537: 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
-fi
-echo "$as_me:2542: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
else
- # Is the header compilable?
-echo "$as_me:2546: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 2549 "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2555: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2558: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2561: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2564: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
+ echo "$ac_t""no" 1>&6
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:2573: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:2577: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 2580 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:2584: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:2590: \$? = $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
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:2608: 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:2614: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:2616: WARNING: $ac_header: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
- no:yes )
- { echo "$as_me:2619: WARNING: $ac_header: present but cannot be compiled." >&5-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
- { echo "$as_me:2621: WARNING: $ac_header: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:2623: WARNING: $ac_header: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:2626: 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
-else
- eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:2633: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6-
-fi
-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 "$GCC" = yes
then
CFLAGS="$CFLAGS -Wall"
fi
-echo "$as_me:2651: 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
+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+echo "configure:1394: 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
- # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
-#line 2658 "configure"
+ ac_cv_c_bigendian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
+cat > conftest.$ac_ext <<EOF
+#line 1401 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
+int main() {-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-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:2681: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2684: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2687: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2690: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:1412: \"$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 2694 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 1416 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
+int main() {-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{#if BYTE_ORDER != BIG_ENDIAN
not big endian
#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2717: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2720: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2723: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2726: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:1427: \"$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
-cat 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
-cat conftest.$ac_ext >&5
-# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
- # try to guess the endianess by grep'ing values into an object file
- ac_cv_c_bigendian=unknown
- cat >conftest.$ac_ext <<_ACEOF
-#line 2743 "configure"
-#include "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; }-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{- _ascii (); _ebcdic ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2766: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2769: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2772: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2775: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- if fgrep 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 fgrep 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
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 2795 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 1447 "configure"
#include "confdefs.h"
-int
-main ()
-{+main () {/* Are we little or big endian? From Harbison&Steele. */
union
{@@ -2806,386 +1455,200 @@
u.l = 1;
exit (u.c[sizeof (long) - 1] == 1);
}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:2811: \"$ac_link\"") >&5- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:2814: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'- { (eval echo "$as_me:2816: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2819: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:1460: \"$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
-cat conftest.$ac_ext >&5
-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 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:2833: 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:2845: error: unknown endianess-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianess
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;-esac
+EOF
-echo "$as_me:2852: 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 2860 "configure"
-#include "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;
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-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:2915: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2918: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2921: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2924: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
-else
- echo "$as_me: failed program was:" >&5
-cat 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:2941: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;- *)
- echo "$as_me:2944: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6- CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-echo "$as_me:2949: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:1484: checking for working const" >&5
+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line 2955 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 1489 "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
- const charset x;
- /* SunOS 4.1.1 cc rejects this. */
- char const *const *ccp;
- char **p;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};- static struct point const zero = {0,0};- /* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
- ccp = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++ccp;
- p = (char**) ccp;
- ccp = (char const *const *) p;
- { /* SCO 3.2v4 cc rejects this. */- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
+int main() {- *t++ = 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */- int x[] = {25, 17};- const int *foo = &x[0];
- ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */- typedef const int *iptr;
- iptr p = 0;
- ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this saying- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };- struct s *b; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */- const int foo = 10;
- }
-#endif
+/* Ultrix mips cc rejects this. */
+typedef int charset[2]; const charset x;
+/* SunOS 4.1.1 cc rejects this. */
+char const *const *ccp;
+char **p;
+/* NEC SVR4.0.2 mips cc rejects this. */
+struct point {int x, y;};+static struct point const zero = {0,0};+/* AIX XL C 1.02.0.0 rejects this.
+ It does not let you subtract one const X* pointer from another in an arm
+ of an if-expression whose if-part is not a constant expression */
+const char *g = "string";
+ccp = &g + (g ? g-g : 0);
+/* HPUX 7.0 cc rejects these. */
+++ccp;
+p = (char**) ccp;
+ccp = (char const *const *) p;
+{ /* SCO 3.2v4 cc rejects this. */+ char *t;
+ char const *s = 0 ? (char *) 0 : (char const *) 0;
- ;
- return 0;
+ *t++ = 0;
}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3019: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3022: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3025: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3028: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */+ int x[] = {25, 17};+ const int *foo = &x[0];
+ ++foo;
+}
+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */+ typedef const int *iptr;
+ iptr p = 0;
+ ++p;
+}
+{ /* AIX XL C 1.02.0.0 rejects this saying+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+ struct s { int j; const int *ap[3]; };+ struct s *b; b->j = 5;
+}
+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */+ const int foo = 10;
+}
+
+; return 0; }
+EOF
+if { (eval echo configure:1538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then+ rm -rf conftest*
ac_cv_c_const=yes
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_c_const=no
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_c_const=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
fi
-echo "$as_me:3038: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6+
+echo "$ac_t""$ac_cv_c_const" 1>&6
if test $ac_cv_c_const = no; then
+ cat >> confdefs.h <<\EOF
+#define const
+EOF
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
-
fi
-echo "$as_me:3048: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:1559: checking for inline" >&5
+if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
-#line 3056 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 1566 "configure"
#include "confdefs.h"
-#ifndef __cplusplus
-static $ac_kw int static_foo () {return 0; }-$ac_kw int foo () {return 0; }-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3065: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3068: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3071: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3074: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+int main() {+} $ac_kw foo() {+; return 0; }
+EOF
+if { (eval echo configure:1573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then+ rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
done
fi
-echo "$as_me:3085: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6-case $ac_cv_c_inline in
+
+echo "$ac_t""$ac_cv_c_inline" 1>&6
+case "$ac_cv_c_inline" in
inline | yes) ;;
- no)
-cat >>confdefs.h <<\_ACEOF
-#define inline
-_ACEOF
+ no) cat >> confdefs.h <<\EOF
+#define inline
+EOF
;;
- *) cat >>confdefs.h <<_ACEOF
+ *) cat >> confdefs.h <<EOF
#define inline $ac_cv_c_inline
-_ACEOF
+EOF
;;
esac
-echo "$as_me:3100: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+echo "configure:1599: checking for size_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line 3106 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 1604 "configure"
#include "confdefs.h"
-$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
#endif
-int
-main ()
-{-if ((size_t *) 0)
- return 0;
-if (sizeof (size_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3127: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3130: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3133: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3136: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ rm -rf conftest*
ac_cv_type_size_t=yes
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_size_t=no
+ rm -rf conftest*
+ ac_cv_type_size_t=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:3146: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6-if test $ac_cv_type_size_t = yes; then
- :
-else
+rm -f conftest*
-cat >>confdefs.h <<_ACEOF
+fi
+echo "$ac_t""$ac_cv_type_size_t" 1>&6
+if test $ac_cv_type_size_t = no; then
+ cat >> confdefs.h <<\EOF
#define size_t unsigned
-_ACEOF
+EOF
fi
-{ echo "$as_me:3158: checking if math library is required during link..." >&5-echo "$as_me: checking if math library is required during link..." >&6;}
-echo "$as_me:3160: checking for pow" >&5
-echo $ECHO_N "checking for pow... $ECHO_C" >&6
-if test "${ac_cv_func_pow+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+echo "checking if math library is required during link" 1>&6
+echo "configure:1634: checking if math library is required during link" >&5
+echo $ac_n "checking for pow""... $ac_c" 1>&6
+echo "configure:1636: checking for pow" >&5
+if eval "test \"`echo '$''{'ac_cv_func_pow'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line 3166 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 1641 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char pow (); below. */
+ which can conflict with char pow(); 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 pow ();
-char (*f) ();
+ builtin and then its argument prototype would still apply. */
+char pow();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{+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. */
@@ -3192,105 +1655,82 @@
#if defined (__stub_pow) || defined (__stub___pow)
choke me
#else
-f = pow;
+pow();
#endif
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3203: \"$ac_link\"") >&5- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:3206: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'- { (eval echo "$as_me:3209: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3212: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_pow=yes
+; return 0; }
+EOF
+if { (eval echo configure:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then+ rm -rf conftest*
+ eval "ac_cv_func_pow=yes"
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_func_pow=no
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_pow=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
fi
-echo "$as_me:3222: result: $ac_cv_func_pow" >&5
-echo "${ECHO_T}$ac_cv_func_pow" >&6+if eval "test \"`echo '$ac_cv_func_'pow`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
if test "$ac_cv_func_pow" = no
then
-
-echo "$as_me:3228: checking for pow in -lm" >&5
-echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6
-if test "${ac_cv_lib_m_pow+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+ echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6
+echo "configure:1686: checking for pow in -lm" >&5
+ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_check_lib_save_LIBS=$LIBS
+ ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 3236 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 1694 "configure"
#include "confdefs.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 pow ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{-pow ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3261: \"$ac_link\"") >&5- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:3264: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'- { (eval echo "$as_me:3267: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3270: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_m_pow=yes
+ builtin and then its argument prototype would still apply. */
+char pow();
+
+int main() {+pow()
+; return 0; }
+EOF
+if { (eval echo configure:1705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_m_pow=no
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
fi
-echo "$as_me:3281: result: $ac_cv_lib_m_pow" >&5
-echo "${ECHO_T}$ac_cv_lib_m_pow" >&6-if test $ac_cv_lib_m_pow = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
LIBS="-lm $LIBS"
+else
+ echo "$ac_t""no" 1>&6
fi
fi
+
NEED_OSS=0
NEED_SUNAU=0
NEED_ALSA=0
@@ -3297,6 +1737,7 @@
GSM_SUPPORT=0
PLAY_SUPPORT=0
+
if test "$ogg_vorbislib" != auto && test "$ogg_vorbislib" != no
then
LIBS="$LIBS -L$ogg_vorbislib"
@@ -3313,182 +1754,90 @@
fi
fi
-if test "${ac_cv_header_vorbis_codec_h+set}" = set; then- echo "$as_me:3317: checking for vorbis/codec.h" >&5
-echo $ECHO_N "checking for vorbis/codec.h... $ECHO_C" >&6
-if test "${ac_cv_header_vorbis_codec_h+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:3322: result: $ac_cv_header_vorbis_codec_h" >&5
-echo "${ECHO_T}$ac_cv_header_vorbis_codec_h" >&6+ac_safe=`echo "vorbis/codec.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for vorbis/codec.h""... $ac_c" 1>&6
+echo "configure:1760: checking for vorbis/codec.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:3326: checking vorbis/codec.h usability" >&5
-echo $ECHO_N "checking vorbis/codec.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3329 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 1765 "configure"
#include "confdefs.h"
-$ac_includes_default
#include <vorbis/codec.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3335: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3338: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3341: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3344: \$? = $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:1770: \"$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
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:3353: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:3357: checking vorbis/codec.h presence" >&5
-echo $ECHO_N "checking vorbis/codec.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3360 "configure"
-#include "confdefs.h"
-#include <vorbis/codec.h>
-_ACEOF
-if { (eval echo "$as_me:3364: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:3370: \$? = $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
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
- ac_header_preproc=no
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:3388: 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:3394: WARNING: vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&5-echo "$as_me: WARNING: vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:3396: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&2;};;
- no:yes )
- { echo "$as_me:3399: WARNING: vorbis/codec.h: present but cannot be compiled." >&5-echo "$as_me: WARNING: vorbis/codec.h: present but cannot be compiled." >&2;}
- { echo "$as_me:3401: WARNING: vorbis/codec.h: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: vorbis/codec.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:3403: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:3406: checking for vorbis/codec.h" >&5
-echo $ECHO_N "checking for vorbis/codec.h... $ECHO_C" >&6
-if test "${ac_cv_header_vorbis_codec_h+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_vorbis_codec_h=$ac_header_preproc
+rm -f conftest*
fi
-echo "$as_me:3413: result: $ac_cv_header_vorbis_codec_h" >&5
-echo "${ECHO_T}$ac_cv_header_vorbis_codec_h" >&6-
-fi
-if test $ac_cv_header_vorbis_codec_h = yes; then
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
ogg_vorbisinc=yes
else
- ogg_vorbisinc=no
+ echo "$ac_t""no" 1>&6
+ogg_vorbisinc=no
fi
if test "$ogg_vorbisinc" = yes
then
- echo "$as_me:3425: checking for vorbis_analysis_init in -lvorbis" >&5
-echo $ECHO_N "checking for vorbis_analysis_init in -lvorbis... $ECHO_C" >&6
-if test "${ac_cv_lib_vorbis_vorbis_analysis_init+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+ echo $ac_n "checking for vorbis_analysis_init in -lvorbis""... $ac_c" 1>&6
+echo "configure:1795: checking for vorbis_analysis_init in -lvorbis" >&5
+ac_lib_var=`echo vorbis'_'vorbis_analysis_init | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_check_lib_save_LIBS=$LIBS
+ ac_save_LIBS="$LIBS"
LIBS="-lvorbis $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 3433 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 1803 "configure"
#include "confdefs.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 vorbis_analysis_init ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{-vorbis_analysis_init ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3458: \"$ac_link\"") >&5- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:3461: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'- { (eval echo "$as_me:3464: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3467: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_vorbis_vorbis_analysis_init=yes
+ builtin and then its argument prototype would still apply. */
+char vorbis_analysis_init();
+
+int main() {+vorbis_analysis_init()
+; return 0; }
+EOF
+if { (eval echo configure:1814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_vorbis_vorbis_analysis_init=no
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
fi
-echo "$as_me:3478: result: $ac_cv_lib_vorbis_vorbis_analysis_init" >&5
-echo "${ECHO_T}$ac_cv_lib_vorbis_vorbis_analysis_init" >&6-if test $ac_cv_lib_vorbis_vorbis_analysis_init = yes; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
LIBS="$LIBS -logg -lvorbis -lvorbisfile -lvorbisenc"
-
-cat >>confdefs.h <<\_ACEOF
+ cat >> confdefs.h <<\EOF
#define HAVE_LIBVORBIS 1
-_ACEOF
+EOF
+else
+ echo "$ac_t""no" 1>&6
fi
fi
CPPFLAGS="$ac_save_CPPFLAGS"
+
if test "$madlib" != auto && test "$madlib" != no
then
LIBS="$LIBS -L$madlib"
@@ -3505,182 +1854,90 @@
fi
fi
-if test "${ac_cv_header_mad_h+set}" = set; then- echo "$as_me:3509: checking for mad.h" >&5
-echo $ECHO_N "checking for mad.h... $ECHO_C" >&6
-if test "${ac_cv_header_mad_h+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:3514: result: $ac_cv_header_mad_h" >&5
-echo "${ECHO_T}$ac_cv_header_mad_h" >&6+ac_safe=`echo "mad.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for mad.h""... $ac_c" 1>&6
+echo "configure:1860: checking for mad.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:3518: checking mad.h usability" >&5
-echo $ECHO_N "checking mad.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3521 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 1865 "configure"
#include "confdefs.h"
-$ac_includes_default
#include <mad.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3527: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3530: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3533: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3536: \$? = $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:1870: \"$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
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:3545: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:3549: checking mad.h presence" >&5
-echo $ECHO_N "checking mad.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3552 "configure"
-#include "confdefs.h"
-#include <mad.h>
-_ACEOF
-if { (eval echo "$as_me:3556: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:3562: \$? = $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
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
- ac_header_preproc=no
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:3580: 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:3586: WARNING: mad.h: accepted by the compiler, rejected by the preprocessor!" >&5-echo "$as_me: WARNING: mad.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:3588: WARNING: mad.h: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: mad.h: proceeding with the preprocessor's result" >&2;};;
- no:yes )
- { echo "$as_me:3591: WARNING: mad.h: present but cannot be compiled." >&5-echo "$as_me: WARNING: mad.h: present but cannot be compiled." >&2;}
- { echo "$as_me:3593: WARNING: mad.h: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: mad.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:3595: WARNING: mad.h: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: mad.h: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:3598: checking for mad.h" >&5
-echo $ECHO_N "checking for mad.h... $ECHO_C" >&6
-if test "${ac_cv_header_mad_h+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_mad_h=$ac_header_preproc
+rm -f conftest*
fi
-echo "$as_me:3605: result: $ac_cv_header_mad_h" >&5
-echo "${ECHO_T}$ac_cv_header_mad_h" >&6-
-fi
-if test $ac_cv_header_mad_h = yes; then
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
madinc=yes
else
- madinc=no
+ echo "$ac_t""no" 1>&6
+madinc=no
fi
if test "$madinc" = yes
then
- echo "$as_me:3617: checking for mad_stream_buffer in -lmad" >&5
-echo $ECHO_N "checking for mad_stream_buffer in -lmad... $ECHO_C" >&6
-if test "${ac_cv_lib_mad_mad_stream_buffer+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+ echo $ac_n "checking for mad_stream_buffer in -lmad""... $ac_c" 1>&6
+echo "configure:1895: checking for mad_stream_buffer in -lmad" >&5
+ac_lib_var=`echo mad'_'mad_stream_buffer | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_check_lib_save_LIBS=$LIBS
+ ac_save_LIBS="$LIBS"
LIBS="-lmad $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 3625 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 1903 "configure"
#include "confdefs.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 mad_stream_buffer ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{-mad_stream_buffer ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3650: \"$ac_link\"") >&5- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:3653: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'- { (eval echo "$as_me:3656: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3659: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_mad_mad_stream_buffer=yes
+ builtin and then its argument prototype would still apply. */
+char mad_stream_buffer();
+
+int main() {+mad_stream_buffer()
+; return 0; }
+EOF
+if { (eval echo configure:1914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_mad_mad_stream_buffer=no
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
fi
-echo "$as_me:3670: result: $ac_cv_lib_mad_mad_stream_buffer" >&5
-echo "${ECHO_T}$ac_cv_lib_mad_mad_stream_buffer" >&6-if test $ac_cv_lib_mad_mad_stream_buffer = yes; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lmad"
-
-cat >>confdefs.h <<\_ACEOF
+ cat >> confdefs.h <<\EOF
#define HAVE_LIBMAD 1
-_ACEOF
+EOF
+else
+ echo "$ac_t""no" 1>&6
fi
fi
CPPFLAGS="$ac_save_CPPFLAGS"
+
if test "$lamelib" != auto && test "$lamelib" != no
then
LIBS="$LIBS -L$lamelib"
@@ -3697,214 +1954,110 @@
fi
fi
-if test "${ac_cv_header_lame_lame_h+set}" = set; then- echo "$as_me:3701: checking for lame/lame.h" >&5
-echo $ECHO_N "checking for lame/lame.h... $ECHO_C" >&6
-if test "${ac_cv_header_lame_lame_h+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:3706: result: $ac_cv_header_lame_lame_h" >&5
-echo "${ECHO_T}$ac_cv_header_lame_lame_h" >&6+ac_safe=`echo "lame/lame.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for lame/lame.h""... $ac_c" 1>&6
+echo "configure:1960: checking for lame/lame.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:3710: checking lame/lame.h usability" >&5
-echo $ECHO_N "checking lame/lame.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3713 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 1965 "configure"
#include "confdefs.h"
-$ac_includes_default
#include <lame/lame.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3719: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3722: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3725: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3728: \$? = $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:1970: \"$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
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:3737: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:3741: checking lame/lame.h presence" >&5
-echo $ECHO_N "checking lame/lame.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3744 "configure"
-#include "confdefs.h"
-#include <lame/lame.h>
-_ACEOF
-if { (eval echo "$as_me:3748: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:3754: \$? = $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
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
- ac_header_preproc=no
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:3772: 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:3778: WARNING: lame/lame.h: accepted by the compiler, rejected by the preprocessor!" >&5-echo "$as_me: WARNING: lame/lame.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:3780: WARNING: lame/lame.h: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: lame/lame.h: proceeding with the preprocessor's result" >&2;};;
- no:yes )
- { echo "$as_me:3783: WARNING: lame/lame.h: present but cannot be compiled." >&5-echo "$as_me: WARNING: lame/lame.h: present but cannot be compiled." >&2;}
- { echo "$as_me:3785: WARNING: lame/lame.h: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: lame/lame.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:3787: WARNING: lame/lame.h: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: lame/lame.h: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:3790: checking for lame/lame.h" >&5
-echo $ECHO_N "checking for lame/lame.h... $ECHO_C" >&6
-if test "${ac_cv_header_lame_lame_h+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_lame_lame_h=$ac_header_preproc
+rm -f conftest*
fi
-echo "$as_me:3797: result: $ac_cv_header_lame_lame_h" >&5
-echo "${ECHO_T}$ac_cv_header_lame_lame_h" >&6-
-fi
-if test $ac_cv_header_lame_lame_h = yes; then
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
lameinc=yes
else
- lameinc=no
+ echo "$ac_t""no" 1>&6
+lameinc=no
fi
if test "$lameinc" = yes
then
- echo "$as_me:3809: checking for lame_init in -lmp3lame" >&5
-echo $ECHO_N "checking for lame_init in -lmp3lame... $ECHO_C" >&6
-if test "${ac_cv_lib_mp3lame_lame_init+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+ echo $ac_n "checking for lame_init in -lmp3lame""... $ac_c" 1>&6
+echo "configure:1995: checking for lame_init in -lmp3lame" >&5
+ac_lib_var=`echo mp3lame'_'lame_init | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_check_lib_save_LIBS=$LIBS
+ ac_save_LIBS="$LIBS"
LIBS="-lmp3lame $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 3817 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 2003 "configure"
#include "confdefs.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 lame_init ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{-lame_init ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3842: \"$ac_link\"") >&5- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:3845: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'- { (eval echo "$as_me:3848: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3851: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_mp3lame_lame_init=yes
+ builtin and then its argument prototype would still apply. */
+char lame_init();
+
+int main() {+lame_init()
+; return 0; }
+EOF
+if { (eval echo configure:2014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_mp3lame_lame_init=no
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
fi
-echo "$as_me:3862: result: $ac_cv_lib_mp3lame_lame_init" >&5
-echo "${ECHO_T}$ac_cv_lib_mp3lame_lame_init" >&6-if test $ac_cv_lib_mp3lame_lame_init = yes; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lmp3lame"
-
-cat >>confdefs.h <<\_ACEOF
+ cat >> confdefs.h <<\EOF
#define HAVE_LAME 1
-_ACEOF
+EOF
+else
+ echo "$ac_t""no" 1>&6
fi
fi
CPPFLAGS="$ac_save_CPPFLAGS"
+
for ac_func in getopt strerror memmove rand strcasecmp
do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:3879: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:2045: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line 3885 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2050 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below. */
+ which can conflict with char $ac_func(); 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 $ac_func ();
-char (*f) ();
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{+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. */
@@ -3911,328 +2064,211 @@
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-f = $ac_func;
+$ac_func();
#endif
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3922: \"$ac_link\"") >&5- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:3925: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'- { (eval echo "$as_me:3928: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3931: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
+; return 0; }
+EOF
+if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
fi
-echo "$as_me:3941: result: `eval echo '${'$as_ac_var'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6-if test `eval echo '${'$as_ac_var'}'` = yes; then- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
fi
done
+
+
if test "$alsa_dsp" = auto
then
-
-for ac_header in linux/asound.h
+ for ac_hdr in linux/asound.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then- echo "$as_me:3958: 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
-fi
-echo "$as_me:3963: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2105: checking for $ac_hdr" >&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:3967: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3970 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2110 "configure"
#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3976: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3979: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3982: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3985: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2115: \"$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
-cat 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:3994: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:3998: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 4001 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:4005: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:4011: \$? = $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
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ alsa_dsp=check_ioctl
else
- echo "$as_me: failed program was:" >&5
- cat 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:4029: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6+done
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:4035: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:4037: WARNING: $ac_header: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
- no:yes )
- { echo "$as_me:4040: WARNING: $ac_header: present but cannot be compiled." >&5-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
- { echo "$as_me:4042: WARNING: $ac_header: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:4044: WARNING: $ac_header: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:4047: 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
+ for ac_hdr in sound/asound.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2145: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- eval "$as_ac_Header=$ac_header_preproc"
+ cat > conftest.$ac_ext <<EOF
+#line 2150 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2155: \"$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:4054: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6-
+rm -f conftest*
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- alsa_dsp=yes
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ alsa_dsp=alsa9
+else
+ echo "$ac_t""no" 1>&6
fi
-
done
fi
-if test "$alsa_dsp" = yes
+echo $ac_n "checking for ALSA ioctl API""... $ac_c" 1>&6
+echo "configure:2184: checking for ALSA ioctl API" >&5
+if test "$alsa_dsp" = check_ioctl
then
- echo "$as_me:4071: checking for ALSA ioctl API" >&5
-echo $ECHO_N "checking for ALSA ioctl API... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-#line 4074 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2188 "configure"
#include "confdefs.h"
#include <linux/asound.h>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{+int main() {snd_pcm_capture_info_t c_info;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4096: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4099: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4102: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4105: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- alsa_api_ver=oldapi
+; return 0; }
+EOF
+if { (eval echo configure:2199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then+ rm -rf conftest*
+ alsa_dsp=alsa4
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-alsa_api_ver=newapi
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ alsa_dsp=alsa5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:4114: result: $alsa_api_ver" >&5
-echo "${ECHO_T}$alsa_api_ver" >&6- CFLAGS="$CFLAGS -DALSA_PLAYER"
- if test "$alsa_api_ver" = oldapi; then CFLAGS="$CFLAGS -DUSE_OLD_API"; fi
+rm -f conftest*
+fi
+
+if test "$alsa_dsp" = alsa9
+then
+ CFLAGS="$CFLAGS -DALSA_PLAYER -DUSE_ALSA9"
NEED_ALSA=1
PLAY_SUPPORT=1
+ echo "$ac_t""0.9.X" 1>&6
+elif test "$alsa_dsp" = alsa5
+then
+ CFLAGS="$CFLAGS -DALSA_PLAYER -DUSE_ALSA5"
+ NEED_ALSA=1
+ PLAY_SUPPORT=1
+ echo "$ac_t""0.5.X" 1>&6
+elif test "$alsa_dsp" = alsa4
+then
+ CFLAGS="$CFLAGS -DALSA_PLAYER -DUSE_ALSA4"
+ NEED_ALSA=1
+ PLAY_SUPPORT=1
+ echo "$ac_t""0.4.X" 1>&6
+else
+ echo "$ac_t""not found" 1>&6
fi
if test "$oss_dsp" = auto
then
-
-for ac_header in sys/soundcard.h machine/soundcard.h
+ for ac_hdr in sys/soundcard.h machine/soundcard.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then- echo "$as_me:4129: 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
-fi
-echo "$as_me:4134: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2239: checking for $ac_hdr" >&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:4138: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 4141 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2244 "configure"
#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4147: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4150: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4153: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4156: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2249: \"$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
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:4165: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:4169: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 4172 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:4176: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:4182: \$? = $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
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
- ac_header_preproc=no
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:4200: 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:4206: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:4208: WARNING: $ac_header: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
- no:yes )
- { echo "$as_me:4211: WARNING: $ac_header: present but cannot be compiled." >&5-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
- { echo "$as_me:4213: WARNING: $ac_header: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:4215: WARNING: $ac_header: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:4218: 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
-else
- eval "$as_ac_Header=$ac_header_preproc"
+rm -f conftest*
fi
-echo "$as_me:4225: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
oss_dsp=yes
+else
+ echo "$ac_t""no" 1>&6
fi
-
done
fi
@@ -4246,118 +2282,44 @@
if test "$sun_audio" = auto
then
-
-for ac_header in sys/audioio.h sun/audioio.h
+ for ac_hdr in sys/audioio.h sun/audioio.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then- echo "$as_me:4254: 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
-fi
-echo "$as_me:4259: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2290: checking for $ac_hdr" >&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:4263: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 4266 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2295 "configure"
#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4272: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4275: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4278: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4281: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2300: \"$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
-cat conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:4290: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:4294: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 4297 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:4301: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:4307: \$? = $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
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
- ac_header_preproc=no
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:4325: 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:4331: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:4333: WARNING: $ac_header: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
- no:yes )
- { echo "$as_me:4336: WARNING: $ac_header: present but cannot be compiled." >&5-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
- { echo "$as_me:4338: WARNING: $ac_header: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:4340: WARNING: $ac_header: proceeding with the preprocessor's result" >&5-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-esac
-echo "$as_me:4343: 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
-else
- eval "$as_ac_Header=$ac_header_preproc"
+rm -f conftest*
fi
-echo "$as_me:4350: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
sun_audio=yes
+else
+ echo "$ac_t""no" 1>&6
fi
-
done
fi
@@ -4369,6 +2331,7 @@
PLAY_SUPPORT=1
fi
+
if test "$old_rate" = yes
then
CFLAGS="$CFLAGS -DUSE_OLD_RATE"
@@ -4388,21 +2351,24 @@
GSM_SUPPORT=1
fi
-ac_config_headers="$ac_config_headers stconfig.h"
+
+
+
+
+
+
+
# ------ AC CREATE STDINT H -------------------------------------
-echo "$as_me:4394: checking for stdint-types...." >&5
-echo $ECHO_N "checking for stdint-types....... $ECHO_C" >&6
+echo $ac_n "checking for stdint-types....""... $ac_c" 1>&6
+echo "configure:2365: checking for stdint-types...." >&5
ac_stdint_h=`echo ststdint.h`
if test "$ac_stdint_h" = "stdint.h" ; then
- echo "$as_me:4398: result: \"(are you sure you want them in ./stdint.h?)\"" >&5
-echo "${ECHO_T}\"(are you sure you want them in ./stdint.h?)\"" >&6+ echo "$ac_t"""(are you sure you want them in ./stdint.h?)"" 1>&6
elif test "$ac_stdint_h" = "inttypes.h" ; then
- echo "$as_me:4401: result: \"(are you sure you want them in ./inttypes.h?)\"" >&5
-echo "${ECHO_T}\"(are you sure you want them in ./inttypes.h?)\"" >&6+ echo "$ac_t"""(are you sure you want them in ./inttypes.h?)"" 1>&6
else
- echo "$as_me:4404: result: \"(putting them into $ac_stdint_h)\"" >&5
-echo "${ECHO_T}\"(putting them into $ac_stdint_h)\"" >&6+ echo "$ac_t"""(putting them into $ac_stdint_h)"" 1>&6
fi
inttype_headers=`echo inttypes.h sys/inttypes.h sys/inttypes.h \
@@ -4412,120 +2378,43 @@
ac_cv_header_stdint_o="no-file"
ac_cv_header_stdint_u="no-file"
for i in stdint.h $inttype_headers ; do
- unset ac_cv_type_uintptr_t
+ unset ac_cv_type_uintptr_t
unset ac_cv_type_uint64_t
- echo "$as_me:4417: checking for uintptr_t" >&5
-echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6
-if test "${ac_cv_type_uintptr_t+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+ _AC_CHECK_TYPE_NEW(uintptr_t,ac_cv_header_stdint_x=$i, continue,#include <$i>)
+ echo $ac_n "checking for uint64_t""... $ac_c" 1>&6
+echo "configure:2386: checking for uint64_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_uint64_t'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4423 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2391 "configure"
#include "confdefs.h"
-#include <$i>
-
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
#endif
-int
-main ()
-{-if ((uintptr_t *) 0)
- return 0;
-if (sizeof (uintptr_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4445: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4448: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4451: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4454: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_uintptr_t=yes
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])uint64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ac_cv_type_uint64_t=yes
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_uintptr_t=no
+ rm -rf conftest*
+ ac_cv_type_uint64_t=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+
fi
-echo "$as_me:4464: result: $ac_cv_type_uintptr_t" >&5
-echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6-if test $ac_cv_type_uintptr_t = yes; then
- ac_cv_header_stdint_x=$i
-else
- continue
-fi
+echo "$ac_t""$ac_cv_type_uint64_t" 1>&6
+if test $ac_cv_type_uint64_t = no; then
+ cat >> confdefs.h <<\EOF
+#define uint64_t and64="(uint64_t too)"
+EOF
- echo "$as_me:4472: checking for uint64_t" >&5
-echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6
-if test "${ac_cv_type_uint64_t+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4478 "configure"
-#include "confdefs.h"
-#include<$i>
-
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{-if ((uint64_t *) 0)
- return 0;
-if (sizeof (uint64_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4500: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4503: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4506: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4509: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_uint64_t=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_uint64_t=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:4519: result: $ac_cv_type_uint64_t" >&5
-echo "${ECHO_T}$ac_cv_type_uint64_t" >&6-if test $ac_cv_type_uint64_t = yes; then
- and64="(uint64_t too)"
-else
- and64=""
-fi
- echo "$as_me:4527: result: ... seen our uintptr_t in $i $and64" >&5
-echo "${ECHO_T}... seen our uintptr_t in $i $and64" >&6+ echo "$ac_t""... seen our uintptr_t in $i $and64" 1>&6
break;
done
if test "$ac_cv_header_stdint_x" = "no-file" ; then
@@ -4532,118 +2421,73 @@
for i in stdint.h $inttype_headers ; do
unset ac_cv_type_uint32_t
unset ac_cv_type_uint64_t
- echo "$as_me:4535: checking for uint32_t" >&5
-echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
-if test "${ac_cv_type_uint32_t+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+ echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
+echo "configure:2426: checking for uint32_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4541 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2431 "configure"
#include "confdefs.h"
-#include <$i>
-
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
#endif
-int
-main ()
-{-if ((uint32_t *) 0)
- return 0;
-if (sizeof (uint32_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4563: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4566: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4569: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4572: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])uint32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ rm -rf conftest*
ac_cv_type_uint32_t=yes
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_uint32_t=no
+ rm -rf conftest*
+ ac_cv_type_uint32_t=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+
fi
-echo "$as_me:4582: result: $ac_cv_type_uint32_t" >&5
-echo "${ECHO_T}$ac_cv_type_uint32_t" >&6-if test $ac_cv_type_uint32_t = yes; then
- ac_cv_header_stdint_o=$i
-else
- continue
+echo "$ac_t""$ac_cv_type_uint32_t" 1>&6
+if test $ac_cv_type_uint32_t = no; then
+ cat >> confdefs.h <<\EOF
+#define uint32_t ac_cv_header_stdint_o=$i
+EOF
+
fi
- echo "$as_me:4590: checking for uint64_t" >&5
-echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6
-if test "${ac_cv_type_uint64_t+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+ echo $ac_n "checking for uint64_t""... $ac_c" 1>&6
+echo "configure:2459: checking for uint64_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_uint64_t'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4596 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2464 "configure"
#include "confdefs.h"
-#include<$i>
-
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
#endif
-int
-main ()
-{-if ((uint64_t *) 0)
- return 0;
-if (sizeof (uint64_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4618: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4621: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4624: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4627: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])uint64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ rm -rf conftest*
ac_cv_type_uint64_t=yes
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_uint64_t=no
+ rm -rf conftest*
+ ac_cv_type_uint64_t=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+
fi
-echo "$as_me:4637: result: $ac_cv_type_uint64_t" >&5
-echo "${ECHO_T}$ac_cv_type_uint64_t" >&6-if test $ac_cv_type_uint64_t = yes; then
- and64="(uint64_t too)"
-else
- and64=""
+echo "$ac_t""$ac_cv_type_uint64_t" 1>&6
+if test $ac_cv_type_uint64_t = no; then
+ cat >> confdefs.h <<\EOF
+#define uint64_t and64="(uint64_t too)"
+EOF
+
fi
- echo "$as_me:4645: result: ... seen our uint32_t in $i $and64" >&5
-echo "${ECHO_T}... seen our uint32_t in $i $and64" >&6+ echo "$ac_t""... seen our uint32_t in $i $and64" 1>&6
break;
done
if test "$ac_cv_header_stdint_o" = "no-file" ; then
@@ -4650,118 +2494,73 @@
for i in sys/types.h $inttype_headers ; do
unset ac_cv_type_u_int32_t
unset ac_cv_type_u_int64_t
- echo "$as_me:4653: checking for u_int32_t" >&5
-echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6
-if test "${ac_cv_type_u_int32_t+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+ echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
+echo "configure:2499: checking for u_int32_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4659 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2504 "configure"
#include "confdefs.h"
-#include <$i>
-
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
#endif
-int
-main ()
-{-if ((u_int32_t *) 0)
- return 0;
-if (sizeof (u_int32_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4681: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4684: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4687: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4690: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])u_int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ rm -rf conftest*
ac_cv_type_u_int32_t=yes
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_u_int32_t=no
+ rm -rf conftest*
+ ac_cv_type_u_int32_t=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+
fi
-echo "$as_me:4700: result: $ac_cv_type_u_int32_t" >&5
-echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6-if test $ac_cv_type_u_int32_t = yes; then
- ac_cv_header_stdint_u=$i
-else
- continue
+echo "$ac_t""$ac_cv_type_u_int32_t" 1>&6
+if test $ac_cv_type_u_int32_t = no; then
+ cat >> confdefs.h <<\EOF
+#define u_int32_t ac_cv_header_stdint_u=$i
+EOF
+
fi
- echo "$as_me:4708: checking for uint64_t" >&5
-echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6
-if test "${ac_cv_type_uint64_t+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+ echo $ac_n "checking for uint64_t""... $ac_c" 1>&6
+echo "configure:2532: checking for uint64_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_uint64_t'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4714 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2537 "configure"
#include "confdefs.h"
-#include<$i>
-
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
#endif
-int
-main ()
-{-if ((uint64_t *) 0)
- return 0;
-if (sizeof (uint64_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4736: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4739: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4742: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4745: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])uint64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ rm -rf conftest*
ac_cv_type_uint64_t=yes
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_uint64_t=no
+ rm -rf conftest*
+ ac_cv_type_uint64_t=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+
fi
-echo "$as_me:4755: result: $ac_cv_type_uint64_t" >&5
-echo "${ECHO_T}$ac_cv_type_uint64_t" >&6-if test $ac_cv_type_uint64_t = yes; then
- and64="(u_int64_t too)"
-else
- and64=""
+echo "$ac_t""$ac_cv_type_uint64_t" 1>&6
+if test $ac_cv_type_uint64_t = no; then
+ cat >> confdefs.h <<\EOF
+#define uint64_t and64="(u_int64_t too)"
+EOF
+
fi
- echo "$as_me:4763: result: ... seen our u_int32_t in $i $and64" >&5
-echo "${ECHO_T}... seen our u_int32_t in $i $and64" >&6+ echo "$ac_t""... seen our u_int32_t in $i $and64" 1>&6
break;
done
fi
@@ -4770,50 +2569,30 @@
# ----------------- DONE inttypes.h checks MAYBE C basic types --------
if test "$ac_cv_header_stdint_x" = "no-file" ; then
- echo "$as_me:4773: checking size of char" >&5
-echo $ECHO_N "checking size of char... $ECHO_C" >&6
-if test "${ac_cv_sizeof_char+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+ echo $ac_n "checking size of char""... $ac_c" 1>&6
+echo "configure:2574: checking size of char" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
- cat >conftest.$ac_ext <<_ACEOF
-#line 4780 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2580 "configure"
#include "confdefs.h"
#include "confdefs.h"
#include <sys/types.h>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{+int main() {switch (0) case 0: case (sizeof (char) == $ac_size):;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4800: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4803: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4806: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4809: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:2589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then+ rm -rf conftest*
ac_cv_sizeof_char=$ac_size
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
if test x$ac_cv_sizeof_char != x ; then break; fi
done
@@ -4820,61 +2599,38 @@
fi
if test x$ac_cv_sizeof_char = x ; then
- { { echo "$as_me:4823: error: cannot determine a size for char" >&5-echo "$as_me: error: cannot determine a size for char" >&2;}
- { (exit 1); exit 1; }; }+ { echo "configure: error: cannot determine a size for char" 1>&2; exit 1; }fi
-echo "$as_me:4827: result: $ac_cv_sizeof_char" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char" >&6-
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_char" 1>&6
+cat >> confdefs.h <<EOF
#define SIZEOF_CHAR $ac_cv_sizeof_char
-_ACEOF
+EOF
- echo "$as_me:4834: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6
-if test "${ac_cv_sizeof_short+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+
+ echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:2612: checking size of short" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
- cat >conftest.$ac_ext <<_ACEOF
-#line 4841 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2618 "configure"
#include "confdefs.h"
#include "confdefs.h"
#include <sys/types.h>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{+int main() {switch (0) case 0: case (sizeof (short) == $ac_size):;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4861: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4864: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4867: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4870: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:2627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then+ rm -rf conftest*
ac_cv_sizeof_short=$ac_size
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
if test x$ac_cv_sizeof_short != x ; then break; fi
done
@@ -4881,61 +2637,38 @@
fi
if test x$ac_cv_sizeof_short = x ; then
- { { echo "$as_me:4884: error: cannot determine a size for short" >&5-echo "$as_me: error: cannot determine a size for short" >&2;}
- { (exit 1); exit 1; }; }+ { echo "configure: error: cannot determine a size for short" 1>&2; exit 1; }fi
-echo "$as_me:4888: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6-
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+cat >> confdefs.h <<EOF
#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
+EOF
- echo "$as_me:4895: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_int+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+
+ echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:2650: checking size of int" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
- cat >conftest.$ac_ext <<_ACEOF
-#line 4902 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2656 "configure"
#include "confdefs.h"
#include "confdefs.h"
#include <sys/types.h>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{+int main() {switch (0) case 0: case (sizeof (int) == $ac_size):;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4922: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4925: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4928: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4931: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:2665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then+ rm -rf conftest*
ac_cv_sizeof_int=$ac_size
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
if test x$ac_cv_sizeof_int != x ; then break; fi
done
@@ -4942,61 +2675,38 @@
fi
if test x$ac_cv_sizeof_int = x ; then
- { { echo "$as_me:4945: error: cannot determine a size for int" >&5-echo "$as_me: error: cannot determine a size for int" >&2;}
- { (exit 1); exit 1; }; }+ { echo "configure: error: cannot determine a size for int" 1>&2; exit 1; }fi
-echo "$as_me:4949: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6-
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
+EOF
- echo "$as_me:4956: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+
+ echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:2688: checking size of long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
- cat >conftest.$ac_ext <<_ACEOF
-#line 4963 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2694 "configure"
#include "confdefs.h"
#include "confdefs.h"
#include <sys/types.h>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{+int main() {switch (0) case 0: case (sizeof (long) == $ac_size):;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4983: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:4986: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4989: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4992: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:2703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then+ rm -rf conftest*
ac_cv_sizeof_long=$ac_size
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
if test x$ac_cv_sizeof_long != x ; then break; fi
done
@@ -5003,61 +2713,38 @@
fi
if test x$ac_cv_sizeof_long = x ; then
- { { echo "$as_me:5006: error: cannot determine a size for long" >&5-echo "$as_me: error: cannot determine a size for long" >&2;}
- { (exit 1); exit 1; }; }+ { echo "configure: error: cannot determine a size for long" 1>&2; exit 1; }fi
-echo "$as_me:5010: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6-
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+EOF
- echo "$as_me:5017: checking size of void*" >&5
-echo $ECHO_N "checking size of void*... $ECHO_C" >&6
-if test "${ac_cv_sizeof_voidp+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
+
+ echo $ac_n "checking size of void*""... $ac_c" 1>&6
+echo "configure:2726: checking size of void*" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then+ echo $ac_n "(cached) $ac_c" 1>&6
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
- cat >conftest.$ac_ext <<_ACEOF
-#line 5024 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2732 "configure"
#include "confdefs.h"
#include "confdefs.h"
#include <sys/types.h>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{+int main() {switch (0) case 0: case (sizeof (void*) == $ac_size):;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5044: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:5047: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:5050: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:5053: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:2741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then+ rm -rf conftest*
ac_cv_sizeof_voidp=$ac_size
else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
if test x$ac_cv_sizeof_voidp != x ; then break; fi
done
@@ -5064,17 +2751,14 @@
fi
if test x$ac_cv_sizeof_voidp = x ; then
- { { echo "$as_me:5067: error: cannot determine a size for void*" >&5-echo "$as_me: error: cannot determine a size for void*" >&2;}
- { (exit 1); exit 1; }; }+ { echo "configure: error: cannot determine a size for void*" 1>&2; exit 1; }fi
-echo "$as_me:5071: result: $ac_cv_sizeof_voidp" >&5
-echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6-
-cat >>confdefs.h <<_ACEOF
+echo "$ac_t""$ac_cv_sizeof_voidp" 1>&6
+cat >> confdefs.h <<EOF
#define SIZEOF_VOIDP $ac_cv_sizeof_voidp
-_ACEOF
+EOF
+
ac_cv_header_stdint_test="yes"
else
ac_cv_header_stdint_test="no"
@@ -5081,9 +2765,8 @@
fi
# ----------------- DONE inttypes.h checks START header -------------
-_ac_stdint_h=`echo "_$ac_stdint_h" | $as_tr_cpp`
-echo "$as_me:5085: result: creating $ac_stdint_h : $_ac_stdint_h" >&5
-echo "${ECHO_T}creating $ac_stdint_h : $_ac_stdint_h" >&6+_ac_stdint_h=AS_TR_CPP(_$ac_stdint_h)
+echo "$ac_t""creating $ac_stdint_h : $_ac_stdint_h" 1>&6
echo "#ifndef" $_ac_stdint_h >$ac_stdint_h
echo "#define" $_ac_stdint_h "1" >>$ac_stdint_h
echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint_h
@@ -5108,27 +2791,22 @@
if test "$ac_cv_header_stdint" != "stddef.h" ; then
if test "$ac_cv_header_stdint" != "stdint.h" ; then
-echo "$as_me:5111: result: ..adding include stddef.h" >&5
-echo "${ECHO_T}..adding include stddef.h" >&6+echo "$ac_t""..adding include stddef.h" 1>&6
echo "#include <stddef.h>" >>$ac_stdint_h
fi ; fi
-echo "$as_me:5115: result: ..adding include $ac_cv_header_stdint" >&5
-echo "${ECHO_T}..adding include $ac_cv_header_stdint" >&6+echo "$ac_t""..adding include $ac_cv_header_stdint" 1>&6
echo "#include <$ac_cv_header_stdint>" >>$ac_stdint_h
echo "" >>$ac_stdint_h
# ----------------- DONE header START basic int types -------------
if test "$ac_cv_header_stdint_x" = "no-file" ; then
- echo "$as_me:5122: result: ... need to look at C basic types" >&5
-echo "${ECHO_T}... need to look at C basic types" >&6+ echo "$ac_t""... need to look at C basic types" 1>&6
else
- echo "$as_me:5125: result: ... seen good stdint.h inttypes" >&5
-echo "${ECHO_T}... seen good stdint.h inttypes" >&6+ echo "$ac_t""... seen good stdint.h inttypes" 1>&6
fi
if test "$ac_cv_header_stdint_u" != "no-file" ; then
- echo "$as_me:5130: result: ... seen bsd/sysv typedefs" >&5
-echo "${ECHO_T}... seen bsd/sysv typedefs" >&6+ echo "$ac_t""... seen bsd/sysv typedefs" 1>&6
cat >>$ac_stdint_h <<EOF
/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */
@@ -5156,8 +2834,7 @@
EOF
t="typedefs for a"
case "$ac_cv_sizeof_X" in
- 1:2:2:2:4) echo "$as_me:5159: result: ..adding $t normal 16-bit system" >&5
-echo "${ECHO_T}..adding $t normal 16-bit system" >&6+ 1:2:2:2:4) echo "$ac_t""..adding $t normal 16-bit system" 1>&6
cat >>$ac_stdint_h <<EOF
/* a normal 16-bit system */
typedef unsigned char uint8_t;
@@ -5171,8 +2848,7 @@
#endif
EOF
;;
- 1:2:2:4:4) echo "$as_me:5174: result: ..adding $t 32-bit system derived from a 16-bit" >&5
-echo "${ECHO_T}..adding $t 32-bit system derived from a 16-bit" >&6+ 1:2:2:4:4) echo "$ac_t""..adding $t 32-bit system derived from a 16-bit" 1>&6
cat >>$ac_stdint_h <<EOF
/* a 32-bit system derived from a 16-bit */
typedef unsigned char uint8_t;
@@ -5186,8 +2862,7 @@
#endif
EOF
;;
- 1:2:4:4:4) echo "$as_me:5189: result: ..adding $t normal 32-bit system" >&5
-echo "${ECHO_T}..adding $t normal 32-bit system" >&6+ 1:2:4:4:4) echo "$ac_t""..adding $t normal 32-bit system" 1>&6
cat >>$ac_stdint_h <<EOF
/* a normal 32-bit system */
typedef unsigned char uint8_t;
@@ -5201,8 +2876,7 @@
#endif
EOF
;;
- 1:2:4:4:8) echo "$as_me:5204: result: ..adding $t 32-bit system prepared for 64-bit" >&5
-echo "${ECHO_T}..adding $t 32-bit system prepared for 64-bit" >&6+ 1:2:4:4:8) echo "$ac_t""..adding $t 32-bit system prepared for 64-bit" 1>&6
cat >>$ac_stdint_h <<EOF
/* a 32-bit system prepared for 64-bit */
@@ -5217,8 +2891,7 @@
#endif
EOF
;;
- 1:2:4:8:8) echo "$as_me:5220: result: ..adding $t normal 64-bit system" >&5
-echo "${ECHO_T}..adding $t normal 64-bit system" >&6+ 1:2:4:8:8) echo "$ac_t""..adding $t normal 64-bit system" 1>&6
cat >>$ac_stdint_h <<EOF
/* a normal 64-bit system */
@@ -5233,8 +2906,7 @@
#endif
EOF
;;
- 1:2:4:8:4) echo "$as_me:5236: result: ..adding $t 64-bit system derived from a 32-bit" >&5
-echo "${ECHO_T}..adding $t 64-bit system derived from a 32-bit" >&6+ 1:2:4:8:4) echo "$ac_t""..adding $t 64-bit system derived from a 32-bit" 1>&6
cat >>$ac_stdint_h <<EOF
/* a 64-bit system derived from a 32-bit system */
@@ -5250,9 +2922,7 @@
EOF
;;
*)
- { { echo "$as_me:5253: error: $ac_cv_sizeof_X what is that a system? contact the author, quick! http://ac-archive.sf.net" >&5-echo "$as_me: error: $ac_cv_sizeof_X what is that a system? contact the author, quick! http://ac-archive.sf.net" >&2;}
- { (exit 1); exit 1; }; }+ { echo "configure: error: $ac_cv_sizeof_X what is that a system? contact the author, quick! http://ac-archive.sf.net" 1>&2; exit 1; }exit 1
;;
esac
@@ -5259,9 +2929,8 @@
fi
# ------------- DONE basic int types START int64_t types ------------
-if test "$ac_cv_type_uint64_t" = "yes"
-then echo "$as_me:5263: result: ... seen good uint64_t" >&5
-echo "${ECHO_T}... seen good uint64_t" >&6+if test "$ac_cv_type_uint64_t" = "yes"
+then echo "$ac_t""... seen good uint64_t" 1>&6
cat >>$ac_stdint_h <<EOF
/* system headers have good uint64_t */
@@ -5270,9 +2939,8 @@
#endif
EOF
-elif test "$ac_cv_type_u_int64_t" = "yes"
-then echo "$as_me:5274: result: ..adding typedef u_int64_t uint64_t" >&5
-echo "${ECHO_T}..adding typedef u_int64_t uint64_t" >&6+elif test "$ac_cv_type_u_int64_t" = "yes"
+then echo "$ac_t""..adding typedef u_int64_t uint64_t" 1>&6
cat >>$ac_stdint_h <<EOF
/* system headers have an u_int64_t */
@@ -5281,8 +2949,7 @@
typedef u_int64_t uint64_t;
#endif
EOF
-else echo "$as_me:5284: result: ..adding generic uint64_t runtime checks" >&5
-echo "${ECHO_T}..adding generic uint64_t runtime checks" >&6+else echo "$ac_t""..adding generic uint64_t runtime checks" 1>&6
cat >>$ac_stdint_h <<EOF
/* -------------------- 64 BIT GENERIC SECTION -------------------- */
@@ -5328,10 +2995,9 @@
#endif
EOF
-# plus a default 64-bit for systems that are likely to be 64-bit ready
+# plus a default 64-bit for systems that are likely to be 64-bit ready
case "$ac_cv_sizeof_x:$ac_cv_sizeof_voidp:$ac_cv_sizeof_long" in
- 1:2:8:8) echo "$as_me:5333: result: ..adding uint64_t default" >&5
-echo "${ECHO_T}..adding uint64_t default" >&6+ 1:2:8:8) echo "$ac_t""..adding uint64_t default" 1>&6
cat >>$ac_stdint_h <<EOF
/* DEFAULT: */
/* seen normal 64-bit system, CC has sizeof(long and void*) == 8 bytes */
@@ -5339,11 +3005,10 @@
#define _HAVE_UINT64_T
typedef long int64_t;
typedef unsigned long uint64_t;
-#endif
+#endif
EOF
;;
- 1:2:4:8) echo "$as_me:5345: result: ..adding uint64_t default" >&5
-echo "${ECHO_T}..adding uint64_t default" >&6+ 1:2:4:8) echo "$ac_t""..adding uint64_t default" 1>&6
cat >>$ac_stdint_h <<EOF
/* DEFAULT: */
/* seen 32-bit system prepared for 64-bit, CC has sizeof(long) == 8 bytes */
@@ -5351,11 +3016,10 @@
#define _HAVE_UINT64_T
typedef long int64_t;
typedef unsigned long uint64_t;
-#endif
+#endif
EOF
;;
- 1:2:8:4) echo "$as_me:5357: result: ..adding uint64_t default" >&5
-echo "${ECHO_T}..adding uint64_t default" >&6+ 1:2:8:4) echo "$ac_t""..adding uint64_t default" 1>&6
cat >>$ac_stdint_h <<EOF
/* DEFAULT: */
/* seen 64-bit derived from a 32-bit, CC has sizeof(long) == 4 bytes */
@@ -5363,7 +3027,7 @@
#define _HAVE_UINT64_T
typedef long long int64_t;
typedef unsigned long long uint64_t;
-#endif
+#endif
EOF
;;
*)
@@ -5415,14 +3079,12 @@
EOF
;;
esac
-echo "$as_me:5418: result: ..adding typedef $a intptr_t" >&5
-echo "${ECHO_T}..adding typedef $a intptr_t" >&6+echo "$ac_t""..adding typedef $a intptr_t" 1>&6
fi
# ------------- DONE intptr types START int_least types ------------
if test "$ac_cv_header_stdint_x" = "no-file" ; then
-echo "$as_me:5424: result: ..adding generic int_least-types" >&5
-echo "${ECHO_T}..adding generic int_least-types" >&6+echo "$ac_t""..adding generic int_least-types" 1>&6
cat >>$ac_stdint_h <<EOF
/* --------------GENERIC INT_LEAST / INTMAX SECTION ------------------ */
@@ -5445,8 +3107,7 @@
EOF
fi
-echo "$as_me:5448: result: ... DONE $ac_stdint_h" >&5
-echo "${ECHO_T}... DONE $ac_stdint_h" >&6+echo "$ac_t""... DONE $ac_stdint_h" 1>&6
cat >>$ac_stdint_h <<EOF
/* once */
@@ -5454,56 +3115,48 @@
#endif
EOF
-ac_config_files="$ac_config_files libst-config Makefile gsm/Makefile"
-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 overriden 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 cmp -s $cache_file confcache; 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
@@ -5510,804 +3163,338 @@
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
+
DEFS=-DHAVE_CONFIG_H
+# 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:5537: creating $CONFIG_STATUS" >&5-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated automatically 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
-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=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then- set -o posix
-fi
-
-# Name of the executable.
-as_me=`echo "$0" |sed 's,.*[\\/],,'`
-
-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
-
-as_executable_p="test -f"
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
-# NLS nuisances.
-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export 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.52d. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
- CONFIG_LINKS = $CONFIG_LINKS
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $@
-
-_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
- -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
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-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.52d,
- 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
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option
do
- case $1 in
- --*=*)
- ac_option=`expr "x$1" : 'x\([^=]*\)='`
- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
- shift
- set dummy "$ac_option" "$ac_optarg" ${1+"$@"}- shift
- ;;
- -*);;
- *) # This is not an option, so the user has probably given explicit
- # arguments.
- ac_need_defaults=false;;
- esac
-
- case $1 in
- # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+ case "\$ac_option" in
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
- exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
- --he | --h)
- # Conflict between --help and --header
- { { echo "$as_me:5737: 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 )
- shift
- CONFIG_FILES="$CONFIG_FILES $1"
- ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- shift
- CONFIG_HEADERS="$CONFIG_HEADERS $1"
- ac_need_defaults=false;;
-
- # This is an error.
- -*) { { echo "$as_me:5756: 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" ;;
-
+ 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
- shift
done
-_ACEOF
+ac_given_srcdir=$srcdir
+ac_given_INSTALL="$INSTALL"
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
- case "$ac_config_target" in
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "gsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES gsm/Makefile" ;;
- "stconfig.h" ) CONFIG_HEADERS="$CONFIG_HEADERS stconfig.h" ;;
- *) { { echo "$as_me:5778: error: invalid argument: $ac_config_target" >&5-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;- esac
-done
+trap 'rm -fr `echo "libst-config Makefile gsm/Makefile stconfig.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
-# 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- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers-fi
+# 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%@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%@LN_S@%$LN_S%g
+s%@CPP@%$CPP%g
+s%@SED@%$SED%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%@NEED_OSS@%$NEED_OSS%g
+s%@NEED_SUNAU@%$NEED_SUNAU%g
+s%@NEED_ALSA@%$NEED_ALSA%g
+s%@GSM_SUPPORT@%$GSM_SUPPORT%g
+s%@PLAY_SUPPORT@%$PLAY_SUPPORT%g
-# 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.
-: ${TMPDIR=/tmp}-{- tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
-} ||
-{- tmp=$TMPDIR/cs$$-$RANDOM
- (umask 077 && mkdir $tmp)
-} ||
-{- echo "$me: cannot create a temporary directory in $TMPDIR" >&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,@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,@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,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@DEFS@,$DEFS,;t t
-s,@LIBS@,$LIBS,;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,@LN_S@,$LN_S,;t t
-s,@CPP@,$CPP,;t t
-s,@SED@,$SED,;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,@NEED_OSS@,$NEED_OSS,;t t
-s,@NEED_SUNAU@,$NEED_SUNAU,;t t
-s,@NEED_ALSA@,$NEED_ALSA,;t t
-s,@GSM_SUPPORT@,$GSM_SUPPORT,;t t
-s,@PLAY_SUPPORT@,$PLAY_SUPPORT,;t t
CEOF
+EOF
-_ACEOF
+cat >> $CONFIG_STATUS <<\EOF
- 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+# 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
+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file+ fi
+ if test ! -s conftest.s$ac_file; then
+ ac_more_lines=false
+ rm -f conftest.s$ac_file
+ else
+ if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds="sed -f conftest.s$ac_file"
else
- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
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
+ ac_file=`expr $ac_file + 1`
+ ac_beg=$ac_end
+ ac_end=`expr $ac_end + $ac_max_sed_cmds`
fi
-fi # test -n "$CONFIG_FILES"
+done
+if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds=cat
+fi
+EOF
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"libst-config Makefile gsm/Makefile"}+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
- - | *:- | *:-:* ) # 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_file" in
+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+ ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ *) ac_file_in="${ac_file}.in" ;;esac
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
- ac_dir=`$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'`
- { case "$ac_dir" in- [\\/]* | ?:[\\/]* ) as_incr_dir=;;
- *) as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
- case $as_mkdir_dir in
- # Skip DOS drivespec
- ?:) as_incr_dir=$as_mkdir_dir ;;
- *)
- as_incr_dir=$as_incr_dir/$as_mkdir_dir
- test -d "$as_incr_dir" ||
- mkdir "$as_incr_dir" ||
- { { echo "$as_me:5973: error: cannot create \"$ac_dir\"" >&5-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }- ;;
- esac
-done; }
+ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
- 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
+ # 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
-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 ;;
+ 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.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
+ srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+ top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ case "$ac_given_INSTALL" in
+ [/$]*) INSTALL="$ac_given_INSTALL" ;;
+ *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
esac
- if test x"$ac_file" != x-; then
- { echo "$as_me:6010: 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 automatically by config.status. */
- configure_input="Generated automatically from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
+ 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
- # 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:6028: 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:6041: 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,@top_srcdir@,$ac_top_srcdir,;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
+ 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*
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
# NAME is the cpp macro being defined and VALUE is the value it is being given.
#
# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB='[ ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-ac_uB='$,\1#\2define\3'
+ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
+ac_dC='\3'
+ac_dD='%g'
+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
+ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+ac_uB='\([ ]\)%\1#\2define\3'
ac_uC=' '
-ac_uD=',;t'
+ac_uD='\4%g'
+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+ac_eB='$%\1#\2define\3'
+ac_eC=' '
+ac_eD='%g'
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+if test "${CONFIG_HEADERS+set}" != set; then+EOF
+cat >> $CONFIG_STATUS <<EOF
+ CONFIG_HEADERS="stconfig.h"
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+fi
+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
# 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_file" in
+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+ ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ *) ac_file_in="${ac_file}.in" ;;esac
- test x"$ac_file" != x- && { echo "$as_me:6102: creating $ac_file" >&5-echo "$as_me: creating $ac_file" >&6;}
+ echo creating $ac_file
- # 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:6113: 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:6126: 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; }- # Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
+ rm -f conftest.frag conftest.in conftest.out
+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+ cat $ac_file_inputs > conftest.in
-_ACEOF
+EOF
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h. The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status. Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp-t end
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless. Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
+# Transform confdefs.h into a sed script conftest.vals that substitutes
+# the proper values into config.h.in to produce config.h. And first:
+# Protect against being on the right side of a sed subst in config.status.
+# Protect against being in an unquoted here document in config.status.
+rm -f conftest.vals
+cat > conftest.hdr <<\EOF
+s/[\\&%]/\\&/g
+s%[\\$`]%\\&%g
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp+s%ac_d%ac_u%gp
+s%ac_u%ac_e%gp
+EOF
+sed -n -f conftest.hdr confdefs.h > conftest.vals
+rm -f conftest.hdr
# This sed command replaces #undef with comments. This is necessary, for
# example, in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
+cat >> conftest.vals <<\EOF
+s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
+EOF
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo ' :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
- # Write a limited-size here document to $tmp/defines.sed.
- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#define' lines.
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS- echo 'CEOF
- sed -f $tmp/defines.sed $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail- rm -f conftest.defines
- mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo ' fi # egrep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
+# Break up conftest.vals because some shells have a limit on
+# the size of here documents, and old seds have small limits too.
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
+while :
do
- # Write a limited-size here document to $tmp/undefs.sed.
- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#undef'
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS+ ac_lines=`grep -c . conftest.vals`
+ # grep -c gives empty output for an empty file on some AIX systems.
+ if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
+ # Write a limited-size here document to conftest.frag.
+ echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
+ sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUSecho 'CEOF
- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail- rm -f conftest.undefs
- mv conftest.tail conftest.undefs
+ sed -f conftest.frag conftest.in > conftest.out
+ rm -f conftest.in
+ mv conftest.out conftest.in
+' >> $CONFIG_STATUS
+ sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail+ rm -f conftest.vals
+ mv conftest.tail conftest.vals
done
-rm -f conftest.undefs
+rm -f conftest.vals
-cat >>$CONFIG_STATUS <<\_ACEOF
- # 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 automatically by config.status. */
- if test x"$ac_file" = x-; then
- echo "/* Generated automatically by configure. */" >$tmp/config.h
+cat >> $CONFIG_STATUS <<\EOF
+ rm -f conftest.frag conftest.h
+ echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
+ cat conftest.in >> conftest.h
+ rm -f conftest.in
+ if cmp -s $ac_file conftest.h 2>/dev/null; then
+ echo "$ac_file is unchanged"
+ rm -f conftest.h
else
- echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h
- fi
- cat $tmp/in >>$tmp/config.h
- rm -f $tmp/in
- if test x"$ac_file" != x-; then
- if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:6243: $ac_file is unchanged" >&5-echo "$as_me: $ac_file is unchanged" >&6;}
- else
- ac_dir=`$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'`
- { case "$ac_dir" in- [\\/]* | ?:[\\/]* ) as_incr_dir=;;
- *) as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
- case $as_mkdir_dir in
- # Skip DOS drivespec
- ?:) as_incr_dir=$as_mkdir_dir ;;
- *)
- as_incr_dir=$as_incr_dir/$as_mkdir_dir
- test -d "$as_incr_dir" ||
- mkdir "$as_incr_dir" ||
- { { echo "$as_me:6270: error: cannot create \"$ac_dir\"" >&5-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }- ;;
- esac
-done; }
-
- rm -f $ac_file
- mv $tmp/config.h $ac_file
+ # 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"
fi
- else
- cat $tmp/config.h
- rm -f $tmp/config.h
+ rm -f $ac_file
+ mv conftest.h $ac_file
fi
-done
-_ACEOF
+fi; done
-cat >>$CONFIG_STATUS <<\_ACEOF
+EOF
+cat >> $CONFIG_STATUS <<EOF
-{ (exit 0); exit 0; }-_ACEOF
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+
+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=:
- exec 5>/dev/null
- $SHELL $CONFIG_STATUS || 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
if test ! -f tests.sh; then cp ${srcdir}/tests.sh tests.sh; fi if test ! -f testall.sh; then cp ${srcdir}/testall.sh testall.sh; fi@@ -6317,3 +3504,4 @@
echo
echo "Configure finished. Do 'make; make install' to compile and install SoX."
echo
+
--- a/configure.in
+++ b/configure.in
@@ -219,12 +219,13 @@
if test "$alsa_dsp" = auto
then
- AC_CHECK_HEADERS(linux/asound.h, alsa_dsp=yes)
+ AC_CHECK_HEADERS(linux/asound.h, alsa_dsp=check_ioctl)
+ AC_CHECK_HEADERS(sound/asound.h, alsa_dsp=alsa9)
fi
-if test "$alsa_dsp" = yes
+AC_MSG_CHECKING([for ALSA ioctl API])
+if test "$alsa_dsp" = check_ioctl
then
- AC_MSG_CHECKING([for ALSA ioctl API])
AC_TRY_COMPILE(
[
#include <linux/asound.h>
@@ -232,12 +233,29 @@
[
snd_pcm_capture_info_t c_info;
],
- alsa_api_ver=oldapi,alsa_api_ver=newapi)
- AC_MSG_RESULT($alsa_api_ver)
- CFLAGS="$CFLAGS -DALSA_PLAYER"
- if test "$alsa_api_ver" = oldapi; then CFLAGS="$CFLAGS -DUSE_OLD_API"; fi
+ alsa_dsp=alsa4,alsa_dsp=alsa5)
+fi
+
+if test "$alsa_dsp" = alsa9
+then
+ CFLAGS="$CFLAGS -DALSA_PLAYER -DUSE_ALSA9"
NEED_ALSA=1
PLAY_SUPPORT=1
+ AC_MSG_RESULT([0.9.X])
+elif test "$alsa_dsp" = alsa5
+then
+ CFLAGS="$CFLAGS -DALSA_PLAYER -DUSE_ALSA5"
+ NEED_ALSA=1
+ PLAY_SUPPORT=1
+ AC_MSG_RESULT([0.5.X])
+elif test "$alsa_dsp" = alsa4
+then
+ CFLAGS="$CFLAGS -DALSA_PLAYER -DUSE_ALSA4"
+ NEED_ALSA=1
+ PLAY_SUPPORT=1
+ AC_MSG_RESULT([0.4.X])
+else
+ AC_MSG_RESULT([not found])
fi
if test "$oss_dsp" = auto
--- a/src/alsa.c
+++ b/src/alsa.c
@@ -10,15 +10,15 @@
*
* added by Jimen Ching (jching@flex.com) 19990207
* based on info grabed from aplay.c in alsa-utils package.
+ * Updated for ALSA 0.9.X API 20020824.
*/
#include "st_i.h"
-#if defined(ALSA_PLAYER)
+#if defined(ALSA_PLAYER)
#include <string.h>
#include <fcntl.h>
-#include <linux/asound.h>
#include <sys/ioctl.h>
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -26,8 +26,177 @@
static int get_format(ft_t ft, int formats, int *fmt);
-#ifdef USE_OLD_API /* Start 0.4.x API */
+#if USE_ALSA9
+#include <limits.h>
+#include <sound/asound.h>
+
+/* Backwards compatibility. */
+#define SND_PCM_SFMT_S8 SNDRV_PCM_FORMAT_S8
+#define SND_PCM_SFMT_U8 SNDRV_PCM_FORMAT_U8
+#define SND_PCM_SFMT_S16_LE SNDRV_PCM_FORMAT_S16
+#define SND_PCM_SFMT_U16_LE SNDRV_PCM_FORMAT_U16
+
+#define SND_PCM_FMT_S8 (1 << SNDRV_PCM_FORMAT_S8)
+#define SND_PCM_FMT_U8 (1 << SNDRV_PCM_FORMAT_U8)
+#define SND_PCM_FMT_S16 (1 << SNDRV_PCM_FORMAT_S16)
+#define SND_PCM_FMT_U16 (1 << SNDRV_PCM_FORMAT_U16)
+
+#define alsa_params_masks(p, i) \
+ (&((p)->masks[(i)-SNDRV_PCM_HW_PARAM_FIRST_MASK]))
+#define alsa_params_intervals(p, i) \
+ (&((p)->intervals[(i)-SNDRV_PCM_HW_PARAM_FIRST_INTERVAL]))
+
+struct alsa_info
+{+ unsigned int formats;
+ unsigned int min_buffer_size;
+ unsigned int max_buffer_size;
+ unsigned int min_channels;
+ unsigned int max_channels;
+ unsigned int min_rate;
+ unsigned int max_rate;
+ unsigned int min_periods;
+ unsigned int max_periods;
+ unsigned int min_period_size;
+ unsigned int max_period_size;
+};
+
+struct alsa_setup
+{+ int format;
+ char channels;
+ st_rate_t rate;
+ size_t buffer_size;
+ int periods;
+ size_t period_size;
+};
+
+int
+alsa_hw_info_get(fd, a_info, params)
+int fd;
+struct alsa_info *a_info;
+struct sndrv_pcm_hw_params *params;
+{+ unsigned int i;
+ unsigned int *msk;
+ struct sndrv_interval *intr;
+
+ memset(params, '\0', sizeof(struct sndrv_pcm_hw_params));
+ for (i = 0; i <= SNDRV_PCM_HW_PARAM_LAST; ++i)
+ {+ if (i >= SNDRV_PCM_HW_PARAM_FIRST_MASK &&
+ i <= SNDRV_PCM_HW_PARAM_LAST_MASK)
+ {+ msk = alsa_params_masks(params, i);
+ *msk = ~0UL;
+ }
+ else
+ {+ intr = alsa_params_intervals(params, i);
+ intr->min = 0;
+ intr->openmin = 0;
+ intr->max = UINT_MAX;
+ intr->openmax = 0;
+ intr->integer = 0;
+ intr->empty = 0;
+ }
+ params->cmask |= 1 << i;
+ params->rmask |= 1 << i;
+ }
+ if (ioctl(fd, SNDRV_PCM_IOCTL_HW_REFINE, params) < 0) {+ return -1;
+ }
+ a_info->formats = *alsa_params_masks(params, SNDRV_PCM_HW_PARAM_FORMAT);
+ a_info->min_buffer_size = alsa_params_intervals(params, SNDRV_PCM_HW_PARAM_BUFFER_BYTES)->min;
+ a_info->max_buffer_size = alsa_params_intervals(params, SNDRV_PCM_HW_PARAM_BUFFER_BYTES)->max;
+ a_info->min_channels = alsa_params_intervals(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min;
+ a_info->max_channels = alsa_params_intervals(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max;
+ a_info->min_rate = alsa_params_intervals(params, SNDRV_PCM_HW_PARAM_RATE)->min;
+ a_info->max_rate = alsa_params_intervals(params, SNDRV_PCM_HW_PARAM_RATE)->max;
+ a_info->min_periods = alsa_params_intervals(params, SNDRV_PCM_HW_PARAM_PERIODS)->min;
+ a_info->max_periods = alsa_params_intervals(params, SNDRV_PCM_HW_PARAM_PERIODS)->max;
+ a_info->min_period_size = alsa_params_intervals(params, SNDRV_PCM_HW_PARAM_PERIOD_BYTES)->min;
+ a_info->max_period_size = alsa_params_intervals(params, SNDRV_PCM_HW_PARAM_PERIOD_BYTES)->max;
+ return 0;
+}
+
+int
+alsa_hw_info_set(fd, params, setup)
+int fd;
+struct sndrv_pcm_hw_params *params;
+struct alsa_setup *setup;
+{+ int i;
+ unsigned int *msk;
+ struct sndrv_interval *intr;
+
+ i = SNDRV_PCM_HW_PARAM_ACCESS;
+ msk = alsa_params_masks(params, i);
+ *msk &= 1 << SNDRV_PCM_ACCESS_RW_INTERLEAVED;
+ params->cmask = 1 << i;
+ params->rmask = 1 << i;
+
+ i = SNDRV_PCM_HW_PARAM_FORMAT;
+ msk = alsa_params_masks(params, i);
+ *msk &= 1 << setup->format;
+ params->cmask = 1 << i;
+ params->rmask = 1 << i;
+
+ i = SNDRV_PCM_HW_PARAM_CHANNELS;
+ intr = alsa_params_intervals(params, i);
+ intr->empty = 0;
+ intr->min = intr->max = setup->channels;
+ intr->openmin = intr->openmax = 0;
+ intr->integer = 1;
+ params->cmask = 1 << i;
+ params->rmask = 1 << i;
+
+ i = SNDRV_PCM_HW_PARAM_RATE;
+ intr = alsa_params_intervals(params, i);
+ intr->empty = 0;
+ intr->min = intr->max = setup->rate;
+ intr->openmin = intr->openmax = 0;
+ intr->integer = 1;
+ params->cmask = 1 << i;
+ params->rmask = 1 << i;
+
+ i = SNDRV_PCM_HW_PARAM_BUFFER_BYTES;
+ intr = alsa_params_intervals(params, i);
+ intr->empty = 0;
+ intr->min = intr->max = setup->buffer_size;
+ intr->openmin = intr->openmax = 0;
+ intr->integer = 1;
+ params->cmask = 1 << i;
+ params->rmask = 1 << i;
+
+ i = SNDRV_PCM_HW_PARAM_PERIODS;
+ intr = alsa_params_intervals(params, i);
+ intr->empty = 0;
+ intr->min = intr->max = setup->periods;
+ intr->openmin = intr->openmax = 0;
+ intr->integer = 1;
+ params->cmask = 1 << i;
+ params->rmask = 1 << i;
+
+ i = SNDRV_PCM_HW_PARAM_PERIOD_BYTES;
+ intr = alsa_params_intervals(params, i);
+ intr->empty = 0;
+ intr->min = intr->max = setup->period_size;
+ intr->openmin = intr->openmax = 0;
+ intr->integer = 1;
+ params->cmask = 1 << i;
+ params->rmask = 1 << i;
+
+ if (ioctl(fd, SNDRV_PCM_IOCTL_HW_PARAMS, params) < 0) {+ return -1;
+ }
+ if (ioctl(fd, SNDRV_PCM_IOCTL_PREPARE) < 0) {+ return -1;
+ }
+ return 0;
+}
+
/*
* Do anything required before you start reading samples.
* Read file header.
@@ -38,6 +207,116 @@
int st_alsastartread(ft)
ft_t ft;
{+ int fmt;
+ struct alsa_info a_info;
+ struct alsa_setup a_setup;
+ struct sndrv_pcm_hw_params params;
+
+ if (alsa_hw_info_get(fileno(ft->fp), a_info, ¶ms) < 0) {+ st_fail_errno(ft,ST_EPERM,"ioctl operation failed %d",errno);
+ return(ST_EOF);
+ }
+ ft->file.count = 0;
+ ft->file.pos = 0;
+ ft->file.eof = 0;
+ ft->file.size = a_info.max_buffer_size;
+ if ((ft->file.buf = malloc (ft->file.size)) == NULL) {+ st_fail_errno(ft,ST_ENOMEM,"unable to allocate output buffer of size %d", ft->file.size);
+ return(ST_EOF);
+ }
+ if (ft->info.rate < a_info.min_rate) ft->info.rate = 2 * a_info.min_rate;
+ else if (ft->info.rate > a_info.max_rate) ft->info.rate = a_info.max_rate;
+ if (ft->info.channels == -1) ft->info.channels = a_info.min_channels;
+ else if (ft->info.channels > a_info.max_channels) ft->info.channels = a_info.max_channels;
+ if (get_format(ft, a_info.formats, &fmt) < 0)
+ return (ST_EOF);
+
+ a_setup.format = fmt;
+ a_setup.channels = ft->info.channels;
+ a_setup.rate = ft->info.rate;
+ a_setup.buffer_size = ft->file.size;
+ a_setup.periods = 16;
+ if (a_setup.periods < a_info.min_periods) a_setup.periods = a_info.min_periods;
+ else if (a_setup.periods > a_info.max_periods) a_setup.periods = a_info.max_periods;
+ a_setup.period_size = a_setup.buffer_size / a_setup.periods;
+ if (a_setup.period_size < a_info.min_period_size) a_setup.period_size = a_info.min_period_size;
+ else if (a_setup.period_size > a_info.max_period_size) a_setup.period_size = a_info.max_period_size;
+ if (alsa_hw_info_set(fileno(ft->fp), ¶ms, &a_setup) < 0) {+ st_fail_errno(ft,ST_EPERM,"ioctl operation failed %d",errno);
+ return(ST_EOF);
+ }
+
+ /* Change to non-buffered I/O */
+ setvbuf(ft->fp, NULL, _IONBF, sizeof(char) * ft->file.size);
+
+ sigintreg(ft); /* Prepare to catch SIGINT */
+
+ return (ST_SUCCESS);
+}
+
+int st_alsastartwrite(ft)
+ft_t ft;
+{+ int fmt;
+ struct alsa_info a_info;
+ struct alsa_setup a_setup;
+ struct sndrv_pcm_hw_params params;
+
+ if (alsa_hw_info_get(fileno(ft->fp), &a_info, ¶ms) < 0) {+ st_fail_errno(ft,ST_EPERM,"ioctl operation failed %d",errno);
+ return(ST_EOF);
+ }
+ ft->file.pos = 0;
+ ft->file.eof = 0;
+ ft->file.size = a_info.max_buffer_size;
+ if ((ft->file.buf = malloc (ft->file.size)) == NULL) {+ st_fail_errno(ft,ST_ENOMEM,"unable to allocate output buffer of size %d", ft->file.size);
+ return(ST_EOF);
+ }
+ if (ft->info.rate < a_info.min_rate) ft->info.rate = 2 * a_info.min_rate;
+ else if (ft->info.rate > a_info.max_rate) ft->info.rate = a_info.max_rate;
+ if (ft->info.channels == -1) ft->info.channels = a_info.min_channels;
+ else if (ft->info.channels > a_info.max_channels) ft->info.channels = a_info.max_channels;
+ if (get_format(ft, a_info.formats, &fmt) < 0)
+ return (ST_EOF);
+
+ a_setup.format = fmt;
+ a_setup.channels = ft->info.channels;
+ a_setup.rate = ft->info.rate;
+ a_setup.buffer_size = ft->file.size;
+ a_setup.periods = 16;
+ if (a_setup.periods < a_info.min_periods) a_setup.periods = a_info.min_periods;
+ else if (a_setup.periods > a_info.max_periods) a_setup.periods = a_info.max_periods;
+ a_setup.period_size = a_setup.buffer_size / a_setup.periods;
+ if (a_setup.period_size < a_info.min_period_size) a_setup.period_size = a_info.min_period_size;
+ else if (a_setup.period_size > a_info.max_period_size) a_setup.period_size = a_info.max_period_size;
+ if (alsa_hw_info_set(fileno(ft->fp), ¶ms, &a_setup) < 0) {+ st_fail_errno(ft,ST_EPERM,"ioctl operation failed %d",errno);
+ return(ST_EOF);
+ }
+
+ /* Change to non-buffered I/O */
+ setvbuf(ft->fp, NULL, _IONBF, sizeof(char) * ft->file.size);
+
+ return(ST_SUCCESS);
+}
+
+int st_alsastopwrite(ft)
+ft_t ft;
+{+ ioctl(fileno(ft->fp), SNDRV_PCM_IOCTL_DRAIN);
+ return(st_rawstopwrite(ft));
+}
+
+#else /* ! USE_ALSA9 */
+
+#include <linux/asound.h>
+
+#if USE_ALSA4 /* Start 0.4.x API */
+
+int st_alsastartread(ft)
+ft_t ft;
+{int bps, fmt, size;
snd_pcm_capture_info_t c_info;
snd_pcm_format_t format;
@@ -151,8 +430,15 @@
return(ST_SUCCESS);
}
-#else /* Start 0.5.x API */
+int st_alsastopwrite(ft)
+ft_t ft;
+{+ /* Is there a drain operation for ALSA 0.4.X? */
+ return(st_rawstopwrite(ft));
+}
+#elif USE_ALSA5 /* Start 0.5.x API */
+
int st_alsastartread(ft)
ft_t ft;
{@@ -278,8 +564,17 @@
return(ST_SUCCESS);
}
-#endif /* End API */
+int st_alsastopwrite(ft)
+ft_t ft;
+{+ ioctl(fileno(ft->fp), SND_PCM_IOCTL_CHANNEL_DRAIN);
+ return(st_rawstopwrite(ft));
+}
+#endif /* USE_ALSA4/5 */
+
+#endif /* USE_ALSA9 */
+
#define EMSGFMT "ALSA driver does not support %s %s output"
static int get_format(ft, formats, fmt)
@@ -351,4 +646,4 @@
return 0;
}
-#endif
+#endif /* ALSA_PLAYER */
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -259,7 +259,7 @@
#ifdef ALSA_PLAYER
{alsanames, ST_FILE_STEREO,st_alsastartread, st_rawread, st_rawstopread,
- st_alsastartwrite, st_rawwrite, st_rawstopwrite,
+ st_alsastartwrite, st_rawwrite, st_alsastopwrite,
st_format_nothing_seek},
#endif
{aunames, ST_FILE_STEREO | ST_FILE_SEEK,--- a/src/st_i.h
+++ b/src/st_i.h
@@ -160,6 +160,7 @@
#ifdef ALSA_PLAYER
int st_alsastartread(ft_t ft);
int st_alsastartwrite(ft_t ft);
+int st_alsastopwrite(ft_t ft);
#endif
int st_austartread(ft_t ft);