some java fixes for Per

diff --git a/ChangeLog b/ChangeLog
index 2558d3f627d7b3929b7d5ed875227ffd6f3654c4..7a099103ec2a91d83d6d0be273962a7600505cb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Thu Mar 19 01:33:35 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_java): Use $(JAVAROOT) in place of `../..'
+       in default CLASSPATH.
+       (am_install_var): Allow `JAVA' variable to be defined.  Don't
+       define `JAVA' primary.
+
        * automake.in (scan_one_configure_file): Check for `sinclude' and
        turn into recursive call.
 

diff --git a/automake.in b/automake.in
index 150934a50a384e216be72c181d049ba3949376dc..fb39ff8f6dd1561da23f92a55c5c148a5bd7fc66 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3884,7 +3884,7 @@ sub handle_java
     &define_variable ('JAVAC', 'javac');
     &define_variable ('JAVACFLAGS', '');
     &define_variable ('CLASSPATH_ENV',
-                     'CLASSPATH=../..:$(srcdir)/../..:$$CLASSPATH');
+                     'CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT):$$CLASSPATH');
     &define_variable ('JAVAROOT', '$(top_builddir)');
 
     local (%valid) = &am_primary_prefixes ('JAVA', 'java', 'noinst', 'check');
@@ -5785,9 +5785,11 @@ sub am_install_var
     local (@result) = ();
 
     # Now that configure substitutions are allowed in where_HOW
-    # variables, it is an error to actually define the primary.
+    # variables, it is an error to actually define the primary.  We
+    # allow `JAVA', as it is customarily used to mean the Java
+    # interpreter.  This is but one of several Java hacks.
     &am_line_error ($primary, "\`$primary' is an anachronism")
-       if &variable_defined ($primary);
+       if &variable_defined ($primary) && $primary ne 'JAVA';
 
 
     # Look for misspellings.  It is an error to have a variable ending
@@ -5962,7 +5964,8 @@ sub am_install_var
        }
     }
 
-    if (@used)
+    # The JAVA variable is used as the name of the Java interpreter.
+    if (@used && $primary ne 'JAVA')
     {
        # Define it.
        &define_pretty_variable ($primary, '', @used);

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 76b3641c0f5b9dec21e2f3de5c6383c885099513..708f7df628639a788ffbeca9b293b451820c9114 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,7 @@
 Thu Mar 19 14:11:45 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * javaprim.test: New file.
+
        * sinclude.test: New file.
 
 Wed Mar 18 17:15:22 1998  Tom Tromey  <tromey@cygnus.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ea9cc2db958945e3e9d0e27cdbce2d48e9c3e18f..b49e749790e5c1a0a71c269d3b8e4a329cc38b18 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -29,7 +29,7 @@ xsource.test libobj6.test depend3.test output5.test ammissing.test \
 install.test libobj7.test objc.test cond3.test cxxcpp.test \
 aclocal.test alpha.test whoami.test unused.test condman.test \
 texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \
-java.test sinclude.test
+java.test sinclude.test javaprim.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/javaprim.test b/tests/javaprim.test
new file mode 100755 (executable)
index 0000000..2b37ace
--- /dev/null
+++ b/tests/javaprim.test
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+# Test to make sure JAVA variable can be defined.
+
+. $srcdir/defs || exit 1
+
+echo 'AC_SUBST(JAVA)' >> configure.in
+
+cat > Makefile.am << 'END'
+javadir = $(datadir)/java
+java_JAVA = a.java b.java c.java
+END
+
+$AUTOMAKE || exit 1