ref: fa2c658b659267ff82cad42ad0cfeeb70a1f69ff
parent: cddf607d21ca48fc759fcfcee17ba03ac9696481
author: cbagwell <cbagwell>
date: Wed Mar 6 16:50:16 EST 2002
Adding MP3 support.
--- a/Changelog
+++ b/Changelog
@@ -7,6 +7,8 @@
sox-12.17.4
-----------
o Updated config.sub to detect latest supported OS's.
+ o Fabrizio Gennari added support for reading and writing
+ MP3 files using the external libraries libmad and libmp3lame.
sox-12.17.3
-----------
--- a/Makefile.dos
+++ b/Makefile.dos
@@ -15,7 +15,7 @@
FOBJ = 8svx.obj adpcm.obj aiff.obj alsa.obj au.obj auto.obj \
avr.obj cdr.obj cvsd.obj dat.obj g711.obj g721.obj g723_16.obj \
g723_24.obj g723_40.obj g72x.obj gsm.obj \
- hcom.obj ima_rw.obj maud.obj nulfile.obj oss.obj raw.obj \
+ hcom.obj ima_rw.obj maud.obj mp3.obj nulfile.obj oss.obj raw.obj \
sf.obj smp.obj sndrtool.obj sphere.obj sunaudio.obj \
tx16w.obj voc.obj vorbis.obj wav.obj wve.obj
--- a/Makefile.gcc
+++ b/Makefile.gcc
@@ -21,7 +21,7 @@
FOBJ = 8svx.o adpcm.o aiff.o alsa.o au.o auto.o avr.o cdr.o cvsd.o dat.o \
g711.o g721.o g723_16.o g723_24.o g723_40.o g72x.o gsm.o hcom.o \
- ima_rw.o maud.o nulfile.o oss.o raw.o sf.o smp.o sndrtool.o \
+ ima_rw.o maud.o mp3.o nulfile.o oss.o raw.o sf.o smp.o sndrtool.o \
sphere.o sunaudio.o tx16w.o voc.o vorbis.o wav.o wve.o
EOBJ = avg.o band.o bandpass.o breject.o btrworth.o chorus.o compand.o \
@@ -96,12 +96,15 @@
# MATHLIB =
# If your linking Ogg Vorbis support, uncomment the following
-VORBISLIB = -logg -lvorbis -lvorbisfile -lvorbisenc
+#VORBISLIB = -logg -lvorbis -lvorbisfile -lvorbisenc
+# If your linking MP3 support, uncomment the following
+#MP3LIB = -lmad -lmp3lame
+
##############################################################################
SOX_PRE_LIBS = -L./gsm
-SOX_POST_LIBS = -lgsm $(VORBISLIB) $(MATHLIB)
+SOX_POST_LIBS = -lgsm $(VORBISLIB) $(MP3LIB) $(MATHLIB)
SOX_INCLUDES =
SOX_DEFINES = -DGSM_SUPPORT $(DOS_DEFINES)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.in 1.3.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52d.
+# Generated by Autoconf 2.52.
#
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
@@ -21,10 +21,6 @@
# 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; thenemulate sh
@@ -558,10 +554,10 @@
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+ { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 { (exit 1); exit 1; }; }else
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2+ { echo "$as_me: error: cannot find sources in $srcdir" >&2 { (exit 1); exit 1; }; }fi
fi
@@ -605,7 +601,7 @@
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
+ cat <<EOF
\`configure' configures this package to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -626,9 +622,9 @@
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
-_ACEOF
+EOF
- cat <<_ACEOF
+ cat <<EOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
@@ -655,20 +651,20 @@
--oldincludedir=DIR C header files for non-gcc [/usr/include]
--infodir=DIR info documentation [PREFIX/info]
--mandir=DIR man documentation [PREFIX/man]
-_ACEOF
+EOF
- cat <<\_ACEOF
+ cat <<\EOF
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
+EOF
fi
if test -n "$ac_init_help"; then
- cat <<\_ACEOF
+ cat <<\EOF
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
@@ -686,6 +682,10 @@
--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
@@ -699,51 +699,40 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-_ACEOF
+EOF
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
+ for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
+ cd $ac_subdir
+ # A "../" for each directory in /$ac_subdir.
+ ac_dots=`echo $ac_subdir |
+ sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
-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
+ case $srcdir in
+ .) # No --srcdir option. We are building in place.
+ ac_sub_srcdir=$srcdir ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_sub_srcdir=$srcdir/$ac_subdir ;;
+ *) # Relative path.
+ ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+ esac
# Check for guested configure; otherwise get Cygnus style configure.
- if test -f $ac_srcdir/configure.gnu; then
+ if test -f $ac_sub_srcdir/configure.gnu; then
echo
- $SHELL $ac_srcdir/configure.gnu --help=recursive
- elif test -f $ac_srcdir/configure; then
+ $SHELL $ac_sub_srcdir/configure.gnu --help=recursive
+ elif test -f $ac_sub_srcdir/configure; then
echo
- $SHELL $ac_srcdir/configure --help=recursive
- elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
+ $SHELL $ac_sub_srcdir/configure --help=recursive
+ elif test -f $ac_sub_srcdir/configure.ac ||
+ test -f $ac_sub_srcdir/configure.in; then
echo
$ac_configure --help
else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
fi
cd $ac_popdir
done
@@ -751,31 +740,31 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
- cat <<\_ACEOF
+ cat <<\EOF
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
+EOF
exit 0
fi
exec 5>config.log
-cat >&5 <<_ACEOF
+cat >&5 <<EOF
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
+generated by GNU Autoconf 2.52. Invocation command line was
$ $0 $@
-_ACEOF
+EOF
{cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
+## ---------- ##
+## Platform. ##
+## ---------- ##
hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
uname -m = `(uname -m) 2>/dev/null || echo unknown`
@@ -799,12 +788,12 @@
_ASUNAME
} >&5
-cat >&5 <<_ACEOF
-## ----------- ##
-## Core tests. ##
-## ----------- ##
+cat >&5 <<EOF
+## ------------ ##
+## Core tests. ##
+## ------------ ##
-_ACEOF
+EOF
# Keep a trace of the command line.
# Strip out --no-create and --no-recursion so they do not pile up.
@@ -831,19 +820,14 @@
# 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,
+ echo >&5
+ echo "## ----------------- ##" >&5
+ echo "## Cache variables. ##" >&5
+ echo "## ----------------- ##" >&5
+ echo >&5
+ # The following way of writing the cache mishandles newlines in values,
{(set) 2>&1 |
case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
@@ -857,22 +841,20 @@
"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
+} >&5
+ sed "/^$/d" confdefs.h >conftest.log
+ if test -s conftest.log; then
+ echo >&5
+ echo "## ------------ ##" >&5
+ echo "## confdefs.h. ##" >&5
+ echo "## ------------ ##" >&5
+ echo >&5
+ cat conftest.log >&5
+ fi
+ (echo; echo) >&5
+ test "$ac_signal" != 0 &&
+ echo "$as_me: caught signal $ac_signal" >&5
+ echo "$as_me: exit $exit_status" >&5
rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
exit $exit_status
' 0
@@ -897,9 +879,9 @@
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
- { echo "$as_me:900: loading site script $ac_site_file" >&5+ { echo "$as_me:882: loading site script $ac_site_file" >&5echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
+ cat "$ac_site_file" >&5
. "$ac_site_file"
fi
done
@@ -908,7 +890,7 @@
# 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:911: loading cache $cache_file" >&5+ { echo "$as_me:893: loading cache $cache_file" >&5echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -916,7 +898,7 @@
esac
fi
else
- { echo "$as_me:919: creating cache $cache_file" >&5+ { echo "$as_me:901: creating cache $cache_file" >&5echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -932,21 +914,21 @@
eval ac_new_val="\$ac_env_${ac_var}_value"case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:935: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5+ { echo "$as_me:917: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:939: error: \`$ac_var' was not set in the previous run" >&5+ { echo "$as_me:921: error: \`$ac_var' was not set in the previous run" >&5echo "$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:945: error: \`$ac_var' has changed since the previous run:" >&5+ { echo "$as_me:927: error: \`$ac_var' has changed since the previous run:" >&5echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:947: former value: $ac_old_val" >&5+ { echo "$as_me:929: former value: $ac_old_val" >&5echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:949: current value: $ac_new_val" >&5+ { echo "$as_me:931: current value: $ac_new_val" >&5echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=:
fi;;
@@ -965,9 +947,9 @@
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:968: error: changes in the environment can compromise the build" >&5+ { echo "$as_me:950: error: changes in the environment can compromise the build" >&5echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:970: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5+ { { echo "$as_me:952: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; }fi
@@ -987,10 +969,10 @@
echo "#! $SHELL" >conftest.sh
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
-if { (echo "$as_me:990: PATH=\".;.\"; conftest.sh") >&5+if { (echo "$as_me:972: PATH=\".;.\"; conftest.sh") >&5(PATH=".;."; conftest.sh) 2>&5
ac_status=$?
- echo "$as_me:993: \$? = $ac_status" >&5
+ echo "$as_me:975: \$? = $ac_status" >&5
(exit $ac_status); }; then
ac_path_separator=';'
else
@@ -1069,6 +1051,38 @@
ogg_vorbisinc=auto
fi;
+# Check whether --with-madlib or --without-madlib was given.
+if test "${with_madlib+set}" = set; then+ withval="$with_madlib"
+ madlib="$withval"
+else
+ madlib=auto
+fi;
+
+# Check whether --with-madinc or --without-madinc was given.
+if test "${with_madinc+set}" = set; then+ withval="$with_madinc"
+ madinc="$withval"
+else
+ madinc=auto
+fi;
+
+# Check whether --with-lamelib or --without-lamelib was given.
+if test "${with_lamelib+set}" = set; then+ withval="$with_lamelib"
+ lamelib="$withval"
+else
+ lamelib=auto
+fi;
+
+# Check whether --with-lameinc or --without-lameinc was given.
+if test "${with_lameinc+set}" = set; then+ withval="$with_lameinc"
+ lameinc="$withval"
+else
+ lameinc=auto
+fi;
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1077,7 +1091,7 @@
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:1080: checking for $ac_word" >&5
+echo "$as_me:1094: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -1092,7 +1106,7 @@
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:1095: found $ac_dir/$ac_word" >&5
+echo "$as_me:1109: found $ac_dir/$ac_word" >&5
break
done
@@ -1100,10 +1114,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1103: result: $CC" >&5
+ echo "$as_me:1117: result: $CC" >&5
echo "${ECHO_T}$CC" >&6else
- echo "$as_me:1106: result: no" >&5
+ echo "$as_me:1120: result: no" >&5
echo "${ECHO_T}no" >&6fi
@@ -1112,7 +1126,7 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-echo "$as_me:1115: checking for $ac_word" >&5
+echo "$as_me:1129: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -1127,7 +1141,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1130: found $ac_dir/$ac_word" >&5
+echo "$as_me:1144: found $ac_dir/$ac_word" >&5
break
done
@@ -1135,10 +1149,10 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1138: result: $ac_ct_CC" >&5
+ echo "$as_me:1152: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6else
- echo "$as_me:1141: result: no" >&5
+ echo "$as_me:1155: result: no" >&5
echo "${ECHO_T}no" >&6fi
@@ -1151,7 +1165,7 @@
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:1154: checking for $ac_word" >&5
+echo "$as_me:1168: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -1166,7 +1180,7 @@
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:1169: found $ac_dir/$ac_word" >&5
+echo "$as_me:1183: found $ac_dir/$ac_word" >&5
break
done
@@ -1174,10 +1188,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1177: result: $CC" >&5
+ echo "$as_me:1191: result: $CC" >&5
echo "${ECHO_T}$CC" >&6else
- echo "$as_me:1180: result: no" >&5
+ echo "$as_me:1194: result: no" >&5
echo "${ECHO_T}no" >&6fi
@@ -1186,7 +1200,7 @@
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:1189: checking for $ac_word" >&5
+echo "$as_me:1203: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -1201,7 +1215,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1204: found $ac_dir/$ac_word" >&5
+echo "$as_me:1218: found $ac_dir/$ac_word" >&5
break
done
@@ -1209,10 +1223,10 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1212: result: $ac_ct_CC" >&5
+ echo "$as_me:1226: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6else
- echo "$as_me:1215: result: no" >&5
+ echo "$as_me:1229: result: no" >&5
echo "${ECHO_T}no" >&6fi
@@ -1225,7 +1239,7 @@
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:1228: checking for $ac_word" >&5
+echo "$as_me:1242: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -1245,7 +1259,7 @@
continue
fi
ac_cv_prog_CC="cc"
-echo "$as_me:1248: found $ac_dir/$ac_word" >&5
+echo "$as_me:1262: found $ac_dir/$ac_word" >&5
break
done
@@ -1267,10 +1281,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1270: result: $CC" >&5
+ echo "$as_me:1284: result: $CC" >&5
echo "${ECHO_T}$CC" >&6else
- echo "$as_me:1273: result: no" >&5
+ echo "$as_me:1287: result: no" >&5
echo "${ECHO_T}no" >&6fi
@@ -1281,7 +1295,7 @@
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:1284: checking for $ac_word" >&5
+echo "$as_me:1298: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -1296,7 +1310,7 @@
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:1299: found $ac_dir/$ac_word" >&5
+echo "$as_me:1313: found $ac_dir/$ac_word" >&5
break
done
@@ -1304,10 +1318,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1307: result: $CC" >&5
+ echo "$as_me:1321: result: $CC" >&5
echo "${ECHO_T}$CC" >&6else
- echo "$as_me:1310: result: no" >&5
+ echo "$as_me:1324: result: no" >&5
echo "${ECHO_T}no" >&6fi
@@ -1320,7 +1334,7 @@
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:1323: checking for $ac_word" >&5
+echo "$as_me:1337: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -1335,7 +1349,7 @@
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:1338: found $ac_dir/$ac_word" >&5
+echo "$as_me:1352: found $ac_dir/$ac_word" >&5
break
done
@@ -1343,10 +1357,10 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1346: result: $ac_ct_CC" >&5
+ echo "$as_me:1360: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6else
- echo "$as_me:1349: result: no" >&5
+ echo "$as_me:1363: result: no" >&5
echo "${ECHO_T}no" >&6fi
@@ -1358,40 +1372,34 @@
fi
-test -z "$CC" && { { echo "$as_me:1361: error: no acceptable cc found in \$PATH" >&5+test -z "$CC" && { { echo "$as_me:1375: error: no acceptable cc found in \$PATH" >&5echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }# Provide some information about the compiler.
-echo "$as_me:1366:" \
+echo "$as_me:1380:" \
"checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1369: \"$ac_compiler --version </dev/null >&5\"") >&5+{ (eval echo "$as_me:1383: \"$ac_compiler --version </dev/null >&5\"") >&5(eval $ac_compiler --version </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1372: \$? = $ac_status" >&5
+ echo "$as_me:1386: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1374: \"$ac_compiler -v </dev/null >&5\"") >&5+{ (eval echo "$as_me:1388: \"$ac_compiler -v </dev/null >&5\"") >&5(eval $ac_compiler -v </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1377: \$? = $ac_status" >&5
+ echo "$as_me:1391: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1379: \"$ac_compiler -V </dev/null >&5\"") >&5+{ (eval echo "$as_me:1393: \"$ac_compiler -V </dev/null >&5\"") >&5(eval $ac_compiler -V </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1382: \$? = $ac_status" >&5
+ echo "$as_me:1396: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-#line 1386 "configure"
+#line 1400 "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -1405,13 +1413,13 @@
# 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:1408: checking for C compiler default output" >&5
+echo "$as_me:1416: 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:1411: \"$ac_link_default\"") >&5+if { (eval echo "$as_me:1419: \"$ac_link_default\"") >&5(eval $ac_link_default) 2>&5
ac_status=$?
- echo "$as_me:1414: \$? = $ac_status" >&5
+ echo "$as_me:1422: \$? = $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
@@ -1420,7 +1428,7 @@
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 ) ;;
+ *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
a.out ) # We found the default executable, but exeext='' is most
# certainly right.
break;;
@@ -1434,27 +1442,27 @@
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1437: error: C compiler cannot create executables" >&5+{ { echo "$as_me:1445: error: C compiler cannot create executables" >&5echo "$as_me: error: C compiler cannot create executables" >&2;}
{ (exit 77); exit 77; }; }fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:1443: result: $ac_file" >&5
+echo "$as_me:1451: 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:1448: checking whether the C compiler works" >&5
+echo "$as_me:1456: 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:1454: \"$ac_try\"") >&5+ { (eval echo "$as_me:1462: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1457: \$? = $ac_status" >&5
+ echo "$as_me:1465: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
@@ -1461,7 +1469,7 @@
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:1464: error: cannot run C compiled programs.+ { { echo "$as_me:1472: 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;}
@@ -1469,7 +1477,7 @@
fi
fi
fi
-echo "$as_me:1472: result: yes" >&5
+echo "$as_me:1480: result: yes" >&5
echo "${ECHO_T}yes" >&6rm -f a.out a.exe conftest$ac_cv_exeext
@@ -1476,17 +1484,17 @@
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:1479: checking whether we are cross compiling" >&5
+echo "$as_me:1487: checking whether we are cross compiling" >&5
echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1481: result: $cross_compiling" >&5
+echo "$as_me:1489: result: $cross_compiling" >&5
echo "${ECHO_T}$cross_compiling" >&6-echo "$as_me:1484: checking for executable suffix" >&5
+echo "$as_me:1492: checking for executable suffix" >&5
echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1486: \"$ac_link\"") >&5+if { (eval echo "$as_me:1494: \"$ac_link\"") >&5(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:1489: \$? = $ac_status" >&5
+ echo "$as_me:1497: \$? = $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
@@ -1502,33 +1510,27 @@
esac
done
else
- { { echo "$as_me:1505: error: cannot compute EXEEXT: cannot compile and link" >&5+ { { echo "$as_me:1513: error: cannot compute EXEEXT: cannot compile and link" >&5echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
{ (exit 1); exit 1; }; }fi
rm -f conftest$ac_cv_exeext
-echo "$as_me:1511: result: $ac_cv_exeext" >&5
+echo "$as_me:1519: result: $ac_cv_exeext" >&5
echo "${ECHO_T}$ac_cv_exeext" >&6rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-echo "$as_me:1517: checking for object suffix" >&5
+echo "$as_me:1525: checking for object suffix" >&5
echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
if test "${ac_cv_objext+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 1523 "configure"
+#line 1531 "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -1538,10 +1540,10 @@
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1541: \"$ac_compile\"") >&5+if { (eval echo "$as_me:1543: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1544: \$? = $ac_status" >&5
+ echo "$as_me:1546: \$? = $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
@@ -1553,7 +1555,7 @@
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1556: error: cannot compute OBJEXT: cannot compile" >&5+{ { echo "$as_me:1558: error: cannot compute OBJEXT: cannot compile" >&5echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
{ (exit 1); exit 1; }; }fi
@@ -1560,25 +1562,19 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:1563: result: $ac_cv_objext" >&5
+echo "$as_me:1565: result: $ac_cv_objext" >&5
echo "${ECHO_T}$ac_cv_objext" >&6OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-echo "$as_me:1567: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1569: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 1573 "configure"
+#line 1575 "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -1591,16 +1587,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1594: \"$ac_compile\"") >&5+if { (eval echo "$as_me:1590: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1597: \$? = $ac_status" >&5
+ echo "$as_me:1593: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:1600: \"$ac_try\"") >&5+ { (eval echo "$as_me:1596: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1603: \$? = $ac_status" >&5
+ echo "$as_me:1599: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
@@ -1612,27 +1608,21 @@
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:1615: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1611: result: $ac_cv_c_compiler_gnu" >&5
echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6GCC=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CFLAGS=${CFLAGS+set}ac_save_CFLAGS=$CFLAGS
CFLAGS="-g"
-echo "$as_me:1621: checking whether $CC accepts -g" >&5
+echo "$as_me:1617: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 1627 "configure"
+#line 1623 "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -1642,16 +1632,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1645: \"$ac_compile\"") >&5+if { (eval echo "$as_me:1635: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1648: \$? = $ac_status" >&5
+ echo "$as_me:1638: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:1651: \"$ac_try\"") >&5+ { (eval echo "$as_me:1641: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1654: \$? = $ac_status" >&5
+ echo "$as_me:1644: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
@@ -1661,7 +1651,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:1664: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1654: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
@@ -1688,16 +1678,16 @@
#endif
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1691: \"$ac_compile\"") >&5+if { (eval echo "$as_me:1681: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1694: \$? = $ac_status" >&5
+ echo "$as_me:1684: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:1697: \"$ac_try\"") >&5+ { (eval echo "$as_me:1687: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1700: \$? = $ac_status" >&5
+ echo "$as_me:1690: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
''\
@@ -1709,16 +1699,10 @@
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line 1712 "configure"
+#line 1702 "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 ()
{@@ -1728,16 +1712,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1731: \"$ac_compile\"") >&5+if { (eval echo "$as_me:1715: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1734: \$? = $ac_status" >&5
+ echo "$as_me:1718: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:1737: \"$ac_try\"") >&5+ { (eval echo "$as_me:1721: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1740: \$? = $ac_status" >&5
+ echo "$as_me:1724: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -1747,15 +1731,9 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 1750 "configure"
+#line 1734 "configure"
#include "confdefs.h"
$ac_declaration
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -1765,16 +1743,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1768: \"$ac_compile\"") >&5+if { (eval echo "$as_me:1746: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1771: \$? = $ac_status" >&5
+ echo "$as_me:1749: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:1774: \"$ac_try\"") >&5+ { (eval echo "$as_me:1752: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1777: \$? = $ac_status" >&5
+ echo "$as_me:1755: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -1804,7 +1782,7 @@
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:1807: checking for $ac_word" >&5
+echo "$as_me:1785: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_RANLIB+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -1819,7 +1797,7 @@
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:1822: found $ac_dir/$ac_word" >&5
+echo "$as_me:1800: found $ac_dir/$ac_word" >&5
break
done
@@ -1827,10 +1805,10 @@
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$as_me:1830: result: $RANLIB" >&5
+ echo "$as_me:1808: result: $RANLIB" >&5
echo "${ECHO_T}$RANLIB" >&6else
- echo "$as_me:1833: result: no" >&5
+ echo "$as_me:1811: result: no" >&5
echo "${ECHO_T}no" >&6fi
@@ -1839,7 +1817,7 @@
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:1842: checking for $ac_word" >&5
+echo "$as_me:1820: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -1854,7 +1832,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:1857: found $ac_dir/$ac_word" >&5
+echo "$as_me:1835: found $ac_dir/$ac_word" >&5
break
done
@@ -1863,10 +1841,10 @@
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- echo "$as_me:1866: result: $ac_ct_RANLIB" >&5
+ echo "$as_me:1844: result: $ac_ct_RANLIB" >&5
echo "${ECHO_T}$ac_ct_RANLIB" >&6else
- echo "$as_me:1869: result: no" >&5
+ echo "$as_me:1847: result: no" >&5
echo "${ECHO_T}no" >&6fi
@@ -1892,7 +1870,7 @@
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:1895: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5+ { { echo "$as_me:1873: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
{ (exit 1); exit 1; }; }fi
@@ -1912,7 +1890,7 @@
# 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:1915: checking for a BSD compatible install" >&5
+echo "$as_me:1893: checking for a BSD compatible install" >&5
echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then@@ -1961,7 +1939,7 @@
INSTALL=$ac_install_sh
fi
fi
-echo "$as_me:1964: result: $INSTALL" >&5
+echo "$as_me:1942: result: $INSTALL" >&5
echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.@@ -1972,14 +1950,14 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'-echo "$as_me:1975: checking whether ln -s works" >&5
+echo "$as_me:1953: 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:1979: result: yes" >&5
+ echo "$as_me:1957: result: yes" >&5
echo "${ECHO_T}yes" >&6else
- echo "$as_me:1982: result: no, using $LN_S" >&5
+ echo "$as_me:1960: result: no, using $LN_S" >&5
echo "${ECHO_T}no, using $LN_S" >&6fi
@@ -1988,7 +1966,7 @@
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:1991: checking how to run the C preprocessor" >&5
+echo "$as_me:1969: checking how to run the C preprocessor" >&5
echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
@@ -2009,18 +1987,18 @@
# 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 2012 "configure"
+#line 1990 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:2017: \"$ac_cpp conftest.$ac_ext\"") >&5+if { (eval echo "$as_me:1995: \"$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:2023: \$? = $ac_status" >&5
+ echo "$as_me:2001: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2043,17 +2021,17 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line 2046 "configure"
+#line 2024 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:2050: \"$ac_cpp conftest.$ac_ext\"") >&5+if { (eval echo "$as_me:2028: \"$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:2056: \$? = $ac_status" >&5
+ echo "$as_me:2034: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2090,7 +2068,7 @@
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:2093: result: $CPP" >&5
+echo "$as_me:2071: result: $CPP" >&5
echo "${ECHO_T}$CPP" >&6ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
@@ -2100,18 +2078,18 @@
# 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 2103 "configure"
+#line 2081 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:2108: \"$ac_cpp conftest.$ac_ext\"") >&5+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:2114: \$? = $ac_status" >&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
@@ -2134,17 +2112,17 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line 2137 "configure"
+#line 2115 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:2141: \"$ac_cpp conftest.$ac_ext\"") >&5+if { (eval echo "$as_me:2119: \"$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:2147: \$? = $ac_status" >&5
+ echo "$as_me:2125: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2172,7 +2150,7 @@
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:2175: error: C preprocessor \"$CPP\" fails sanity check" >&5+ { { echo "$as_me:2153: error: C preprocessor \"$CPP\" fails sanity check" >&5echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
{ (exit 1); exit 1; }; }fi
@@ -2187,7 +2165,7 @@
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:2190: checking for $ac_word" >&5
+echo "$as_me:2168: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_SED+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -2202,7 +2180,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_SED="$ac_prog"
-echo "$as_me:2205: found $ac_dir/$ac_word" >&5
+echo "$as_me:2183: found $ac_dir/$ac_word" >&5
break
done
@@ -2210,10 +2188,10 @@
fi
SED=$ac_cv_prog_SED
if test -n "$SED"; then
- echo "$as_me:2213: result: $SED" >&5
+ echo "$as_me:2191: result: $SED" >&5
echo "${ECHO_T}$SED" >&6else
- echo "$as_me:2216: result: no" >&5
+ echo "$as_me:2194: result: no" >&5
echo "${ECHO_T}no" >&6fi
@@ -2222,11 +2200,11 @@
# Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:2225: error: cannot run $ac_config_sub" >&5+ { { echo "$as_me:2203: error: cannot run $ac_config_sub" >&5echo "$as_me: error: cannot run $ac_config_sub" >&2;}
{ (exit 1); exit 1; }; }-echo "$as_me:2229: checking build system type" >&5
+echo "$as_me:2207: checking build system type" >&5
echo $ECHO_N "checking build system type... $ECHO_C" >&6
if test "${ac_cv_build+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -2235,16 +2213,16 @@
test -z "$ac_cv_build_alias" &&
ac_cv_build_alias=`$ac_config_guess`
test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:2238: error: cannot guess build type; you must specify one" >&5+ { { echo "$as_me:2216: error: cannot guess build type; you must specify one" >&5echo "$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:2242: error: $ac_config_sub $ac_cv_build_alias failed." >&5+ { { echo "$as_me:2220: error: $ac_config_sub $ac_cv_build_alias failed." >&5echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
{ (exit 1); exit 1; }; }fi
-echo "$as_me:2247: result: $ac_cv_build" >&5
+echo "$as_me:2225: result: $ac_cv_build" >&5
echo "${ECHO_T}$ac_cv_build" >&6build=$ac_cv_build
build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -2251,7 +2229,7 @@
build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$as_me:2254: checking host system type" >&5
+echo "$as_me:2232: checking host system type" >&5
echo $ECHO_N "checking host system type... $ECHO_C" >&6
if test "${ac_cv_host+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -2260,12 +2238,12 @@
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:2263: error: $ac_config_sub $ac_cv_host_alias failed" >&5+ { { echo "$as_me:2241: error: $ac_config_sub $ac_cv_host_alias failed" >&5echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
{ (exit 1); exit 1; }; }fi
-echo "$as_me:2268: result: $ac_cv_host" >&5
+echo "$as_me:2246: result: $ac_cv_host" >&5
echo "${ECHO_T}$ac_cv_host" >&6host=$ac_cv_host
host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -2272,7 +2250,7 @@
host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$as_me:2275: checking target system type" >&5
+echo "$as_me:2253: checking target system type" >&5
echo $ECHO_N "checking target system type... $ECHO_C" >&6
if test "${ac_cv_target+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -2281,12 +2259,12 @@
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:2284: error: $ac_config_sub $ac_cv_target_alias failed" >&5+ { { echo "$as_me:2262: error: $ac_config_sub $ac_cv_target_alias failed" >&5echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
{ (exit 1); exit 1; }; }fi
-echo "$as_me:2289: result: $ac_cv_target" >&5
+echo "$as_me:2267: result: $ac_cv_target" >&5
echo "${ECHO_T}$ac_cv_target" >&6target=$ac_cv_target
target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -2307,13 +2285,13 @@
LDFLAGS="$LDFLAGS -mno-cygwin"
esac
-echo "$as_me:2310: checking for ANSI C header files" >&5
+echo "$as_me:2288: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 2316 "configure"
+#line 2294 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -2321,13 +2299,13 @@
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:2324: \"$ac_cpp conftest.$ac_ext\"") >&5+if { (eval echo "$as_me:2302: \"$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:2330: \$? = $ac_status" >&5
+ echo "$as_me:2308: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2349,7 +2327,7 @@
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 2352 "configure"
+#line 2330 "configure"
#include "confdefs.h"
#include <string.h>
@@ -2367,7 +2345,7 @@
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 2370 "configure"
+#line 2348 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -2388,7 +2366,7 @@
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 2391 "configure"
+#line 2369 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)@@ -2414,15 +2392,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:2417: \"$ac_link\"") >&5+if { (eval echo "$as_me:2395: \"$ac_link\"") >&5(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:2420: \$? = $ac_status" >&5
+ echo "$as_me:2398: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'- { (eval echo "$as_me:2422: \"$ac_try\"") >&5+ { (eval echo "$as_me:2400: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2425: \$? = $ac_status" >&5
+ echo "$as_me:2403: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -2435,123 +2413,36 @@
fi
fi
fi
-echo "$as_me:2438: result: $ac_cv_header_stdc" >&5
+echo "$as_me:2416: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
+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_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`
-echo "$as_me:2454: checking for $ac_header" >&5
+echo "$as_me:2429: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 2460 "configure"
+#line 2435 "configure"
#include "confdefs.h"
-$ac_includes_default
-
#include <$ac_header>
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2467: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2470: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2473: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2476: \$? = $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:2486: 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:2501: 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:2506: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6-else
- # Is the header compilable?
-echo "$as_me:2510: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 2513 "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2519: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2522: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2525: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2528: \$? = $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:2537: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:2541: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 2544 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:2548: \"$ac_cpp conftest.$ac_ext\"") >&5+if { (eval echo "$as_me:2439: \"$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:2554: \$? = $ac_status" >&5
+ echo "$as_me:2445: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2562,49 +2453,22 @@
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- ac_header_preproc=no
+ eval "$as_ac_Header=no"
fi
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:2572: 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:2578: 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:2580: 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:2583: WARNING: $ac_header: present but cannot be compiled." >&5-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
- { echo "$as_me:2585: WARNING: $ac_header: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:2587: 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:2590: 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:2597: result: `eval echo '${'$as_ac_Header'}'`" >&5+echo "$as_me:2464: 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
+ cat >>confdefs.h <<EOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+EOF
fi
-
done
if test "$GCC" = yes
@@ -2612,24 +2476,19 @@
CFLAGS="$CFLAGS -Wall"
fi
-echo "$as_me:2615: checking whether byte ordering is bigendian" >&5
+echo "$as_me:2479: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
- # See if sys/param.h defines the BYTE_ORDER macro.
+ ac_cv_c_bigendian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
cat >conftest.$ac_ext <<_ACEOF
-#line 2622 "configure"
+#line 2487 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -2642,30 +2501,24 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2645: \"$ac_compile\"") >&5+if { (eval echo "$as_me:2504: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2648: \$? = $ac_status" >&5
+ echo "$as_me:2507: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2651: \"$ac_try\"") >&5+ { (eval echo "$as_me:2510: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2654: \$? = $ac_status" >&5
+ echo "$as_me:2513: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
# It does; now see whether it defined to BIG_ENDIAN or not.
cat >conftest.$ac_ext <<_ACEOF
-#line 2658 "configure"
+#line 2517 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -2678,16 +2531,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2681: \"$ac_compile\"") >&5+if { (eval echo "$as_me:2534: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2684: \$? = $ac_status" >&5
+ echo "$as_me:2537: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2687: \"$ac_try\"") >&5+ { (eval echo "$as_me:2540: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2690: \$? = $ac_status" >&5
+ echo "$as_me:2543: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_bigendian=yes
else
@@ -2699,64 +2552,16 @@
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 2707 "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:2730: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2733: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2736: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2739: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- if fgrep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
- ac_cv_c_bigendian=yes
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
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
rm -f conftest.$ac_objext conftest.$ac_ext
+if test $ac_cv_c_bigendian = unknown; then
+if test "$cross_compiling" = yes; then
+ { { echo "$as_me:2559: error: cannot run test program while cross compiling" >&5+echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+ { (exit 1); exit 1; }; }else
cat >conftest.$ac_ext <<_ACEOF
-#line 2759 "configure"
+#line 2564 "configure"
#include "confdefs.h"
int
main ()
@@ -2772,15 +2577,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:2775: \"$ac_link\"") >&5+if { (eval echo "$as_me:2580: \"$ac_link\"") >&5(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:2778: \$? = $ac_status" >&5
+ echo "$as_me:2583: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'- { (eval echo "$as_me:2780: \"$ac_try\"") >&5+ { (eval echo "$as_me:2585: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2783: \$? = $ac_status" >&5
+ echo "$as_me:2588: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_bigendian=no
else
@@ -2792,28 +2597,18 @@
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:2797: result: $ac_cv_c_bigendian" >&5
+echo "$as_me:2601: result: $ac_cv_c_bigendian" >&5
echo "${ECHO_T}$ac_cv_c_bigendian" >&6-case $ac_cv_c_bigendian in
- yes)
+if test $ac_cv_c_bigendian = yes; then
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<\EOF
#define WORDS_BIGENDIAN 1
-_ACEOF
- ;;
- no)
- ;;
- *)
- { { echo "$as_me:2809: 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:2816: checking for $CC option to accept ANSI C" >&5
+fi
+
+echo "$as_me:2611: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -2821,7 +2616,7 @@
ac_cv_prog_cc_stdc=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
-#line 2824 "configure"
+#line 2619 "configure"
#include "confdefs.h"
#include <stdarg.h>
#include <stdio.h>
@@ -2851,12 +2646,6 @@
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 ()
{@@ -2876,16 +2665,16 @@
do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2879: \"$ac_compile\"") >&5+if { (eval echo "$as_me:2668: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2882: \$? = $ac_status" >&5
+ echo "$as_me:2671: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2885: \"$ac_try\"") >&5+ { (eval echo "$as_me:2674: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2888: \$? = $ac_status" >&5
+ echo "$as_me:2677: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_stdc=$ac_arg
break
@@ -2902,29 +2691,23 @@
case "x$ac_cv_prog_cc_stdc" in
x|xno)
- echo "$as_me:2905: result: none needed" >&5
+ echo "$as_me:2694: result: none needed" >&5
echo "${ECHO_T}none needed" >&6 ;;*)
- echo "$as_me:2908: result: $ac_cv_prog_cc_stdc" >&5
+ echo "$as_me:2697: result: $ac_cv_prog_cc_stdc" >&5
echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6CC="$CC $ac_cv_prog_cc_stdc" ;;
esac
-echo "$as_me:2913: checking for an ANSI C-conforming const" >&5
+echo "$as_me:2702: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 2919 "configure"
+#line 2708 "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -2980,16 +2763,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2983: \"$ac_compile\"") >&5+if { (eval echo "$as_me:2766: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2986: \$? = $ac_status" >&5
+ echo "$as_me:2769: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:2989: \"$ac_try\"") >&5+ { (eval echo "$as_me:2772: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2992: \$? = $ac_status" >&5
+ echo "$as_me:2775: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_const=yes
else
@@ -2999,17 +2782,17 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3002: result: $ac_cv_c_const" >&5
+echo "$as_me:2785: result: $ac_cv_c_const" >&5
echo "${ECHO_T}$ac_cv_c_const" >&6if test $ac_cv_c_const = no; then
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<\EOF
#define const
-_ACEOF
+EOF
fi
-echo "$as_me:3012: checking for inline" >&5
+echo "$as_me:2795: checking for inline" >&5
echo $ECHO_N "checking for inline... $ECHO_C" >&6
if test "${ac_cv_c_inline+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -3017,7 +2800,7 @@
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat >conftest.$ac_ext <<_ACEOF
-#line 3020 "configure"
+#line 2803 "configure"
#include "confdefs.h"
#ifndef __cplusplus
static $ac_kw int static_foo () {return 0; }@@ -3026,16 +2809,16 @@
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3029: \"$ac_compile\"") >&5+if { (eval echo "$as_me:2812: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3032: \$? = $ac_status" >&5
+ echo "$as_me:2815: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3035: \"$ac_try\"") >&5+ { (eval echo "$as_me:2818: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3038: \$? = $ac_status" >&5
+ echo "$as_me:2821: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_inline=$ac_kw; break
else
@@ -3046,36 +2829,77 @@
done
fi
-echo "$as_me:3049: result: $ac_cv_c_inline" >&5
+echo "$as_me:2832: result: $ac_cv_c_inline" >&5
echo "${ECHO_T}$ac_cv_c_inline" >&6case $ac_cv_c_inline in
inline | yes) ;;
no)
-cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<\EOF
#define inline
-_ACEOF
+EOF
;;
- *) cat >>confdefs.h <<_ACEOF
+ *) cat >>confdefs.h <<EOF
#define inline $ac_cv_c_inline
-_ACEOF
+EOF
;;
esac
-echo "$as_me:3064: checking for size_t" >&5
+# 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:2853: 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 2859 "configure"
+#include "confdefs.h"
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2865: \"$ac_compile\"") >&5+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:2868: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'+ { (eval echo "$as_me:2871: \"$ac_try\"") >&5+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2874: \$? = $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:2884: 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 <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+echo "$as_me:2894: checking for size_t" >&5
echo $ECHO_N "checking for size_t... $ECHO_C" >&6
if test "${ac_cv_type_size_t+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3070 "configure"
+#line 2900 "configure"
#include "confdefs.h"
$ac_includes_default
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -3088,16 +2912,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3091: \"$ac_compile\"") >&5+if { (eval echo "$as_me:2915: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3094: \$? = $ac_status" >&5
+ echo "$as_me:2918: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3097: \"$ac_try\"") >&5+ { (eval echo "$as_me:2921: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3100: \$? = $ac_status" >&5
+ echo "$as_me:2924: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_size_t=yes
else
@@ -3107,27 +2931,27 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3110: result: $ac_cv_type_size_t" >&5
+echo "$as_me:2934: result: $ac_cv_type_size_t" >&5
echo "${ECHO_T}$ac_cv_type_size_t" >&6if test $ac_cv_type_size_t = yes; then
:
else
-cat >>confdefs.h <<_ACEOF
+cat >>confdefs.h <<EOF
#define size_t unsigned
-_ACEOF
+EOF
fi
-{ echo "$as_me:3122: checking if math library is required during link..." >&5+{ echo "$as_me:2946: checking if math library is required during link..." >&5echo "$as_me: checking if math library is required during link..." >&6;}
-echo "$as_me:3124: checking for pow" >&5
+echo "$as_me:2948: checking for pow" >&5
echo $ECHO_N "checking for pow... $ECHO_C" >&6
if test "${ac_cv_func_pow+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3130 "configure"
+#line 2954 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pow (); below. */
@@ -3141,12 +2965,6 @@
char pow ();
char (*f) ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -3164,16 +2982,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3167: \"$ac_link\"") >&5+if { (eval echo "$as_me:2985: \"$ac_link\"") >&5(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3170: \$? = $ac_status" >&5
+ echo "$as_me:2988: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'- { (eval echo "$as_me:3173: \"$ac_try\"") >&5+ { (eval echo "$as_me:2991: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3176: \$? = $ac_status" >&5
+ echo "$as_me:2994: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_pow=yes
else
@@ -3183,13 +3001,13 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:3186: result: $ac_cv_func_pow" >&5
+echo "$as_me:3004: result: $ac_cv_func_pow" >&5
echo "${ECHO_T}$ac_cv_func_pow" >&6if test "$ac_cv_func_pow" = no
then
-echo "$as_me:3192: checking for pow in -lm" >&5
+echo "$as_me:3010: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -3197,7 +3015,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 3200 "configure"
+#line 3018 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3207,12 +3025,6 @@
/* 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 ()
{@@ -3222,16 +3034,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3225: \"$ac_link\"") >&5+if { (eval echo "$as_me:3037: \"$ac_link\"") >&5(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3228: \$? = $ac_status" >&5
+ echo "$as_me:3040: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'- { (eval echo "$as_me:3231: \"$ac_try\"") >&5+ { (eval echo "$as_me:3043: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3234: \$? = $ac_status" >&5
+ echo "$as_me:3046: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_m_pow=yes
else
@@ -3242,12 +3054,12 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:3245: result: $ac_cv_lib_m_pow" >&5
+echo "$as_me:3057: result: $ac_cv_lib_m_pow" >&5
echo "${ECHO_T}$ac_cv_lib_m_pow" >&6if test $ac_cv_lib_m_pow = yes; then
- cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<EOF
#define HAVE_LIBM 1
-_ACEOF
+EOF
LIBS="-lm $LIBS"
@@ -3277,61 +3089,145 @@
fi
fi
-if test "${ac_cv_header_vorbis_codec_h+set}" = set; then- echo "$as_me:3281: checking for vorbis/codec.h" >&5
+echo "$as_me:3092: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3098 "configure"
+#include "confdefs.h"
+#include <vorbis/codec.h>
+_ACEOF
+if { (eval echo "$as_me:3102: \"$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:3108: \$? = $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
-echo "$as_me:3286: result: $ac_cv_header_vorbis_codec_h" >&5
+if test -z "$ac_cpp_err"; then
+ ac_cv_header_vorbis_codec_h=yes
+else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_header_vorbis_codec_h=no
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:3127: result: $ac_cv_header_vorbis_codec_h" >&5
echo "${ECHO_T}$ac_cv_header_vorbis_codec_h" >&6+if test $ac_cv_header_vorbis_codec_h = yes; then
+ ogg_vorbisinc=yes
else
- # Is the header compilable?
-echo "$as_me:3290: checking vorbis/codec.h usability" >&5
-echo $ECHO_N "checking vorbis/codec.h usability... $ECHO_C" >&6
+ ogg_vorbisinc=no
+fi
+
+if test "$ogg_vorbisinc" = yes
+then
+ echo "$as_me:3137: 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
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lvorbis $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 3293 "configure"
+#line 3145 "configure"
#include "confdefs.h"
-$ac_includes_default
-#include <vorbis/codec.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 ();
+int
+main ()
+{+vorbis_analysis_init ();
+ ;
+ return 0;
+}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3299: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3164: \"$ac_link\"") >&5+ (eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3302: \$? = $ac_status" >&5
+ echo "$as_me:3167: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3305: \"$ac_try\"") >&5+ { ac_try='test -s conftest$ac_exeext'+ { (eval echo "$as_me:3170: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3308: \$? = $ac_status" >&5
+ echo "$as_me:3173: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_header_compiler=yes
+ ac_cv_lib_vorbis_vorbis_analysis_init=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-ac_header_compiler=no
+ac_cv_lib_vorbis_vorbis_analysis_init=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:3317: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3184: 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
+ LIBS="$LIBS -logg -lvorbis -lvorbisfile -lvorbisenc"
-# Is the header present?
-echo "$as_me:3321: checking vorbis/codec.h presence" >&5
-echo $ECHO_N "checking vorbis/codec.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3324 "configure"
+cat >>confdefs.h <<\EOF
+#define HAVE_LIBVORBIS 1
+EOF
+
+fi
+
+fi
+CPPFLAGS="$ac_save_CPPFLAGS"
+
+if test "madlib" != auto && test "madlib" != no
+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
+
+echo "$as_me:3214: 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
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3220 "configure"
#include "confdefs.h"
-#include <vorbis/codec.h>
+#include <mad.h>
_ACEOF
-if { (eval echo "$as_me:3328: \"$ac_cpp conftest.$ac_ext\"") >&5+if { (eval echo "$as_me:3224: \"$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:3334: \$? = $ac_status" >&5
+ echo "$as_me:3230: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3342,59 +3238,155 @@
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
+ ac_cv_header_mad_h=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- ac_header_preproc=no
+ ac_cv_header_mad_h=no
fi
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:3352: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6+fi
+echo "$as_me:3249: result: $ac_cv_header_mad_h" >&5
+echo "${ECHO_T}$ac_cv_header_mad_h" >&6+if test $ac_cv_header_mad_h = yes; then
+ madinc=yes
+else
+ madinc=no
+fi
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:3358: 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:3360: 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:3363: 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:3365: 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:3367: 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:3370: 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+if test "$madinc" = yes
+then
+ echo "$as_me:3259: 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
else
- ac_cv_header_vorbis_codec_h=$ac_header_preproc
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmad $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 3267 "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 ();
+int
+main ()
+{+mad_stream_buffer ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3286: \"$ac_link\"") >&5+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3289: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'+ { (eval echo "$as_me:3292: \"$ac_try\"") >&5+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3295: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_mad_mad_stream_buffer=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_mad_mad_stream_buffer=no
fi
-echo "$as_me:3377: result: $ac_cv_header_vorbis_codec_h" >&5
-echo "${ECHO_T}$ac_cv_header_vorbis_codec_h" >&6+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3306: 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
+ LIBS="$LIBS -lmad"
+cat >>confdefs.h <<\EOF
+#define HAVE_LIBMAD 1
+EOF
+
fi
-if test $ac_cv_header_vorbis_codec_h = yes; then
- ogg_vorbisinc=yes
+
+fi
+CPPFLAGS="$ac_save_CPPFLAGS"
+
+if test "lamelib" != auto && test "lamelib" != no
+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$madinc"
+ fi
+fi
+
+echo "$as_me:3336: 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
- ogg_vorbisinc=no
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3342 "configure"
+#include "confdefs.h"
+#include <lame/lame.h>
+_ACEOF
+if { (eval echo "$as_me:3346: \"$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:3352: \$? = $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_lame_lame_h=yes
+else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_header_lame_lame_h=no
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:3371: result: $ac_cv_header_lame_lame_h" >&5
+echo "${ECHO_T}$ac_cv_header_lame_lame_h" >&6+if test $ac_cv_header_lame_lame_h = yes; then
+ lameinc=yes
+else
+ lameinc=no
+fi
-if test "$ogg_vorbisinc" = yes
+if test "$lameinc" = yes
then
- echo "$as_me:3389: 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 "$as_me:3381: 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
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lvorbis $LIBS"
+LIBS="-lmp3lame $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 3397 "configure"
+#line 3389 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3403,50 +3395,44 @@
#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
+char lame_init ();
int
main ()
{-vorbis_analysis_init ();
+lame_init ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3422: \"$ac_link\"") >&5+if { (eval echo "$as_me:3408: \"$ac_link\"") >&5(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3425: \$? = $ac_status" >&5
+ echo "$as_me:3411: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'- { (eval echo "$as_me:3428: \"$ac_try\"") >&5+ { (eval echo "$as_me:3414: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3431: \$? = $ac_status" >&5
+ echo "$as_me:3417: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_vorbis_vorbis_analysis_init=yes
+ ac_cv_lib_mp3lame_lame_init=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-ac_cv_lib_vorbis_vorbis_analysis_init=no
+ac_cv_lib_mp3lame_lame_init=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:3442: 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
- LIBS="$LIBS -logg -lvorbis -lvorbisfile -lvorbisenc"
+echo "$as_me:3428: 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
+ LIBS="$LIBS -lmp3lame"
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBVORBIS 1
-_ACEOF
+cat >>confdefs.h <<\EOF
+#define HAVE_LAME 1
+EOF
fi
@@ -3456,13 +3442,13 @@
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:3459: checking for $ac_func" >&5
+echo "$as_me:3445: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3465 "configure"
+#line 3451 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -3476,12 +3462,6 @@
char $ac_func ();
char (*f) ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -3499,16 +3479,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3502: \"$ac_link\"") >&5+if { (eval echo "$as_me:3482: \"$ac_link\"") >&5(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3505: \$? = $ac_status" >&5
+ echo "$as_me:3485: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'- { (eval echo "$as_me:3508: \"$ac_try\"") >&5+ { (eval echo "$as_me:3488: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3511: \$? = $ac_status" >&5
+ echo "$as_me:3491: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -3518,12 +3498,12 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:3521: result: `eval echo '${'$as_ac_var'}'`" >&5+echo "$as_me:3501: 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
+ cat >>confdefs.h <<EOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+EOF
fi
done
@@ -3534,61 +3514,23 @@
for ac_header 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:3538: checking for $ac_header" >&5
+echo "$as_me:3517: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; thenecho $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:3543: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6else
- # Is the header compilable?
-echo "$as_me:3547: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3550 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3523 "configure"
#include "confdefs.h"
-$ac_includes_default
#include <$ac_header>
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3556: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3559: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3562: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3565: \$? = $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:3574: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:3578: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3581 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:3585: \"$ac_cpp conftest.$ac_ext\"") >&5+if { (eval echo "$as_me:3527: \"$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:3591: \$? = $ac_status" >&5
+ echo "$as_me:3533: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3599,49 +3541,22 @@
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- ac_header_preproc=no
+ eval "$as_ac_Header=no"
fi
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:3609: 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:3615: 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:3617: 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:3620: WARNING: $ac_header: present but cannot be compiled." >&5-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
- { echo "$as_me:3622: WARNING: $ac_header: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:3624: 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:3627: 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:3634: result: `eval echo '${'$as_ac_Header'}'`" >&5+echo "$as_me:3552: 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
+ cat >>confdefs.h <<EOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+EOF
alsa_dsp=yes
fi
-
done
fi
@@ -3648,20 +3563,14 @@
if test "$alsa_dsp" = yes
then
- echo "$as_me:3651: checking for ALSA ioctl API" >&5
+ echo "$as_me:3566: checking for ALSA ioctl API" >&5
echo $ECHO_N "checking for ALSA ioctl API... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 3654 "configure"
+#line 3569 "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 ()
{@@ -3673,16 +3582,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3676: \"$ac_compile\"") >&5+if { (eval echo "$as_me:3585: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3679: \$? = $ac_status" >&5
+ echo "$as_me:3588: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3682: \"$ac_try\"") >&5+ { (eval echo "$as_me:3591: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3685: \$? = $ac_status" >&5
+ echo "$as_me:3594: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
alsa_api_ver=oldapi
else
@@ -3691,7 +3600,7 @@
alsa_api_ver=newapi
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:3694: result: $alsa_api_ver" >&5
+ echo "$as_me:3603: result: $alsa_api_ver" >&5
echo "${ECHO_T}$alsa_api_ver" >&6CFLAGS="$CFLAGS -DALSA_PLAYER"
if test "$alsa_api_ver" = oldapi; then CFLAGS="$CFLAGS -DUSE_OLD_API"; fi
@@ -3705,61 +3614,23 @@
for ac_header 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:3709: checking for $ac_header" >&5
+echo "$as_me:3617: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; thenecho $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:3714: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6else
- # Is the header compilable?
-echo "$as_me:3718: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3721 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3623 "configure"
#include "confdefs.h"
-$ac_includes_default
#include <$ac_header>
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3727: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3730: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3733: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3736: \$? = $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:3745: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:3749: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3752 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:3756: \"$ac_cpp conftest.$ac_ext\"") >&5+if { (eval echo "$as_me:3627: \"$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:3762: \$? = $ac_status" >&5
+ echo "$as_me:3633: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3770,49 +3641,22 @@
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- ac_header_preproc=no
+ eval "$as_ac_Header=no"
fi
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:3780: 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:3786: 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:3788: 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:3791: WARNING: $ac_header: present but cannot be compiled." >&5-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
- { echo "$as_me:3793: WARNING: $ac_header: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:3795: 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:3798: 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:3805: result: `eval echo '${'$as_ac_Header'}'`" >&5+echo "$as_me:3652: 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
+ cat >>confdefs.h <<EOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+EOF
oss_dsp=yes
fi
-
done
fi
@@ -3830,61 +3674,23 @@
for ac_header 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:3834: checking for $ac_header" >&5
+echo "$as_me:3677: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; thenecho $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:3839: result: `eval echo '${'$as_ac_Header'}'`" >&5-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6else
- # Is the header compilable?
-echo "$as_me:3843: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3846 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3683 "configure"
#include "confdefs.h"
-$ac_includes_default
#include <$ac_header>
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3852: \"$ac_compile\"") >&5- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3855: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:3858: \"$ac_try\"") >&5- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3861: \$? = $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:3870: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6-
-# Is the header present?
-echo "$as_me:3874: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 3877 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:3881: \"$ac_cpp conftest.$ac_ext\"") >&5+if { (eval echo "$as_me:3687: \"$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:3887: \$? = $ac_status" >&5
+ echo "$as_me:3693: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3895,49 +3701,22 @@
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- ac_header_preproc=no
+ eval "$as_ac_Header=no"
fi
rm -f conftest.err conftest.$ac_ext
-echo "$as_me:3905: 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:3911: 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:3913: 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:3916: WARNING: $ac_header: present but cannot be compiled." >&5-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
- { echo "$as_me:3918: WARNING: $ac_header: check for missing prerequisite headers?" >&5-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:3920: 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:3923: 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:3930: result: `eval echo '${'$as_ac_Header'}'`" >&5+echo "$as_me:3712: 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
+ cat >>confdefs.h <<EOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+EOF
sun_audio=yes
fi
-
done
fi
@@ -3971,17 +3750,17 @@
ac_config_headers="$ac_config_headers stconfig.h"
# ------ AC CREATE STDINT H -------------------------------------
-echo "$as_me:3974: checking for stdint-types...." >&5
+echo "$as_me:3753: checking for stdint-types...." >&5
echo $ECHO_N "checking for stdint-types....... $ECHO_C" >&6
ac_stdint_h=`echo ststdint.h`
if test "$ac_stdint_h" = "stdint.h" ; then
- echo "$as_me:3978: result: \"(are you sure you want them in ./stdint.h?)\"" >&5
+ echo "$as_me:3757: result: \"(are you sure you want them in ./stdint.h?)\"" >&5
echo "${ECHO_T}\"(are you sure you want them in ./stdint.h?)\"" >&6elif test "$ac_stdint_h" = "inttypes.h" ; then
- echo "$as_me:3981: result: \"(are you sure you want them in ./inttypes.h?)\"" >&5
+ echo "$as_me:3760: result: \"(are you sure you want them in ./inttypes.h?)\"" >&5
echo "${ECHO_T}\"(are you sure you want them in ./inttypes.h?)\"" >&6else
- echo "$as_me:3984: result: \"(putting them into $ac_stdint_h)\"" >&5
+ echo "$as_me:3763: result: \"(putting them into $ac_stdint_h)\"" >&5
echo "${ECHO_T}\"(putting them into $ac_stdint_h)\"" >&6fi
@@ -3994,22 +3773,16 @@
for i in stdint.h $inttype_headers ; do
unset ac_cv_type_uintptr_t
unset ac_cv_type_uint64_t
- echo "$as_me:3997: checking for uintptr_t" >&5
+ echo "$as_me:3776: checking for uintptr_t" >&5
echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6
if test "${ac_cv_type_uintptr_t+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4003 "configure"
+#line 3782 "configure"
#include "confdefs.h"
#include <$i>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -4022,16 +3795,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4025: \"$ac_compile\"") >&5+if { (eval echo "$as_me:3798: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4028: \$? = $ac_status" >&5
+ echo "$as_me:3801: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4031: \"$ac_try\"") >&5+ { (eval echo "$as_me:3804: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4034: \$? = $ac_status" >&5
+ echo "$as_me:3807: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_uintptr_t=yes
else
@@ -4041,7 +3814,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4044: result: $ac_cv_type_uintptr_t" >&5
+echo "$as_me:3817: result: $ac_cv_type_uintptr_t" >&5
echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6if test $ac_cv_type_uintptr_t = yes; then
ac_cv_header_stdint_x=$i
@@ -4049,22 +3822,16 @@
continue
fi
- echo "$as_me:4052: checking for uint64_t" >&5
+ echo "$as_me:3825: checking for uint64_t" >&5
echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6
if test "${ac_cv_type_uint64_t+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4058 "configure"
+#line 3831 "configure"
#include "confdefs.h"
#include<$i>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -4077,16 +3844,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4080: \"$ac_compile\"") >&5+if { (eval echo "$as_me:3847: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4083: \$? = $ac_status" >&5
+ echo "$as_me:3850: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4086: \"$ac_try\"") >&5+ { (eval echo "$as_me:3853: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4089: \$? = $ac_status" >&5
+ echo "$as_me:3856: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_uint64_t=yes
else
@@ -4096,7 +3863,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4099: result: $ac_cv_type_uint64_t" >&5
+echo "$as_me:3866: result: $ac_cv_type_uint64_t" >&5
echo "${ECHO_T}$ac_cv_type_uint64_t" >&6if test $ac_cv_type_uint64_t = yes; then
and64="(uint64_t too)"
@@ -4104,7 +3871,7 @@
and64=""
fi
- echo "$as_me:4107: result: ... seen our uintptr_t in $i $and64" >&5
+ echo "$as_me:3874: result: ... seen our uintptr_t in $i $and64" >&5
echo "${ECHO_T}... seen our uintptr_t in $i $and64" >&6break;
done
@@ -4112,22 +3879,16 @@
for i in stdint.h $inttype_headers ; do
unset ac_cv_type_uint32_t
unset ac_cv_type_uint64_t
- echo "$as_me:4115: checking for uint32_t" >&5
+ echo "$as_me:3882: checking for uint32_t" >&5
echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
if test "${ac_cv_type_uint32_t+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4121 "configure"
+#line 3888 "configure"
#include "confdefs.h"
#include <$i>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -4140,16 +3901,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4143: \"$ac_compile\"") >&5+if { (eval echo "$as_me:3904: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4146: \$? = $ac_status" >&5
+ echo "$as_me:3907: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4149: \"$ac_try\"") >&5+ { (eval echo "$as_me:3910: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4152: \$? = $ac_status" >&5
+ echo "$as_me:3913: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_uint32_t=yes
else
@@ -4159,7 +3920,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4162: result: $ac_cv_type_uint32_t" >&5
+echo "$as_me:3923: result: $ac_cv_type_uint32_t" >&5
echo "${ECHO_T}$ac_cv_type_uint32_t" >&6if test $ac_cv_type_uint32_t = yes; then
ac_cv_header_stdint_o=$i
@@ -4167,22 +3928,16 @@
continue
fi
- echo "$as_me:4170: checking for uint64_t" >&5
+ echo "$as_me:3931: checking for uint64_t" >&5
echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6
if test "${ac_cv_type_uint64_t+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4176 "configure"
+#line 3937 "configure"
#include "confdefs.h"
#include<$i>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -4195,16 +3950,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4198: \"$ac_compile\"") >&5+if { (eval echo "$as_me:3953: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4201: \$? = $ac_status" >&5
+ echo "$as_me:3956: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4204: \"$ac_try\"") >&5+ { (eval echo "$as_me:3959: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4207: \$? = $ac_status" >&5
+ echo "$as_me:3962: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_uint64_t=yes
else
@@ -4214,7 +3969,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4217: result: $ac_cv_type_uint64_t" >&5
+echo "$as_me:3972: result: $ac_cv_type_uint64_t" >&5
echo "${ECHO_T}$ac_cv_type_uint64_t" >&6if test $ac_cv_type_uint64_t = yes; then
and64="(uint64_t too)"
@@ -4222,7 +3977,7 @@
and64=""
fi
- echo "$as_me:4225: result: ... seen our uint32_t in $i $and64" >&5
+ echo "$as_me:3980: result: ... seen our uint32_t in $i $and64" >&5
echo "${ECHO_T}... seen our uint32_t in $i $and64" >&6break;
done
@@ -4230,22 +3985,16 @@
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:4233: checking for u_int32_t" >&5
+ echo "$as_me:3988: 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; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4239 "configure"
+#line 3994 "configure"
#include "confdefs.h"
#include <$i>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -4258,16 +4007,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4261: \"$ac_compile\"") >&5+if { (eval echo "$as_me:4010: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4264: \$? = $ac_status" >&5
+ echo "$as_me:4013: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4267: \"$ac_try\"") >&5+ { (eval echo "$as_me:4016: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4270: \$? = $ac_status" >&5
+ echo "$as_me:4019: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_u_int32_t=yes
else
@@ -4277,7 +4026,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4280: result: $ac_cv_type_u_int32_t" >&5
+echo "$as_me:4029: result: $ac_cv_type_u_int32_t" >&5
echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6if test $ac_cv_type_u_int32_t = yes; then
ac_cv_header_stdint_u=$i
@@ -4285,22 +4034,16 @@
continue
fi
- echo "$as_me:4288: checking for uint64_t" >&5
+ echo "$as_me:4037: checking for uint64_t" >&5
echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6
if test "${ac_cv_type_uint64_t+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4294 "configure"
+#line 4043 "configure"
#include "confdefs.h"
#include<$i>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }-#endif
int
main ()
{@@ -4313,16 +4056,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4316: \"$ac_compile\"") >&5+if { (eval echo "$as_me:4059: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4319: \$? = $ac_status" >&5
+ echo "$as_me:4062: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4322: \"$ac_try\"") >&5+ { (eval echo "$as_me:4065: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4325: \$? = $ac_status" >&5
+ echo "$as_me:4068: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_uint64_t=yes
else
@@ -4332,7 +4075,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4335: result: $ac_cv_type_uint64_t" >&5
+echo "$as_me:4078: result: $ac_cv_type_uint64_t" >&5
echo "${ECHO_T}$ac_cv_type_uint64_t" >&6if test $ac_cv_type_uint64_t = yes; then
and64="(u_int64_t too)"
@@ -4340,7 +4083,7 @@
and64=""
fi
- echo "$as_me:4343: result: ... seen our u_int32_t in $i $and64" >&5
+ echo "$as_me:4086: result: ... seen our u_int32_t in $i $and64" >&5
echo "${ECHO_T}... seen our u_int32_t in $i $and64" >&6break;
done
@@ -4350,7 +4093,7 @@
# ----------------- DONE inttypes.h checks MAYBE C basic types --------
if test "$ac_cv_header_stdint_x" = "no-file" ; then
- echo "$as_me:4353: checking size of char" >&5
+ echo "$as_me:4096: checking size of char" >&5
echo $ECHO_N "checking size of char... $ECHO_C" >&6
if test "${ac_cv_sizeof_char+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -4357,17 +4100,11 @@
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
cat >conftest.$ac_ext <<_ACEOF
-#line 4360 "configure"
+#line 4103 "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 ()
{@@ -4377,16 +4114,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4380: \"$ac_compile\"") >&5+if { (eval echo "$as_me:4117: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4383: \$? = $ac_status" >&5
+ echo "$as_me:4120: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4386: \"$ac_try\"") >&5+ { (eval echo "$as_me:4123: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4389: \$? = $ac_status" >&5
+ echo "$as_me:4126: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_char=$ac_size
else
@@ -4400,18 +4137,18 @@
fi
if test x$ac_cv_sizeof_char = x ; then
- { { echo "$as_me:4403: error: cannot determine a size for char" >&5+ { { echo "$as_me:4140: error: cannot determine a size for char" >&5echo "$as_me: error: cannot determine a size for char" >&2;}
{ (exit 1); exit 1; }; }fi
-echo "$as_me:4407: result: $ac_cv_sizeof_char" >&5
+echo "$as_me:4144: result: $ac_cv_sizeof_char" >&5
echo "${ECHO_T}$ac_cv_sizeof_char" >&6-cat >>confdefs.h <<_ACEOF
+cat >>confdefs.h <<EOF
#define SIZEOF_CHAR $ac_cv_sizeof_char
-_ACEOF
+EOF
- echo "$as_me:4414: checking size of short" >&5
+ echo "$as_me:4151: checking size of short" >&5
echo $ECHO_N "checking size of short... $ECHO_C" >&6
if test "${ac_cv_sizeof_short+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -4418,17 +4155,11 @@
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
cat >conftest.$ac_ext <<_ACEOF
-#line 4421 "configure"
+#line 4158 "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 ()
{@@ -4438,16 +4169,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4441: \"$ac_compile\"") >&5+if { (eval echo "$as_me:4172: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4444: \$? = $ac_status" >&5
+ echo "$as_me:4175: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4447: \"$ac_try\"") >&5+ { (eval echo "$as_me:4178: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4450: \$? = $ac_status" >&5
+ echo "$as_me:4181: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_short=$ac_size
else
@@ -4461,18 +4192,18 @@
fi
if test x$ac_cv_sizeof_short = x ; then
- { { echo "$as_me:4464: error: cannot determine a size for short" >&5+ { { echo "$as_me:4195: error: cannot determine a size for short" >&5echo "$as_me: error: cannot determine a size for short" >&2;}
{ (exit 1); exit 1; }; }fi
-echo "$as_me:4468: result: $ac_cv_sizeof_short" >&5
+echo "$as_me:4199: result: $ac_cv_sizeof_short" >&5
echo "${ECHO_T}$ac_cv_sizeof_short" >&6-cat >>confdefs.h <<_ACEOF
+cat >>confdefs.h <<EOF
#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
+EOF
- echo "$as_me:4475: checking size of int" >&5
+ echo "$as_me:4206: checking size of int" >&5
echo $ECHO_N "checking size of int... $ECHO_C" >&6
if test "${ac_cv_sizeof_int+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -4479,17 +4210,11 @@
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
cat >conftest.$ac_ext <<_ACEOF
-#line 4482 "configure"
+#line 4213 "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 ()
{@@ -4499,16 +4224,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4502: \"$ac_compile\"") >&5+if { (eval echo "$as_me:4227: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4505: \$? = $ac_status" >&5
+ echo "$as_me:4230: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4508: \"$ac_try\"") >&5+ { (eval echo "$as_me:4233: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4511: \$? = $ac_status" >&5
+ echo "$as_me:4236: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_int=$ac_size
else
@@ -4522,18 +4247,18 @@
fi
if test x$ac_cv_sizeof_int = x ; then
- { { echo "$as_me:4525: error: cannot determine a size for int" >&5+ { { echo "$as_me:4250: error: cannot determine a size for int" >&5echo "$as_me: error: cannot determine a size for int" >&2;}
{ (exit 1); exit 1; }; }fi
-echo "$as_me:4529: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:4254: result: $ac_cv_sizeof_int" >&5
echo "${ECHO_T}$ac_cv_sizeof_int" >&6-cat >>confdefs.h <<_ACEOF
+cat >>confdefs.h <<EOF
#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
+EOF
- echo "$as_me:4536: checking size of long" >&5
+ echo "$as_me:4261: checking size of long" >&5
echo $ECHO_N "checking size of long... $ECHO_C" >&6
if test "${ac_cv_sizeof_long+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -4540,17 +4265,11 @@
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
cat >conftest.$ac_ext <<_ACEOF
-#line 4543 "configure"
+#line 4268 "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 ()
{@@ -4560,16 +4279,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4563: \"$ac_compile\"") >&5+if { (eval echo "$as_me:4282: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4566: \$? = $ac_status" >&5
+ echo "$as_me:4285: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4569: \"$ac_try\"") >&5+ { (eval echo "$as_me:4288: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4572: \$? = $ac_status" >&5
+ echo "$as_me:4291: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_long=$ac_size
else
@@ -4583,18 +4302,18 @@
fi
if test x$ac_cv_sizeof_long = x ; then
- { { echo "$as_me:4586: error: cannot determine a size for long" >&5+ { { echo "$as_me:4305: error: cannot determine a size for long" >&5echo "$as_me: error: cannot determine a size for long" >&2;}
{ (exit 1); exit 1; }; }fi
-echo "$as_me:4590: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:4309: result: $ac_cv_sizeof_long" >&5
echo "${ECHO_T}$ac_cv_sizeof_long" >&6-cat >>confdefs.h <<_ACEOF
+cat >>confdefs.h <<EOF
#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+EOF
- echo "$as_me:4597: checking size of void*" >&5
+ echo "$as_me:4316: checking size of void*" >&5
echo $ECHO_N "checking size of void*... $ECHO_C" >&6
if test "${ac_cv_sizeof_voidp+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -4601,17 +4320,11 @@
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
cat >conftest.$ac_ext <<_ACEOF
-#line 4604 "configure"
+#line 4323 "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 ()
{@@ -4621,16 +4334,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4624: \"$ac_compile\"") >&5+if { (eval echo "$as_me:4337: \"$ac_compile\"") >&5(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4627: \$? = $ac_status" >&5
+ echo "$as_me:4340: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'- { (eval echo "$as_me:4630: \"$ac_try\"") >&5+ { (eval echo "$as_me:4343: \"$ac_try\"") >&5(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4633: \$? = $ac_status" >&5
+ echo "$as_me:4346: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_voidp=$ac_size
else
@@ -4644,16 +4357,16 @@
fi
if test x$ac_cv_sizeof_voidp = x ; then
- { { echo "$as_me:4647: error: cannot determine a size for void*" >&5+ { { echo "$as_me:4360: error: cannot determine a size for void*" >&5echo "$as_me: error: cannot determine a size for void*" >&2;}
{ (exit 1); exit 1; }; }fi
-echo "$as_me:4651: result: $ac_cv_sizeof_voidp" >&5
+echo "$as_me:4364: result: $ac_cv_sizeof_voidp" >&5
echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6-cat >>confdefs.h <<_ACEOF
+cat >>confdefs.h <<EOF
#define SIZEOF_VOIDP $ac_cv_sizeof_voidp
-_ACEOF
+EOF
ac_cv_header_stdint_test="yes"
else
@@ -4662,7 +4375,7 @@
# ----------------- DONE inttypes.h checks START header -------------
_ac_stdint_h=`echo "_$ac_stdint_h" | $as_tr_cpp`
-echo "$as_me:4665: result: creating $ac_stdint_h : $_ac_stdint_h" >&5
+echo "$as_me:4378: result: creating $ac_stdint_h : $_ac_stdint_h" >&5
echo "${ECHO_T}creating $ac_stdint_h : $_ac_stdint_h" >&6echo "#ifndef" $_ac_stdint_h >$ac_stdint_h
echo "#define" $_ac_stdint_h "1" >>$ac_stdint_h
@@ -4688,11 +4401,11 @@
if test "$ac_cv_header_stdint" != "stddef.h" ; then
if test "$ac_cv_header_stdint" != "stdint.h" ; then
-echo "$as_me:4691: result: ..adding include stddef.h" >&5
+echo "$as_me:4404: result: ..adding include stddef.h" >&5
echo "${ECHO_T}..adding include stddef.h" >&6echo "#include <stddef.h>" >>$ac_stdint_h
fi ; fi
-echo "$as_me:4695: result: ..adding include $ac_cv_header_stdint" >&5
+echo "$as_me:4408: result: ..adding include $ac_cv_header_stdint" >&5
echo "${ECHO_T}..adding include $ac_cv_header_stdint" >&6echo "#include <$ac_cv_header_stdint>" >>$ac_stdint_h
echo "" >>$ac_stdint_h
@@ -4699,15 +4412,15 @@
# ----------------- DONE header START basic int types -------------
if test "$ac_cv_header_stdint_x" = "no-file" ; then
- echo "$as_me:4702: result: ... need to look at C basic types" >&5
+ echo "$as_me:4415: result: ... need to look at C basic types" >&5
echo "${ECHO_T}... need to look at C basic types" >&6else
- echo "$as_me:4705: result: ... seen good stdint.h inttypes" >&5
+ echo "$as_me:4418: result: ... seen good stdint.h inttypes" >&5
echo "${ECHO_T}... seen good stdint.h inttypes" >&6fi
if test "$ac_cv_header_stdint_u" != "no-file" ; then
- echo "$as_me:4710: result: ... seen bsd/sysv typedefs" >&5
+ echo "$as_me:4423: result: ... seen bsd/sysv typedefs" >&5
echo "${ECHO_T}... seen bsd/sysv typedefs" >&6cat >>$ac_stdint_h <<EOF
@@ -4736,7 +4449,7 @@
EOF
t="typedefs for a"
case "$ac_cv_sizeof_X" in
- 1:2:2:2:4) echo "$as_me:4739: result: ..adding $t normal 16-bit system" >&5
+ 1:2:2:2:4) echo "$as_me:4452: result: ..adding $t normal 16-bit system" >&5
echo "${ECHO_T}..adding $t normal 16-bit system" >&6cat >>$ac_stdint_h <<EOF
/* a normal 16-bit system */
@@ -4751,7 +4464,7 @@
#endif
EOF
;;
- 1:2:2:4:4) echo "$as_me:4754: result: ..adding $t 32-bit system derived from a 16-bit" >&5
+ 1:2:2:4:4) echo "$as_me:4467: 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" >&6cat >>$ac_stdint_h <<EOF
/* a 32-bit system derived from a 16-bit */
@@ -4766,7 +4479,7 @@
#endif
EOF
;;
- 1:2:4:4:4) echo "$as_me:4769: result: ..adding $t normal 32-bit system" >&5
+ 1:2:4:4:4) echo "$as_me:4482: result: ..adding $t normal 32-bit system" >&5
echo "${ECHO_T}..adding $t normal 32-bit system" >&6cat >>$ac_stdint_h <<EOF
/* a normal 32-bit system */
@@ -4781,7 +4494,7 @@
#endif
EOF
;;
- 1:2:4:4:8) echo "$as_me:4784: result: ..adding $t 32-bit system prepared for 64-bit" >&5
+ 1:2:4:4:8) echo "$as_me:4497: result: ..adding $t 32-bit system prepared for 64-bit" >&5
echo "${ECHO_T}..adding $t 32-bit system prepared for 64-bit" >&6cat >>$ac_stdint_h <<EOF
@@ -4797,7 +4510,7 @@
#endif
EOF
;;
- 1:2:4:8:8) echo "$as_me:4800: result: ..adding $t normal 64-bit system" >&5
+ 1:2:4:8:8) echo "$as_me:4513: result: ..adding $t normal 64-bit system" >&5
echo "${ECHO_T}..adding $t normal 64-bit system" >&6cat >>$ac_stdint_h <<EOF
@@ -4813,7 +4526,7 @@
#endif
EOF
;;
- 1:2:4:8:4) echo "$as_me:4816: result: ..adding $t 64-bit system derived from a 32-bit" >&5
+ 1:2:4:8:4) echo "$as_me:4529: 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" >&6cat >>$ac_stdint_h <<EOF
@@ -4830,7 +4543,7 @@
EOF
;;
*)
- { { echo "$as_me:4833: error: $ac_cv_sizeof_X what is that a system? contact the author, quick! http://ac-archive.sf.net" >&5+ { { echo "$as_me:4546: error: $ac_cv_sizeof_X what is that a system? contact the author, quick! http://ac-archive.sf.net" >&5echo "$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; }; }exit 1
@@ -4840,7 +4553,7 @@
# ------------- DONE basic int types START int64_t types ------------
if test "$ac_cv_type_uint64_t" = "yes"
-then echo "$as_me:4843: result: ... seen good uint64_t" >&5
+then echo "$as_me:4556: result: ... seen good uint64_t" >&5
echo "${ECHO_T}... seen good uint64_t" >&6cat >>$ac_stdint_h <<EOF
@@ -4851,7 +4564,7 @@
EOF
elif test "$ac_cv_type_u_int64_t" = "yes"
-then echo "$as_me:4854: result: ..adding typedef u_int64_t uint64_t" >&5
+then echo "$as_me:4567: result: ..adding typedef u_int64_t uint64_t" >&5
echo "${ECHO_T}..adding typedef u_int64_t uint64_t" >&6cat >>$ac_stdint_h <<EOF
@@ -4861,7 +4574,7 @@
typedef u_int64_t uint64_t;
#endif
EOF
-else echo "$as_me:4864: result: ..adding generic uint64_t runtime checks" >&5
+else echo "$as_me:4577: result: ..adding generic uint64_t runtime checks" >&5
echo "${ECHO_T}..adding generic uint64_t runtime checks" >&6cat >>$ac_stdint_h <<EOF
@@ -4910,7 +4623,7 @@
# 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:4913: result: ..adding uint64_t default" >&5
+ 1:2:8:8) echo "$as_me:4626: result: ..adding uint64_t default" >&5
echo "${ECHO_T}..adding uint64_t default" >&6cat >>$ac_stdint_h <<EOF
/* DEFAULT: */
@@ -4922,7 +4635,7 @@
#endif
EOF
;;
- 1:2:4:8) echo "$as_me:4925: result: ..adding uint64_t default" >&5
+ 1:2:4:8) echo "$as_me:4638: result: ..adding uint64_t default" >&5
echo "${ECHO_T}..adding uint64_t default" >&6cat >>$ac_stdint_h <<EOF
/* DEFAULT: */
@@ -4934,7 +4647,7 @@
#endif
EOF
;;
- 1:2:8:4) echo "$as_me:4937: result: ..adding uint64_t default" >&5
+ 1:2:8:4) echo "$as_me:4650: result: ..adding uint64_t default" >&5
echo "${ECHO_T}..adding uint64_t default" >&6cat >>$ac_stdint_h <<EOF
/* DEFAULT: */
@@ -4995,13 +4708,13 @@
EOF
;;
esac
-echo "$as_me:4998: result: ..adding typedef $a intptr_t" >&5
+echo "$as_me:4711: result: ..adding typedef $a intptr_t" >&5
echo "${ECHO_T}..adding typedef $a intptr_t" >&6fi
# ------------- DONE intptr types START int_least types ------------
if test "$ac_cv_header_stdint_x" = "no-file" ; then
-echo "$as_me:5004: result: ..adding generic int_least-types" >&5
+echo "$as_me:4717: result: ..adding generic int_least-types" >&5
echo "${ECHO_T}..adding generic int_least-types" >&6cat >>$ac_stdint_h <<EOF
@@ -5025,7 +4738,7 @@
EOF
fi
-echo "$as_me:5028: result: ... DONE $ac_stdint_h" >&5
+echo "$as_me:4741: result: ... DONE $ac_stdint_h" >&5
echo "${ECHO_T}... DONE $ac_stdint_h" >&6cat >>$ac_stdint_h <<EOF
@@ -5114,11 +4827,11 @@
: ${CONFIG_STATUS=./config.status}ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:5117: creating $CONFIG_STATUS" >&5+{ echo "$as_me:4830: creating $CONFIG_STATUS" >&5echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
-# Generated automatically by $as_me.
+# Generated automatically by configure.
# Run this file to recreate the current configuration.
# Compiler output produced by configure, useful for debugging
# configure, is in config.log if it exists.
@@ -5125,14 +4838,11 @@
debug=false
SHELL=\${CONFIG_SHELL-$SHELL}+ac_cs_invocation="\$0 \$@"
+
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
-
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; thenemulate sh
@@ -5198,30 +4908,6 @@
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.
@@ -5241,7 +4927,7 @@
echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
fi
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\EOF
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
@@ -5265,12 +4951,12 @@
$config_headers
Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
+EOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<EOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.52d,
+configured by $0, generated by GNU Autoconf 2.52,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -5279,9 +4965,9 @@
gives unlimited permission to copy, distribute and modify it."
srcdir=$srcdir
INSTALL="$INSTALL"
-_ACEOF
+EOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\EOF
# 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=:
@@ -5303,18 +4989,18 @@
case $1 in
# Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+EOF
+cat >>$CONFIG_STATUS <<EOF
-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
+EOF
+cat >>$CONFIG_STATUS <<\EOF
--version | --vers* | -V )
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:5317: error: ambiguous option: $1+ { { echo "$as_me:5003: error: ambiguous option: $1Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
@@ -5333,7 +5019,7 @@
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:5336: error: unrecognized option: $1+ -*) { { echo "$as_me:5022: error: unrecognized option: $1Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
@@ -5345,9 +5031,25 @@
shift
done
+exec 5>>config.log
+cat >&5 << _ACEOF
+
+## ----------------------- ##
+## Running config.status. ##
+## ----------------------- ##
+
+This file was extended by $as_me 2.52, executed with
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+ CONFIG_LINKS = $CONFIG_LINKS
+ CONFIG_COMMANDS = $CONFIG_COMMANDS
+ > $ac_cs_invocation
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+
_ACEOF
+EOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\EOF
for ac_config_target in $ac_config_targets
do
case "$ac_config_target" in
@@ -5355,7 +5057,7 @@
"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:5358: error: invalid argument: $ac_config_target" >&5+ *) { { echo "$as_me:5060: error: invalid argument: $ac_config_target" >&5echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;esac
@@ -5392,9 +5094,9 @@
{ (exit 1); exit 1; }}
-_ACEOF
+EOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<EOF
#
# CONFIG_FILES section.
@@ -5470,9 +5172,9 @@
s,@PLAY_SUPPORT@,$PLAY_SUPPORT,;t t
CEOF
-_ACEOF
+EOF
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\EOF
# 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
@@ -5511,8 +5213,8 @@
fi
fi # test -n "$CONFIG_FILES"
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+EOF
+cat >>$CONFIG_STATUS <<\EOF
for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case $ac_file in
@@ -5537,7 +5239,8 @@
/^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; }s/.*/./; q'`
- { case "$ac_dir" in+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+ { case "$ac_dir" in[\\/]* | ?:[\\/]* ) as_incr_dir=;;
*) as_incr_dir=.;;
esac
@@ -5548,46 +5251,40 @@
?:) 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:5553: error: cannot create \"$ac_dir\"" >&5-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }+ test -d "$as_incr_dir" || mkdir "$as_incr_dir"
;;
esac
done; }
- 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
+ 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 $srcdir in
+ .) ac_srcdir=.
+ if test -z "$ac_dots"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* )
+ 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
+ ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_dots$srcdir ;;
+ esac
case $INSTALL in
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ *) ac_INSTALL=$ac_dots$INSTALL ;;
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:5590: creating $ac_file" >&5+ { echo "$as_me:5287: creating $ac_file" >&5echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -5605,7 +5302,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:5608: error: cannot find input file: $f" >&5+ test -f "$f" || { { echo "$as_me:5305: error: cannot find input file: $f" >&5echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }echo $f;;
@@ -5618,18 +5315,18 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:5621: error: cannot find input file: $f" >&5+ { { echo "$as_me:5318: error: cannot find input file: $f" >&5echo "$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
+EOF
+cat >>$CONFIG_STATUS <<EOF
sed "$ac_vpsub
$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+EOF
+cat >>$CONFIG_STATUS <<\EOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
s,@configure_input@,$configure_input,;t t
@@ -5646,8 +5343,8 @@
fi
done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+EOF
+cat >>$CONFIG_STATUS <<\EOF
#
# CONFIG_HEADER section.
@@ -5679,7 +5376,7 @@
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:5682: creating $ac_file" >&5+ test x"$ac_file" != x- && { echo "$as_me:5379: creating $ac_file" >&5echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -5690,7 +5387,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:5693: error: cannot find input file: $f" >&5+ test -f "$f" || { { echo "$as_me:5390: error: cannot find input file: $f" >&5echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }echo $f;;
@@ -5703,7 +5400,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:5706: error: cannot find input file: $f" >&5+ { { echo "$as_me:5403: error: cannot find input file: $f" >&5echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }fi;;
@@ -5712,7 +5409,7 @@
# Remove the trailing spaces.
sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-_ACEOF
+EOF
# Transform confdefs.h into two sed scripts, `conftest.defines' and
# `conftest.undefs', that substitutes the proper values into
@@ -5728,7 +5425,7 @@
# `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
+cat >confdef2sed.sed <<\EOF
s/[\\&,]/\\&/g
s,[\\$`],\\&,g
t clear
@@ -5737,7 +5434,7 @@
t end
s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp: end
-_ACEOF
+EOF
# 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.
@@ -5748,9 +5445,9 @@
# 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
+cat >>conftest.undefs <<\EOF
s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
+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).
@@ -5807,7 +5504,7 @@
done
rm -f conftest.undefs
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\EOF
# 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. */
@@ -5820,7 +5517,7 @@
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:5823: $ac_file is unchanged" >&5+ { echo "$as_me:5520: $ac_file is unchanged" >&5echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -5834,7 +5531,8 @@
/^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; }s/.*/./; q'`
- { case "$ac_dir" in+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+ { case "$ac_dir" in[\\/]* | ?:[\\/]* ) as_incr_dir=;;
*) as_incr_dir=.;;
esac
@@ -5845,15 +5543,12 @@
?:) 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:5850: error: cannot create \"$ac_dir\"" >&5-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }+ test -d "$as_incr_dir" || mkdir "$as_incr_dir"
;;
esac
done; }
+ fi
rm -f $ac_file
mv $tmp/config.h $ac_file
fi
@@ -5862,12 +5557,12 @@
rm -f $tmp/config.h
fi
done
-_ACEOF
+EOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\EOF
{ (exit 0); exit 0; }-_ACEOF
+EOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
@@ -5897,3 +5592,4 @@
echo
echo "Configure finished. Do 'make; make install' to compile and install SoX."
echo
+
--- a/configure.in
+++ b/configure.in
@@ -49,6 +49,26 @@
[ogg_vorbisinc="$withval"],
[ogg_vorbisinc=auto])
+AC_ARG_WITH(madlib,
+ [ --with-madlib Location of MAD (MP3 Audio Decoder) libraries (=dir)],
+ [madlib="$withval"],
+ [madlib=auto])
+
+AC_ARG_WITH(madinc,
+ [ --with-madinc Location of MAD (MP3 Audio Decoder) headers (=dir)],
+ [madinc="$withval"],
+ [madinc=auto])
+
+AC_ARG_WITH(lamelib,
+ [ --with-lamelib Location of LAME (LAME Ain't an MP3 Encoder) libraries (=dir)],
+ [lamelib="$withval"],
+ [lamelib=auto])
+
+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
@@ -128,6 +148,66 @@
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
+then
+ LIBS="$LIBS -L$madlib"
+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
+then
+ LIBS="$LIBS -L$lamelib"
+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"
+
+if test "lameinc" != auto && test "lameinc" != no
+then
+ CFLAGS="$CFLAGS -I$lameinc"
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ if test \! -z "$lameinc" ; then
+ CPPFLAGS="$CPPFLAGS -I$madinc"
+ fi
+fi
+
+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"
--- a/sox.1
+++ b/sox.1
@@ -429,6 +429,18 @@
Allows 8bit linear, 16bit linear, A-Law, u-law
in mono and stereo.
.TP 10
+.B .mp3
+MP3 Compressed Audio
+.br
+MP3 audio files come from the MPEG standards for audio and video compression. They are a lossy compression format that achieves good compression rates with a minimum amount of quality loss. Also see Ogg Vorbis for a similar format.
+MP3 support in
+.B SoX
+is optional and requires access to either or both the external
+libmad and libmp3lame libraries. To
+see if there is support for Mp3 run \fBsox -h\fR
+and look for it under the list of supported file formats as "mp3".
+
+.TP 10
.B .nul
Null file handler. This is a fake file hander that act as if its reading
a stream of 0's from a while or fake writing output to a file. This
--- a/sox.txt
+++ b/sox.txt
@@ -367,75 +367,88 @@
8bit linear, 16bit linear, A-Law, u-law in mono
and stereo.
- .nul Null file handler. This is a fake file hander
- that act as if its reading a stream of 0's from
- a while or fake writing output to a file. This
+ .mp3 MP3 Compressed Audio
+ MP3 audio files come from the MPEG standards for
+ audio and video compression. They are a lossy
+ compression format that achieves good compres�
+ sion rates with a minimum amount of quality
+ loss. Also see Ogg Vorbis for a similar format.
+ MP3 support in SoX is optional and requires
+ access to either or both the external libmad and
+ libmp3lame libraries. To see if there is sup�
+ port for Mp3 run sox -h and look for it under
+ the list of supported file formats as "mp3".
+
+
+ .nul Null file handler. This is a fake file hander
+ that act as if its reading a stream of 0's from
+ a while or fake writing output to a file. This
is not a very useful file handler in most cases.
- It might be useful in some scripts were you do
- not want to read or write from a real file but
- would like to specify a filename for consis�
+ It might be useful in some scripts were you do
+ not want to read or write from a real file but
+ would like to specify a filename for consis�
tency.
.ogg Ogg Vorbis Compressed Audio.
Ogg Vorbis is a open, patent-free CODEC designed
- for compressing music and streaming audio. It
- is similar to MP3, VQF, AAC, and other lossy
+ for compressing music and streaming audio. It
+ is similar to MP3, VQF, AAC, and other lossy
formats. SoX can decode all types of Ogg Vorbis
- files, but can only encode at 128 kbps. Decod�
- ing is somewhat CPU intensive and encoding is
+ files, but can only encode at 128 kbps. Decod�
+ ing is somewhat CPU intensive and encoding is
very CPU intensive.
- Ogg Vorbis in SoX is optional and requires
+ Ogg Vorbis in SoX is optional and requires
access to external Ogg Vorbis libraries. To see
- if there is support for Ogg Vorbis run sox -h
+ if there is support for Ogg Vorbis run sox -h
and look for it under the list of supported file
formats as "vorbis".
ossdsp OSS /dev/dsp device driver
This is a pseudo-file type and can be optionally
- compiled into SoX. Run sox -h to see if you
- have support for this file type. When this
- driver is used it allows you to open up the OSS
- /dev/dsp file and configure it to use the same
- data format as passed in to SoX. It works for
- both playing and recording sound samples. When
- playing sound files it attempts to set up the
- OSS driver to use the same format as the input
- file. It is suggested to always override the
+ compiled into SoX. Run sox -h to see if you
+ have support for this file type. When this
+ driver is used it allows you to open up the OSS
+ /dev/dsp file and configure it to use the same
+ data format as passed in to SoX. It works for
+ both playing and recording sound samples. When
+ playing sound files it attempts to set up the
+ OSS driver to use the same format as the input
+ file. It is suggested to always override the
output values to use the highest quality samples
- your sound card can handle. Example: -t ossdsp
+ your sound card can handle. Example: -t ossdsp
-w -s /dev/dsp
.sf IRCAM Sound Files.
- Sound Files are used by academic music software
- such as the CSound package, and the MixView
+ Sound Files are used by academic music software
+ such as the CSound package, and the MixView
sound sample editor.
.sph
- SPHERE (SPeech HEader Resources) is a file for�
+ SPHERE (SPeech HEader Resources) is a file for�
mat defined by NIST (National Institute of Stan�
- dards and Technology) and is used with speech
- audio. SoX can read these files when they con�
- tain u-law and PCM data. It will ignore any
- header information that says the data is com�
+ dards and Technology) and is used with speech
+ audio. SoX can read these files when they con�
+ tain u-law and PCM data. It will ignore any
+ header information that says the data is com�
pressed using shorten compression and will treat
- the data as either u-law or PCM. This will
- allow SoX and the command line shorten program
+ the data as either u-law or PCM. This will
+ allow SoX and the command line shorten program
to be ran together using pipes to uncompress the
- data and then pass the result to SoX for pro�
+ data and then pass the result to SoX for pro�
cessing.
.smp Turtle Beach SampleVision files.
- SMP files are for use with the PC-DOS package
- SampleVision by Turtle Beach Softworks. This
- package is for communication to several MIDI
- samplers. All sample rates are supported by the
- package, although not all are supported by the
- samplers themselves. Currently loop points are
+ SMP files are for use with the PC-DOS package
+ SampleVision by Turtle Beach Softworks. This
+ package is for communication to several MIDI
+ samplers. All sample rates are supported by the
+ package, although not all are supported by the
+ samplers themselves. Currently loop points are
ignored.
.snd
- Under DOS this file format is the same as the
- .sndt format. Under all other platforms it is
+ Under DOS this file format is the same as the
+ .sndt format. Under all other platforms it is
the same as the .au format.
.sndt SoundTool files.
@@ -443,136 +456,136 @@
sunau Sun /dev/audio device driver
This is a pseudo-file type and can be optionally
- compiled into SoX. Run sox -h to see if you
- have support for this file type. When this
- driver is used it allows you to open up a Sun
+ compiled into SoX. Run sox -h to see if you
+ have support for this file type. When this
+ driver is used it allows you to open up a Sun
/dev/audio file and configure it to use the same
- data type as passed in to SoX. It works for
- both playing and recording sound samples. When
- playing sound files it attempts to set up the
+ data type as passed in to SoX. It works for
+ both playing and recording sound samples. When
+ playing sound files it attempts to set up the
audio driver to use the same format as the input
- file. It is suggested to always override the
+ file. It is suggested to always override the
output values to use the highest quality samples
- your hardware can handle. Example: -t sunau -w
+ your hardware can handle. Example: -t sunau -w
-s /dev/audio or -t sunau -U -c 1 /dev/audio for
older sun equipment.
.txw Yamaha TX-16W sampler.
- A file format from a Yamaha sampling keyboard
- which wrote IBM-PC format 3.5" floppies.
- Handles reading of files which do not have the
- sample rate field set to one of the expected by
- looking at some other bytes in the attack/loop
- length fields, and defaulting to 33kHz if the
+ A file format from a Yamaha sampling keyboard
+ which wrote IBM-PC format 3.5" floppies. Han�
+ dles reading of files which do not have the sam�
+ ple rate field set to one of the expected by
+ looking at some other bytes in the attack/loop
+ length fields, and defaulting to 33kHz if the
sample rate is still unknown.
.vms More info to come.
- Used to compress speech audio for applications
+ Used to compress speech audio for applications
such as voice mail.
.voc Sound Blaster VOC files.
- VOC files are multi-part and contain silence
- parts, looping, and different sample rates for
- different chunks. On input, the silence parts
- are filled out, loops are rejected, and sample
- data with a new sample rate is rejected.
- Silence with a different sample rate is gener�
- ated appropriately. On output, silence is not
- detected, nor are impossible sample rates.
- Note, this version now supports playing VOC
- files with multiple blocks and supports playing
+ VOC files are multi-part and contain silence
+ parts, looping, and different sample rates for
+ different chunks. On input, the silence parts
+ are filled out, loops are rejected, and sample
+ data with a new sample rate is rejected.
+ Silence with a different sample rate is gener�
+ ated appropriately. On output, silence is not
+ detected, nor are impossible sample rates.
+ Note, this version now supports playing VOC
+ files with multiple blocks and supports playing
files containing u-law and A-law samples.
vorbis See .ogg format.
.wav Microsoft .WAV RIFF files.
- These appear to be very similar to IFF files,
- but not the same. They are the native sound
+ These appear to be very similar to IFF files,
+ but not the same. They are the native sound
file format of Windows. (Obviously, Windows was
- of such incredible importance to the computer
- industry that it just had to have its own sound
+ of such incredible importance to the computer
+ industry that it just had to have its own sound
file format.) Normally .wav files have all for�
- matting information in their headers, and so do
- not need any format options specified for an
- input file. If any are, they will override the
- file header, and you will be warned to this
+ matting information in their headers, and so do
+ not need any format options specified for an
+ input file. If any are, they will override the
+ file header, and you will be warned to this
effect. You had better know what you are doing!
- Output format options will cause a format con�
- version, and the .wav will written appropri�
- ately. SoX currently can read PCM, ULAW, ALAW,
- MS ADPCM, and IMA (or DVI) ADPCM. It can write
+ Output format options will cause a format con�
+ version, and the .wav will written appropri�
+ ately. SoX currently can read PCM, ULAW, ALAW,
+ MS ADPCM, and IMA (or DVI) ADPCM. It can write
all of these formats including (NEW!) the ADPCM
encoding.
.wve Psion 8-bit A-law
- These are 8-bit A-law 8khz sound files used on
+ These are 8-bit A-law 8khz sound files used on
the Psion palmtop portable computer.
.raw Raw files (no header).
- The sample rate, size (byte, word, etc), and
+ The sample rate, size (byte, word, etc), and
encoding (signed, unsigned, etc.) of the sample
- file must be given. The number of channels
+ file must be given. The number of channels
defaults to 1.
.ub, .sb, .uw, .sw, .ul, .al, .lu, .la, .sl
- These are several suffices which serve as a
- shorthand for raw files with a given size and
- encoding. Thus, ub, sb, uw, sw, ul, al, lu, la
- and sl correspond to "unsigned byte", "signed
- byte", "unsigned word", "signed word", "u-law"
- (byte), "A-law" (byte), inverse bit order "u-
- law", inverse bit order "A-law", and "signed
- long". The sample rate defaults to 8000 hz if
- not explicitly set, and the number of channels
- defaults to 1. There are lots of Sparc samples
- floating around in u-law format with no header
+ These are several suffices which serve as a
+ shorthand for raw files with a given size and
+ encoding. Thus, ub, sb, uw, sw, ul, al, lu, la
+ and sl correspond to "unsigned byte", "signed
+ byte", "unsigned word", "signed word", "u-law"
+ (byte), "A-law" (byte), inverse bit order "u-
+ law", inverse bit order "A-law", and "signed
+ long". The sample rate defaults to 8000 hz if
+ not explicitly set, and the number of channels
+ defaults to 1. There are lots of Sparc samples
+ floating around in u-law format with no header
and fixed at a sample rate of 8000 hz. (Certain
sound management software cheerfully ignores the
- headers.) Similarly, most Mac sound files are
- in unsigned byte format with a sample rate of
+ headers.) Similarly, most Mac sound files are
+ in unsigned byte format with a sample rate of
11025 or 22050 hz.
- .auto This is a ``meta-type'': specifying this type
- for an input file triggers some code that tries
- to guess the real type by looking for magic
- words in the header. If the type can't be
- guessed, the program exits with an error mes�
- sage. The input must be a plain file, not a
+ .auto This is a ``meta-type'': specifying this type
+ for an input file triggers some code that tries
+ to guess the real type by looking for magic
+ words in the header. If the type can't be
+ guessed, the program exits with an error mes�
+ sage. The input must be a plain file, not a
pipe. This type can't be used for output files.
EFFECTS
Multiple effects may be applied to the audio data by spec�
- ifying them one after another at the end of the command
+ ifying them one after another at the end of the command
line.
avg [ -l | -r | -f | -b | n,n,...,n ]
- Reduce the number of channels by averaging the
- samples, or duplicate channels to increase the
- number of channels. This effect is automati�
- cally used when the number of input channels
+ Reduce the number of channels by averaging the
+ samples, or duplicate channels to increase the
+ number of channels. This effect is automati�
+ cally used when the number of input channels
differ from the number of output channels. When
- reducing the number of channels it is possible
- to manually specify the avg effect and use the
- -l, -r, -f, or -b options to select only the
- left, right, front, or back channel(s) for the
- output instead of averaging the channels. The
- -f and -b options maintain left/right stereo
+ reducing the number of channels it is possible
+ to manually specify the avg effect and use the
+ -l, -r, -f, or -b options to select only the
+ left, right, front, or back channel(s) for the
+ output instead of averaging the channels. The
+ -f and -b options maintain left/right stereo
separation; use the avg effect twice to select a
single channel.
The avg effect can also be invoked with up to 16
double-precision numbers, which specify the pro�
- portion of each input channel that is to be
- mixed into each output channel. In two-channel
+ portion of each input channel that is to be
+ mixed into each output channel. In two-channel
mode, 4 numbers are given: l->l, l->r, r->l, and
- r->r, respectively. In four-channel mode, the
- first 4 numbers give the proportions for the
- left-front output channel, as follows: lf->lf,
+ r->r, respectively. In four-channel mode, the
+ first 4 numbers give the proportions for the
+ left-front output channel, as follows: lf->lf,
rf->lf, lb->lf, and rb->rf. The next 4 give the
right-front output in the same order, then left-
back and right-back.
- It is also possible to use the 16 numbers to
+ It is also possible to use the 16 numbers to
expand or reduce the channel count; just specify
0 for unused channels. Finally, if fewer than 4
numbers are given, certain special abbreviations
@@ -579,24 +592,24 @@
may be invoked; see the source code for details.
band [ -n ] center [ width ]
- Apply a band-pass filter. The frequency
+ Apply a band-pass filter. The frequency
response drops logarithmically around the center
- frequency. The width gives the slope of the
- drop. The frequencies at center + width and
- center - width will be half of their original
+ frequency. The width gives the slope of the
+ drop. The frequencies at center + width and
+ center - width will be half of their original
amplitudes. Band defaults to a mode oriented to
pitched signals, i.e. voice, singing, or instru�
- mental music. The -n (for noise) option uses
- the alternate mode for un-pitched signals.
- Warning: -n introduces a power-gain of about
- 11dB in the filter, so beware of output clip�
+ mental music. The -n (for noise) option uses
+ the alternate mode for un-pitched signals.
+ Warning: -n introduces a power-gain of about
+ 11dB in the filter, so beware of output clip�
ping. Band introduces noise in the shape of the
filter, i.e. peaking at the center frequency and
- settling around it. See filter for a bandpass
+ settling around it. See filter for a bandpass
effect with steeper shoulders.
bandpass frequency bandwidth
- Butterworth bandpass filter. Description coming
+ Butterworth bandpass filter. Description coming
soon!
bandreject frequency bandwidth
@@ -606,11 +619,11 @@
chorus gain-in gain-out delay decay speed depth
-s | -t [ delay decay speed depth -s | -t ... ]
- Add a chorus to a sound sample. Each quadtuple
- delay/decay/speed/depth gives the delay in mil�
- liseconds and the decay (relative to gain-in)
- with a modulation speed in Hz using depth in
- milliseconds. The modulation is either sinu�
+ Add a chorus to a sound sample. Each quadtuple
+ delay/decay/speed/depth gives the delay in mil�
+ liseconds and the decay (relative to gain-in)
+ with a modulation speed in Hz using depth in
+ milliseconds. The modulation is either sinu�
soidal (-s) or triangular (-t). Gain-out is the
volume of the output.
@@ -619,85 +632,85 @@
in-dB1,out-dB1[,in-dB2,out-dB2...]
[gain [initial-volume [delay ] ] ]
- Compand (compress or expand) the dynamic range
- of a sample. The attack and decay time specify
- the integration time over which the absolute
- value of the input signal is integrated to
+ Compand (compress or expand) the dynamic range
+ of a sample. The attack and decay time specify
+ the integration time over which the absolute
+ value of the input signal is integrated to
determine its volume; attacks refer to increases
- in volume and decays refer to decreases. Where
- more than one pair of attack/decay parameters
- are specified, each channel is treated sepa�
- rately and the number of pairs must agree with
+ in volume and decays refer to decreases. Where
+ more than one pair of attack/decay parameters
+ are specified, each channel is treated sepa�
+ rately and the number of pairs must agree with
the number of input channels. The second param�
- eter is a list of points on the compander's
- transfer function specified in dB relative to
+ eter is a list of points on the compander's
+ transfer function specified in dB relative to
the maximum possible signal amplitude. The
- input values must be in a strictly increasing
+ input values must be in a strictly increasing
order but the transfer function does not have to
be monotonically rising. The special value -inf
- may be used to indicate that the input volume
- should be associated output volume. The points
+ may be used to indicate that the input volume
+ should be associated output volume. The points
-inf,-inf and 0,0 are assumed; the latter may be
overridden, but the former may not.
- The third (optional) parameter is a post-pro�
- cessing gain in dB which is applied after the
- compression has taken place; the fourth
- (optional) parameter is an initial volume to be
+ The third (optional) parameter is a post-pro�
+ cessing gain in dB which is applied after the
+ compression has taken place; the fourth
+ (optional) parameter is an initial volume to be
assumed for each channel when the effect starts.
- This permits the user to supply a nominal level
- initially, so that, for example, a very large
- gain is not applied to initial signal levels
- before the companding action has begun to oper�
+ This permits the user to supply a nominal level
+ initially, so that, for example, a very large
+ gain is not applied to initial signal levels
+ before the companding action has begun to oper�
ate: it is quite probable that in such an event,
- the output would be severely clipped while the
+ the output would be severely clipped while the
compander gain properly adjusts itself.
- The fifth (optional) parameter is a delay in
- seconds. The input signal is analyzed immedi�
+ The fifth (optional) parameter is a delay in
+ seconds. The input signal is analyzed immedi�
ately to control the compander, but it is
delayed before being fed to the volume adjuster.
- Specifying a delay approximately equal to the
- attack/decay times allows the compander to
- effectively operate in a "predictive" rather
+ Specifying a delay approximately equal to the
+ attack/decay times allows the compander to
+ effectively operate in a "predictive" rather
than a reactive mode.
copy Copy the input file to the output file. This is
- the default effect if both files have the same
+ the default effect if both files have the same
sampling rate.
dcshift shift [ limitergain ]
- DC Shift the audio data, with basic linear
- amplitude formula. This is most useful if your
- audio data tends to not be centered around a
- value of 0. Shifting it back will allow you to
+ DC Shift the audio data, with basic linear
+ amplitude formula. This is most useful if your
+ audio data tends to not be centered around a
+ value of 0. Shifting it back will allow you to
get the most volume adjustments without clipping
audio data.
- The first option is the dcshift value. It is a
- floating point number that indicates the amount
+ The first option is the dcshift value. It is a
+ floating point number that indicates the amount
to shift.
- An option limtergain value can be specified as
+ An option limtergain value can be specified as
well. It should have a value much less then 1.0
and is used only on peaks to prevent clipping.
- deemph Apply a treble attenuation shelving filter to
+ deemph Apply a treble attenuation shelving filter to
samples in audio cd format. The frequency
- response of pre-emphasized recordings is recti�
- fied. The filtering is defined in the standard
+ response of pre-emphasized recordings is recti�
+ fied. The filtering is defined in the standard
document ISO 908.
- earwax Makes sound easier to listen to on headphones.
+ earwax Makes sound easier to listen to on headphones.
Adds audio-cues to samples in audio cd format so
- that when listened to on headphones the stereo
- image is moved from inside your head (standard
- for headphones) to outside and in front of the
+ that when listened to on headphones the stereo
+ image is moved from inside your head (standard
+ for headphones) to outside and in front of the
listener (standard for speakers). See
- www.geocities.com/beinges for a full explana�
+ www.geocities.com/beinges for a full explana�
tion.
echo gain-in gain-out delay decay [ delay decay ... ]
Add echoing to a sound sample. Each delay/decay
- part gives the delay in milliseconds and the
+ part gives the delay in milliseconds and the
decay (relative to gain-in) of that echo. Gain-
out is the volume of the output.
@@ -704,7 +717,7 @@
echos gain-in gain-out delay decay [ delay decay ... ]
Add a sequence of echos to a sound sample. Each
delay/decay part gives the delay in milliseconds
- and the decay (relative to gain-in) of that
+ and the decay (relative to gain-in) of that
echo. Gain-out is the volume of the output.
fade [ type ] fade-in-length
@@ -713,63 +726,63 @@
Add a fade effect to the beginning, end, or both
of the audio data.
- For fade-ins, this starts from the first sample
+ For fade-ins, this starts from the first sample
and ramps the volume of the audio from 0 to full
- volume over fade-in-length seconds. Specify 0
+ volume over fade-in-length seconds. Specify 0
seconds if no fade-in is wanted.
- For fade-outs, the audio data will be truncated
- at the stop-time and the volume will be ramped
+ For fade-outs, the audio data will be truncated
+ at the stop-time and the volume will be ramped
from full volume down to 0 starting at fade-out-
- length seconds before the stop-time. No fade-
+ length seconds before the stop-time. No fade-
out is performed if these options are not speci�
fied.
- All times can be specified in either periods of
- time or sample counts. To specify time periods
+ All times can be specified in either periods of
+ time or sample counts. To specify time periods
use the format hh:mm:ss.frac format. To specify
- using sample counts, specify the number of sam�
- ples and append the letter 's' to the sample
+ using sample counts, specify the number of sam�
+ ples and append the letter 's' to the sample
count (for example 8000s).
- An optional type can be specified to change the
- type of envelope. Choices are q for quarter of
- a sinewave, h for half a sinewave, t for linear
- slope, l for logarithmic, and p for inverted
+ An optional type can be specified to change the
+ type of envelope. Choices are q for quarter of
+ a sinewave, h for half a sinewave, t for linear
+ slope, l for logarithmic, and p for inverted
parabola. The default is a linear slope.
filter [ low ]-[ high ] [ window-len [ beta ] ]
Apply a Sinc-windowed lowpass, highpass, or
- bandpass filter of given window length to the
- signal. low refers to the frequency of the
- lower 6dB corner of the filter. high refers to
- the frequency of the upper 6dB corner of the
+ bandpass filter of given window length to the
+ signal. low refers to the frequency of the
+ lower 6dB corner of the filter. high refers to
+ the frequency of the upper 6dB corner of the
filter.
- A lowpass filter is obtained by leaving low
- unspecified, or 0. A highpass filter is
- obtained by leaving high unspecified, or 0, or
- greater than or equal to the Nyquist frequency.
+ A lowpass filter is obtained by leaving low
+ unspecified, or 0. A highpass filter is
+ obtained by leaving high unspecified, or 0, or
+ greater than or equal to the Nyquist frequency.
The window-len, if unspecified, defaults to 128.
- Longer windows give a sharper cutoff, smaller
+ Longer windows give a sharper cutoff, smaller
windows a more gradual cutoff.
- The beta, if unspecified, defaults to 16. This
- selects a Kaiser window. You can select a Nut�
- tall window by specifying anything <= 2.0 here.
- For more discussion of beta, look under the
+ The beta, if unspecified, defaults to 16. This
+ selects a Kaiser window. You can select a Nut�
+ tall window by specifying anything <= 2.0 here.
+ For more discussion of beta, look under the
resample effect.
flanger gain-in gain-out delay decay speed < -s | -t >
- Add a flanger to a sound sample. Each triple
- delay/decay/speed gives the delay in millisec�
- onds and the decay (relative to gain-in) with a
+ Add a flanger to a sound sample. Each triple
+ delay/decay/speed gives the delay in millisec�
+ onds and the decay (relative to gain-in) with a
modulation speed in Hz. The modulation is
- either sinodial (-s) or triangular (-t). Gain-
+ either sinodial (-s) or triangular (-t). Gain-
out is the volume of the output.
highp frequency
- Apply a single pole recursive high-pass filter.
+ Apply a single pole recursive high-pass filter.
The frequency response drops logarithmically
with I frequency in the middle of the drop. The
slope of the filter is quite gentle. See filter
@@ -780,71 +793,71 @@
soon!
lowp frequency
- Apply a single pole recursive low-pass filter.
+ Apply a single pole recursive low-pass filter.
The frequency response drops logarithmically
- with frequency in the middle of the drop. The
+ with frequency in the middle of the drop. The
slope of the filter is quite gentle. See filter
for a lowpass effect with sharper cutoff.
lowpass frequency
- Butterworth lowpass filter. Description coming
+ Butterworth lowpass filter. Description coming
soon!
map Display a list of loops in a sample, and miscel�
laneous loop info.
- mask Add "masking noise" to signal. This effect
- deliberately adds white noise to a sound in
- order to mask quantization effects, created by
- the process of playing a sound digitally. It
- tends to mask buzzing voices, for example. It
- adds 1/2 bit of noise to the sound file at the
+ mask Add "masking noise" to signal. This effect
+ deliberately adds white noise to a sound in
+ order to mask quantization effects, created by
+ the process of playing a sound digitally. It
+ tends to mask buzzing voices, for example. It
+ adds 1/2 bit of noise to the sound file at the
output bit depth.
pan direction
- Pan the sound of an audio file from one channel
+ Pan the sound of an audio file from one channel
to another. This is done by changing the volume
- of the input channels so that it fades out on
- one channel and fades-in on another. If the
- number of input channels is different then the
+ of the input channels so that it fades out on
+ one channel and fades-in on another. If the
+ number of input channels is different then the
number of output channels then this effect tries
- to intelligently handle this. For instance, if
+ to intelligently handle this. For instance, if
the input contains 1 channel and the output con�
- tains 2 channels, then it will create the miss�
- ing channel itself. The direction is a value
- from -1.0 to 1.0. -1.0 represents far left and
- 1.0 represents far right. Numbers in between
+ tains 2 channels, then it will create the miss�
+ ing channel itself. The direction is a value
+ from -1.0 to 1.0. -1.0 represents far left and
+ 1.0 represents far right. Numbers in between
will start the pan effect without totally muting
the opposite channel.
phaser gain-in gain-out delay decay speed < -s | -t >
- Add a phaser to a sound sample. Each triple
- delay/decay/speed gives the delay in millisec�
- onds and the decay (relative to gain-in) with a
+ Add a phaser to a sound sample. Each triple
+ delay/decay/speed gives the delay in millisec�
+ onds and the decay (relative to gain-in) with a
modulation speed in Hz. The modulation is
- either sinodial (-s) or triangular (-t). The
+ either sinodial (-s) or triangular (-t). The
decay should be less than 0.5 to avoid feedback.
Gain-out is the volume of the output.
pick [ -1 | -2 | -3 | -4 | -l | -r ]
- Select the left or right channel of a stereo
- sample, or one of four channels in a quadra�
- phonic sample. The -l and -r options represent
- either the left or right channel. It is
- required that you use the -c 1 command line
+ Select the left or right channel of a stereo
+ sample, or one of four channels in a quadra�
+ phonic sample. The -l and -r options represent
+ either the left or right channel. It is
+ required that you use the -c 1 command line
option in order to force the output file to con�
tain only 1 channel.
pitch shift [ width interpole fade ]
- Change the pitch of file without affecting its
+ Change the pitch of file without affecting its
duration by cross-fading shifted samples. shift
is given in cents. Use a positive value to shift
- to treble, negative value to shift to bass.
- Default shift is 0. width of window is in ms.
- Default width is 20ms. Try 30ms to lower pitch,
- and 10ms to raise pitch. interpole option, can
+ to treble, negative value to shift to bass.
+ Default shift is 0. width of window is in ms.
+ Default width is 20ms. Try 30ms to lower pitch,
+ and 10ms to raise pitch. interpole option, can
be "cubic" or "linear". Default is "cubic". The
- fade option, can be "cos", "hamming", "linear"
+ fade option, can be "cos", "hamming", "linear"
or "trapezoid". Default is "cos".
polyphase [ -w < nut / ham > ]
@@ -853,47 +866,47 @@
[ -cutoff # ]
Translate input sampling rate to output sampling
- rate via polyphase interpolation, a DSP algo�
- rithm. This method is slow and uses lots of
+ rate via polyphase interpolation, a DSP algo�
+ rithm. This method is slow and uses lots of
RAM, but gives much better results than rate.
- -w < nut / ham > : select either a Nuttal (~90
- dB stopband) or Hamming (~43 dB stopband) win�
+ -w < nut / ham > : select either a Nuttal (~90
+ dB stopband) or Hamming (~43 dB stopband) win�
dow. Default is nut.
- -width long / short / # : specify the (approxi�
- mate) width of the filter. long is 1024 sam�
- ples; short is 128 samples. Alternatively, an
+ -width long / short / # : specify the (approxi�
+ mate) width of the filter. long is 1024 sam�
+ ples; short is 128 samples. Alternatively, an
exact number can be used. Default is long. The
- short option is not recommended, as it produces
+ short option is not recommended, as it produces
poor quality results.
- -cutoff # : specify the filter cutoff frequency
- in terms of fraction of frequency bandwidth,
- also know as the Nyquist frequency. Please see
- the resample effect for further information on
- Nyquist frequency. If upsampling, then this is
- the fraction of the original signal that should
- go through. If downsampling, this is the frac�
- tion of the signal left after downsampling.
+ -cutoff # : specify the filter cutoff frequency
+ in terms of fraction of frequency bandwidth,
+ also know as the Nyquist frequency. Please see
+ the resample effect for further information on
+ Nyquist frequency. If upsampling, then this is
+ the fraction of the original signal that should
+ go through. If downsampling, this is the frac�
+ tion of the signal left after downsampling.
Default is 0.95. Remember that this is a float.
rate Translate input sampling rate to output sampling
- rate via linear interpolation to the Least Com�
+ rate via linear interpolation to the Least Com�
mon Multiple of the two sampling rates. This is
the default effect if the two files have differ�
- ent sampling rates and the preview options was
+ ent sampling rates and the preview options was
specified. This is fast but noisy: the spectrum
- of the original sound will be shifted upwards
- and duplicated faintly when up-translating by a
+ of the original sound will be shifted upwards
+ and duplicated faintly when up-translating by a
multiple.
- Lerp-ing is acceptable for cheap 8-bit sound
- hardware, but for CD-quality sound you should
- instead use either resample or polyphase. If
+ Lerp-ing is acceptable for cheap 8-bit sound
+ hardware, but for CD-quality sound you should
+ instead use either resample or polyphase. If
you are wondering which rate changing effects to
- use, you will want to read a detailed analysis
+ use, you will want to read a detailed analysis
of all of them at http://eakaw2.et.tu-dres�
den.de/~wilde/resample/resample.html
@@ -900,26 +913,26 @@
resample [ -qs | -q | -ql ] [ rolloff [ beta ] ]
Translate input sampling rate to output sampling
rate via simulated analog filtration. This
- method is slower than rate, but gives much bet�
+ method is slower than rate, but gives much bet�
ter results.
By default, linear interpolation is used, with a
- window width about 45 samples at the lower of
- the two rate. This gives an accuracy of about
- 16 bits, but insufficient stopband rejection in
- the case that you want to have rolloff greater
+ window width about 45 samples at the lower of
+ the two rate. This gives an accuracy of about
+ 16 bits, but insufficient stopband rejection in
+ the case that you want to have rolloff greater
than about 0.80 of the Nyquist frequency.
- The -q* options will change the default values
- for rolloff and beta as well as use quadratic
- interpolation of filter coefficients, resulting
+ The -q* options will change the default values
+ for rolloff and beta as well as use quadratic
+ interpolation of filter coefficients, resulting
in about 24 bits precision. The -qs, -q, or -ql
- options specify increased accuracy at the cost
- of lower execution speed. It is optional to
- specify rolloff and beta parameters when using
+ options specify increased accuracy at the cost
+ of lower execution speed. It is optional to
+ specify rolloff and beta parameters when using
the -q* options.
- Following is a table of the reasonable defaults
+ Following is a table of the reasonable defaults
which are built-in to SoX:
Option Window rolloff beta interpolation
@@ -931,78 +944,78 @@
------ ------ ------- ---- -------------
-qs, -q, or -ql use window lengths of 45, 75, or
- 149 samples, respectively, at the lower sample-
+ 149 samples, respectively, at the lower sample-
rate of the two files. This means progressively
- sharper stop-band rejection, at proportionally
+ sharper stop-band rejection, at proportionally
slower execution times.
- rolloff refers to the cut-off frequency of the
- low pass filter and is given in terms of the
- Nyquist frequency for the lower sample rate.
- rolloff therefore should be something between
+ rolloff refers to the cut-off frequency of the
+ low pass filter and is given in terms of the
+ Nyquist frequency for the lower sample rate.
+ rolloff therefore should be something between
0.0 and 1.0, in practice 0.8-0.95. The defaults
are indicated above.
The Nyquist frequency is equal to (sample rate /
- 2). Logically, this is because the A/D con�
- verter needs at least 2 samples to detect 1
- cycle at the Nyquist frequency. Frequencies
- higher then the Nyquist will actually appear as
- lower frequencies to the A/D converter and is
+ 2). Logically, this is because the A/D con�
+ verter needs at least 2 samples to detect 1
+ cycle at the Nyquist frequency. Frequencies
+ higher then the Nyquist will actually appear as
+ lower frequencies to the A/D converter and is
called aliasing. Normally, A/D converts run the
- signal through a highpass filter first to avoid
+ signal through a highpass filter first to avoid
these problems.
- Similar problems will happen in software when
- reducing the sample rate of an audio file (fre�
- quencies above the new Nyquist frequency can be
- aliased to lower frequencies). Therefore, a
- good resample effect will remove all frequency
+ Similar problems will happen in software when
+ reducing the sample rate of an audio file (fre�
+ quencies above the new Nyquist frequency can be
+ aliased to lower frequencies). Therefore, a
+ good resample effect will remove all frequency
information above the new Nyquist frequency.
- The rolloff refers to how close to the Nyquist
+ The rolloff refers to how close to the Nyquist
frequency this cutoff is, with closer being bet�
- ter. When increasing the sample rate of an
+ ter. When increasing the sample rate of an
audio file you would not expect to have any fre�
- quencies exist that are past the original
- Nyquist frequency. Because of resampling prop�
- erties, it is common to have alaising data cre�
- ated that is above the old Nyquist frequency.
- In that case the rolloff refers to how close to
+ quencies exist that are past the original
+ Nyquist frequency. Because of resampling prop�
+ erties, it is common to have alaising data cre�
+ ated that is above the old Nyquist frequency.
+ In that case the rolloff refers to how close to
the original Nyquist frequency to use a highpass
- filter to remove this false data, with closer
+ filter to remove this false data, with closer
also being better.
The beta parameter determines the type of filter
- window used. Any value greater than 2.0 is the
+ window used. Any value greater than 2.0 is the
beta for a Kaiser window. Beta <= 2.0 selects a
- Nuttall window. If unspecified, the default is
+ Nuttall window. If unspecified, the default is
a Kaiser window with beta 16.
In the case of Kaiser window (beta > 2.0), lower
- betas produce a somewhat faster transition from
- passband to stopband, at the cost of noticeable
- artifacts. A beta of 16 is the default, beta
- less than 10 is not recommended. If you want a
- sharper cutoff, don't use low beta's, use a
+ betas produce a somewhat faster transition from
+ passband to stopband, at the cost of noticeable
+ artifacts. A beta of 16 is the default, beta
+ less than 10 is not recommended. If you want a
+ sharper cutoff, don't use low beta's, use a
longer sample window. A Nuttall window is
- selected by specifying any 'beta' <= 2, and the
- Nuttall window has somewhat steeper cutoff than
- the default Kaiser window. You will probably
- not need to use the beta parameter at all,
- unless you are just curious about comparing the
+ selected by specifying any 'beta' <= 2, and the
+ Nuttall window has somewhat steeper cutoff than
+ the default Kaiser window. You will probably
+ not need to use the beta parameter at all,
+ unless you are just curious about comparing the
effects of Nuttall vs. Kaiser windows.
This is the default effect if the two files have
- different sampling rates. Default parameters
+ different sampling rates. Default parameters
are, as indicated above, Kaiser window of length
45, rolloff 0.80, beta 16, linear interpolation.
- NOTE: -qs is only slightly slower, but more
+ NOTE: -qs is only slightly slower, but more
accurate for 16-bit or higher precision.
- NOTE: In many cases of up-sampling, no interpo�
- lation is needed, as exact filter coefficients
+ NOTE: In many cases of up-sampling, no interpo�
+ lation is needed, as exact filter coefficients
can be computed in a reasonable amount of space.
To be precise, this is done when
@@ -1012,13 +1025,13 @@
reverb gain-out delay [ delay ... ]
Add reverberation to a sound sample. Each delay
- is given in milliseconds and its feedback is
- depending on the reverb-time in milliseconds.
- Each delay should be in the range of half to
+ is given in milliseconds and its feedback is
+ depending on the reverb-time in milliseconds.
+ Each delay should be in the range of half to
quarter of reverb-time to get a realistic rever�
beration. Gain-out is the volume of the output.
- reverse Reverse the sound sample completely. Included
+ reverse Reverse the sound sample completely. Included
for finding Satanic subliminals.
silence above_periods [ duration threshold[ d | % ]
@@ -1026,197 +1039,197 @@
[ below_periods duration
threshold[ d | % ]]
- Removes silence from the beginning or end of a
- sound file. Silence is anything below a speci�
+ Removes silence from the beginning or end of a
+ sound file. Silence is anything below a speci�
fied threshold.
- When trimming silence from the beginning of a
+ When trimming silence from the beginning of a
sound file, you specify a duration of audio that
- is above a given silence threshold before audio
- data is processed. You can also specify the
- count of periods of none silence you want to
- detect before processing audio data. Specify a
+ is above a given silence threshold before audio
+ data is processed. You can also specify the
+ count of periods of none silence you want to
+ detect before processing audio data. Specify a
period of 0 if you do not want to trim data from
the front of the sound file.
When optionally trimming silence form the end of
- a sound file, you specify the duration of audio
- that must be below a given threshold before
- stopping to process audio data. A count of
- periods that occur below the threshold may also
+ a sound file, you specify the duration of audio
+ that must be below a given threshold before
+ stopping to process audio data. A count of
+ periods that occur below the threshold may also
be specified. If this options are not specified
- then data is not trimmed from the end of the
+ then data is not trimmed from the end of the
audio file.
- Duration counts may be in the format of time,
+ Duration counts may be in the format of time,
hh:mm:ss.frac, or in the exact count of samples.
- Threshold may be suffixed with d, or % to indi�
- cated the value is in decibels or a percentage
- of max value of the sample value. A value of
+ Threshold may be suffixed with d, or % to indi�
+ cated the value is in decibels or a percentage
+ of max value of the sample value. A value of
'0%' will look for total silence.
speed [ -c ] factor
- Speed up or down the sound, as a magnetic tape
+ Speed up or down the sound, as a magnetic tape
with a speed control. It affects both pitch and
- time. A factor of 1.0 means no change, and is
+ time. A factor of 1.0 means no change, and is
the default. 2.0 doubles speed, thus time
- length is cut by a half and pitch is one octave
- higher. 0.5 halves speed thus time length dou�
- bles and pitch is one octave lower. If the
+ length is cut by a half and pitch is one octave
+ higher. 0.5 halves speed thus time length dou�
+ bles and pitch is one octave lower. If the
optional -c parameter is used then the factor is
specified in "cents".
split Turn a mono sample into a stereo sample by copy�
- ing the input channel to the left and right
+ ing the input channel to the left and right
channels.
stat [ -s n ] [-rms ] [ -v ] [ -d ]
- Do a statistical check on the input file, and
+ Do a statistical check on the input file, and
print results on the standard error file. Audio
- data is passed unmodified from input to output
+ data is passed unmodified from input to output
file unless used along with the -e option.
The "Volume Adjustment:" field in the statistics
- gives you the argument to the -v number which
+ gives you the argument to the -v number which
will make the sample as loud as possible without
clipping.
The option -v will print out the "Volume Adjust�
- ment:" field's value only and return. This
- could be of use in scripts to auto convert the
+ ment:" field's value only and return. This
+ could be of use in scripts to auto convert the
volume.
- The -s n option is used to scale the input data
- by a given factor. The default value of n is
- the max value of a signed long variable
+ The -s n option is used to scale the input data
+ by a given factor. The default value of n is
+ the max value of a signed long variable
(0x7fffffff). Internal effects always work with
- signed long PCM data and so the value should
+ signed long PCM data and so the value should
relate to this fact.
- The -rms option will convert all output average
+ The -rms option will convert all output average
values to root mean square format.
There is also an optional parameter -d that will
- print out a hex dump of the sound file from the
- internal buffer that is in 32-bit signed PCM
- data. This is mainly only of use in tracking
- down endian problems that creep in to SoX on
+ print out a hex dump of the sound file from the
+ internal buffer that is in 32-bit signed PCM
+ data. This is mainly only of use in tracking
+ down endian problems that creep in to SoX on
cross-platform versions.
stretch factor [window fade shift fading]
- Time stretch file by a given factor. Change
+ Time stretch file by a given factor. Change
duration without affecting the pitch. factor of
- stretching: >1.0 lengthen, <1.0 shorten dura�
- tion. window size is in ms. Default is 20ms.
- The fade option, can be "lin". shift ratio, in
- [0.0 1.0]. Default depends on stretch factor.
- 1.0 to shorten, 0.8 to lengthen. The fading
- ratio, in [0.0 0.5]. The amount of a fade's
+ stretching: >1.0 lengthen, <1.0 shorten dura�
+ tion. window size is in ms. Default is 20ms.
+ The fade option, can be "lin". shift ratio, in
+ [0.0 1.0]. Default depends on stretch factor.
+ 1.0 to shorten, 0.8 to lengthen. The fading
+ ratio, in [0.0 0.5]. The amount of a fade's
default depends on factor and shift.
swap [ 1 2 | 1 2 3 4 ]
Swap channels in multi-channel sound files.
- Optionally, you may specify the channel order
- you would like the output in. This defaults to
+ Optionally, you may specify the channel order
+ you would like the output in. This defaults to
output channel 2 and then 1 for stereo and 2, 1,
- 4, 3 for quad-channels. An interesting feature
- is that you may duplicate a given channel by
- overwriting another. This is done by repeating
- an output channel on the command line. For
- example, swap 2 2 will overwrite channel 1 with
- channel 2's data; creating a stereo file with
+ 4, 3 for quad-channels. An interesting feature
+ is that you may duplicate a given channel by
+ overwriting another. This is done by repeating
+ an output channel on the command line. For
+ example, swap 2 2 will overwrite channel 1 with
+ channel 2's data; creating a stereo file with
both channels containing the same audio data.
synth [ length ] type mix [ freq [ -freq2 ]
[ off ] [ ph ] [ p1 ] [ p2 ] [ p3 ]
- The synth effect will generate various types of
- audio data. Although this effect is used to
+ The synth effect will generate various types of
+ audio data. Although this effect is used to
generate audio data, an input file must be spec�
- ified. The length of the input audio file
- determines the length of the output audio file.
- <length> length in sec or hh:mm:ss.frac,
+ ified. The length of the input audio file
+ determines the length of the output audio file.
+ <length> length in sec or hh:mm:ss.frac,
0=inputlength, default=0
<type> is sine, square, triangle, sawtooth,
trapetz, exp, whitenoise, pinknoise, brownnoise,
default=sine
<mix> is create, mix, amod, default=create
- <freq> frequency at beginning in Hz, not used
+ <freq> frequency at beginning in Hz, not used
for noise..
- <freq2> frequency at end in Hz, not used for
+ <freq2> frequency at end in Hz, not used for
noise.. <freq/2> can be given as %%n, where 'n'
- is the number of half notes in respect to A
+ is the number of half notes in respect to A
(440Hz)
- <off> Bias (DC-offset) of signal in percent,
+ <off> Bias (DC-offset) of signal in percent,
default=0
<ph> phase shift 0..100 shift phase 0..2*Pi, not
used for noise..
- <p1> square: Ton/Toff, triangle+trapetz: rising
+ <p1> square: Ton/Toff, triangle+trapetz: rising
slope time (0..100)
<p2> trapetz: ON time (0..100)
<p3> trapetz: falling slope position (0..100)
trim start [ length ]
- Trim can trim off unwanted audio data from the
+ Trim can trim off unwanted audio data from the
beginning and end of the audio file. Audio sam�
ples are not sent to the output stream until the
start location is reached.
- The optional length parameter tells the number
- of samples to output after the start sample and
- is used to trim off the back side of the audio
- data. Using a value of 0 for the start parame�
- ter will allow trimming off the back side only.
- Both options can be specified using either an
- amount of time and an exact count of samples.
- The format for specifying lengths in time is
+ The optional length parameter tells the number
+ of samples to output after the start sample and
+ is used to trim off the back side of the audio
+ data. Using a value of 0 for the start parame�
+ ter will allow trimming off the back side only.
+ Both options can be specified using either an
+ amount of time and an exact count of samples.
+ The format for specifying lengths in time is
hh:mm:ss.frac. A start value of 1:30.5 will not
- start until 1 minute, thirty and 1/2 seconds
- into the audio data. The format for specifying
- sample counts is the number of samples with the
- letter 's' appended to it. A value of 8000s
- will wait until 8000 samples are read before
+ start until 1 minute, thirty and 1/2 seconds
+ into the audio data. The format for specifying
+ sample counts is the number of samples with the
+ letter 's' appended to it. A value of 8000s
+ will wait until 8000 samples are read before
starting to process audio data.
vibro speed [ depth ]
- Add the world-famous Fender Vibro-Champ sound
+ Add the world-famous Fender Vibro-Champ sound
effect to a sound sample by using a sine wave as
the volume knob. Speed gives the Hertz value of
- the wave. This must be under 30. Depth gives
- the amount the volume is cut into by the sine
- wave, ranging 0.0 to 1.0 and defaulting to 0.5.
+ the wave. This must be under 30. Depth gives
+ the amount the volume is cut into by the sine
+ wave, ranging 0.0 to 1.0 and defaulting to 0.5.
vol gain [ type [ limitergain ] ]
- The vol effect is much like the command line
- option -v. It allows you to adjust the volume
- of an input file and allows you to specify the
- adjustment in relation to amplitude, power, or
- dB. If type is not specified then it defaults
+ The vol effect is much like the command line
+ option -v. It allows you to adjust the volume
+ of an input file and allows you to specify the
+ adjustment in relation to amplitude, power, or
+ dB. If type is not specified then it defaults
to amplitude.
- When type is amplitude then a linear change of
- the amplitude is performed based on the gain.
- Therefore, a value of 1.0 will keep the volume
- the same, 0.0 to < 1.0 will cause the volume to
+ When type is amplitude then a linear change of
+ the amplitude is performed based on the gain.
+ Therefore, a value of 1.0 will keep the volume
+ the same, 0.0 to < 1.0 will cause the volume to
decrease and values of > 1.0 will cause the vol�
- ume to increase. Beware of clipping audio data
- when the gain is greater then 1.0. A negative
- value performs the same adjustment while also
+ ume to increase. Beware of clipping audio data
+ when the gain is greater then 1.0. A negative
+ value performs the same adjustment while also
changing the phase.
- When type is power then a value of 1.0 also
+ When type is power then a value of 1.0 also
means no change in volume.
- When type is dB the amplitude is changed loga�
- rithmically. 0.0 is constant while +6 doubles
+ When type is dB the amplitude is changed loga�
+ rithmically. 0.0 is constant while +6 doubles
the amplitude.
- An optional limitergain value can be specified
- and should be a value much less then 1.0 (ie
- 0.05 or 0.02) and is used only on peaks to pre�
- vent clipping. Not specifying this parameter
- will cause no limiter to be used. In verbose
+ An optional limitergain value can be specified
+ and should be a value much less then 1.0 (ie
+ 0.05 or 0.02) and is used only on peaks to pre�
+ vent clipping. Not specifying this parameter
+ will cause no limiter to be used. In verbose
mode, this effect will display the percentage of
audio data that needed to be limited.
BUGS
- The syntax is horrific. Thats the breaks when trying to
+ The syntax is horrific. Thats the breaks when trying to
handle all things from the command line.
- Please report any bugs found in this version of SoX to
+ Please report any bugs found in this version of SoX to
Chris Bagwell (cbagwell@sprynet.com)
FILES
@@ -1224,10 +1237,10 @@
play(1), rec(1), soxexam(1)
NOTICES
- The version of SoX that accompanies this manual page is
+ The version of SoX that accompanies this manual page is
support by Chris Bagwell (cbagwell@users.sourceforge.net).
- Please refer any questions regarding it to this address.
- You may obtain the latest version at the the web site
+ Please refer any questions regarding it to this address.
+ You may obtain the latest version at the the web site
http://sox.sourceforge.net/
AUTHOR
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -46,7 +46,7 @@
FOBJ = 8svx.o adpcm.o aiff.o au.o auto.o avr.o cdr.o \
cvsd.o dat.o g711.o g721.o g723_16.o g723_24.o g723_40.o \
- g72x.o gsm.o hcom.o ima_rw.o maud.o nulfile.o raw.o sf.o \
+ g72x.o gsm.o hcom.o ima_rw.o maud.o mp3.o nulfile.o raw.o sf.o \
smp.o sndrtool.o sphere.o tx16w.o voc.o vorbis.o \
wav.o wve.o
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -111,6 +111,12 @@
(char *) 0,
};
+/* MP3 */
+static char *mp3names[] = {+ "mp3",
+ (char *) 0,
+};
+
static char *nulnames[] = {"nul",
(char *) 0,
@@ -293,6 +299,9 @@
{maudnames, ST_FILE_STEREO,st_maudstartread, st_maudread, st_maudstopread,
st_maudstartwrite, st_maudwrite, st_maudstopwrite, st_format_nothing_seek},
+ {mp3names, ST_FILE_STEREO,+ st_mp3startread, st_mp3read, st_mp3stopread,
+ st_mp3startwrite, st_mp3write, st_mp3stopwrite, st_format_nothing_seek},
{nulnames, ST_FILE_STEREO,st_nulstartread, st_nulread, st_nulstopread,
st_nulstartwrite, st_nulwrite, st_nulstopwrite, st_format_nothing_seek},
--- a/src/misc.c
+++ b/src/misc.c
@@ -54,7 +54,8 @@
"ima_adpcm",
"gsm",
"inversed u-law",
- "inversed A-law"
+ "inversed A-law",
+ "MPEG audio (layer I, III or III)"
};
static const char readerr[] = "Premature EOF while reading sample file.";
--- a/src/st.h
+++ b/src/st.h
@@ -192,7 +192,8 @@
#define ST_ENCODING_GSM 8 /* GSM 6.10 33byte frame lossy compression */
#define ST_ENCODING_INV_ULAW 9 /* Inversed bit-order u-law */
#define ST_ENCODING_INV_ALAW 10/* Inversed bit-order A-law */
-#define ST_ENCODING_MAX 10
+#define ST_ENCODING_MP3 11/* MP3 compression */
+#define ST_ENCODING_MAX 11
/* declared in misc.c */
extern const char *st_sizes_str[];
--- a/src/st_i.h
+++ b/src/st_i.h
@@ -229,6 +229,13 @@
int st_maudstartwrite(ft_t ft);
int st_maudstopwrite(ft_t ft);
+int st_mp3startread(ft_t ft);
+st_ssize_t st_mp3read(ft_t ft, st_sample_t *buf, st_ssize_t len);
+int st_mp3stopread(ft_t ft);
+st_ssize_t st_mp3write(ft_t ft, st_sample_t *buf, st_ssize_t len);
+int st_mp3startwrite(ft_t ft);
+int st_mp3stopwrite(ft_t ft);
+
int st_nulstartread(ft_t ft);
st_ssize_t st_nulread(ft_t ft, st_sample_t *buf, st_ssize_t len);
int st_nulstopread(ft_t ft);
--- a/src/stconfig.h.in
+++ b/src/stconfig.h.in
@@ -21,6 +21,12 @@
/* Define if you have the `m' library (-lm). */
#undef HAVE_LIBM
+/* Define if you have MAD (MP3 Audio Decoder) Library installed */
+#undef HAVE_LIBMAD
+
+/* Define if you have LAME (LAME Ain't an MP3 Encoder) Library installed */
+#undef HAVE_LAME
+
/* Define if you have Ogg Vorbis Library installed */
#undef HAVE_LIBVORBIS