* configure.ac (--with-classpath-glibj-zip): Renamed to

* configure.ac (--with-classpath-glibj-zip): Renamed to
--with-classpath-classes.

* m4/ac_prog_javac.m4 (AC_PROG_JAVAC): Renamed CLASSPATH_GLIBJ_ZIP to
CLASSPATH_CLASSES.

* src/Makefile.am (VM_DIR): Added.
(SUBDIRS): Use VM_DIR.

* src/native/include/Makefile.am [WITH_CLASSPATH_GNU] (CLASSPATH): Set
differently for non-gnu classpaths.

* src/cacaoh/cacaoh.c (main) [WITH_CLASSPATH_GNU]: Likewise.
* src/vm/vm.c (vm_create): Likewise.