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

AC_CHECK_WITH_VM_ZIP.
* m4/vm-zip.m4: New file.

diff --git a/configure.ac b/configure.ac
index 5b0d822d50fd840dff55d95aa7b084ae5f1175cd..9b773032c69a43cf25a9ab93a646e3933af534e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -542,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
 

diff --git a/m4/vm-zip.m4 b/m4/vm-zip.m4
new file mode 100644 (file)
index 0000000..85f2548
--- /dev/null
+++ b/m4/vm-zip.m4
@@ -0,0 +1,43 @@
+dnl m4/vm-zip.m4
+dnl
+dnl Copyright (C) 2008
+dnl CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
+dnl 
+dnl This file is part of CACAO.
+dnl 
+dnl This program is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU General Public License as
+dnl published by the Free Software Foundation; either version 2, or (at
+dnl your option) any later version.
+dnl 
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+dnl 02110-1301, USA.
+
+
+dnl where is CACAO's vm.zip
+
+AC_DEFUN([AC_CHECK_WITH_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=(--enable-zlib:${CACAO_PREFIX}/share/cacao/vm.zip,--disable-zlib:${CACAO_PREFIX}/share/cacao/classes)]])],
+            [CACAO_VM_ZIP=${withval}],
+            [case "${ENABLE_ZLIB}" in
+                 no)
+                     CACAO_VM_ZIP=${CACAO_PREFIX}/share/cacao/classes
+                     ;;
+                 *)
+                     CACAO_VM_ZIP=${CACAO_PREFIX}/share/cacao/vm.zip
+                     ;;
+             esac
+            ])
+AC_MSG_RESULT(${CACAO_VM_ZIP})
+AC_DEFINE_UNQUOTED([CACAO_VM_ZIP], "${CACAO_VM_ZIP}", [CACAO's vm.zip])
+AC_SUBST(CACAO_VM_ZIP)
+])