diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-10-05 21:19:16 +0000 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-10-05 21:19:16 +0000 |
commit | cae9a32cbcc4c133301d64f49d36709ccbc994da (patch) | |
tree | 2c41753d6c88c8b8817cc0a811bb7c0801ec9f02 /m4 | |
parent | e93c4ea50e2390957e16c1d4c8de76de1666725f (diff) | |
download | classpath-cae9a32cbcc4c133301d64f49d36709ccbc994da.tar.gz |
Add -regen-gjdoc-parser option.
2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Add regen-gjdoc-parser option,
and separate antlr tests.
* m4/ac_prog_antlr.m4:
Turn single test into AC_LIB_ANTLR
and AC_PROG_ANTLR.
* m4/ac_prog_java.m4:
Quote tests.
* tools/Makefile.am:
Support CREATE_GJDOC_PARSER option.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/ac_prog_antlr.m4 | 76 | ||||
-rw-r--r-- | m4/ac_prog_java.m4 | 8 |
2 files changed, 43 insertions, 41 deletions
diff --git a/m4/ac_prog_antlr.m4 b/m4/ac_prog_antlr.m4 index 356a4f3e0..cb7d8cd92 100644 --- a/m4/ac_prog_antlr.m4 +++ b/m4/ac_prog_antlr.m4 @@ -1,39 +1,24 @@ -AC_DEFUN([AC_PROG_ANTLR],[ +AC_DEFUN([AC_LIB_ANTLR],[ + AC_MSG_CHECKING([for the ANTLR parser generator JAR file]) if test -z "$ANTLR_JAR"; then - AC_REQUIRE([AC_PROG_JAVA])dnl - AC_MSG_CHECKING([for antlr $1.$2.$3 or better]) - for antlr_lib_home in `ls -d /usr/local/share/antlr* 2> /dev/null` /usr/share/antlr/lib /usr/share/java /usr/lib; do - antlr_version_str=`$JAVA -classpath "$antlr_lib_home/antlr.jar" antlr.Tool 2>&1 | head -n 1 | sed '/.*Version */!d; s///;q'` - if test "$antlr_version_str"; then - antlr_version_regex='s/\([[[:digit:]]]\+\)\.\([[[:digit:]]]\+\)\.\([[[:digit:]]]\+\).*$/' - antlr_version_major=`echo $antlr_version_str | sed "$antlr_version_regex\\1/"` - antlr_version_minor=`echo $antlr_version_str | sed "$antlr_version_regex\\2/"` - antlr_version_micro=`echo $antlr_version_str | sed "$antlr_version_regex\\3/"` - (test $antlr_version_major -gt $1 || - (test $antlr_version_major -eq $1 && \ - test $antlr_version_minor -gt $2) || \ - (test $antlr_version_major -eq $1 && \ - test $antlr_version_minor -eq $2 && \ - test $antlr_version_micro -ge $3)) && \ - - (test -z $ANTLR_JAR || \ - (test $antlr_version_major -gt $antlr_use_major || - (test $antlr_version_major -eq $antlr_use_major && \ - test $antlr_version_minor -gt $antlr_use_minor) || \ - (test $antlr_version_major -eq $antlr_use_major && \ - test $antlr_version_minor -eq $antlr_use_minor && \ - test $antlr_version_micro -ge $antlr_use_micro))) && \ - ANTLR_JAR=$antlr_lib_home/antlr.jar && \ - antlr_use_major=$antlr_version_major && \ - antlr_use_minor=$antlr_version_minor && \ - antlr_use_micro=$antlr_version_micro - fi + for antlr_lib_home in `ls -d /usr/local/share/antlr* 2> /dev/null` \ + /usr/share/antlr/lib /usr/share/java /usr/lib; + do + if test -f "$antlr_lib_home/antlr.jar"; then + ANTLR_JAR="$antlr_lib_home/antlr.jar" + break + fi done - else - test -f $ANTLR_JAR || AC_MSG_ERROR([specified ANTLR jar file $ANTLR_JAR not found.]) \ - && AC_MSG_NOTICE([using ANTLR parser generator in $ANTLR_JAR]) fi + test -f $ANTLR_JAR || AC_MSG_ERROR([specified ANTLR jar file $ANTLR_JAR not found.]) \ + && AC_MSG_RESULT([$ANTLR_JAR]) + AC_SUBST(ANTLR_JAR) + AC_PROVIDE([$0])dnl +]) + +AC_DEFUN([AC_PROG_ANTLR],[ + AC_REQUIRE([AC_PROG_JAVA])dnl AC_CHECK_TOOLS([ANTLR], [runantlr antlr]) if test "x$ANTLR" = x; then if test -z "$JAVA"; then @@ -42,10 +27,27 @@ AC_DEFUN([AC_PROG_ANTLR],[ ANTLR="$JAVA -classpath $ANTLR_JAR antlr.Tool" fi fi - test -z "$ANTLR_JAR" && \ - AC_MSG_ERROR(no suitable antlr.jar found for version $1.$2.$3) - AC_MSG_RESULT($antlr_use_major.$antlr_use_minor.$antlr_use_micro) AC_SUBST(ANTLR) - AC_SUBST(ANTLR_JAR) - AC_PROVIDE([$0])dnl + AC_MSG_CHECKING([for antlr $1.$2.$3 or better]) + antlr_version_str=`$ANTLR 2>&1 | head -n 1 | sed '/.*Version */!d; s///;q'` + if test "$antlr_version_str"; then + antlr_version_regex='s/\([[[:digit:]]]\+\)\.\([[[:digit:]]]\+\)\.\([[[:digit:]]]\+\).*$/' + antlr_version_major=`echo $antlr_version_str | sed "$antlr_version_regex\\1/"` + antlr_version_minor=`echo $antlr_version_str | sed "$antlr_version_regex\\2/"` + antlr_version_micro=`echo $antlr_version_str | sed "$antlr_version_regex\\3/"` + (test $antlr_version_major -gt $1 || + (test $antlr_version_major -eq $1 && \ + test $antlr_version_minor -gt $2) || \ + (test $antlr_version_major -eq $1 && \ + test $antlr_version_minor -eq $2 && \ + test $antlr_version_micro -ge $3)) && \ + (test -z $ANTLR_JAR || \ + (test $antlr_version_major -gt $antlr_use_major || + (test $antlr_version_major -eq $antlr_use_major && \ + test $antlr_version_minor -gt $antlr_use_minor) || \ + (test $antlr_version_major -eq $antlr_use_major && \ + test $antlr_version_minor -eq $antlr_use_minor && \ + test $antlr_version_micro -ge $antlr_use_micro))) + fi + AC_MSG_RESULT($antlr_use_major.$antlr_use_minor.$antlr_use_micro) ]) diff --git a/m4/ac_prog_java.m4 b/m4/ac_prog_java.m4 index b0f237d16..356d99d80 100644 --- a/m4/ac_prog_java.m4 +++ b/m4/ac_prog_java.m4 @@ -6,12 +6,12 @@ dnl Changes for GNU Classpath: check for "cacao, jamvm" as well dnl AC_DEFUN([AC_PROG_JAVA],[ AC_REQUIRE([AC_EXEEXT])dnl -if test x$JAVAPREFIX = x; then - test x$JAVA = x && AC_CHECK_PROGS(JAVA, cacao$EXEEXT jamvm$EXEEXT kaffe$EXEEXT gij$EXEEXT java$EXEEXT) +if test "x$JAVAPREFIX" = x; then + test "x$JAVA" = x && AC_CHECK_PROGS(JAVA, cacao$EXEEXT jamvm$EXEEXT kaffe$EXEEXT gij$EXEEXT java$EXEEXT) else - test x$JAVA = x && AC_CHECK_PROGS(JAVA, cacao$EXEEXT jamvm$EXEEXT kaffe$EXEEXT gij$EXEEXT java$EXEEXT, $JAVAPREFIX) + test "x$JAVA" = x && AC_CHECK_PROGS(JAVA, cacao$EXEEXT jamvm$EXEEXT kaffe$EXEEXT gij$EXEEXT java$EXEEXT, $JAVAPREFIX) fi -test x$JAVA = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH]) +test "x$JAVA" = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH]) AC_PROG_JAVA_WORKS AC_PROVIDE([$0])dnl ]) |