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

diff --git a/autogen.sh b/autogen.sh
index 0f4a7771..8685c3c8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 ##
-## This file is part of the sigrok project.
+## This file is part of the libsigrok 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,19 +32,45 @@ 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
 
 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.
+CXXMACROVERSION=$(
+	grep -B 5 'm4_define(\[_AX_CXX_COMPILE_STDCXX_11_testbody\]' aclocal.m4 |
+	sed -nr 's/.*serial[[:space:]]+([[:digit:]]+).*/\1/p'
+)
+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!"
+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!"
+fi
+
 autoheader || exit 1
-automake --add-missing --copy --foreign || exit 1
+automake --add-missing --copy || exit 1
 autoconf || exit 1