* configure.ac (VM_ZIP_STRING): Added.

(GLIBJZ): Renamed to GLIBJ_ZIP_STRING.
* src/vm/global.h (CACAO_VM_ZIP_PATH): Use GLIBJ_ZIP_STRING.
* src/lib/Makefile.am (GLIBJ_ZIP): Likewise.
* src/native/include/Makefile.am, src/native/Makefile.am (VM_ZIP): Use
VM_ZIP_STRING.
(GLIBJ_ZIP): Use GLIBJ_ZIP_STRING.
* contrib/setenvinstalled.in, contrib/setenvsource.in: Likewise.

diff --git a/configure.ac b/configure.ac
index 5070974c06e0b4217ad106a69955a11145a5acc5..dcc089fb0a8f58a0f34515c97402d8a22cd44103 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,7 @@ xdspcore )
 esac
 
 dnl host type
+echo $host_os
 case "$host_os" in
 *linux* | *Linux* )
        OS_DIR="linux"
@@ -505,7 +506,12 @@ if test x"${ENABLE_ZLIB}" = "xyes"; then
     AC_CHECK_HEADERS([zlib.h],, [AC_MSG_ERROR(cannot find zlib.h)])
     AC_CHECK_LIB(z, inflate,, [AC_MSG_ERROR(cannot find libz)])
     AC_DEFINE([ENABLE_ZLIB], 1, [use zlib])
+    VM_ZIP_STRING=vm.zip
+else
+    VM_ZIP_STRING=classes/
 fi
+AC_DEFINE_UNQUOTED(VM_ZIP_STRING, "${VM_ZIP_STRING}", [define to the string base name of the VM zip file])
+AC_SUBST(VM_ZIP_STRING)
 AM_CONDITIONAL([ENABLE_ZLIB], test x"${ENABLE_ZLIB}" = "xyes")
 
 
@@ -561,12 +567,12 @@ AC_SUBST(CLASSPATH_LIBDIR)
 dnl Maybe the user has Classpath installed 'flat'.
 AC_ARG_WITH([flat-classpath], [AS_HELP_STRING(--with-flat-classpath, GNU Classpath is not zipped in the install directory)])
 if test x"$with_flat_classpath" = "x"; then
-       GLIBJZ=glibj.zip
+       GLIBJ_ZIP_STRING=glibj.zip
 else
-       GLIBJZ=
+       GLIBJ_ZIP_STRING=
 fi
-AC_SUBST(GLIBJZ)
-AC_DEFINE_UNQUOTED(GLIBJZ_STRING, "$GLIBJZ", [define to the string base name of the classpath zip file])
+AC_SUBST(GLIBJ_ZIP_STRING)
+AC_DEFINE_UNQUOTED(GLIBJ_ZIP_STRING, "$GLIBJ_ZIP_STRING", [define to the string base name of the classpath zip file])
 
 
 dnl check for some programs we need

diff --git a/contrib/setenvinstalled.in b/contrib/setenvinstalled.in
index 6a95338519cf3dcb91d3d0e2271133a7e4518d8a..bf14d6941ae9b6f8883bb9aeb7d7ebe801507e04 100644 (file)
--- a/contrib/setenvinstalled.in
+++ b/contrib/setenvinstalled.in
@@ -1,5 +1,5 @@
 # sets the environment variables when GNU classpath is installed, but
 # CACAO not
 
-export BOOTCLASSPATH=$PWD/src/lib/vm.zip:@CLASSPATH_PREFIX@/share/classpath/glibj.zip
+export BOOTCLASSPATH=$PWD/src/lib/@VM_ZIP_STRING@:@CLASSPATH_PREFIX@/share/classpath/@GLIBJ_ZIP_STRING@
 export PATH=$PWD/src/cacao:$PATH

diff --git a/contrib/setenvsource.in b/contrib/setenvsource.in
index 8c6e6d864ff72cd4fb9bf663bfccaba800526965..09e6abf36c68ce781fa59e6d8a105a9fc5a7a37b 100644 (file)
--- a/contrib/setenvsource.in
+++ b/contrib/setenvsource.in
@@ -11,5 +11,5 @@ export LD_LIBRARY_PATH=\
 @CLASSPATH_PREFIX@/native/jni/java-util/.libs:\
 $LD_LIBRARY_PATH
 
