projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* configure.ac (--with-classpath-glibj-zip): Renamed to
[cacao.git]
/
src
/
cacaoh
/
cacaoh.c
diff --git
a/src/cacaoh/cacaoh.c
b/src/cacaoh/cacaoh.c
index c77550d42f31cd85400c40a8e97b80ae228c9040..29d686063db4f286e1caf4c482b4b6b1fa48a030 100644
(file)
--- a/
src/cacaoh/cacaoh.c
+++ b/
src/cacaoh/cacaoh.c
@@
-25,12
+25,11
@@
Contact: cacao@cacaojvm.org
Authors: Reinhard Grafl
Contact: cacao@cacaojvm.org
Authors: Reinhard Grafl
-
- Changes: Mark Probst
+ Mark Probst
Philipp Tomsich
Christian Thalinger
Philipp Tomsich
Christian Thalinger
- $Id: cacaoh.c 6
034 2006-11-21 21:02:30
Z twisti $
+ $Id: cacaoh.c 6
243 2006-12-27 13:56:31
Z twisti $
*/
*/
@@
-187,15
+186,20
@@
int main(int argc, char **argv)
strcpy(bootclasspath, cp);
}
else {
strcpy(bootclasspath, cp);
}
else {
- cplen = strlen(CACAO_VM_ZIP) +
+ cplen =
+#if defined(WITH_CLASSPATH_GNU)
+ strlen(CACAO_VM_ZIP) +
strlen(":") +
strlen(":") +
- strlen(CLASSPATH_GLIBJ_ZIP) +
+#endif
+ strlen(CLASSPATH_CLASSES) +
strlen("0");
bootclasspath = MNEW(char, cplen);
strlen("0");
bootclasspath = MNEW(char, cplen);
+#if defined(WITH_CLASSPATH_GNU)
strcat(bootclasspath, CACAO_VM_ZIP);
strcat(bootclasspath, ":");
strcat(bootclasspath, CACAO_VM_ZIP);
strcat(bootclasspath, ":");
- strcat(bootclasspath, CLASSPATH_GLIBJ_ZIP);
+#endif
+ strcat(bootclasspath, CLASSPATH_CLASSES);
}
}
@@
-203,7
+207,7
@@
int main(int argc, char **argv)
cp = getenv("CLASSPATH");
cp = getenv("CLASSPATH");
- if (cp) {
+ if (cp
!= NULL
) {
classpath = MNEW(char, strlen(cp) + strlen("0"));
strcat(classpath, cp);
}
classpath = MNEW(char, strlen(cp) + strlen("0"));
strcat(classpath, cp);
}