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
46 lines
1.3 KiB
Plaintext
46 lines
1.3 KiB
Plaintext
dnl @synopsis AC_PROG_JAVAC_WORKS
|
|
dnl
|
|
dnl Internal use ONLY.
|
|
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 test for 1.5 by Andrew John Hughes on 2008-02-11
|
|
|
|
AC_DEFUN([AC_PROG_JAVAC_WORKS],[
|
|
AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [
|
|
JAVA_TEST=Object.java
|
|
CLASS_TEST=Object.class
|
|
cat << \EOF > $JAVA_TEST
|
|
/* [#]line __oline__ "configure" */
|
|
package java.lang;
|
|
|
|
public class Object
|
|
{
|
|
static <T> void doStuff()
|
|
{
|
|
}
|
|
}
|
|
EOF
|
|
dnl GCJ LOCAL: don't call JAVAC with $JAVACFLAGS -source 1.5 -target 1.5
|
|
if AC_TRY_COMMAND($JAVAC $JAVA_TEST) >/dev/null 2>&1; then
|
|
ac_cv_prog_javac_works=yes
|
|
else
|
|
AC_MSG_ERROR([The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)])
|
|
echo "configure: failed program was:" >&AC_FD_CC
|
|
cat $JAVA_TEST >&AC_FD_CC
|
|
fi
|
|
rm -f $JAVA_TEST $CLASS_TEST
|
|
])
|
|
AC_PROVIDE([$0])dnl
|
|
])
|