X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=b7641413eca8b9aa79c73f30439ac3774d304ce2;hb=HEAD;hp=d39b7c1a19043091267ff9e0496efb360e09e7da;hpb=36074319ac7c80ac0d80334b8664d0bd8e6dee90;p=sigrok-firmware-fx2lafw.git

diff --git a/autogen.sh b/autogen.sh
index d39b7c1a..b7641413 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/sh -e
 ##
-## This file is part of the fx2lafw project.
+## This file is part of the sigrok-firmware-fx2lafw project.
 ##
 ## Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
 ##
@@ -15,43 +15,10 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
-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 -p autostuff
-aclocal ${ACLOCAL_DIR} || exit 1
-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"