* configure.ac: Some maintenance for make dist.

[cacao.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ea2f6f684c075850b8b512aa985a4826794de167..5acb74857738051ed0de586459a36153bac9f350 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -286,7 +286,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])
@@ -294,6 +296,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
@@ -346,6 +349,7 @@ 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])
@@ -592,6 +596,11 @@ dnl The check for jni_md.h must be before jni.h.
 AC_CHECK_WITH_JNI_MD_H
 AC_CHECK_WITH_JNI_H
 
+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)
@@ -646,14 +655,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"
@@ -685,7 +689,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]