* configure.ac (VM_ZIP_STRING): Removed.

* configure.ac (VM_ZIP_STRING): Removed.
(--with-vm-zip): Added.
(--with-classpath-glibj-zip): Added.
(--with-flat-classpath): Removed.

* contrib/setenvinstalled.in (BOOTCLASSPATH): Use hardcoded vm.zip and
@CLASSPATH_GLIBJ_ZIP@.
* contrib/setenvsource.in: Likewise.

* src/vm/global.h (CACAO_VM_ZIP_PATH): Removed.
(CLASSPATH_GLIBJ_ZIP_PATH): Likewise.
* src/vm/vm.c (CACAO_VM_ZIP_PATH): Replaced with CACAO_VM_ZIP.
(CLASSPATH_GLIBJ_ZIP_PATH): Replaced with CLASSPATH_GLIBJ_ZIP.
* src/cacaoh/cacaoh.c: Likewise.

* src/lib/Makefile.am (GLIBJ_ZIP): Removed and replaced with
CLASSPATH_GLIBJ_ZIP.
* src/native/include/Makefile.am (VM_ZIP): Removed and replaced with
flat classes in builddir.
(GLIBJ_ZIP): Removed and replaced with CLASSPATH_GLIBJ_ZIP.
* src/native/Makefile.am: Likewise.