summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2008-06-05 21:32:03 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2008-06-05 21:32:03 +0000
commit070b8f7b02574cf5bb19ab6813092020ede391d7 (patch)
tree63499bd78e9349b22f62a35241fe06b9cef91782
parent8f24da8bef52a21f8b18d0883fb9514ff5f8b138 (diff)
downloadclasspath-070b8f7b02574cf5bb19ab6813092020ede391d7.tar.gz
Final fix for the native-only build.
2008-06-05 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Check for --with-glibj too when disabling the javac check.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a7b44bbb..4f9784167 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-05 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * configure.ac:
+ Check for --with-glibj too when disabling
+ the javac check.
+
2008-06-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/getopt/OptionException.java:
diff --git a/configure.ac b/configure.ac
index 391e4c486..9bf4266ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -889,8 +889,9 @@ AC_SUBST(PATH_TO_GLIBJ_ZIP)
# the examples or the tools
if test "x${use_glibj_zip}" = xfalse || \
test "x${EXAMPLESDIR}" != x || \
- test "x${TOOLSDIR}" != x; then
- AC_PROG_JAVAC
+ test "x${TOOLSDIR}" != x && \
+ test "x${build_class_files}" != xno; then
+ AC_PROG_JAVAC
CLASSPATH_JAVAC_MEM_CHECK
fi