ref: ac2334ced5fe3f243edab2bd966ffa97ed959305
parent: c0d4253e05c5b7d823a7ac852826d78294ae9bda
author: cbagwell <cbagwell>
date: Wed Aug 16 21:11:54 EDT 2006
Allow uninstalling again.
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,6 +18,7 @@
INSTALL = @INSTALL@
LN_S = @LN_S@
+RM = /bin/rm
all:
cd src && $(MAKE) $@
@@ -41,13 +42,13 @@
install-play:
if [ -f $(mandir)/man1/rec.1 ]; then $(RM) $(mandir)/man1/rec.1; fi
$(srcdir)/mkinstalldirs $(mandir)/man1
- $(INSTALL) -c -m 644 $(srcdir)/play.1 $(mandir)/man1
+ $(INSTALL) -m 644 $(srcdir)/play.1 $(mandir)/man1
cd $(mandir)/man1 && $(LN_S) play.1 rec.1
install-lib:
cd src && $(MAKE) $@
$(srcdir)/mkinstalldirs $(mandir)/man3
- $(INSTALL) -c -m 644 $(srcdir)/libst.3 $(mandir)/man3
+ $(INSTALL) -m 644 $(srcdir)/libst.3 $(mandir)/man3
PLAY_UNINSTALL_0 =
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.in 1.9.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for sox 12.18.1.
+# Generated by GNU Autoconf 2.59 for sox 12.18.2.
#
# Report bugs to <cbagwell@users.sourceforge.net>.
#
@@ -269,9 +269,9 @@
# Identity of this package.
PACKAGE_NAME='sox'
-PACKAGE_TARNAME='"sox-12.18.1"'
-PACKAGE_VERSION='12.18.1'
-PACKAGE_STRING='sox 12.18.1'
+PACKAGE_TARNAME='"sox-12.18.2"'
+PACKAGE_VERSION='12.18.2'
+PACKAGE_STRING='sox 12.18.2'
PACKAGE_BUGREPORT='cbagwell@users.sourceforge.net'
ac_unique_file="sox.1"
@@ -781,7 +781,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.1 to adapt to many kinds of systems.
+\`configure' configures sox 12.18.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -843,7 +843,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sox 12.18.1:";;
+ short | recursive ) echo "Configuration of sox 12.18.2:";;
esac
cat <<\_ACEOF
@@ -969,7 +969,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-sox configure 12.18.1
+sox configure 12.18.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -983,7 +983,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.1, which was
+It was created by sox $as_me 12.18.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -5866,7 +5866,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by sox $as_me 12.18.1, which was
+This file was extended by sox $as_me 12.18.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5926,7 +5926,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-sox config.status 12.18.1
+sox config.status 12.18.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@
AC_REVISION(1.9)
-AC_INIT(sox, 12.18.1, cbagwell@users.sourceforge.net, "sox-12.18.1")
+AC_INIT(sox, 12.18.2, cbagwell@users.sourceforge.net, "sox-12.18.2")
AC_CONFIG_SRCDIR(sox.1)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -23,6 +23,7 @@
AR = ar r
RM = rm -f
LN_S = @LN_S@
+RM = /bin/rm
# Build macros.
CFLAGS = @CFLAGS@ -I$(srcdir) -I$(builddir)
--- a/src/stconfig.h.in
+++ b/src/stconfig.h.in
@@ -1,4 +1,4 @@
-/* stconfig.h.in. Generated from configure.in by autoheader. */
+/* src/stconfig.h.in. Generated from configure.in by autoheader. */
/* Define if you want to use internal GSM library */
#undef ENABLE_GSM
@@ -9,18 +9,12 @@
/* Define if you want to use fast ULAW conversions */
#undef FAST_ULAW_CONVERSION
-/* Define if you have ALSA installed */
+/* Define if you have ALSA library installed */
#undef HAVE_ALSA
-/* Define if you have ALSA 0.4 installed */
-#undef HAVE_ALSA4
+/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
+#undef HAVE_ALSA_ASOUNDLIB_H
-/* Define if you have ALSA 0.5 installed */
-#undef HAVE_ALSA5
-
-/* Define if you have ALSA 0.9 installed */
-#undef HAVE_ALSA9
-
/* Define to 1 if you have the <byteswap.h> header file. */
#undef HAVE_BYTESWAP_H
@@ -30,7 +24,7 @@
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
-/* Define to 1 if you have the `getopt_LONG' function. */
+/* Define to 1 if you have the `getopt_long' function. */
#undef HAVE_GETOPT_LONG
/* Define to 1 if you have the <inttypes.h> header file. */
@@ -51,9 +45,6 @@
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
-/* Define to 1 if you have the <linux/asound.h> header file. */
-#undef HAVE_LINUX_ASOUND_H
-
/* Define to 1 if you have the <machine/soundcard.h> header file. */
#undef HAVE_MACHINE_SOUNDCARD_H
@@ -72,9 +63,6 @@
/* Define to 1 if you have the `rand' function. */
#undef HAVE_RAND
-/* Define to 1 if you have the <sound/asound.h> header file. */
-#undef HAVE_SOUND_ASOUND_H
-
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@@ -160,9 +148,11 @@
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
- if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
#undef inline
+#endif
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t