The autoreconf tool is provided by autoconf to do what custom
autogen.sh scripts in many projects used to do. Only it is more
robust and widely tested. It has been available for several years,
too. No reason to rely on custom code for this.
Signed-off-by: Max Horn
---
Makefile.am| 2 -
autogen.sh | 168 +
configure.ac | 2 +-
doc/Makefile.am| 2 -
doc/html/Makefile.am | 2 -
doc/html/images/Makefile.am| 2 -
doc/html/images/hw/Makefile.am | 2 -
doc/html/ru/Makefile.am| 2 -
include/share/Makefile.am | 2 -
include/share/grabbag/Makefile.am | 2 -
include/test_libs_common/Makefile.am | 2 -
src/libFLAC/Makefile.am| 3 +
src/plugin_common/Makefile.am | 2 -
src/share/getopt/Makefile.am | 2 -
src/share/grabbag/Makefile.am | 2 -
src/share/replaygain_analysis/Makefile.am | 2 -
src/share/replaygain_synthesis/Makefile.am | 2 -
src/share/utf8/Makefile.am | 2 -
18 files changed, 8 insertions(+), 195 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 0a65206..45a0260 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,8 +28,6 @@
# distclean: remove everything except what goes in the distribution
#
-AUTOMAKE_OPTIONS = foreign 1.7
-
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = doc include m4 man src examples test build obj
diff --git a/autogen.sh b/autogen.sh
index 3290f2e..2aa4c30 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,166 +1,6 @@
#!/bin/sh
# Run this to set up the build system: configure, makefiles, etc.
-# (based on the version in enlightenment's cvs)
-
-# Some notes:
-#
-# You may need to specify -I /SOME_PATH/share/aclocal in ACLOCAL_FLAGS
-# if any packages FLAC relies on (autotools, libogg, libiconv) are
-# installed in non-standard places.
-#
-# If you don't have XMMS installed at all, you should comment out
-# AM_PATH_XMMS in configure.in.
-#
-# FLAC uses iconv but not gettext. iconv requires config.rpath which
-# is supplied by gettext, which is copied in by gettextize. But we
-# can't run gettextize since we do not fulfill all it's requirements
-# (because we don't use it). So you may have to:
-#
-# cp /usr/share/gettext/config.rpath .
-#
-# before running autogen.sh
-#
-# If you are running on OS X and get errors related to the AM_ICONV
-# and/or AM_LANGINFO_CODESET macros, replace those 2 lines in
-# configure.in with
-#
-# AC_DEFINE([HAVE_ICONV], [], [Whether we have libiconv available])
LIBICONV="-liconv"
-# AC_SUBST(LIBICONV)
-#
-# See also http://lists.xiph.org/pipermail/flac-dev/2007-September/002384.html
-#
-# Also watchout, if you replace ltmain.sh, there is a bug in some
-# versions of libtool (or maybe autoconf) on some platforms where the
-# configure-generated libtool does not have $SED defined. See also:
-#
-# http://lists.gnu.org/archive/html/libtool/2003-11/msg00131.html
-
-package="flac"
-
-olddir=`pwd`
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-cd "$srcdir"
-DIE=0
-
-ACLOCAL_FLAGS="-I m4 $ACLOCAL_FLAGS"
-
-echo "checking for autoconf... "
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-echo
-echo "You must have autoconf installed to compile $package."
-echo "Download the appropriate package for your distribution,"
-echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/";
-DIE=1
-}
-
-VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/"
-VERSIONMKMAJ="sed -e s/\([0-9][0-9]*\)[^0-9].*/\\1/"
-VERSIONMKMIN="sed -e s/.*[0-9][0-9]*\.//"
-
-# do we need automake?
-if test -r Makefile.am; then
- AM_OPTIONS=`fgrep AUTOMAKE_OPTIONS Makefile.am`
- AM_NEEDED=`echo $AM_OPTIONS | $VERSIONGREP`
- if test x"$AM_NEEDED" = "x$AM_OPTIONS"; then
-AM_NEEDED=""
- fi
- if test -z $AM_NEEDED; then
-echo -n "checking for automake... "
-AUTOMAKE=automake
-ACLOCAL=aclocal
-if ($AUTOMAKE --version < /dev/null > /dev/null 2>&1); then
- echo "yes"
-else
- echo "no"
- AUTOMAKE=
-fi
- else
-echo -n "checking for automake $AM_NEEDED or later... "
-majneeded=`echo $AM_NEEDED | $VERSIONMKMAJ`
-minneeded=`echo $AM_NEEDED | $VERSIONMKMIN`
-for am in automake-$AM_NEEDED automake$AM_NEEDED \
- automake automake-1.7 automake-1.8 automake-1.9 automake-1.10; do
- ($am --version < /dev/null > /dev/null 2>&1) || continue
- ver=`$am --version < /dev/null | head -n 1 | $VERSIONGREP`
- maj=`echo $ver | $VERSIONMKMAJ`
- min=`echo $ver | $VERSIONMKMIN`
- if test $maj -eq $majneeded -a $min -ge $minneeded; then
-AUTOMAKE=$am
-echo $AUTOMAKE
-break
- fi
-done
-test -z $AUTOMAKE && echo "no"
-echo -n "checking for aclocal $AM_NEEDED
