ref: 0bf280ec84b215fd654628b0acdf578aa94a40d3
parent: 4e626f97b1562b2821e9152c8a42d537785279dd
author: cbagwell <cbagwell>
date: Sat Jan 25 18:50:10 EST 2003
Updates to configure scripts
--- a/configure
+++ b/configure
@@ -1,8 +1,10 @@
#! /bin/sh
-# From configure.in 1.3.
+# From configure.in 1.4.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53.
+# Generated by GNU Autoconf 2.53 for sox 12.17.4.
#
+# Report bugs to <cbagwell@users.sourceforge.net>.
+#
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -253,11 +255,11 @@
: ${ac_max_here_lines=38}# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='sox'
+PACKAGE_TARNAME='"sox-12.17.4"'
+PACKAGE_VERSION='12.17.4'
+PACKAGE_STRING='sox 12.17.4'
+PACKAGE_BUGREPORT='cbagwell@users.sourceforge.net'
ac_unique_file="sox.c"
# Factoring default headers for most tests.
@@ -761,7 +763,7 @@
# 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.
+\`configure' configures sox 12.17.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -822,7 +824,9 @@
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of sox 12.17.4:";;
+ esac
cat <<\_ACEOF
Optional Features:
@@ -832,20 +836,13 @@
--disable-fast-ulaw Disable fast ulaw compression (-32K memory)
--disable-fast-alaw Disable fast alaw compression (-32K memory)
--disable-gsm Disable internal GSM support
+ --disable-alsa-dsp Disable detection of ALSA
+ --disable-oss-dsp Disable detection of OSS
+ --disable-sun-audio Disable detection of SUN-style audio
+ --disable-ogg-vorbis Disable detection of Ogg Vorbis
+ --disable-mad Disable detection of MAD (MP3 Audio Decoder)
+ --disable-lame Disable detection of LAME (LAME Ain't an MP3 Encoder)
-Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --without-alsa-dsp Disable detection of ALSA
- --without-oss-dsp Disable detection of OSS
- --without-sun-audio Disable detection of SUN-style audio
- --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
@@ -858,6 +855,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+Report bugs to <cbagwell@users.sourceforge.net>.
_ACEOF
fi
@@ -920,6 +918,8 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
+sox configure 12.17.4
+generated by GNU Autoconf 2.53
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
Free Software Foundation, Inc.
@@ -933,7 +933,7 @@
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
+It was created by sox $as_me 12.17.4, which was
generated by GNU Autoconf 2.53. Invocation command line was
$ $0 $@
@@ -1205,10 +1205,22 @@
+
+
+
+
+
+
+
+
+
+
# Check whether --enable-old_rate or --disable-old_rate was given.
if test "${enable_old_rate+set}" = set; thenenableval="$enable_old_rate"
-
+ enable_old_rate=$enableval
+else
+ enable_old_rate=no
fi;
# Check whether --enable-fast_ulaw or --disable-fast_ulaw was given.
@@ -1235,87 +1247,169 @@
enable_gsm=yes
fi;
-
-# Check whether --with-alsa_dsp or --without-alsa_dsp was given.
-if test "${with_alsa_dsp+set}" = set; then- withval="$with_alsa_dsp"
- alsa_dsp="$withval"
+# Check whether --enable-alsa_dsp or --disable-alsa_dsp was given.
+if test "${enable_alsa_dsp+set}" = set; then+ enableval="$enable_alsa_dsp"
+ enable_alsa_dsp=$enableval
else
- alsa_dsp=auto
+ enable_alsa_dsp=yes
fi;
-
-# Check whether --with-oss_dsp or --without-oss_dsp was given.
-if test "${with_oss_dsp+set}" = set; then- withval="$with_oss_dsp"
- oss_dsp="$withval"
+# Check whether --enable-oss_dsp or --disable-oss_dsp was given.
+if test "${enable_oss_dsp+set}" = set; then+ enableval="$enable_oss_dsp"
+ enable_oss_dsp=$enableval
else
- oss_dsp=auto
+ enable_oss_dsp=yes
fi;
-
-# Check whether --with-sun_audio or --without-sun_audio was given.
-if test "${with_sun_audio+set}" = set; then- withval="$with_sun_audio"
- sun_audio="$withval"
+# Check whether --enable-sun_audio or --disable-sun_audio was given.
+if test "${enable_sun_audio+set}" = set; then+ enableval="$enable_sun_audio"
+ enable_sun_audio=$enableval
else
- sun_audio=auto
+ enable_sun_audio=yes
fi;
-
-# Check whether --with-ogg_vorbislib or --without-ogg_vorbislib was given.
-if test "${with_ogg_vorbislib+set}" = set; then- withval="$with_ogg_vorbislib"
- ogg_vorbislib="$withval"
+# Check whether --enable-ogg_vorbis or --disable-ogg_vorbis was given.
+if test "${enable_ogg_vorbis+set}" = set; then+ enableval="$enable_ogg_vorbis"
+ enable_ogg_vorbis=$enableval
else
- ogg_vorbislib=auto
+ enable_ogg_vorbis=yes
fi;
-
-# Check whether --with-ogg_vorbisinc or --without-ogg_vorbisinc was given.
-if test "${with_ogg_vorbisinc+set}" = set; then- withval="$with_ogg_vorbisinc"
- ogg_vorbisinc="$withval"
+# Check whether --enable-mad or --disable-mad was given.
+if test "${enable_mad+set}" = set; then+ enableval="$enable_mad"
+ enable_mad=$enableval
else
- ogg_vorbisinc=auto
+ enable_mad=yes
fi;
-
-# Check whether --with-madlib or --without-madlib was given.
-if test "${with_madlib+set}" = set; then- withval="$with_madlib"
- madlib="$withval"
+# Check whether --enable-lame or --disable-lame was given.
+if test "${enable_lame+set}" = set; then+ enableval="$enable_lame"
+ enable_lame=$enableval
else
- madlib=auto
+ enable_lame=yes
fi;
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+ if test -f $ac_dir/install-sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f $ac_dir/install.sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f $ac_dir/shtool; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+ { (exit 1); exit 1; }; }+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.
-# Check whether --with-madinc or --without-madinc was given.
-if test "${with_madinc+set}" = set; then- withval="$with_madinc"
- madinc="$withval"
+# Make sure we can run config.sub.
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+ { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }+
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
+if test "${ac_cv_build+set}" = set; then+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- madinc=auto
-fi;
+ ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+ ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }+fi
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6+build=$ac_cv_build
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-# Check whether --with-lamelib or --without-lamelib was given.
-if test "${with_lamelib+set}" = set; then- withval="$with_lamelib"
- lamelib="$withval"
+
+echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
+if test "${ac_cv_host+set}" = set; then+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lamelib=auto
-fi;
+ ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+ ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }+fi
+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6+host=$ac_cv_host
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-# Check whether --with-lameinc or --without-lameinc was given.
-if test "${with_lameinc+set}" = set; then- withval="$with_lameinc"
- lameinc="$withval"
+
+echo "$as_me:$LINENO: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6
+if test "${ac_cv_target+set}" = set; then+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lameinc=auto
-fi;
+ ac_cv_target_alias=$target_alias
+test "x$ac_cv_target_alias" = "x" &&
+ ac_cv_target_alias=$ac_cv_host_alias
+ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5+echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+ { (exit 1); exit 1; }; }+fi
+echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6+target=$ac_cv_target
+target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$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"
+ CPPFLAGS="$CPPFLAGS -mno-cygwin"
+ LDFLAGS="$LDFLAGS -mno-cygwin"
+esac
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2154,31 +2248,6 @@
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
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f $ac_dir/install.sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f $ac_dir/shtool; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
- { (exit 1); exit 1; }; }-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.
-
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -2508,421 +2577,11 @@
done
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
- { (exit 1); exit 1; }; }-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
- ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
- ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
- { (exit 1); exit 1; }; }-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
- ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
- { (exit 1); exit 1; }; }-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$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"
- CPPFLAGS="$CFLAGS -mno-cygwin"
- LDFLAGS="$LDFLAGS -mno-cygwin"
-esac
-
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_cv_header_stdc=yes
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "memchr" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "free" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
- :
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "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 XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_Header=yes"
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6-if test `eval echo '${'$as_ac_Header'}'` = yes; then- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-
-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:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=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:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$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:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- 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:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: $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:$LINENO: 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:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: 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:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: 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
+if test "$GCC" = yes; then
CFLAGS="$CFLAGS -Wall"
fi
+
echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
if test "${ac_cv_c_bigendian+set}" = set; then@@ -3373,6 +3032,204 @@
;;
esac
+
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_cv_header_stdc=yes
+else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_header_stdc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "memchr" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "free" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "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 XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ exit(2);
+ exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6+if test `eval echo '${'$as_ac_Header'}'` = yes; then+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
echo "$as_me:$LINENO: 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@@ -3432,7 +3289,281 @@
fi
+if test "$enable_old_rate" = yes
+then
+ CFLAGS="$CFLAGS -DUSE_OLD_RATE"
+fi
+if test "$enable_fast_ulaw" = yes
+then
+ CFLAGS="$CFLAGS -DFAST_ULAW_CONVERSION"
+fi
+if test "$enable_fast_alaw" = yes
+then
+ CFLAGS="$CFLAGS -DFAST_ALAW_CONVERSION"
+fi
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_cv_header_stdc=yes
+else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_header_stdc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "memchr" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "free" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "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 XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ exit(2);
+ exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+
+
+
+
+
+
+
+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:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=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:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$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:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ 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:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
+ { echo "$as_me:$LINENO: WARNING: $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:$LINENO: 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:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: 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:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: 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
+
+
+
+
{ echo "$as_me:$LINENO: checking if math library is required during link..." >&5echo "$as_me: checking if math library is required during link..." >&6;}
echo "$as_me:$LINENO: checking for pow" >&5
@@ -3577,23 +3708,91 @@
PLAY_SUPPORT=0
-if test "$ogg_vorbislib" != auto && test "$ogg_vorbislib" != no
-then
- LIBS="$LIBS -L$ogg_vorbislib"
-fi
-ac_save_CPPFLAGS="$CPPFLAGS"
-if test "$ogg_vorbisinc" != auto && test "$ogg_vorbisinc" != no
-then
- CFLAGS="$CFLAGS -I$ogg_vorbisinc"
- ac_save_CPPFLAGS="$CPPFLAGS"
- if test \! -z "$ogg_vorbisinc" ; then
- CPPFLAGS="$CPPFLAGS -I$ogg_vorbisinc"
- fi
+
+
+
+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:$LINENO: 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
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ 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) ();
+
+#ifdef F77_DUMMY_MAIN
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int F77_DUMMY_MAIN() { return 1; }+#endif
+int
+main ()
+{+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: 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 test "${ac_cv_header_vorbis_codec_h+set}" = set; then+fi
+done
+
+
+
+if test "$enable_ogg_vorbis" = yes
+then
+ if test "${ac_cv_header_vorbis_codec_h+set}" = set; thenecho "$as_me:$LINENO: 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@@ -3695,15 +3894,15 @@
fi
if test $ac_cv_header_vorbis_codec_h = yes; then
- ogg_vorbisinc=yes
+ found_ogg_vorbis=yes
else
- ogg_vorbisinc=no
+ found_ogg_vorbis=no
fi
-if test "$ogg_vorbisinc" = yes
-then
- echo "$as_me:$LINENO: checking for vorbis_analysis_init in -lvorbis" >&5
+ if test "$found_ogg_vorbis" = yes
+ then
+ echo "$as_me:$LINENO: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -3765,29 +3964,17 @@
#define HAVE_LIBVORBIS 1
_ACEOF
+else
+ enable_ogg_vorbis=no
fi
+ fi
fi
-CPPFLAGS="$ac_save_CPPFLAGS"
-if test "$madlib" != auto && test "$madlib" != no
+if test "$enable_mad" = yes
then
- LIBS="$LIBS -L$madlib"
-fi
-
-ac_save_CPPFLAGS="$CPPFLAGS"
-
-if test "$madinc" != auto && test "$madinc" != no
-then
- CFLAGS="$CFLAGS -I$madinc"
- ac_save_CPPFLAGS="$CPPFLAGS"
- if test \! -z "$madinc" ; then
- CPPFLAGS="$CPPFLAGS -I$madinc"
- fi
-fi
-
-if test "${ac_cv_header_mad_h+set}" = set; then+ if test "${ac_cv_header_mad_h+set}" = set; thenecho "$as_me:$LINENO: 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@@ -3889,15 +4076,15 @@
fi
if test $ac_cv_header_mad_h = yes; then
- madinc=yes
+ found_mad=yes
else
- madinc=no
+ found_mad=no
fi
-if test "$madinc" = yes
-then
- echo "$as_me:$LINENO: checking for mad_stream_buffer in -lmad" >&5
+ if test "$found_mad" = yes
+ then
+ echo "$as_me:$LINENO: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -3959,29 +4146,17 @@
#define HAVE_LIBMAD 1
_ACEOF
+else
+ enable_mad=no
fi
+ fi
fi
-CPPFLAGS="$ac_save_CPPFLAGS"
-if test "$lamelib" != auto && test "$lamelib" != no
+if test "$enable_lame" = yes
then
- LIBS="$LIBS -L$lamelib"
-fi
-
-ac_save_CPPFLAGS="$CPPFLAGS"
-
-if test "$lameinc" != auto && test "$lameinc" != no
-then
- CFLAGS="$CFLAGS -I$lameinc"
- ac_save_CPPFLAGS="$CPPFLAGS"
- if test \! -z "$lameinc" ; then
- CPPFLAGS="$CPPFLAGS -I$lameinc"
- fi
-fi
-
-if test "${ac_cv_header_lame_lame_h+set}" = set; then+ if test "${ac_cv_header_lame_lame_h+set}" = set; thenecho "$as_me:$LINENO: 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@@ -4083,15 +4258,15 @@
fi
if test $ac_cv_header_lame_lame_h = yes; then
- lameinc=yes
+ found_lame=yes
else
- lameinc=no
+ found_lame=no
fi
-if test "$lameinc" = yes
-then
- echo "$as_me:$LINENO: checking for lame_init in -lmp3lame" >&5
+ if test "$found_lame" = yes
+ then
+ echo "$as_me:$LINENO: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -4153,214 +4328,17 @@
#define HAVE_LAME 1
_ACEOF
-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:$LINENO: 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
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- 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) ();
-
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
-int
-main ()
-{-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ enable_lame=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: 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
+ fi
fi
-done
-
-if test "$alsa_dsp" = yes
+if test "$enable_alsa_dsp" = yes
then
- alsa_type=alsa9
-for ac_header in sound/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:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=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:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$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:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- 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:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: $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:$LINENO: 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:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: 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:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: 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
-
-elif test "$alsa_dsp" = auto
-then
-
for ac_header in linux/asound.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4588,12 +4566,12 @@
done
-fi
-echo "$as_me:$LINENO: checking for ALSA ioctl API" >&5
+ echo "$as_me:$LINENO: checking for ALSA ioctl API" >&5
echo $ECHO_N "checking for ALSA ioctl API... $ECHO_C" >&6
-if test "$alsa_type" = check_ioctl
-then
+
+ if test "$alsa_type" = check_ioctl
+ then
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
@@ -4635,35 +4613,37 @@
alsa_type=alsa5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-fi
+ fi
-if test "$alsa_type" = alsa9
-then
+ if test "$alsa_type" = alsa9
+ then
CFLAGS="$CFLAGS -DALSA_PLAYER -DUSE_ALSA9"
NEED_ALSA=1
PLAY_SUPPORT=1
echo "$as_me:$LINENO: result: 0.9.X" >&5
echo "${ECHO_T}0.9.X" >&6-elif test "$alsa_type" = alsa5
-then
+ elif test "$alsa_type" = alsa5
+ then
CFLAGS="$CFLAGS -DALSA_PLAYER -DUSE_ALSA5"
NEED_ALSA=1
PLAY_SUPPORT=1
echo "$as_me:$LINENO: result: 0.5.X" >&5
echo "${ECHO_T}0.5.X" >&6-elif test "$alsa_type" = alsa4
-then
+ elif test "$alsa_type" = alsa4
+ then
CFLAGS="$CFLAGS -DALSA_PLAYER -DUSE_ALSA4"
NEED_ALSA=1
PLAY_SUPPORT=1
echo "$as_me:$LINENO: result: 0.4.X" >&5
echo "${ECHO_T}0.4.X" >&6-else
+ else
echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6+ enable_alsa_dsp=no
+ fi
fi
-if test "$oss_dsp" != no
+if test "$enable_oss_dsp" = yes
then
@@ -4775,22 +4755,23 @@
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- oss_dsp_found=yes
+ found_oss_dsp=yes
fi
done
-fi
-if test "$oss_dsp" = yes || test "$oss_dsp_found" = yes
-then
-
+ if test "$found_oss_dsp" = yes
+ then
CFLAGS="$CFLAGS -DOSS_PLAYER"
NEED_OSS=1
PLAY_SUPPORT=1
+ else
+ enable_oss_dsp=no
+ fi
fi
-if test "$sun_audio" != no
+if test "$enable_sun_audio" = yes
then
@@ -4902,32 +4883,22 @@
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- sun_audio_found=yes
+ found_sun_audio=yes
fi
done
-fi
-if test "$sun_audio" = yes || test "$sun_audio_found" = yes
+ if test "$found_sun_audio" = yes
then
CFLAGS="$CFLAGS -DSUNAUDIO_PLAYER"
NEED_SUNAU=1
PLAY_SUPPORT=1
+ else
+ enable_sun_audio=no
+ fi
fi
-if test "$old_rate" = yes
-then
- CFLAGS="$CFLAGS -DUSE_OLD_RATE"
-fi
-if test "$enable_fast_ulaw" = yes
-then
- CFLAGS="$CFLAGS -DFAST_ULAW_CONVERSION"
-fi
-if test "$enable_fast_alaw" = yes
-then
- CFLAGS="$CFLAGS -DFAST_ALAW_CONVERSION"
-fi
if test "$enable_gsm" = yes
then
CFLAGS="$CFLAGS -DENABLE_GSM"
@@ -4942,6 +4913,7 @@
+
ac_config_headers="$ac_config_headers stconfig.h"
# ------ AC CREATE STDINT H -------------------------------------
@@ -6013,7 +5985,10 @@
#endif
EOF
+
ac_config_files="$ac_config_files libst-config Makefile gsm/Makefile"
+
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -6339,7 +6314,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by $as_me, which was
+This file was extended by sox $as_me 12.17.4, which was
generated by GNU Autoconf 2.53. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6398,7 +6373,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-config.status
+sox config.status 12.17.4
configured by $0, generated by GNU Autoconf 2.53,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -6570,6 +6545,18 @@
s,@ECHO_N@,$ECHO_N,;t t
s,@ECHO_T@,$ECHO_T,;t t
s,@LIBS@,$LIBS,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@target@,$target,;t t
+s,@target_cpu@,$target_cpu,;t t
+s,@target_vendor@,$target_vendor,;t t
+s,@target_os@,$target_os,;t t
s,@CC@,$CC,;t t
s,@CFLAGS@,$CFLAGS,;t t
s,@LDFLAGS@,$LDFLAGS,;t t
@@ -6585,18 +6572,6 @@
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
@@ -7052,6 +7027,17 @@
if test ! -f monkey.au; then cp ${srcdir}/monkey.au monkey.au; fi if test ! -f monkey.voc; then cp ${srcdir}/monkey.voc monkey.voc; fi+echo
+echo "Old Rate enabled.................. $enable_old_rate"
+echo "Fast ulaw enabled................. $enable_fast_ulaw"
+echo "Fast alaw enabled................. $enable_fast_alaw"
+echo "GSM Support....................... $enable_gsm"
+echo "ALSA Driver....................... $enable_alsa_dsp"
+echo "OSS Driver........................ $enable_oss_dsp"
+echo "SUN /dev/audio.................... $enable_sun_audio"
+echo "Ogg Vorbis support................ $enable_ogg_vorbis"
+echo "MAD MP3 Decoder................... $enable_mad"
+echo "LAME MP3 Encoder.................. $enable_lame"
echo
echo "Configure finished. Do 'make; make install' to compile and install SoX."
echo
--- a/configure.in
+++ b/configure.in
@@ -3,14 +3,17 @@
dnl configure.in
dnl
-AC_REVISION([1.3])
+AC_REVISION(1.4)
-AC_INIT(sox.c)
+AC_INIT(sox, 12.17.4, cbagwell@users.sourceforge.net, "sox-12.17.4")
+AC_CONFIG_SRCDIR(sox.c)
+
dnl Parameters to configure
AC_ARG_ENABLE(old_rate,
- [ --enable-old-rate Use old rate code])
+ [ --enable-old-rate Use old rate code],
+ enable_old_rate=$enableval, enable_old_rate=no)
AC_ARG_ENABLE(fast_ulaw,
[ --disable-fast-ulaw Disable fast ulaw compression (-32K memory)],
@@ -24,51 +27,46 @@
[ --disable-gsm Disable internal GSM support],
enable_gsm=$enableval, enable_gsm=yes)
-AC_ARG_WITH(alsa_dsp,
- [ --without-alsa-dsp Disable detection of ALSA],
- [alsa_dsp="$withval"],
- [alsa_dsp=auto])
+AC_ARG_ENABLE(alsa_dsp,
+ [ --disable-alsa-dsp Disable detection of ALSA],
+ [enable_alsa_dsp=$enableval],
+ [enable_alsa_dsp=yes])
-AC_ARG_WITH(oss_dsp,
- [ --without-oss-dsp Disable detection of OSS],
- [oss_dsp="$withval"],
- [oss_dsp=auto])
+AC_ARG_ENABLE(oss_dsp,
+ [ --disable-oss-dsp Disable detection of OSS],
+ [enable_oss_dsp=$enableval],
+ [enable_oss_dsp=yes])
-AC_ARG_WITH(sun_audio,
- [ --without-sun-audio Disable detection of SUN-style audio],
- [sun_audio="$withval"],
- [sun_audio=auto])
+AC_ARG_ENABLE(sun_audio,
+ [ --disable-sun-audio Disable detection of SUN-style audio],
+ [enable_sun_audio=$enableval],
+ [enable_sun_audio=yes])
-AC_ARG_WITH(ogg_vorbislib,
- [ --with-ogg-vorbislib Location of Ogg Vorbis libraries (=dir)],
- [ogg_vorbislib="$withval"],
- [ogg_vorbislib=auto])
+AC_ARG_ENABLE(ogg_vorbis,
+ [ --disable-ogg-vorbis Disable detection of Ogg Vorbis],
+ [enable_ogg_vorbis=$enableval],
+ [enable_ogg_vorbis=yes])
-AC_ARG_WITH(ogg_vorbisinc,
- [ --with-ogg-vorbisinc Location of Ogg Vorbis headers (=dir)],
- [ogg_vorbisinc="$withval"],
- [ogg_vorbisinc=auto])
+AC_ARG_ENABLE(mad,
+ [ --disable-mad Disable detection of MAD (MP3 Audio Decoder)],
+ [enable_mad=$enableval],
+ [enable_mad=yes])
-AC_ARG_WITH(madlib,
- [ --with-madlib Location of MAD (MP3 Audio Decoder) libraries (=dir)],
- [madlib="$withval"],
- [madlib=auto])
+AC_ARG_ENABLE(lame,
+ [ --disable-lame Disable detection of LAME (LAME Ain't an MP3 Encoder)],
+ [enable_lame=$enableval],
+ [enable_lame=yes])
-AC_ARG_WITH(madinc,
- [ --with-madinc Location of MAD (MP3 Audio Decoder) headers (=dir)],
- [madinc="$withval"],
- [madinc=auto])
+dnl Set host type
+AC_CANONICAL_SYSTEM
-AC_ARG_WITH(lamelib,
- [ --with-lamelib Location of LAME (LAME Ain't an MP3 Encoder) libraries (=dir)],
- [lamelib="$withval"],
- [lamelib=auto])
+case "$target" in
+ *cygwin* )
+ CFLAGS="$CFLAGS -mno-cygwin"
+ CPPFLAGS="$CPPFLAGS -mno-cygwin"
+ LDFLAGS="$LDFLAGS -mno-cygwin"
+esac
-AC_ARG_WITH(lameinc,
- [ --with-lameinc Location of LAME (LAME Ain't an MP3 Encoder) headers (=dir)],
- [lameinc="$withval"],
- [lameinc=auto])
-
dnl Checks for programs.
AC_PROG_CC
AC_PROG_RANLIB
@@ -77,23 +75,8 @@
AC_PROG_CPP
AC_CHECK_PROGS(SED, sed)
-dnl Set host type
-AC_CANONICAL_SYSTEM
-
-case "$target" in
- *cygwin* )
- CFLAGS="$CFLAGS -mno-cygwin"
- CPPFLAGS="$CFLAGS -mno-cygwin"
- LDFLAGS="$LDFLAGS -mno-cygwin"
-esac
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(getopt.h fcntl.h limits.h malloc.h unistd.h byteswap.h errno.h)
-
dnl Extra CFLAGS if we have gcc
-if test "$GCC" = yes
-then
+if test "$GCC" = yes; then
CFLAGS="$CFLAGS -Wall"
fi
@@ -103,9 +86,27 @@
AC_C_INLINE
AC_TYPE_SIZE_T
+if test "$enable_old_rate" = yes
+then
+ CFLAGS="$CFLAGS -DUSE_OLD_RATE"
+fi
+if test "$enable_fast_ulaw" = yes
+then
+ CFLAGS="$CFLAGS -DFAST_ULAW_CONVERSION"
+fi
+if test "$enable_fast_alaw" = yes
+then
+ CFLAGS="$CFLAGS -DFAST_ALAW_CONVERSION"
+fi
+
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS(getopt.h fcntl.h limits.h malloc.h unistd.h byteswap.h errno.h)
+
dnl Checks for libraries.
dnl Check if math library is needed.
+
AC_CHECKING(if math library is required during link)
AC_CHECK_FUNC(pow)
if test "$ac_cv_func_pow" = no
@@ -121,115 +122,66 @@
GSM_SUPPORT=0
PLAY_SUPPORT=0
-dnl Test for Ogg Vorbis libraries.
+dnl Checks for library functions.
-if test "$ogg_vorbislib" != auto && test "$ogg_vorbislib" != no
-then
- LIBS="$LIBS -L$ogg_vorbislib"
-fi
+AC_CHECK_FUNCS(getopt strerror memmove rand strcasecmp)
-dnl Need to tell preprocess where to look for Ogg Vorbis include files
-dnl when they are not in system directories. Because of this make
-dnl a backup copy of the CPPFLAGS.
-ac_save_CPPFLAGS="$CPPFLAGS"
+dnl Test for Ogg Vorbis libraries.
-if test "$ogg_vorbisinc" != auto && test "$ogg_vorbisinc" != no
+if test "$enable_ogg_vorbis" = yes
then
- CFLAGS="$CFLAGS -I$ogg_vorbisinc"
- ac_save_CPPFLAGS="$CPPFLAGS"
- if test \! -z "$ogg_vorbisinc" ; then
- CPPFLAGS="$CPPFLAGS -I$ogg_vorbisinc"
- fi
+ AC_CHECK_HEADER(vorbis/codec.h, found_ogg_vorbis=yes, found_ogg_vorbis=no)
+ if test "$found_ogg_vorbis" = yes
+ then
+ AC_CHECK_LIB(vorbis, vorbis_analysis_init,
+ LIBS="$LIBS -logg -lvorbis -lvorbisfile -lvorbisenc"
+ AC_DEFINE([HAVE_LIBVORBIS], 1,
+ [Define if you have Ogg Vorbis Library install]),
+ enable_ogg_vorbis=no)
+ fi
fi
-AC_CHECK_HEADER(vorbis/codec.h, ogg_vorbisinc=yes, ogg_vorbisinc=no)
-if test "$ogg_vorbisinc" = yes
-then
- AC_CHECK_LIB(vorbis, vorbis_analysis_init,
- LIBS="$LIBS -logg -lvorbis -lvorbisfile -lvorbisenc"
- AC_DEFINE([HAVE_LIBVORBIS], 1, [Define if you have Ogg Vorbis Library installed]))
-fi
-CPPFLAGS="$ac_save_CPPFLAGS"
-
dnl Test for MAD libraries.
-if test "$madlib" != auto && test "$madlib" != no
+if test "$enable_mad" = yes
then
- LIBS="$LIBS -L$madlib"
+ AC_CHECK_HEADER(mad.h, found_mad=yes, found_mad=no)
+ if test "$found_mad" = yes
+ then
+ AC_CHECK_LIB(mad, mad_stream_buffer,
+ LIBS="$LIBS -lmad"
+ AC_DEFINE([HAVE_LIBMAD], 1,
+ [Define if you have MAD (MP3 Audio Decoder) Library installed]),
+ enable_mad=no)
+ fi
fi
-dnl Need to tell preprocess where to look for MAD include files
-dnl when they are not in system directories. Because of this make
-dnl a backup copy of the CPPFLAGS.
-ac_save_CPPFLAGS="$CPPFLAGS"
-
-if test "$madinc" != auto && test "$madinc" != no
-then
- CFLAGS="$CFLAGS -I$madinc"
- ac_save_CPPFLAGS="$CPPFLAGS"
- if test \! -z "$madinc" ; then
- CPPFLAGS="$CPPFLAGS -I$madinc"
- fi
-fi
-
-AC_CHECK_HEADER(mad.h, madinc=yes, madinc=no)
-if test "$madinc" = yes
-then
- AC_CHECK_LIB(mad, mad_stream_buffer,
- LIBS="$LIBS -lmad"
- AC_DEFINE([HAVE_LIBMAD], 1, [Define if you have MAD (MP3 Audio Decoder) Library installed]))
-fi
-CPPFLAGS="$ac_save_CPPFLAGS"
-
dnl Test for LAME library.
-if test "$lamelib" != auto && test "$lamelib" != no
+if test "$enable_lame" = yes
then
- LIBS="$LIBS -L$lamelib"
+ AC_CHECK_HEADER(lame/lame.h, found_lame=yes, found_lame=no)
+ if test "$found_lame" = yes
+ then
+ AC_CHECK_LIB(mp3lame, lame_init,
+ LIBS="$LIBS -lmp3lame"
+ AC_DEFINE([HAVE_LAME], 1,
+ [Define if you have LAME (LAME Ain't an MP3 Encoder) library installed]),
+ enable_lame=no)
+ fi
fi
-dnl Need to tell preprocess where to look for LAME include files
-dnl when they are not in system directories. Because of this make
-dnl a backup copy of the CPPFLAGS.
-ac_save_CPPFLAGS="$CPPFLAGS"
+dnl Checks for ASLA.
-if test "$lameinc" != auto && test "$lameinc" != no
+if test "$enable_alsa_dsp" = yes
then
- CFLAGS="$CFLAGS -I$lameinc"
- ac_save_CPPFLAGS="$CPPFLAGS"
- if test \! -z "$lameinc" ; then
- CPPFLAGS="$CPPFLAGS -I$lameinc"
- fi
-fi
+ AC_CHECK_HEADERS(linux/asound.h, alsa_type=check_ioctl)
+ AC_CHECK_HEADERS(sound/asound.h, alsa_type=alsa9)
-AC_CHECK_HEADER(lame/lame.h, lameinc=yes, lameinc=no)
-if test "$lameinc" = yes
-then
- AC_CHECK_LIB(mp3lame, lame_init,
- LIBS="$LIBS -lmp3lame"
- AC_DEFINE([HAVE_LAME], 1, [Define if you have LAME (LAME Ain't an MP3 Encoder) library installed]))
-fi
-CPPFLAGS="$ac_save_CPPFLAGS"
+ AC_MSG_CHECKING([for ALSA ioctl API])
-dnl Checks for library functions.
-
-AC_CHECK_FUNCS(getopt strerror memmove rand strcasecmp)
-
-dnl Checks for system services.
-
-if test "$alsa_dsp" = yes
-then
- alsa_type=alsa9
- AC_CHECK_HEADERS(sound/asound.h)
-elif test "$alsa_dsp" = auto
-then
- AC_CHECK_HEADERS(linux/asound.h, alsa_type=check_ioctl)
- AC_CHECK_HEADERS(sound/asound.h, alsa_type=alsa9)
-fi
-
-AC_MSG_CHECKING([for ALSA ioctl API])
-if test "$alsa_type" = check_ioctl
-then
+ if test "$alsa_type" = check_ioctl
+ then
AC_TRY_COMPILE(
[
#include <linux/asound.h>
@@ -238,67 +190,60 @@
snd_pcm_capture_info_t c_info;
],
alsa_type=alsa4,alsa_type=alsa5)
-fi
+ fi
-if test "$alsa_type" = alsa9
-then
+ if test "$alsa_type" = alsa9
+ then
CFLAGS="$CFLAGS -DALSA_PLAYER -DUSE_ALSA9"
NEED_ALSA=1
PLAY_SUPPORT=1
AC_MSG_RESULT([0.9.X])
-elif test "$alsa_type" = alsa5
-then
+ elif test "$alsa_type" = alsa5
+ then
CFLAGS="$CFLAGS -DALSA_PLAYER -DUSE_ALSA5"
NEED_ALSA=1
PLAY_SUPPORT=1
AC_MSG_RESULT([0.5.X])
-elif test "$alsa_type" = alsa4
-then
+ elif test "$alsa_type" = alsa4
+ then
CFLAGS="$CFLAGS -DALSA_PLAYER -DUSE_ALSA4"
NEED_ALSA=1
PLAY_SUPPORT=1
AC_MSG_RESULT([0.4.X])
-else
+ else
AC_MSG_RESULT([not found])
+ enable_alsa_dsp=no
+ fi
fi
-if test "$oss_dsp" != no
+if test "$enable_oss_dsp" = yes
then
- AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h, oss_dsp_found=yes)
-fi
+ AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h, found_oss_dsp=yes)
-if test "$oss_dsp" = yes || test "$oss_dsp_found" = yes
-then
-
+ if test "$found_oss_dsp" = yes
+ then
CFLAGS="$CFLAGS -DOSS_PLAYER"
NEED_OSS=1
PLAY_SUPPORT=1
+ else
+ enable_oss_dsp=no
+ fi
fi
-if test "$sun_audio" != no
+if test "$enable_sun_audio" = yes
then
- AC_CHECK_HEADERS(sys/audioio.h sun/audioio.h, sun_audio_found=yes)
-fi
+ AC_CHECK_HEADERS(sys/audioio.h sun/audioio.h, found_sun_audio=yes)
-if test "$sun_audio" = yes || test "$sun_audio_found" = yes
+ if test "$found_sun_audio" = yes
then
CFLAGS="$CFLAGS -DSUNAUDIO_PLAYER"
NEED_SUNAU=1
PLAY_SUPPORT=1
+ else
+ enable_sun_audio=no
+ fi
fi
-if test "$old_rate" = yes
-then
- CFLAGS="$CFLAGS -DUSE_OLD_RATE"
-fi
-if test "$enable_fast_ulaw" = yes
-then
- CFLAGS="$CFLAGS -DFAST_ULAW_CONVERSION"
-fi
-if test "$enable_fast_alaw" = yes
-then
- CFLAGS="$CFLAGS -DFAST_ALAW_CONVERSION"
-fi
if test "$enable_gsm" = yes
then
CFLAGS="$CFLAGS -DENABLE_GSM"
@@ -311,18 +256,33 @@
AC_SUBST(NEED_ALSA)
AC_SUBST(GSM_SUPPORT)
AC_SUBST(PLAY_SUPPORT)
+AC_SUBST(PACKAGE_TARNAME)
dnl Generate output files...
AC_CONFIG_HEADER(stconfig.h)
AC_CREATE_STDINT_H(ststdint.h)
-AC_OUTPUT([libst-config Makefile gsm/Makefile])
+AC_CONFIG_FILES([libst-config Makefile gsm/Makefile])
+
+AC_OUTPUT()
+
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 if test ! -f monkey.au; then cp ${srcdir}/monkey.au monkey.au; fi if test ! -f monkey.voc; then cp ${srcdir}/monkey.voc monkey.voc; fi+echo
+echo "Old Rate enabled.................. $enable_old_rate"
+echo "Fast ulaw enabled................. $enable_fast_ulaw"
+echo "Fast alaw enabled................. $enable_fast_alaw"
+echo "GSM Support....................... $enable_gsm"
+echo "ALSA Driver....................... $enable_alsa_dsp"
+echo "OSS Driver........................ $enable_oss_dsp"
+echo "SUN /dev/audio.................... $enable_sun_audio"
+echo "Ogg Vorbis support................ $enable_ogg_vorbis"
+echo "MAD MP3 Decoder................... $enable_mad"
+echo "LAME MP3 Encoder.................. $enable_lame"
echo
echo "Configure finished. Do 'make; make install' to compile and install SoX."
echo
--- a/libst-config.in
+++ b/libst-config.in
@@ -1,4 +1,7 @@
#! /bin/sh
+#
+# @configure_input@
+#
prefix="@prefix@"
exec_prefix="@exec_prefix@"
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,10 +1,6 @@
#
-# Makefile.in
+# @configure_input@
#
-# Processed by configure into a Makefile. We assume the environment in
-# which we are running is a POSIX'y environment. Thus, all of the standard
-# POSIX tools are available.
-#
# Paths
@@ -16,6 +12,7 @@
libdir = @libdir@
mandir = @mandir@
includedir = @includedir@
+package_tarname = @PACKAGE_TARNAME@
# Shell commands.
@@ -31,8 +28,8 @@
# Build macros.
CFLAGS = @CFLAGS@ -I. -I$(srcdir)
-LDFLAGS = -L. -Lgsm @LDFLAGS@
-LIBS = -lst @LIBS@
+LDFLAGS = -L. @LDFLAGS@
+LIBS = -lst -Lgsm @LIBS@
# Other macros.
@@ -176,5 +173,25 @@
$(RM) stconfig.h ststdint.h
tar:
- cd $(srcdir)/..; $(RM) $(pkgname).tar
- cd $(srcdir)/.. ; $(TAR) $(pkgname).tar $(srcdir)
+ cd $(srcdir)/..; $(RM) $(package_tarname).tar
+ cd $(srcdir)/.. ; $(TAR) $(package_tarname).tar $(srcdir)
+
+# Rules to automatically rerun configure tools as needed.
+$(srcdir)/configure: configure.in aclocal.m4
+ cd $(srcdir) && autoconf
+
+stconfig.h: stconfig.h.in config.status
+ ./config.status stconfig.h
+
+Makefile: Makefile.in config.status
+ ./config.status Makefile
+
+gsm/Makefile: gsm/Makefile.in config.status
+ ./config.status gsm/Makefile
+
+libst-config: libst-config.in config.status
+ ./config.status libst-config
+
+config.status: configure
+ ./config.status --recheck
+
--- a/src/gsm/Makefile.in
+++ b/src/gsm/Makefile.in
@@ -1,10 +1,6 @@
#
-# Makefile.in
+# @configure_input@
#
-# Processed by configure into a Makefile. We assume the environment in
-# which we are running is a POSIX'y environment. Thus, all of the standard
-# POSIX tools are available.
-#
VPATH = @srcdir@
srcdir = @srcdir@