diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-11 21:37:48 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-11 21:37:48 +0000 |
| commit | 48aa4cbbe95580832414644c0138efafbee6c9f5 (patch) | |
| tree | cb6ee0b1ef899799bfb4da6e0e57d855eaa0e6c4 | |
| parent | 3aaea725c6359443ef44b5e752a74f6b2905e377 (diff) | |
| download | classpath-48aa4cbbe95580832414644c0138efafbee6c9f5.tar.gz | |
Forwardport native-only build fix #05.
2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* 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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | scripts/check_jni_methods.sh.in | 2 |
3 files changed, 19 insertions, 4 deletions
@@ -1,5 +1,14 @@ 2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org> + * 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. + +2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org> + * lib/Makefile.am: Replace explicit mkinstalldirs with $(mkinstalldirs). diff --git a/configure.ac b/configure.ac index 7ec0a5138..a9cdab003 100644 --- a/configure.ac +++ b/configure.ac @@ -776,9 +776,6 @@ if test "x${COMPILE_JNI}" = xyes; then AC_CONFIG_LINKS([$ac_config_links_1]) fi -AC_PROG_JAVAC -CLASSPATH_JAVAC_MEM_CHECK - CLASSPATH_WITH_CLASSLIB dnl ----------------------------------------------------------- @@ -930,6 +927,15 @@ esac; 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 ----------------------------------------------------------- diff --git a/scripts/check_jni_methods.sh.in b/scripts/check_jni_methods.sh.in index 835f7b4b1..2a114d340 100644 --- a/scripts/check_jni_methods.sh.in +++ b/scripts/check_jni_methods.sh.in @@ -11,7 +11,7 @@ TMPFILE3=/tmp/check-jni-methods.$$.3 # 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 | \ |