X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=autogen.sh;h=93441ed0f07a3578c9ea22695b5fd71022342994;hp=a49d17b63fcde65964ba465882b7d1f1c5a1229d;hb=c357abd198bd195cb9ea015130dc76c8c7a33651;hpb=63d62a5c6aa3c66b6b3c0662155752ccb123ee23

diff --git a/autogen.sh b/autogen.sh
index a49d17b..93441ed 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##
-## This file is part of the sigrok project.
+## This file is part of the libsigrokdecode project.
 ##
 ## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
 ##
@@ -21,37 +21,28 @@
 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
 autoheader || exit 1
-automake --add-missing --copy --foreign || exit 1
+automake --add-missing --copy || exit 1
 autoconf || exit 1