X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=autogen.sh;h=a639131d8aad119c586b9d2d549c1d6522896544;hb=f2b8b4378b3760e8ba5a1ed54a5f8635d3dac85e;hp=72a2352343087ba9f949882f97a40dd316a4290c;hpb=677eb1ad30321d83f6196672ea1798c0e1712870;p=ncmpc.git

diff --git a/autogen.sh b/autogen.sh
index 72a2352..a639131 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,54 +1,29 @@
-#! /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
+#!/bin/sh -e
+
+rm -rf config.cache build
+mkdir build
+
+# create po/Makefile.in.in
+glib-gettextize --force --copy
+
+# add aclocal.m4 to current dir
+echo "aclocal..."
+aclocal -I m4
+
+# 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 $AUTOMAKE_FLAGS
+
 
-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
+# configure
+if test x$NOCONFIGURE = x; then
+	echo "./configure $*"
+	./configure $*
 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