X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=autogen.sh;h=7cdf22f8708605b92c1eea5181df8eb8749b80ba;hp=0f4a777151203c1321b3e493a0d19f92b91b0aa1;hb=ce71bf0e29e9c3890eb74725ceb963ff35a29639;hpb=a190e97997d091a6a1ff53d4f50ce6eae26ab9ae

diff --git a/autogen.sh b/autogen.sh
index 0f4a777..7cdf22f 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>
 ##
@@ -32,12 +32,22 @@ if [ "x$OS" = "xDarwin" ]; then
 	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
 
@@ -45,6 +55,6 @@ 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