fixes for Mac and automake 1.12 detection

diff --git a/config/antlr.m4 b/config/antlr.m4
index 674feaed68640147d8054586e7ebfb0d317323a9..15b819244198f58caf5634f014f289d168c2c00b 100644 (file)
--- a/config/antlr.m4
+++ b/config/antlr.m4
@@ -27,7 +27,7 @@ been generated already. To obtain ANTLR see <http://www.antlr.org/>.]
     )
     ANTLR_VERSION=
   else
-    ANTLR_VERSION="`$ANTLR -version 2>&1 | sed 's,.*\<Version  *\([[0-9.]]*\).*,\1,'`"
+    ANTLR_VERSION="`$ANTLR -version 2>&1 | sed 's,.*Version  *\([[0-9.]]*\).*,\1,'`"
     case "$ANTLR_VERSION" in
       3.2|3.2.*) ANTLR_VERSION=3.2 ;;
       3.4|3.4.*) ANTLR_VERSION=3.4 ;;

diff --git a/configure.ac b/configure.ac
index 0e98152be005e923ea23a9aee9ac6e82c2235cd0..3ad480854384cc10463e9c30a32832035cde4c38 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -206,6 +206,19 @@ AC_MSG_RESULT([$with_build])
 AM_INIT_AUTOMAKE([1.11 no-define tar-pax parallel-tests color-tests subdir-objects])
 AC_CONFIG_HEADERS([cvc4autoconfig.h])
 
+# automake 1.12 changes the test driver mechanism in a way that is
+# completely incompatible with 1.11.  We figure out here which version
+# we're using in order to set up test makefiles correctly.
+# See http://lists.gnu.org/archive/html/automake/2012-04/msg00060.html
+if test -z "$am__api_version"; then
+  AC_MSG_ERROR([Cannot determine automake API version ?!])
+fi
+case "$am__api_version" in
+  1.11*) automake111=true ;;
+  *) automake111=false ;;
+esac
+AM_CONDITIONAL([AUTOMAKE_1_11], [$automake111])
+
 # Initialize libtool's configuration options.
 _LT_SET_OPTION([LT_INIT],[win32-dll])
 LT_INIT
@@ -749,6 +762,12 @@ else
   AC_CHECK_PROG(LFSC, "$LFSC", [], [])
 fi
 AM_CONDITIONAL([PROOF_REGRESSIONS], [test -n "$LFSC" -a "$enable_proof" = yes])
+if test -n "$LFSC" -a "$enable_proof" = yes; then
+  TESTS_ENVIRONMENT="${TESTS_ENVIRONMENT:+$TESTS_ENVIRONMENT }LFSC=\"$(LFSC) $(LFSCARGS)\""
+  RUN_REGRESSION_ARGS="${RUN_REGRESSION_ARGS:+$RUN_REGRESSION_ARGS }--proof"
+fi
+AC_SUBST([TESTS_ENVIRONMENT])
+AC_SUBST([RUN_REGRESSION_ARGS])
 if test -z "$LFSC"; then
   support_proof_tests='no, lfsc proof checker unavailable'
 elif test "$enable_proof" = yes; then