[cp-patches] [release] FYI: Allow native-only build #05: Only check for javac if needed

[Andrew John Hughes]

This stops the check for javac/ecj if neither the class libraries,
examples or tools are being built.

ChangeLog:

2008-06-01  Andrew John Hughes  <[EMAIL PROTECTED]>

        * configure.ac: Only run javac check
        if examples, tools and/or class library are
        being built.
        * scripts/check_jni_methods.sh.in:
        Remove duplicates in the list of JNI methods
        for when builddir==srcdir.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8

Index: configure.ac
===================================================================
RCS file: /sources/classpath/classpath/configure.ac,v
retrieving revision 1.225.2.2
diff -u -u -r1.225.2.2 configure.ac
--- configure.ac        1 Jun 2008 17:16:50 -0000       1.225.2.2
+++ configure.ac        1 Jun 2008 21:58:53 -0000
@@ -728,9 +728,6 @@
   AC_CONFIG_LINKS([$ac_config_links_1])
 fi
 
-AC_PROG_JAVAC
-CLASSPATH_JAVAC_MEM_CHECK
-
 CLASSPATH_WITH_CLASSLIB
 
 dnl -----------------------------------------------------------
@@ -882,6 +879,15 @@
 AM_CONDITIONAL(USE_PREBUILT_GLIBJ_ZIP, test x$use_glibj_zip = xtrue)
 AC_SUBST(PATH_TO_GLIBJ_ZIP)
 
+# Check for javac if we need to build either the class library,
+# the examples or the tools
+if test "x${use_glibj_zip}" = xfalse || \
+   test "x${EXAMPLESDIR}" != x || \
+   test "x${TOOLSDIR}" != x; then
+       AC_PROG_JAVAC
+       CLASSPATH_JAVAC_MEM_CHECK
+fi
+
 dnl -----------------------------------------------------------
 dnl Build with Escher based X peers.
 dnl -----------------------------------------------------------
Index: scripts/check_jni_methods.sh.in
===================================================================
RCS file: /sources/classpath/classpath/scripts/check_jni_methods.sh.in,v
retrieving revision 1.3.2.1
diff -u -u -r1.3.2.1 check_jni_methods.sh.in
--- scripts/check_jni_methods.sh.in     1 Jun 2008 20:51:12 -0000       1.3.2.1
+++ scripts/check_jni_methods.sh.in     1 Jun 2008 21:59:07 -0000
@@ -11,7 +11,7 @@
 # from the java source files.
 grep -h '^JNIEXPORT .* Java_' @abs_top_builddir@/include/*.h 
@abs_top_srcdir@/include/*.h | \
         LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' | \
-       sort > $TMPFILE
+       sort -u > $TMPFILE
 
 # Find all methods in the JNI C source files.
 find @abs_top_srcdir@/native/jni -name \*.c | \