X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=41853414f0d10090f961bea259247713ae1116c5;hb=4490ae80a2bce8b8e404fc8a63372bd3b71ebd9e;hp=685d4d4cd36e2bdf4794b2c00a2887cabb340c67;hpb=c7d5c92968f36d38301dfde11dc6a90111b418c8;p=cacao.git

diff --git a/configure.ac b/configure.ac
index 685d4d4cd..41853414f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,9 @@ dnl 02110-1301, USA.
 dnl Process this file with autoconf to produce a configure script.
 
 
-AC_INIT(cacao, 1.1.0pre, cacao@cacaojvm.org)
+AC_INIT(cacao, 1.1.0pre1, cacao@cacaojvm.org)
 AC_CONFIG_SRCDIR(src/cacao/cacao.cpp)
+AC_CONFIG_AUX_DIR([.])
 AC_CANONICAL_HOST
 AC_PREREQ(2.59)
 AM_INIT_AUTOMAKE([1.9.0 dist-bzip2 tar-ustar])
@@ -35,20 +36,7 @@ AM_CONFIG_HEADER([config.h])
 AC_PREFIX_DEFAULT(/usr/local/cacao)
 
 
-dnl Set optimization and debugging for all architectures and systems.
-if test x"$CFLAGS" = "x"; then
-    OPT_CFLAGS="-g -O0"
-else
-    OPT_CFLAGS=$CFLAGS
-fi
-
-if test x"$CXXFLAGS" = "x"; then
-    OPT_CXXFLAGS="-g -O0"
-else
-    OPT_CXXFLAGS=$CXXFLAGS
-fi
-
-dnl system type
+dnl Host CPU type.
 case "$host_cpu" in
 alpha | alphaev56 | alphapca56 )
     ARCH_DIR="alpha"
@@ -56,7 +44,7 @@ alpha | alphaev56 | alphapca56 )
     JAVA_ARCH="alpha"
     ;;
 
-arm | armv4 | armv4tl | armv5b | armv5l | armv5tel | armv5tejl )
+arm | armv4* | armv5* | armv6* )
     ARCH_DIR="arm"
     ARCH_FLAGS="-D__ARM__"
     JAVA_ARCH="arm"
@@ -80,13 +68,18 @@ m68k )
     JAVA_ARCH="m68k"
     ;;
 
-mips | mipsel )
+mips )
     ARCH_DIR="mips"
     ARCH_FLAGS="-D__MIPS__"
-    dnl Is this correct for mipsel?
     JAVA_ARCH="mips"
     ;;
 
+mipsel )
+    ARCH_DIR="mips"
+    ARCH_FLAGS="-D__MIPS__"
+    JAVA_ARCH="mipsel"
+    ;;
+
 powerpc )
     ARCH_DIR="powerpc"
     ARCH_FLAGS="-m32 -D__POWERPC__"
@@ -126,25 +119,22 @@ xdspcore )
     ;;
 
 * )
-    AC_MSG_ERROR($host_cpu systems are not supported at this time)
+    AC_MSG_ERROR([$host_cpu systems are currently not supported.])
     ;;
 esac
 
-dnl host type
+
+dnl Host operating system type.
 case "$host_os" in
 *cygwin* )
     OS_DIR="cygwin"
     OS_FLAGS="-D__WINDOWS__ -D__CYGWIN__"
-    CC_FLAGS="-std=c99 -pedantic -Wall -Wno-long-long"
-    CXX_FLAGS="-std=c++98 -pedantic -Wall -Wno-long-long"
     INTRP_CFLAGS="-Wall -Wno-long-long $ARCH_FLAGS $OS_FLAGS"
     ;;
 
 *darwin* )
     OS_DIR="darwin"
     OS_FLAGS="-D__DARWIN__"
-    CC_FLAGS="-std=c99 -pedantic -Wall -Wno-long-long"
-    CXX_FLAGS="-std=c++98 -pedantic -Wall -Wno-long-long"
     INTRP_CFLAGS="-Wall -Wno-long-long $ARCH_FLAGS $OS_FLAGS"
     ;;
 
@@ -152,24 +142,18 @@ dnl Must be BEFORE *freebsd*.
 *kfreebsd*-gnu)
     OS_DIR="freebsd"
     OS_FLAGS="-D__FREEBSD__ -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
