diff --git a/autogen.sh b/autogen.sh
index 72a2352343087ba9f949882f97a40dd316a4290c..1a114eab0757191052fdd990f5a9e86724a86b5b 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
#! /bin/sh
-# Check Autoconf version
-if [ -x `which autoconf` ]; then
- AC_VER=`autoconf --version | head -n 1 | sed 's/^[^0-9]*//'`
- AC_VER_MAJOR=`echo $AC_VER | cut -f1 -d'.'`
- AC_VER_MINOR=`echo $AC_VER | cut -f2 -d'.' | sed 's/[^0-9]*$//'`
-
- if [ "$AC_VER_MAJOR" -lt "2" ]; then
- echo "Autoconf 2.13 or greater needed to build configure."
- exit 1
- fi
-
- if [ "$AC_VER_MINOR" -lt "13" ]; then
- echo "Autoconf 2.13 or greater needed to build configure."
- exit 1
- fi
-
- if [ "$AC_VER_MINOR" -lt "50" ]; then
- if [ ! -e configure.in ]; then
- ln -s configure.ac configure.in
- fi
- echo "If you see some warnings about cross-compiling, don't worry; this is normal."
- else
- echo "rm -f configure.in ?"
- fi
-else
- echo Autoconf not found. AlsaPlayer CVS requires autoconf to bootstrap itself.
- exit 1
-fi
-
-run_cmd() {
- echo running $* ...
- if ! $*; then
- echo failed!
- exit 1
- fi
-}
-
-# Check if /usr/local/share/aclocal exists
-if [ -d /usr/local/share/aclocal ]; then
- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal"
-fi
-
-if [ -d m4 ] ; then
- run_cmd cat m4/*.m4 > acinclude.m4
-fi
-run_cmd aclocal $ACLOCAL_INCLUDE
-run_cmd autoheader
-run_cmd libtoolize --automake
-run_cmd automake --add-missing
-run_cmd autoconf
-echo
-echo "Now run './configure'"
-echo
+
+# Generate config.h.in
+echo "touch stamp-h"
+touch stamp-h
+
+# add aclocal.m4 to current dir
+echo "aclocal..."
+aclocal -I $PWD/m4
+
+# rerun libtoolize
+echo "libtoolize..."
+libtoolize --force
+
+# This generates the configure script from configure.in
+echo "autoconf..."
+autoconf
+
+echo "autoheader..."
+autoheader
+
+# Generate Makefile.in from Makefile.am
+echo "automake..."
+automake --add-missing
+
+
+# configure
+echo "./configure $*"
+./configure $*