X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=autogen.sh;h=09de1ba5f467225dc5e78423f0a6039a0f433ad3;hp=79cec4c293580ee10a2961d7825c2887617d75b2;hb=22fdb67fa0714c11cc0a58ee1423f55d18a4f080;hpb=ff50ad701e6f945cec972465a35c285dbaddd329

diff --git a/autogen.sh b/autogen.sh
index 79cec4c2..09de1ba5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 ##
 ## This file is part of the libsigrok project.
 ##
@@ -18,55 +18,7 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-OS=`uname`
-
-LIBTOOLIZE=libtoolize
-ACLOCAL_DIR=
-
-if [ "x$OS" = "xDarwin" ]; then
-	LIBTOOLIZE=glibtoolize
-
-	if [ -d /sw/share/aclocal ]; then
-		# fink installs aclocal macros here
-		ACLOCAL_DIR="-I /sw/share/aclocal"
-	elif [ -d /opt/local/share/aclocal ]; then
-		# Macports installs aclocal macros here
-		ACLOCAL_DIR="-I /opt/local/share/aclocal"
-	elif [ -d /usr/local/share/aclocal ]; then
-		# Homebrew installs aclocal macros here
-		ACLOCAL_DIR="-I /usr/local/share/aclocal"
-	elif [ -d /usr/share/aclocal ]; then
-		# Xcode installs aclocal macros here
-		ACLOCAL_DIR="-I /usr/share/aclocal"
-	fi
-
-elif [ "x$OS" = "xMINGW32_NT-5.1" ]; then
-	# Windows XP
-	ACLOCAL_DIR="-I /usr/local/share/aclocal"
-elif [ "x$OS" = "xMINGW32_NT-6.0" ]; then
-	# Windows Vista
-	ACLOCAL_DIR="-I /usr/local/share/aclocal"
-elif [ "x$OS" = "xMINGW32_NT-6.1" ]; then
-	# Windows 7
-	ACLOCAL_DIR="-I /usr/local/share/aclocal"
-fi
-
-echo "Generating build system..."
-${LIBTOOLIZE} --install --copy --quiet || exit 1
-aclocal ${ACLOCAL_DIR} || exit 1
-
-# check the version of a specific autoconf macro that tends to cause problems
-CXXMACROVERSION=$(
-	grep -B 5 'm4_define(\[_AX_CXX_COMPILE_STDCXX_11_testbody\]' aclocal.m4 |
-	sed -nr 's/.*serial[[:space:]]+([[:digit:]]+).*/\1/p'
-)
-if [ "$CXXMACROVERSION" -lt 4 ]; then
-	echo "error: the AX_CXX_COMPILE_STDCXX_11 macro on this system is too old."
-	echo "(found version $CXXMACROVERSION, at least 4 is required)"
-	exit 1
-fi
-
-autoheader || exit 1
-automake --add-missing --copy || exit 1
-autoconf || exit 1
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
 
+autoreconf --force --install --verbose "$srcdir"