case "$host_os" in
*darwin* )
OS_DIR="darwin"
+ INTRP_CFLAGS="$CFLAGS -D__DARWIN__ -Wall -Wno-long-long"
CFLAGS="$CFLAGS -D__DARWIN__ -ansi -pedantic -Wall -Wno-long-long"
;;
*freebsd* )
OS_DIR="freebsd"
+ INTRP_CFLAGS="$CFLAGS -D__FREEBSD__ -Wall -Wno-long-long -D_XOPEN_SOURCE_EXTENDED"
CFLAGS="$CFLAGS -D__FREEBSD__ -ansi -pedantic -Wall -Wno-long-long -D_XOPEN_SOURCE_EXTENDED"
;;
*irix* )
OS_DIR="irix"
+ INTRP_CFLAGS="$CFLAGS -D__IRIX__"
CFLAGS="$CFLAGS -D__IRIX__"
;;
*linux* | *Linux* )
OS_DIR="linux"
+ INTRP_CFLAGS="$CFLAGS -D__LINUX__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
CFLAGS="$CFLAGS -D__LINUX__ -ansi -pedantic -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
;;
*netbsd* )
OS_DIR="netbsd"
+ INTRP_CFLAGS="$CFLAGS -D__NETBSD__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
CFLAGS="$CFLAGS -D__NETBSD__ -ansi -pedantic -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
;;
AC_DEFINE_UNQUOTED([ARCH_DIR], "${ARCH_DIR}", [architecture directory])
AC_SUBST(ARCH_DIR)
AC_SUBST(OS_DIR)
+AC_SUBST(INTRP_CFLAGS)
AC_SUBST(USE_SCHEDULER)
dnl check for statistics
AC_MSG_CHECKING(whether statistics generation should be enabled)
AC_ARG_ENABLE([statistics],
- [AS_HELP_STRING(--disable-statistics,disable statistics generation [[default=yes]])],
+ [AS_HELP_STRING(--enable-statistics,enable statistics generation [[default=no]])],
[case "${enableval}" in
- no) ENABLE_STATISTICS=no;;
- *) ENABLE_STATISTICS=yes;;
+ yes) ENABLE_STATISTICS=yes;;
+ *) ENABLE_STATISTICS=no;;
esac],
- [ENABLE_STATISTICS=yes])
+ [ENABLE_STATISTICS=no])
AC_MSG_RESULT(${ENABLE_STATISTICS})
AM_CONDITIONAL([ENABLE_STATISTICS], test x"${ENABLE_STATISTICS}" = "xyes")
enable_threads=${enable_threads:-native}
case "$enable_threads" in
no | none | single)
- AC_MSG_RESULT(no)
- dnl no threads for boehm
- ac_configure_args="$ac_configure_args --disable-boehm-threads"
- AM_CONDITIONAL([USE_THREADS], [false])
- AM_CONDITIONAL([NATIVE_THREADS], [false])
- ;;
-
-green | native | posix | pthreads)
- AC_DEFINE([USE_THREADS], 1, [use threads])
-
- AM_CONDITIONAL([USE_THREADS], [true])
-
- if test x"$enable_threads" != "xgreen"; then
- AC_MSG_RESULT(yes, native)
- AC_CHECK_LIB(pthread, main)
- AC_DEFINE([NATIVE_THREADS], 1, [use pthreads])
-
- CFLAGS="$CFLAGS -D_REENTRANT"
-
- dnl tell boehm to support threads as well
- ac_configure_args="$ac_configure_args --enable-boehm-threads=posix"
- AM_CONDITIONAL([NATIVE_THREADS], [true])
-
- else
- AC_MSG_RESULT(yes, green)
+ AC_MSG_RESULT(no)
+ dnl no threads for boehm
+ ac_configure_args="$ac_configure_args --disable-boehm-threads"
+ AM_CONDITIONAL([ENABLE_THREADS], [false])
+ ;;
- dnl no threads for boehm
- ac_configure_args="$ac_configure_args --disable-boehm-threads"
- AM_CONDITIONAL([NATIVE_THREADS], [false])
- fi
+native | posix | pthreads)
+ AC_DEFINE([ENABLE_THREADS], 1, [enable threads])
+
+ AM_CONDITIONAL([ENABLE_THREADS], [true])
+
+ AC_MSG_RESULT(yes, native)
+ AC_CHECK_LIB(pthread, main)
+
+ CFLAGS="$CFLAGS -D_REENTRANT"
+
+ dnl tell boehm to support threads as well
+ ac_configure_args="$ac_configure_args --enable-boehm-threads=posix"
;;
+
*)
AC_MSG_ERROR($enable_threads is an unknown thread package)
;;
dnl check for inlining
AC_MSG_CHECKING(whether method inlining should be supported)
AC_ARG_ENABLE([inlining],
- [AS_HELP_STRING(--disable-inlining,disable method inlining [[default=yes]])],
+ [AS_HELP_STRING(--enable-inlining,enable method inlining [[default=no]])],
[case "${enableval}" in
- no) ENABLE_INLINING=no;;
- *) ENABLE_INLINING=yes;;
+ yes) ENABLE_INLINING=yes;;
+ *) ENABLE_INLINING=no;;
esac],
- [ENABLE_INLINING=yes])
+ [ENABLE_INLINING=no])
AC_MSG_RESULT(${ENABLE_INLINING})
AM_CONDITIONAL([ENABLE_INLINING], test x"${ENABLE_INLINING}" = "xyes")
dnl check if linear scan register allocator(lsra) should be used
AC_MSG_CHECKING(whether lsra should be supported)
AC_ARG_ENABLE([lsra],
- [AS_HELP_STRING(--disable-lsra,disable linear scan register allocator [[default=yes]])],
+ [AS_HELP_STRING(--enable-lsra,enable linear scan register allocator [[default=no]])],
[case "${enableval}" in
- no) ENABLE_LSRA=no;;
- *) ENABLE_LSRA=yes;;
+ yes) ENABLE_LSRA=yes;;
+ *) ENABLE_LSRA=no;;
esac],
- [ENABLE_LSRA=yes])
+ [ENABLE_LSRA=no])
AC_MSG_RESULT(${ENABLE_LSRA})
AM_CONDITIONAL([ENABLE_LSRA], test x"${ENABLE_LSRA}" = "xyes")
AC_DEFINE_UNQUOTED([CLASSPATH_LIBDIR], "${CLASSPATH_LIBDIR}", [GNU Classpath libraries installation directory])
AC_SUBST(CLASSPATH_LIBDIR)
-AC_CHECK_HEADER([${CLASSPATH_PREFIX}/include/jni.h],
- [AC_DEFINE_UNQUOTED([CLASSPATH_JNI_H], "${CLASSPATH_PREFIX}/include/jni.h", [GNU Classpath jni.h header])],
+AC_MSG_CHECKING(where GNU Classpath headers are installed)
+AC_ARG_WITH([classpath-includedir],
+ [AS_HELP_STRING(--with-classpath-includedir=<dir>,installation directory of GNU Classpath headers [[default=/usr/local/classpath/include]])],
+ [CLASSPATH_INCLUDEDIR=${withval}],
+ [CLASSPATH_INCLUDEDIR=${CLASSPATH_PREFIX}/include])
+AC_MSG_RESULT(${CLASSPATH_INCLUDEDIR})
+
+AC_CHECK_HEADER([${CLASSPATH_INCLUDEDIR}/jni.h],
+ [AC_DEFINE_UNQUOTED([CLASSPATH_JNI_H], "${CLASSPATH_INCLUDEDIR}/jni.h", [GNU Classpath jni.h header])],
[AC_MSG_ERROR(cannot find jni.h)])
[src/native/tools/Makefile]
[src/native/vm/Makefile]
[src/scripts/Makefile]
+ [src/scripts/jarsigner]
[src/scripts/java]
+ [src/scripts/keytool]
+ [src/scripts/rmic]
[src/scripts/rmiregistry]
[src/threads/Makefile]
- [src/threads/green/Makefile]
[src/threads/native/Makefile]
[src/toolbox/Makefile]
[src/vm/Makefile]