ref: 3956d17e66a7b0251b55fcefa2dc29e1eca22351
parent: 2d5ec4081c7598dbd55945f23676d5b54542f574
author: rrt <rrt>
date: Mon Nov 27 13:17:36 EST 2006
Remove C++ checks: it's easy enough to support C++ yourself if you need to. Make library return version number from configure symbol, rather than hand-coding the version in st.h. Don't reimplement strerror, it's ANSI. Always build with GSM support (optionally external). Remove unnecessary and wrong 4th argument to AC_INIT, and case the name of SoX correctly.
--- a/configure
+++ b/configure
@@ -1,7 +1,6 @@
#! /bin/sh
-# From configure.in 1.9.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60a for sox 12.18.2.
+# Generated by GNU Autoconf 2.60a for SoX 12.18.3.
#
# Report bugs to <cbagwell@users.sourceforge.net>.
#
@@ -558,10 +557,10 @@
SHELL=${CONFIG_SHELL-/bin/sh}# Identity of this package.
-PACKAGE_NAME='sox'
-PACKAGE_TARNAME='"sox-12.18.2"'
-PACKAGE_VERSION='12.18.2'
-PACKAGE_STRING='sox 12.18.2'
+PACKAGE_NAME='SoX'
+PACKAGE_TARNAME='sox'
+PACKAGE_VERSION='12.18.3'
+PACKAGE_STRING='SoX 12.18.3'
PACKAGE_BUGREPORT='cbagwell@users.sourceforge.net'
ac_unique_file="sox.1"
@@ -671,7 +670,6 @@
NEED_OSS
NEED_SUNAU
NEED_ALSA
-GSM_SUPPORT
PLAY_SUPPORT
LIBOBJS
LTLIBOBJS'
@@ -1189,7 +1187,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sox 12.18.2 to adapt to many kinds of systems.
+\`configure' configures SoX 12.18.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1237,7 +1235,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/"sox-12.18.2"]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/sox]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1255,7 +1253,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sox 12.18.2:";;
+ short | recursive ) echo "Configuration of SoX 12.18.3:";;
esac
cat <<\_ACEOF
@@ -1262,13 +1260,12 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-gsm Disable GSM support
- --disable-external-gsm Disable external GSM support
+ --disable-external-gsm Disable detection of external GSM library
--disable-alsa-dsp Disable detection of ALSA
--disable-oss-dsp Disable detection of OSS
--disable-sun-audio Disable detection of SUN-style audio
--disable-ogg-vorbis Disable detection of Ogg Vorbis
- --disable-flac Disable detection of FLAC
+ --disable-flac Disable detection of FLAC
--disable-mad Disable detection of MAD (MP3 Audio Decoder)
--disable-lame Disable detection of LAME (LAME Ain't an MP3 Encoder)
--disable-samplerate Detection of libsamplerate (aka Secret Rabbit Code)
@@ -1351,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sox configure 12.18.2
+SoX configure 12.18.3
generated by GNU Autoconf 2.60a
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1365,7 +1362,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sox $as_me 12.18.2, which was
+It was created by SoX $as_me 12.18.3, which was
generated by GNU Autoconf 2.60a. Invocation command line was
$ $0 $@
@@ -1724,14 +1721,6 @@
# Check whether --enable-gsm was given.
if test "${enable_gsm+set}" = set; then- enableval=$enable_gsm; enable_gsm=$enableval
-else
- enable_gsm=yes
-fi
-
-
-# Check whether --enable-gsm was given.
-if test "${enable_gsm+set}" = set; thenenableval=$enable_gsm; enable_external_gsm=$enableval
else
enable_external_gsm=yes
@@ -3151,6 +3140,12 @@
echo "${ECHO_T}no, using $LN_S" >&6; }fi
+
+if test "$GCC" = yes; then
+ CFLAGS="$CFLAGS -Wall"
+fi
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3410,20 +3405,6 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-case "$target" in
- *cygwin* )
- CFLAGS="$CFLAGS -mno-cygwin"
- CPPFLAGS="$CPPFLAGS -mno-cygwin"
- LDFLAGS="$LDFLAGS -mno-cygwin"
- ;;
-esac
-
-if test "$GCC" = yes; then
- CFLAGS="$CFLAGS -Wall"
-fi
-
-
-
{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
if test "${ac_cv_path_GREP+set}" = set; then@@ -6874,10 +6855,8 @@
fi
fi
-if test "$enable_gsm" = yes
+if test "$enable_external_gsm" = yes
then
- if test "$enable_external_gsm" = yes
- then
for ac_header in gsm/gsm.h
do
@@ -7048,9 +7027,9 @@
done
- if test "$found_libgsm" = yes
- then
- { echo "$as_me:$LINENO: checking for gsm_create in -lgsm" >&5+ if test "$found_libgsm" = yes
+ then
+ { echo "$as_me:$LINENO: checking for gsm_create in -lgsm" >&5echo $ECHO_N "checking for gsm_create in -lgsm... $ECHO_C" >&6; }
if test "${ac_cv_lib_gsm_gsm_create+set}" = set; thenecho $ECHO_N "(cached) $ECHO_C" >&6
@@ -7129,27 +7108,16 @@
echo "${ECHO_T}$ac_cv_lib_gsm_gsm_create" >&6; }if test $ac_cv_lib_gsm_gsm_create = yes; then
LIBS="$LIBS -lgsm"
- GSM_SUPPORT=ext
+ GSM_SUPPORT=ext
-cat >>confdefs.h <<\_ACEOF
-#define EXTERNAL_GSM 1
-_ACEOF
-
-
fi
- fi
- fi
+ fi
- if test "$GSM_SUPPORT" = 0
- then
- GSM_SUPPORT=1
- fi
-
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_GSM 1
-_ACEOF
-
+ if test "$GSM_SUPPORT" = 0
+ then
+ GSM_SUPPORT=1
+ fi
fi
@@ -7158,7 +7126,6 @@
-
ac_config_headers="$ac_config_headers src/stconfig.h"
@@ -7550,7 +7517,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sox $as_me 12.18.2, which was
+This file was extended by SoX $as_me 12.18.3, which was
generated by GNU Autoconf 2.60a. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7599,7 +7566,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-sox config.status 12.18.2
+SoX config.status 12.18.3
configured by $0, generated by GNU Autoconf 2.60a,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -7844,13 +7811,12 @@
NEED_OSS!$NEED_OSS$ac_delim
NEED_SUNAU!$NEED_SUNAU$ac_delim
NEED_ALSA!$NEED_ALSA$ac_delim
-GSM_SUPPORT!$GSM_SUPPORT$ac_delim
PLAY_SUPPORT!$PLAY_SUPPORT$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5@@ -9603,7 +9569,6 @@
if test ! -f src/monkey.wav; then cp ${srcdir}/src/monkey.wav src/monkey.wav; fiecho
-echo "GSM Support....................... $enable_gsm"
echo "ALSA Driver....................... $enable_alsa_dsp"
echo "OSS Driver........................ $enable_oss_dsp"
echo "SUN /dev/audio.................... $enable_sun_audio"
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@
dnl configure.in
dnl
-AC_INIT(sox, 12.18.3, cbagwell@users.sourceforge.net, "sox-12.18.3")
+AC_INIT(SoX, 12.18.3, cbagwell@users.sourceforge.net)
AC_CONFIG_SRCDIR(sox.1)
@@ -61,7 +61,6 @@
AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_LN_S
-AC_PROG_CPP
dnl Extra CFLAGS if we have gcc
if test "$GCC" = yes; then
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -37,7 +37,6 @@
NEED_SUNAU = @NEED_SUNAU@
NEED_ALSA = @NEED_ALSA@
PLAY_SUPPORT = @PLAY_SUPPORT@
-GSM_SUPPORT = @GSM_SUPPORT@
# Objects.
@@ -55,9 +54,7 @@
reverb.o reverse.o silence.o speed.o stat.o \
stretch.o swap.o synth.o tone.o trim.o vibro.o vol.o
-
-GSMOBJ_0 =
-GSMOBJ_1 = libgsm/add.o libgsm/code.o libgsm/decode.o libgsm/long_term.o \
+GSMOBJ = libgsm/add.o libgsm/code.o libgsm/decode.o libgsm/long_term.o \
libgsm/lpc.o libgsm/preprocess.o libgsm/rpe.o \
libgsm/gsm_destroy.o libgsm/gsm_decode.o libgsm/gsm_encode.o \
libgsm/gsm_create.o libgsm/gsm_option.o libgsm/short_term.o \
@@ -69,7 +66,7 @@
SUNAUOBJ_1 = sunaudio.o
ALSAOBJ_0 =
ALSAOBJ_1 = alsa.o
-EXTRAOBJS = $(OSSOBJ_$(NEED_OSS)) $(SUNAUOBJ_$(NEED_SUNAU)) $(ALSAOBJ_$(NEED_ALSA)) $(GSMOBJ_$(GSM_SUPPORT))
+EXTRAOBJS = $(OSSOBJ_$(NEED_OSS)) $(SUNAUOBJ_$(NEED_SUNAU)) $(ALSAOBJ_$(NEED_ALSA)) $(GSMOBJ)
LIBOBJS = $(FOBJ) $(EOBJ) getopt.o getopt1.o handlers.o misc.o stio.o \
util.o $(EXTRAOBJS)
@@ -79,8 +76,7 @@
# only so that they can be included inside libst. This semi-fake
# target is just an easy way to make sure that makefile builds
# the objects instead of this makefile.
-GSM_0 =
-GSM_1 = libgsm/libgsm.a
+GSM = libgsm/libgsm.a
GSM_ext =
PLAY_0 =
PLAY_1 = play
@@ -87,7 +83,7 @@
all: sox $(PLAY_$(PLAY_SUPPORT))
-sox: $(GSM_$(GSM_SUPPORT)) libst.a sox.o
+sox: $(GSM) libst.a sox.o
$(CC) $(LDFLAGS) -o sox sox.o $(LIBS)
$(RM) soxmix
$(LN_S) sox soxmix
--- a/src/misc.c
+++ b/src/misc.c
@@ -469,40 +469,10 @@
}
}
-const char *st_version()
+const char *st_version(void)
{- static char versionstr[20];
-
- sprintf(versionstr, "%d.%d.%d",
- (ST_LIB_VERSION_CODE & 0xff0000) >> 16,
- (ST_LIB_VERSION_CODE & 0x00ff00) >> 8,
- (ST_LIB_VERSION_CODE & 0x0000ff));
- return(versionstr);
+ return PACKAGE_VERSION;
}
-
-
-#ifndef HAVE_STRERROR
-#ifdef __cplusplus
-extern "C" int sys_nerr;
-extern "C" char *sys_errlist[];
-#else
-extern int sys_nerr;
-extern char *sys_errlist[];
-#endif
-/* strerror function */
-char *strerror(int errcode)
-{- static char nomesg[30];
-
- if (errcode < sys_nerr)
- return (sys_errlist[errcode]);
- else
- {- sprintf (nomesg, "Undocumented error %d", errcode);
- return (nomesg);
- }
-}
-#endif
/* Implements traditional fseek() behavior. Meant to abstract out
* file operations so that they could one day also work on memory
--- a/src/st.h
+++ b/src/st.h
@@ -11,18 +11,10 @@
* the consequences of using this software.
*/
-#ifdef __cplusplus
-extern "C" {-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include "ststdint.h"
-/* Release 12.18.2 of libst */
-#define ST_LIB_VERSION_CODE 0x0c1202
-#define ST_LIB_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-
/* C language enhancements: */
/* Boolean type, compatible with C++ */
@@ -373,9 +365,5 @@
#define ST_ENOTSUP 2005 /* Operation not supported */
#define ST_EINVAL 2006 /* Invalid argument */
#define ST_EFFMT 2007 /* Unsupported file format */
-
-#ifdef __cplusplus
-} /* end of extern "C" */
-#endif
#endif
--- a/src/st_i.h
+++ b/src/st_i.h
@@ -16,10 +16,6 @@
#include "stconfig.h"
#include "st.h"
-#ifdef __cplusplus
-extern "C" {-#endif
-
#ifdef HAVE_BYTESWAP_H
#include <byteswap.h>
#endif
@@ -310,9 +306,5 @@
*/
st_size_t st_trim_get_start(eff_t effp);
void st_trim_clear_start(eff_t effp);
-
-#ifdef __cplusplus
-} /* end of extern "C" */
-#endif
#endif
--
⑨