X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=autogen.sh;h=d2205fe13c2d5dfd7e12b94d5600436df2388ed9;hp=faa02353ec743f16e03fb451c36aad5ec59b9adc;hb=b8b727e45f55a91171d52f93ac387784914ffbf1;hpb=3fc66eda9f62ed5520e237ad6bad036d27bf96c2

diff --git a/autogen.sh b/autogen.sh
index faa02353..d2205fe1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,11 +21,9 @@
 OS=`uname`
 
 LIBTOOLIZE=libtoolize
-ACLOCAL_DIR=
 
 if [ "x$OS" = "xDarwin" ]; then
 	LIBTOOLIZE=glibtoolize
-
 	if [ -d /sw/share/aclocal ]; then
 		# fink installs aclocal macros here
 		ACLOCAL_DIR="-I /sw/share/aclocal"
@@ -39,16 +37,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..."
@@ -58,7 +46,7 @@ aclocal ${ACLOCAL_DIR} || exit 1
 # Check the version of a specific autoconf macro that tends to cause problems.
 CXXMACROVERSION=$(
 	grep -B 5 'm4_define(\[_AX_CXX_COMPILE_STDCXX_11_testbody\]' aclocal.m4 |
-	sed -nr 's/.*serial[[:space:]]+([[:digit:]]+).*/\1/p'
+	sed -n 's/.*serial[ \t][ \t]*\([0-9][0-9]*\).*/\1/p'
 )
 if [ "x$CXXMACROVERSION" = "x" ]; then
 	echo "--- Warning: AX_CXX_COMPILE_STDCXX_11 macro not found."