e0441a5bfb
libjava/
2008-06-28 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (classpath-0_97_2-release).
* Regenerate class and header files.
* Regenerate auto* files.
* gcj/javaprims.h: Define jobjectRefType.
* jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
(_Jv_JNIFunctions): Initialize GetObjectRefType.
* gnu/classpath/jdwp/VMVirtualMachine.java,
java/security/VMSecureRandom.java: Merge from classpath.
* HACKING: Fix typo.
* ChangeLog-2007: New file.
* configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.
libjava/classpath/
2008-06-28 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Disable check for JAVAC, when
not configured with --enable-java-maintainer-mode.
* aclocal.m4, configure: Regenerate.
* native/jni/gstreamer-peer/Makefile.am: Do not link with
libclasspathnative.
* native/jni/gstreamer-peer/Makefile.in: Regenerate.
* tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
JCOMPILER, drop flags not understood by gcj.
From-SVN: r137223
52 lines
2.2 KiB
Plaintext
52 lines
2.2 KiB
Plaintext
dnl @synopsis AC_PROG_JAVAC
|
|
dnl
|
|
dnl AC_PROG_JAVAC tests an existing Java compiler. It uses the
|
|
dnl environment variable JAVAC then tests in sequence various common
|
|
dnl Java compilers. For political reasons, it starts with the free
|
|
dnl ones.
|
|
dnl
|
|
dnl If you want to force a specific compiler:
|
|
dnl
|
|
dnl - at the configure.in level, set JAVAC=yourcompiler before calling
|
|
dnl AC_PROG_JAVAC
|
|
dnl
|
|
dnl - at the configure level, setenv JAVAC
|
|
dnl
|
|
dnl You can use the JAVAC variable in your Makefile.in, with @JAVAC@.
|
|
dnl
|
|
dnl *Warning*: its success or failure can depend on a proper setting of
|
|
dnl the CLASSPATH env. variable.
|
|
dnl
|
|
dnl TODO: allow to exclude compilers (rationale: most Java programs
|
|
dnl cannot compile with some compilers like guavac).
|
|
dnl
|
|
dnl Note: This is part of the set of autoconf M4 macros for Java
|
|
dnl programs. It is VERY IMPORTANT that you download the whole set,
|
|
dnl some macros depend on other. Unfortunately, the autoconf archive
|
|
dnl does not support the concept of set of macros, so I had to break it
|
|
dnl for submission. The general documentation, as well as the sample
|
|
dnl configure.in, is included in the AC_PROG_JAVA macro.
|
|
dnl
|
|
dnl @category Java
|
|
dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
|
|
dnl @version 2000-07-19
|
|
dnl @license GPLWithACException
|
|
dnl
|
|
dnl Modified to remove jikes by Andrew John Hughes on 2008-02-11
|
|
|
|
AC_DEFUN([AC_PROG_JAVAC],[
|
|
AC_REQUIRE([AC_EXEEXT])dnl
|
|
if test "x$JAVAPREFIX" = x; then
|
|
test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, ["ecj$EXEEXT -warn:-deprecation,serial,unusedImport"] ["ecj-3.3$EXEEXT -warn:-deprecation,serial,unusedImport"] ["ecj-3.2$EXEEXT -warn:-deprecation,serial,unusedImport"] ["javac$EXEEXT -Xlint:unchecked"] "gcj$EXEEXT -C")
|
|
else
|
|
test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, ["ecj$EXEEXT -warn:-deprecation,serial,unusedImport"] ["ecj-3.3$EXEEXT -warn:-deprecation,serial,unusedImport"] ["ecj-3.2$EXEEXT -warn:-deprecation,serial,unusedImport"] ["javac$EXEEXT -Xlint:unchecked"] "gcj$EXEEXT -C", $JAVAPREFIX)
|
|
fi
|
|
test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH])
|
|
dnl GCJ LOCAL
|
|
if test "$enable_java_maintainer_mode" = yes; then
|
|
AC_PROG_JAVAC_WORKS
|
|
fi
|
|
dnl END GCJ LOCAL
|
|
AC_PROVIDE([$0])dnl
|
|
])
|