X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=autogen.sh;h=d760233835e7598ab7f70018de2b36356dbd577b;hp=0f4a777151203c1321b3e493a0d19f92b91b0aa1;hb=2da4987098b2370d5d23f61eded00d83780bb18c;hpb=43e5747a59ed92243c217f7e36da2ac35bbcd80d

diff --git a/autogen.sh b/autogen.sh
index 0f4a777..d760233 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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