summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2009-03-29 19:44:48 +0000
committerMark Wielaard <mark@klomp.org>2009-03-29 19:44:48 +0000
commitce59df245de0ce185f6670b337d6dc3b0ed89265 (patch)
tree2249de589ad1ad9346ea1fc7bafd329ba623e1a0
parentecb8c048818970fc8bf56ce27962acc1712e5f03 (diff)
downloadclasspath-ce59df245de0ce185f6670b337d6dc3b0ed89265.tar.gz
* m4/ac_prog_antlr.m4: Check whether ANTLR_JAR is empty.
-rw-r--r--ChangeLog4
-rw-r--r--m4/ac_prog_antlr.m46
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f9ed9932..6603af3d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-29 Mark Wielaard <mark@klomp.org>
+
+ * m4/ac_prog_antlr.m4: Check whether ANTLR_JAR is empty.
+
2009-03-26 Andrew John Hughes <ahughes@redhat.com>
PR classpath/39408:
diff --git a/m4/ac_prog_antlr.m4 b/m4/ac_prog_antlr.m4
index e2c10780a..df377e8b6 100644
--- a/m4/ac_prog_antlr.m4
+++ b/m4/ac_prog_antlr.m4
@@ -24,7 +24,11 @@ AC_DEFUN([AC_PROG_ANTLR],[
if test -z "$JAVA"; then
AC_MSG_ERROR(Failed to find either an antlr binary or a suitable Java runtime for ANTLR.)
else
- ANTLR="$JAVA -classpath $ANTLR_JAR antlr.Tool"
+ if test -z "$ANTLR_JAR"; then
+ AC_MSG_ERROR(Failed to find either an antlr binary or a suitable antlr jar file.)
+ else
+ ANTLR="$JAVA -classpath $ANTLR_JAR antlr.Tool"
+ fi
fi
fi
AC_SUBST(ANTLR)