* configure.ac: Moved vm.zip code to m4 file and call

[cacao.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f119092de49e1ab7df0bbb605a769a77b6ea584d..9b773032c69a43cf25a9ab93a646e3933af534e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -241,6 +241,8 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AM_PROG_MKDIR_P
 
+AM_CONDITIONAL([WITH_GNU_LD], [test x"$with_gnu_ld" = "xyes"])
+
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -255,6 +257,7 @@ AC_CHECK_HEADERS([errno.h])
 AC_CHECK_HEADERS([fcntl.h])
 AC_CHECK_HEADERS([libgen.h])
 AC_CHECK_HEADERS([netdb.h])
+AC_CHECK_HEADERS([signal.h])
 AC_CHECK_HEADERS([stdint.h])
 AC_CHECK_HEADERS([stdio.h])
 AC_CHECK_HEADERS([stdlib.h])
@@ -347,6 +350,7 @@ AC_CHECK_FUNCS([setsockopt])
 AC_CHECK_FUNCS([shutdown])
 AC_CHECK_FUNCS([socket])
 AC_CHECK_FUNCS([stat])
+AC_CHECK_FUNCS([str2sig])
 AC_CHECK_FUNCS([strcat])
 AC_CHECK_FUNCS([strchr])
 AC_CHECK_FUNCS([strcpy])
@@ -538,17 +542,8 @@ AC_CHECK_ENABLE_STATICVM
 AC_CHECK_ENABLE_ANNOTATIONS
 AC_CHECK_ENABLE_ASSERTION
 
-
-dnl where is CACAO's vm.zip
-AC_MSG_CHECKING(where CACAO's vm.zip is installed)
-AC_ARG_WITH([vm-zip],
-            [AS_HELP_STRING(--with-vm-zip=<path>,path to CACAO's vm.zip (includes the name of the file and may be flat) [[default=/usr/local/cacao/share/cacao/vm.zip]])],
-            [CACAO_VM_ZIP=${withval}],
-            [CACAO_VM_ZIP=${CACAO_PREFIX}/share/cacao/vm.zip])
-AC_MSG_RESULT(${CACAO_VM_ZIP})
-AC_DEFINE_UNQUOTED([CACAO_VM_ZIP], "${CACAO_VM_ZIP}", [CACAO's vm.zip])
-AC_SUBST(CACAO_VM_ZIP)
-
+dnl This one depends on AC_CHECK_ENABLE_ZLIB.
+AC_CHECK_WITH_VM_ZIP
 
 AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY
 
@@ -713,7 +708,6 @@ AC_CONFIG_FILES([Makefile]
                [src/vm/jit/x86_64/freebsd/Makefile]
                [src/vm/jit/x86_64/linux/Makefile]
                [src/vm/jit/x86_64/solaris/Makefile]
-               [src/vmcore/Makefile]
                [tests/Makefile]
                [tests/regression/Makefile]
                [tests/regression/assertion/Makefile]