-    CC_FLAGS="-std=c99 -pedantic -Wall -Wno-long-long"
-    CXX_FLAGS="-std=c++98 -pedantic -Wall -Wno-long-long"
     INTRP_CFLAGS="-Wall -Wno-long-long $ARCH_FLAGS $OS_FLAGS"
     ;;
 
 *freebsd* )
     OS_DIR="freebsd"
     OS_FLAGS="-D__FREEBSD__ -D_XOPEN_SOURCE_EXTENDED"
-    CC_FLAGS="-std=c99 -pedantic -Wall -Wno-long-long"
-    CXX_FLAGS="-std=c++98 -pedantic -Wall -Wno-long-long"
     INTRP_CFLAGS="-Wall -Wno-long-long $ARCH_FLAGS $OS_FLAGS"
     ;;
 
 *irix* )
     OS_DIR="irix"
     OS_FLAGS="-D__IRIX__"
-    CC_FLAGS=""
-    CXX_FLAGS=""
     INTRP_CFLAGS="$ARCH_FLAGS $OS_FLAGS"
     ;;
 
@@ -177,24 +161,18 @@ dnl Must be BEFORE *linux*.
 *uclinux | *elf )
     OS_DIR="uclinux"
     OS_FLAGS="-D__LINUX__ -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
-    CC_FLAGS="-std=c99 -pedantic -Wall -Wno-long-long"
-    CXX_FLAGS="-std=c++98 -pedantic -Wall -Wno-long-long"
     INTRP_CFLAGS="-Wall -Wno-long-long $ARCH_FLAGS $OS_FLAGS"
     ;;
 
 *linux* | *Linux* )
     OS_DIR="linux"
     OS_FLAGS="-D__LINUX__ -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
-    CC_FLAGS="-std=c99 -pedantic -Wall -Wno-long-long"
-    CXX_FLAGS="-std=c++98 -pedantic -Wall -Wno-long-long"
     INTRP_CFLAGS="-Wall -Wno-long-long $ARCH_FLAGS $OS_FLAGS"
     ;;
 
 *netbsd* )
     OS_DIR="netbsd"
     OS_FLAGS="-D__NETBSD__ -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
-    CC_FLAGS="-std=c99 -pedantic -Wall -Wno-long-long"
-    CXX_FLAGS="-std=c++98 -pedantic -Wall -Wno-long-long"
     INTRP_CFLAGS="-Wall -Wno-long-long $ARCH_FLAGS $OS_FLAGS"
     ;;
 
@@ -204,18 +182,64 @@ dnl Must be BEFORE *linux*.
     dnl not set when cpp is called with -std=c99, therefore we add them
     dnl here.
     OS_FLAGS="-D__SOLARIS__ -D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__ -D_BSD_SOURCE"
-    CC_FLAGS="-std=c99 -pedantic -Wall -Wno-long-long -D_XOPEN_SOURCE=600"
-    CXX_FLAGS="-std=c++98 -pedantic -Wall -Wno-long-long"
+    CC_FLAGS="-D_XOPEN_SOURCE=600"
+    CXX_FLAGS="-D_XOPEN_SOURCE=500"
     INTRP_CFLAGS="-Wall -Wno-long-long $ARCH_FLAGS $OS_FLAGS"
     ;;
 
 * )
+    AC_MSG_ERROR([$host_os operating systems are currently not supported.])
     ;;
 esac
 
 
