diff options
Diffstat (limited to 'libjava/classpath/configure.ac')
| -rw-r--r-- | libjava/classpath/configure.ac | 65 |
1 files changed, 40 insertions, 25 deletions
diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index d2d149fe239..ab72c161c52 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -6,8 +6,9 @@ dnl ----------------------------------------------------------- dnl define([AC_CACHE_LOAD], )dnl dnl define([AC_CACHE_SAVE], )dnl -AC_INIT([GNU Classpath],[0.98],[classpath@gnu.org],[classpath]) +AC_INIT([GNU Classpath],[0.99-pre],[classpath@gnu.org],[classpath]) AC_CONFIG_SRCDIR(java/lang/System.java) +AC_CONFIG_MACRO_DIR([m4]) dnl GCJ LOCAL AC_CONFIG_AUX_DIR(../..) @@ -273,7 +274,7 @@ AC_ARG_ENABLE([qt-peer], AM_CONDITIONAL(CREATE_QT_PEER_LIBRARIES, test "x${COMPILE_QT_PEER}" = xyes) dnl ----------------------------------------------------------- -dnl Plugin (enabled by default) +dnl Plugin (disabled by default) dnl ----------------------------------------------------------- AC_ARG_ENABLE([plugin], [AS_HELP_STRING(--disable-plugin,compile gcjwebplugin (disabled by --disable-plugin) [default=yes])], @@ -282,7 +283,7 @@ AC_ARG_ENABLE([plugin], no) COMPILE_PLUGIN=no ;; *) COMPILE_PLUGIN=yes ;; esac], - [COMPILE_PLUGIN=yes]) + [COMPILE_PLUGIN=no]) AM_CONDITIONAL(CREATE_PLUGIN, test "x${COMPILE_PLUGIN}" = xyes) dnl ----------------------------------------------------------- @@ -424,7 +425,7 @@ dnl ----------------------------------------------------------- dnl Initialize libtool AC_DISABLE_STATIC -AC_PROG_LIBTOOL +LT_INIT AC_PROG_AWK AC_PROG_CC AM_PROG_CC_C_O @@ -739,35 +740,26 @@ if test "x${COMPILE_JNI}" = xyes; then dnl Check for MSG_NOSIGNAL dnl ********************************************************************** AC_MSG_CHECKING(for MSG_NOSIGNAL) - AC_TRY_COMPILE([#include <sys/socket.h>], - [ int f = MSG_NOSIGNAL; ], - [ AC_MSG_RESULT(yes) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[ int f = MSG_NOSIGNAL; ]])],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_MSG_NOSIGNAL, 1, - [Define this symbol if you have MSG_NOSIGNAL]) ], - [ AC_MSG_RESULT(no)] - ) + [Define this symbol if you have MSG_NOSIGNAL]) ],[ AC_MSG_RESULT(no) + ]) dnl ********************************************************************** dnl Check for SO_NOSIGPIPE (Darwin equivalent for MSG_NOSIGNAL) dnl ********************************************************************** AC_MSG_CHECKING(for SO_NOSIGPIPE ) - AC_TRY_COMPILE([#include <sys/socket.h>], - [ int f = SO_NOSIGPIPE; ], - [ AC_MSG_RESULT(yes) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[ int f = SO_NOSIGPIPE; ]])],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SO_NOSIGPIPE, 1, - [Define this symbol if you have SO_NOSIGPIPE]) ], - [ AC_MSG_RESULT(no)] - ) + [Define this symbol if you have SO_NOSIGPIPE]) ],[ AC_MSG_RESULT(no) + ]) dnl ********************************************************************** dnl Check for MSG_WAITALL dnl ********************************************************************** AC_MSG_CHECKING(for MSG_WAITALL) - AC_TRY_COMPILE([#include <sys/socket.h>], - [ int f = MSG_WAITALL; ], - [ AC_MSG_RESULT(yes) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[ int f = MSG_WAITALL; ]])],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_MSG_WAITALL, 1, - [Define this symbol if you have MSG_WAITALL]) ], - [ AC_MSG_RESULT(no)] - ) + [Define this symbol if you have MSG_WAITALL]) ],[ AC_MSG_RESULT(no) + ]) dnl Check for plugin support headers and libraries. if test "x${COMPILE_PLUGIN}" = xyes; then @@ -835,6 +827,22 @@ if test "x${COMPILE_JNI}" = xyes; then fi if test "x${COMPILE_GMP}" = xyes; then + AC_MSG_CHECKING([for GMP directories]) + if test "x$with_gmp" != x; then + gmplibs="-L$with_gmp/lib -lgmp" + gmpinc="-I$with_gmp/include" + if test "x$with_gmp_include" != x; then + gmpinc="-I$with_gmp_include $gmpinc" + fi + if test "x$with_gmp_lib" != x; then + gmplibs="-L$with_gmp_lib $gmplibs" + fi + else + with_gmp="/usr" + gmplibs="-lgmp" + gmpinc="-I/usr/include" + fi + AC_MSG_RESULT([prefix=$with_gmp, libs=$gmplibs, inc=$gmpinc]) AC_CHECK_LIB(gmp, __gmpz_mul_si, [GMP_CFLAGS="$gmpinc" GMP_LIBS="$gmplibs" ], @@ -1044,7 +1052,7 @@ AC_SUBST(PATH_TO_GLIBJ_ZIP) if test "x${TOOLSDIR}" != x; then dnl GCJ LOCAL if test "x${COMPILE_WRAPPERS}" = xno && test "x${enable_java_maintainer_mode}" = xyes; then - AC_PROG_JAVA + AC_PROG_JAVA_WORKS fi dnl END GCJ LOCAL if test "x${COMPILE_GJDOC}" = xyes; then @@ -1063,9 +1071,12 @@ fi if test "x${use_glibj_zip}" = xfalse || \ test "x${EXAMPLESDIR}" != x || \ test "x${TOOLSDIR}" != x && \ - test "x${build_class_files}" != xno; then - AC_PROG_JAVAC + test "x${build_class_files}" != xno && \ + test "${enable_java_maintainer_mode}" = yes; then dnl GCJ_LOCAL + AC_PROG_JAVAC_WORKS CLASSPATH_JAVAC_MEM_CHECK +else + AM_CONDITIONAL(GCJ_JAVAC, no) fi dnl ----------------------------------------------------------- @@ -1232,3 +1243,7 @@ cat ${srcdir}/lib/standard.omit.in > lib/standard.omit if test x$use_escher != xtrue; then echo gnu/java/awt/peer/x/.*java$ >> lib/standard.omit fi + +if test "x${COMPILE_PLUGIN}" = "xyes" ; then + AC_MSG_WARN([You have enabled the browser plugin. Please note that this is no longer maintained as part of GNU Classpath; development has moved to the IcedTea project.]) +fi |
