diff options
| author | Mark Wielaard <mark@gcc.gnu.org> | 2006-01-17 18:09:40 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2006-01-17 18:09:40 +0000 |
| commit | 2127637945ea6b763966398130e0770fa993c860 (patch) | |
| tree | c976ca91e3ef0bda3b34b37c0195145638d8d08e /libjava/classpath/configure.ac | |
| parent | bcb36c3e02e3bd2843aad1b9888513dfb5d6e337 (diff) | |
| download | gcc-2127637945ea6b763966398130e0770fa993c860.zip gcc-2127637945ea6b763966398130e0770fa993c860.tar.gz gcc-2127637945ea6b763966398130e0770fa993c860.tar.bz2 | |
Imported GNU Classpath 0.20
Imported GNU Classpath 0.20
* Makefile.am (AM_CPPFLAGS): Add classpath/include.
* java/nio/charset/spi/CharsetProvider.java: New override file.
* java/security/Security.java: Likewise.
* sources.am: Regenerated.
* Makefile.in: Likewise.
From-SVN: r109831
Diffstat (limited to 'libjava/classpath/configure.ac')
| -rw-r--r-- | libjava/classpath/configure.ac | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index c7eacca..d9e442c 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -6,7 +6,7 @@ dnl ----------------------------------------------------------- dnl define([AC_CACHE_LOAD], )dnl dnl define([AC_CACHE_SAVE], )dnl -AC_INIT([GNU Classpath],[0.20-pre],[classpath@gnu.org],[classpath]) +AC_INIT([GNU Classpath],[0.20],[classpath@gnu.org],[classpath]) AC_CONFIG_SRCDIR(java/lang/System.java) AC_CANONICAL_TARGET @@ -274,7 +274,8 @@ if test "x${COMPILE_JNI}" = xyes; then localtime_r \ strerror_r \ fcntl \ - mmap munmap mincore msync madvise getpagesize sysconf]) + mmap munmap mincore msync madvise getpagesize sysconf \ + isnan]) AC_HEADER_TIME AC_STRUCT_TM @@ -370,7 +371,7 @@ if test "x${COMPILE_JNI}" = xyes; then dnl Check for AWT related Qt4 if test "x${COMPILE_QT_PEER}" = xyes; then - PKG_CHECK_MODULES(QT, QtGui >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no") + PKG_CHECK_MODULES(QT, QtCore QtGui >= 4.1.0, HAVE_QT4="yes", HAVE_QT4="no") if test "x$HAVE_QT4" = "xyes"; then dnl Check needed because in some cases the QtGui includedir dnl doesn't contain the subsystem dir. @@ -560,6 +561,8 @@ AC_ARG_ENABLE([portable-native-sync], esac], []) +AX_CREATE_STDINT_H([include/config-int.h]) + dnl ----------------------------------------------------------- dnl output files dnl ----------------------------------------------------------- |