-export BOOTCLASSPATH=$PWD/src/lib/vm.zip:@CLASSPATH_PREFIX@/lib/glibj.zip
+export BOOTCLASSPATH=$PWD/src/lib/@VM_ZIP_STRING@:@CLASSPATH_PREFIX@/lib/@GLIBJ_ZIP_STRING@
 export PATH=$PWD/src/cacao:$PATH

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index bcd9507ec41558863fd6018cc53a129211450e2e..0757fa902bc1c952cbabb814af00a3cfdeecb240 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4416 2006-02-03 22:03:30Z twisti $
+## $Id: Makefile.am 4419 2006-02-03 22:57:32Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -53,7 +53,7 @@ VM_CLASS_FILES = \
        classes/java/lang/VMThrowable.class \
        classes/java/security/VMAccessController.class
 
-GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
+GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING)
 
 $(VM_CLASS_FILES): $(VM_JAVA_FILES)
        $(mkdir_p) classes

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index 64a3de697caf45454c89f3b5f4cee76ec6a34f25..aaf310c4dc396565bc80b26ab65c5521342b7ec1 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4417 2006-02-03 22:24:55Z twisti $
+## $Id: Makefile.am 4419 2006-02-03 22:57:32Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -63,17 +63,13 @@ libnative_la_LIBADD = \
        vm/libnativevm.la \
        $(JVMTI_LIB)
 
-if ENABLE_ZLIB
-VM_ZIP = $(top_builddir)/src/lib/vm.zip
-else
-VM_ZIP = $(top_builddir)/src/lib/classes/
-endif
-
-GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
+VM_ZIP = $(top_builddir)/src/lib/$(VM_ZIP_STRING)
+GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING)
 
 CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)
 
-nativetable.inc: $(VM_ZIP) $(GLIBJ_ZIP) $(top_builddir)/src/native/tools/gennativetable
+#nativetable.inc: $(VM_ZIP) $(GLIBJ_ZIP) $(top_builddir)/src/native/tools/gennativetable
+nativetable.inc:
        $(top_builddir)/src/native/tools/gennativetable -bootclasspath $(CLASSPATH) > $(top_builddir)/src/native/nativetable.inc
 endif
 

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index 371175d12506140d44fd9bb1bb5302c6dbef6092..a0c92b91cc154461db951f7a7019f2e0893458a8 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4417 2006-02-03 22:24:55Z twisti $
+## $Id: Makefile.am 4419 2006-02-03 22:57:32Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -129,13 +129,8 @@ endif
 
 CACAOH = $(top_builddir)/src/cacaoh/cacaoh
 
-if ENABLE_ZLIB
-VM_ZIP = $(top_builddir)/src/lib/vm.zip
-else
-VM_ZIP = $(top_builddir)/src/lib/classes/
-endif
-
-GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
+VM_ZIP = $(top_builddir)/src/lib/$(VM_ZIP_STRING)
+GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING)
 
 CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)
 
@@ -148,7 +143,8 @@ $(NO_GEN_HEADER_FILES):
        echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
        $(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class
 
-$(DO_HEADER_FILES): $(VM_ZIP) $(GLIBJ_ZIP)
+#$(DO_HEADER_FILES): $(VM_ZIP) $(GLIBJ_ZIP)
+$(DO_HEADER_FILES):
        @class=`echo $@ | sed -e 's/\.h$$//' -e 's/_/\./g'`; \
        echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
        $(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class

diff --git a/src/vm/global.h b/src/vm/global.h
index 5ff4ce0a599461dea57b213ee82ef726e71f5cd5..c343932e5b6bc44fa1f1e9295d3a22448a0d9993 100644 (file)
--- a/src/vm/global.h
+++ b/src/vm/global.h
@@ -33,7 +33,7 @@
             Joseph Wenninger
             Christian Thalinger
 
-   $Id: global.h 4417 2006-02-03 22:24:55Z twisti $
+   $Id: global.h 4419 2006-02-03 22:57:32Z twisti $
 
 */
 
@@ -79,12 +79,12 @@ typedef struct java_objectarray java_objectarray;
 /* define some CACAO paths ****************************************************/
 
 #if defined(ENABLE_ZLIB)
-# define CACAO_VM_ZIP_PATH          CACAO_PREFIX "/share/cacao/vm.zip"
+# define CACAO_VM_ZIP_PATH          CACAO_PREFIX "/share/cacao/" VM_ZIP_STRING
 #else
 # define CACAO_VM_ZIP_PATH          CACAO_PREFIX "/share/cacao/"
 #endif
 
-#define CLASSPATH_GLIBJ_ZIP_PATH    CLASSPATH_PREFIX "/share/classpath/" GLIBJZ_STRING
+#define CLASSPATH_GLIBJ_ZIP_PATH    CLASSPATH_PREFIX "/share/classpath/" GLIBJ_ZIP_STRING
 #define CLASSPATH_LIBRARY_PATH      CLASSPATH_LIBDIR "/classpath"