X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=a9b58435db6110ebc2b1531a7cb1a12bd63f55c8;hb=a9d1cdfb4766cd7d7a2dc499657792cef6fcedba;hp=a910269c6b69eea2f2f74f81fa5bfc9bb52f8589;hpb=b6efd7061d22b599a895a69c5b37e7c8623a2619;p=sigrok-firmware.git

diff --git a/autogen.sh b/autogen.sh
index a910269..a9b5843 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/sh -e
 ##
-## This file is part of the sigrok project.
+## This file is part of the sigrok-firmware project.
 ##
 ## Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -19,39 +20,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-OS=`uname`
-
-ACLOCAL_DIR=
-
-if [ "x$OS" = "xDarwin" ]; then
-	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..."
-mkdir autostuff
-aclocal ${ACLOCAL_DIR} || exit 1
-autoheader || exit 1
-automake --add-missing --copy --foreign || exit 1
-autoconf || exit 1
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
 
+autoreconf --force --install --verbose "$srcdir"