From: Uwe Hermann <redacted>
Date: Tue, 7 Apr 2015 00:40:55 +0000 (+0200)
Subject: autogen.sh: Drop obsolete MinGW/MSYS items.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=4893c9ed55d349dce508eb5594d888890d07c76b;p=sigrok-firmware.git

autogen.sh: Drop obsolete MinGW/MSYS items.

For Windows builds (which require MinGW-w64) we currently support:

 - cross-builds using MXE (mxe.cc) and possibly other cross-compile setups

 - native builds using MSYS2 (sf.net/projects/msys2/)

Neither of those require explicitly specifying ACLOCAL_DIR.
---

diff --git a/autogen.sh b/autogen.sh
index eece58f..70d4c18 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,8 +22,6 @@
 
 OS=`uname`
 
-ACLOCAL_DIR=
-
 if [ "x$OS" = "xDarwin" ]; then
 	if [ -d /sw/share/aclocal ]; then
 		# fink installs aclocal macros here
@@ -38,15 +36,6 @@ if [ "x$OS" = "xDarwin" ]; 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..."