X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=b2a694be5ea6c15780f866289379d05efeb5679d;hb=1fe3e6cc2add04d9a4b7fd314cf75b619594b127;hp=6cc2dbcb6e3dabb3daf64960b6ea536a63665442;hpb=3f63165cbcd9e3e512a7f117a025c406147b0466;p=sigrok-gtk.git

diff --git a/autogen.sh b/autogen.sh
index 6cc2dbc..b2a694b 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 sigrok-gtk project.
 ##
 ## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
 ##
@@ -38,6 +38,13 @@ if [ "x$OS" = "xDarwin" ]; then
 	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 +52,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