diff options
| author | Bruno Haible <bruno@clisp.org> | 2001-11-12 12:25:02 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-21 22:56:46 +0200 |
| commit | 66a0a1b27af006c9522514866541708341cac060 (patch) | |
| tree | 764802d554e694a54c0522304c5fc82895f2a2bd /m4 | |
| parent | b2513dbc613605fe6b4fbea2130d1564dca328f5 (diff) | |
| download | external_gettext-66a0a1b27af006c9522514866541708341cac060.zip external_gettext-66a0a1b27af006c9522514866541708341cac060.tar.gz external_gettext-66a0a1b27af006c9522514866541708341cac060.tar.bz2 | |
Remove an automake-1.4 specific workaround.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/javaexec.m4 | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 3ef153b..aae234e 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2001-11-11 Bruno Haible <haible@clisp.cons.org> + + * javaexec.m4 (gt_JAVAEXEC): Use HAVE_JAVA instead of HAVE_JAVA_JVM. + The problem seen with automake-1.4 is gone with automake-1.5. + 2001-11-05 Bruno Haible <haible@clisp.cons.org> * stdint_h.m4: New file. diff --git a/m4/javaexec.m4 b/m4/javaexec.m4 index 7a00aea..82728cd 100644 --- a/m4/javaexec.m4 +++ b/m4/javaexec.m4 @@ -32,7 +32,7 @@ AC_DEFUN([gt_JAVAEXEC], else if test -n "$HAVE_JAVA_IN_PATH" \ && java -version >/dev/null 2>/dev/null; then - HAVE_JAVA_JVM=1 + HAVE_JAVA=1 ac_result="java" else if test -n "$HAVE_JRE_IN_PATH" \ @@ -57,7 +57,7 @@ AC_DEFUN([gt_JAVAEXEC], AC_SUBST(CLASSPATH) AC_SUBST(CLASSPATH_SEPARATOR) AC_SUBST(HAVE_GIJ) - AC_SUBST(HAVE_JAVA_JVM) + AC_SUBST(HAVE_JAVA) AC_SUBST(HAVE_JRE) AC_SUBST(HAVE_JVIEW) ]) |