summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Preiner <mathias.preiner@gmail.com>2017-08-14 11:27:53 -0700
committerGitHub <noreply@github.com>2017-08-14 11:27:53 -0700
commit2addacac33a9f0d28462121dfac5a1392470d60d (patch)
tree689c75776c3b8b3ae7da2303f4d47215e76a342e
parent4618986f539c8c0abee1b82105b6ccef513afecf (diff)
Use antlr-3.4 directory if already present in CVC4 root directory (#213)
* Find antlr-3.4 directory if installed via contrib/get-antlr-3.4.
-rw-r--r--config/antlr.m49
1 files changed, 9 insertions, 0 deletions
diff --git a/config/antlr.m4 b/config/antlr.m4
index 955e1bb2a..aa161989c 100644
--- a/config/antlr.m4
+++ b/config/antlr.m4
@@ -20,6 +20,10 @@ AC_DEFUN([AC_PROG_ANTLR], [
AC_MSG_RESULT([OK])
fi
fi
+ # Check if antlr-3.4 was installed via contrib/get-antlr3.4
+ if test -e "$ac_abs_confdir/antlr-3.4/bin/antlr3"; then
+ ANTLR="$ac_abs_confdir/antlr-3.4/bin/antlr3"
+ fi
if test "x$ANTLR" = "x"; then
AC_MSG_WARN(
[No usable antlr3 script found. Make sure that the parser code has
@@ -55,6 +59,11 @@ AC_DEFUN([AC_LIB_ANTLR],[
ANTLR_PREFIXES="$ANTLR_HOME /usr/local /usr /opt/local /opt"
)
+ # Check if antlr-3.4 was installed via contrib/get-antlr3.4
+ if test -e "$ac_abs_confdir/antlr-3.4"; then
+ ANTLR_PREFIXES="$ac_abs_confdir/antlr-3.4"
+ fi
+
AC_MSG_CHECKING(for ANTLR3 C runtime library)
# Use C and remember the variables we are changing
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback