diff options
| author | Matthias Klose <doko@ubuntu.com> | 2008-10-20 21:12:12 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2008-10-20 21:12:12 +0000 |
| commit | c35f3a3e0f55d91f1773d90e6da5b16677d75d38 (patch) | |
| tree | 84b1f0dce045b9af16bd495ba302822ed5969261 | |
| parent | 78fca0aec6d69e8da8d833af490f743149fe52e5 (diff) | |
2008-10-20 Matthias Klose <doko@ubuntu.com>
* configure.ac: Fix path name in check for generated gjdoc parser files.
* configure: Regenerate.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcj/classpath-098-merge-branch@141247 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 5 | ||||
| -rwxr-xr-x | libjava/classpath/configure | 2 | ||||
| -rw-r--r-- | libjava/classpath/configure.ac | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index aba089ef4bf..c2ca24426e4 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,5 +1,10 @@ 2008-10-20 Matthias Klose <doko@ubuntu.com> + * configure.ac: Fix path name in check for generated gjdoc parser files. + * configure: Regenerate. + +2008-10-20 Matthias Klose <doko@ubuntu.com> + * configure.ac: Don't check for working java, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. diff --git a/libjava/classpath/configure b/libjava/classpath/configure index 4caa040d137..c20d6914321 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -4920,7 +4920,7 @@ if test "${enable_regen_gjdoc_parser+set}" = set; then *) REGENERATE_GJDOC_PARSER=yes ;; esac else - if test -e ${srcdir}/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java; then + if test -e ${srcdir}/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java; then REGENERATE_GJDOC_PARSER=no ; else REGENERATE_GJDOC_PARSER=yes ; diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index 93ad1763fff..dcc1ee9f36f 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -387,7 +387,7 @@ AC_ARG_ENABLE([regen-gjdoc-parser], no) REGENERATE_GJDOC_PARSER=no ;; *) REGENERATE_GJDOC_PARSER=yes ;; esac], - [if test -e ${srcdir}/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java; then + [if test -e ${srcdir}/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java; then REGENERATE_GJDOC_PARSER=no ; else REGENERATE_GJDOC_PARSER=yes ; |