-dnl temporary set the CFLAGS for configure tests (e.g. inline keyword)
-dnl we set it properly at the end of this file
+dnl Set optimization and debugging for all architectures and systems.
+dnl NOTE: Setting the CFLAGS/CXXFLAGS only works before calling AC_PROG_CC/AC_PROG_CXX.
+if test x"$CFLAGS" = "x"; then
+    OPT_CFLAGS="-g -O2"
+else
+    OPT_CFLAGS=$CFLAGS
+fi
+OPT_CFLAGS="$OPT_CFLAGS -fno-strict-aliasing"
+
+if test x"$CXXFLAGS" = "x"; then
+    OPT_CXXFLAGS="-g -O2"
+else
+    OPT_CXXFLAGS=$CXXFLAGS
+fi
+OPT_CXXFLAGS="$OPT_CXXFLAGS -fno-strict-aliasing"
+
+dnl Check for compiler.
+AC_PROG_CC
+AC_PROG_CXX
+
+dnl Check compiler vendor.
+AX_COMPILER_VENDOR
+
+dnl Set compiler flags depending on the compiler vendor.
+case "$ax_cv_c_compiler_vendor" in
+gnu )
+    CC_FLAGS="-std=c99 -pedantic -Wall -Wno-long-long $CC_FLAGS"
+    CXX_FLAGS="-std=c++98 -pedantic -Wall -Wno-long-long $CXX_FLAGS"
+    ;;
+
+sgi )
+    CC_FLAGS="-c99 $CC_FLAGS"
+    CXX_FLAGS="$CXX_FLAGS"
+    ;;
+
+sun )
+    CC_FLAGS="-xc99 $CC_FLAGS"
+    CXX_FLAGS="$CXX_FLAGS"
+    ;;
+
+* )    
+    AC_MSG_ERROR([$ax_cv_c_compiler_vendor compilers are currently not supported.])
+    ;;
+esac
+
+dnl Temporary set the CFLAGS for configure tests (e.g. inline keyword)
+dnl we set it properly at the end of this file.
 CFLAGS="$OPT_CFLAGS $ARCH_FLAGS $OS_FLAGS $CC_FLAGS"
 CXXFLAGS="$OPT_CXXFLAGS $ARCH_FLAGS $OS_FLAGS $CXX_FLAGS"
 
@@ -230,10 +254,7 @@ AC_SUBST(JAVA_ARCH)
 AC_SUBST(OS_DIR)
 AC_SUBST(USE_SCHEDULER)
 
-
 dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_CXX
 AM_PROG_AS
 AC_PROG_LD
 AC_PROG_LD_GNU
@@ -259,6 +280,7 @@ AC_CHECK_HEADERS([fcntl.h])
 AC_CHECK_HEADERS([libgen.h])
 AC_CHECK_HEADERS([netdb.h])
 AC_CHECK_HEADERS([signal.h])
+AC_CHECK_HEADERS([stdarg.h])
 AC_CHECK_HEADERS([stdint.h])
 AC_CHECK_HEADERS([stdio.h])
 AC_CHECK_HEADERS([stdlib.h])
@@ -266,7 +288,9 @@ AC_CHECK_HEADERS([string.h])
 AC_CHECK_HEADERS([time.h])
 AC_CHECK_HEADERS([ucontext.h])
 AC_CHECK_HEADERS([unistd.h])
+AC_CHECK_HEADERS([mach/mach.h])
 AC_CHECK_HEADERS([sys/ioctl.h])
+AC_CHECK_HEADERS([sys/loadavg.h])
 AC_CHECK_HEADERS([sys/mman.h])
 AC_CHECK_HEADERS([sys/resource.h])
 AC_CHECK_HEADERS([sys/select.h])
@@ -274,6 +298,7 @@ AC_CHECK_HEADERS([sys/socket.h])
 AC_CHECK_HEADERS([sys/stat.h])
 AC_CHECK_HEADERS([sys/time.h])
 AC_CHECK_HEADERS([sys/types.h])
