X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=d2205fe13c2d5dfd7e12b94d5600436df2388ed9;hb=39e4517759d391e5572e81d9796d4d8c6892d25e;hp=79cec4c293580ee10a2961d7825c2887617d75b2;hpb=ff50ad701e6f945cec972465a35c285dbaddd329;p=libsigrok.git

diff --git a/autogen.sh b/autogen.sh
index 79cec4c2..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,31 +37,27 @@ 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..."
 ${LIBTOOLIZE} --install --copy --quiet || exit 1
 aclocal ${ACLOCAL_DIR} || exit 1
 
-# check the version of a specific autoconf macro that tends to cause problems
+# 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 [ "$CXXMACROVERSION" -lt 4 ]; then
-	echo "error: the AX_CXX_COMPILE_STDCXX_11 macro on this system is too old."
-	echo "(found version $CXXMACROVERSION, at least 4 is required)"
-	exit 1
+if [ "x$CXXMACROVERSION" = "x" ]; then
+	echo "--- Warning: AX_CXX_COMPILE_STDCXX_11 macro not found."
+	echo "--- You won't be able to build the language bindings!"
+	echo "--- More info: http://sigrok.org/wiki/Building#FAQ"
+fi
+if [ "x$CXXMACROVERSION" != "x" ] && [ "$CXXMACROVERSION" -lt 4 ]; then
+	echo "--- Warning: AX_CXX_COMPILE_STDCXX_11 macro is too old."
+	echo "--- (found version $CXXMACROVERSION, at least 4 is required)"
+	echo "--- You won't be able to build the language bindings!"
+	echo "--- More info: http://sigrok.org/wiki/Building#FAQ"
 fi
 
 autoheader || exit 1