X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=9ee4cd4c4329ea63163b28f95d32b601298a9a99;hb=a376ffea49411cca09b358f3677938612c79afaf;hp=0f4a777151203c1321b3e493a0d19f92b91b0aa1;hpb=826938d81e2e5bf592fbed82523081fcb7fdf85e;p=libsigrok.git

diff --git a/autogen.sh b/autogen.sh
index 0f4a7771..9ee4cd4c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
 ##
 ## This file is part of the sigrok project.
 ##
-## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+## Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -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