+AC_CHECK_HEADERS([sys/utsname.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -286,7 +311,6 @@ AC_STRUCT_TM
 
 dnl Checks for libraries (NOTE: Should be done before function checks,
 dnl as some functions may be in libraries we check for).
-
 case "${OS_DIR}" in
     solaris )
          AC_CHECK_LIB([socket], [gethostname],, [AC_MSG_ERROR(cannot find libsocket)])
@@ -322,9 +346,12 @@ AC_CHECK_FUNCS([fstat])
 AC_CHECK_FUNCS([fsync])
 AC_CHECK_FUNCS([ftruncate])
 AC_CHECK_FUNCS([getcwd])
+AC_CHECK_FUNCS([getenv])
 AC_CHECK_FUNCS([gethostbyname])
 AC_CHECK_FUNCS([gethostname])
+AC_CHECK_FUNCS([getloadavg])
 AC_CHECK_FUNCS([getpagesize])
+AC_CHECK_FUNCS([getpid])
 AC_CHECK_FUNCS([getrusage])
 AC_CHECK_FUNCS([getsockname])
 AC_CHECK_FUNCS([getsockopt])
@@ -342,6 +369,7 @@ AC_CHECK_FUNCS([memset])
 AC_CHECK_FUNCS([mmap])
 AC_CHECK_FUNCS([mprotect])
 AC_CHECK_FUNCS([open])
+AC_CHECK_FUNCS([printf])
 AC_CHECK_FUNCS([read])
 AC_CHECK_FUNCS([readlink])
 AC_CHECK_FUNCS([realloc])
@@ -357,6 +385,7 @@ AC_CHECK_FUNCS([str2sig])
 AC_CHECK_FUNCS([strcat])
 AC_CHECK_FUNCS([strchr])
 AC_CHECK_FUNCS([strcpy])
+AC_CHECK_FUNCS([strcmp])
 AC_CHECK_FUNCS([strdup])
 AC_CHECK_FUNCS([strerror])
 AC_CHECK_FUNCS([strlen])
@@ -421,6 +450,9 @@ AC_CHECK_ENABLE_RT_TIMING
 AC_CHECK_ENABLE_CYCLE_STATS
 AC_CHECK_ENABLE_JVMTI
 AC_CHECK_ENABLE_THREADS
+if test x"${ENABLE_THREADS}" != "xno"; then
+    AC_CHECK_USE___THREAD
+fi
 AC_CHECK_ENABLE_IFCONV
 AC_CHECK_ENABLE_INLINING
 AC_CHECK_ENABLE_INLINING_DEBUG
@@ -566,11 +598,19 @@ dnl The check for jni_md.h must be before jni.h.
 AC_CHECK_WITH_JNI_MD_H
 AC_CHECK_WITH_JNI_H
 
-dnl HPI is only required for OpenJDK
+dnl The jvmti.h header is only required if JVMTI is enabled.
+if test x"${ENABLE_JVMTI}" = "xyes"; then
+    AC_CHECK_WITH_JVMTI_H
+fi
+
+dnl JVM, HPI, and JMM is only required for OpenJDK.
 case "${WITH_JAVA_RUNTIME_LIBRARY}" in
     openjdk)
+        AC_CHECK_WITH_JVM_MD_H
+        AC_CHECK_WITH_JVM_H
         AC_CHECK_WITH_HPI_MD_H
         AC_CHECK_WITH_HPI_H
+        AC_CHECK_WITH_JMM_H
         ;;
     *)
         ;;
@@ -617,14 +657,9 @@ AZ_PYTHON_VERSION_ENSURE( [2.4] )
 AZ_PYTHON_CSPEC
 AZ_PYTHON_LSPEC
 
-
-dnl define some stuff required for --fullversion
-AC_DEFINE_UNQUOTED(VERSION_CONFIGURE_ARGS, "$ac_configure_args", [configure arguments])
-AC_DEFINE_UNQUOTED(VERSION_CC, "$CC", [CC used])
-AC_DEFINE_UNQUOTED(VERSION_CXX, "$CXX", [CXX used])
-AC_DEFINE_UNQUOTED(VERSION_CFLAGS, "$OPT_CFLAGS $ARCH_CFLAGS $CC_FLAGS $CPPFLAGS", [CFLAGS used])
-AC_DEFINE_UNQUOTED(VERSION_CXXFLAGS, "$OPT_CXXFLAGS $ARCH_CXXFLAGS $CXX_FLAGS $CPPFLAGS", [CXXFLAGS used])
-
+dnl Define version numbers.
+AC_VERSION_DETAIL
+AC_VERSION_CONFIG
 
 dnl Finally pass flags to Makefiles.
 CFLAGS="$OPT_CFLAGS"
@@ -656,7 +691,6 @@ AC_CONFIG_FILES([Makefile]
 		[src/mm/Makefile]
 		[src/mm/cacao-gc/Makefile]
 		[src/native/Makefile]
-		[src/native/include/Makefile]
 		[src/native/jvmti/Makefile]
 		[src/native/vm/Makefile]
 		[src/native/vm/cldc1.1/Makefile]