PatchSet 7695 Date: 2008/01/19 18:23:34 Author: robilad Branch: HEAD Tag: (none) Log: added support for having glibj.zip in a different location on install
2008-01-19 Robert Schuster <[EMAIL PROTECTED]> Added --with-target-classpath-classes option to support having glib.zip in a different location on target environment. * libraries/javalib/Makefile.am (install-data-local): Link TARGET_CLASSPATH_CLASSES as rt.jar. * m4/classpath.m4 (AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES): Added. * configure.ac: Use AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES. Members: ChangeLog:1.5196->1.5197 Makefile.in:1.305->1.306 configure:1.631->1.632 configure.ac:1.300->1.301 config/Makefile.in:1.251->1.252 include/Makefile.in:1.315->1.316 kaffe/Makefile.in:1.200->1.201 kaffe/jvmpi/Makefile.in:1.125->1.126 kaffe/kaffe/Makefile.in:1.224->1.225 kaffe/kaffeh/Makefile.in:1.206->1.207 kaffe/kaffevm/Makefile.in:1.279->1.280 kaffe/kaffevm/boehm-gc/Makefile.in:1.91->1.92 kaffe/kaffevm/gcj/Makefile.in:1.180->1.181 kaffe/kaffevm/intrp/Makefile.in:1.189->1.190 kaffe/kaffevm/jit/Makefile.in:1.199->1.200 kaffe/kaffevm/jit3/Makefile.in:1.169->1.170 kaffe/kaffevm/kaffe-gc/Makefile.in:1.89->1.90 kaffe/kaffevm/systems/Makefile.in:1.189->1.190 kaffe/kaffevm/systems/beos-native/Makefile.in:1.180->1.181 kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.44->1.45 kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.186->1.187 kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.190->1.191 kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.166->1.167 kaffe/man/Makefile.in:1.187->1.188 kaffe/scripts/Makefile.in:1.231->1.232 kaffe/scripts/bat/Makefile.in:1.180->1.181 kaffe/scripts/compat/Makefile.in:1.208->1.209 kaffe/xprof/Makefile.in:1.155->1.156 libraries/Makefile.in:1.183->1.184 libraries/clib/Makefile.in:1.205->1.206 libraries/clib/awt/Makefile.in:1.198->1.199 libraries/clib/awt/X/Makefile.in:1.194->1.195 libraries/clib/awt/nano-X/Makefile.in:1.65->1.66 libraries/clib/awt/qt/Makefile.in:1.146->1.147 libraries/clib/awt/xynth/Makefile.in:1.21->1.22 libraries/clib/math/Makefile.in:1.196->1.197 libraries/clib/zip/Makefile.in:1.201->1.202 libraries/javalib/Makefile.am:1.465->1.466 libraries/javalib/Makefile.in:1.595->1.596 libraries/javalib/awt-implementations/Makefile.in:1.77->1.78 libraries/javalib/awt-implementations/kaffe/Makefile.in:1.100->1.101 libraries/javalib/gmp-math/Makefile.in:1.86->1.87 libraries/javalib/vmspecific/Makefile.in:1.29->1.30 libraries/javalib/zlib-zip/Makefile.in:1.23->1.24 m4/classpath.m4:1.2->1.3 replace/Makefile.in:1.143->1.144 test/Makefile.in:1.192->1.193 test/internal/Makefile.in:1.168->1.169 test/jni/Makefile.in:1.99->1.100 test/regression/Makefile.in:1.271->1.272 test/regression/compile_time/Makefile.in:1.120->1.121 test/regression/compiler/Makefile.in:1.104->1.105 test/regression/run_time/Makefile.in:1.119->1.120 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.5196 kaffe/ChangeLog:1.5197 --- kaffe/ChangeLog:1.5196 Sat Jan 19 15:16:52 2008 +++ kaffe/ChangeLog Sat Jan 19 18:23:34 2008 @@ -1,3 +1,15 @@ +2008-01-19 Robert Schuster <[EMAIL PROTECTED]> + + Added --with-target-classpath-classes option to support having glib.zip + in a different location on target environment. + + * libraries/javalib/Makefile.am (install-data-local): + Link TARGET_CLASSPATH_CLASSES as rt.jar. + + * m4/classpath.m4 (AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES): Added. + + * configure.ac: Use AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES. + 2008-01-19 Dalibor Topic <[EMAIL PROTECTED]> * TODO: Updated. Index: kaffe/Makefile.in diff -u kaffe/Makefile.in:1.305 kaffe/Makefile.in:1.306 --- kaffe/Makefile.in:1.305 Sun Jan 6 19:05:14 2008 +++ kaffe/Makefile.in Sat Jan 19 18:23:34 2008 @@ -226,6 +226,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/configure diff -u kaffe/configure:1.631 kaffe/configure:1.632 --- kaffe/configure:1.631 Fri Jan 18 18:49:00 2008 +++ kaffe/configure Sat Jan 19 18:23:34 2008 @@ -953,6 +953,7 @@ VM_LIBS CLASSPATH_PREFIX CLASSPATH_CLASSES +TARGET_CLASSPATH_CLASSES CLASSPATH_LIBDIR GLIBJ_ZIP JAVAC @@ -1706,6 +1707,10 @@ path to Java core library classes (includes the name of the file and may be flat) [default=/usr/local/classpath/share/classpath/glibj.zip] + --with-target-classpath-classes=<path> + path to Java core library classes (includes the name + of the file and may be flat) + [default=/usr/local/classpath/share/classpath/glibj.zip] --with-classpath-libdir=<dir> installation directory of Java core library native libraries [default=/usr/local/classpath/lib] @@ -7042,7 +7047,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7045 "configure"' > conftest.$ac_ext + echo '#line 7050 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9606,11 +9611,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9609: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9614: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9613: \$? = $ac_status" >&5 + echo "$as_me:9618: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9896,11 +9901,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9899: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9904: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9903: \$? = $ac_status" >&5 + echo "$as_me:9908: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10000,11 +10005,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10003: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10008: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10007: \$? = $ac_status" >&5 + echo "$as_me:10012: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12349,7 +12354,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12352 "configure" +#line 12357 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12449,7 +12454,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12452 "configure" +#line 12457 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14873,11 +14878,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14876: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14881: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14880: \$? = $ac_status" >&5 + echo "$as_me:14885: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14977,11 +14982,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14980: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14985: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14984: \$? = $ac_status" >&5 + echo "$as_me:14989: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16539,11 +16544,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16542: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16547: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16546: \$? = $ac_status" >&5 + echo "$as_me:16551: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16643,11 +16648,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16646: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16651: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16650: \$? = $ac_status" >&5 + echo "$as_me:16655: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18834,11 +18839,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18837: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18842: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18841: \$? = $ac_status" >&5 + echo "$as_me:18846: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19124,11 +19129,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19127: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19132: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19131: \$? = $ac_status" >&5 + echo "$as_me:19136: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19228,11 +19233,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19231: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19236: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19235: \$? = $ac_status" >&5 + echo "$as_me:19240: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -25363,7 +25368,6 @@ { echo "$as_me:$LINENO: result: ${CLASSPATH_PREFIX}" >&5 echo "${ECHO_T}${CLASSPATH_PREFIX}" >&6; } -#AC_DEFINE_UNQUOTED([CLASSPATH_PREFIX], "${CLASSPATH_PREFIX}", [Java core library installation directory]) @@ -25379,7 +25383,21 @@ { echo "$as_me:$LINENO: result: ${CLASSPATH_CLASSES}" >&5 echo "${ECHO_T}${CLASSPATH_CLASSES}" >&6; } -#AC_DEFINE_UNQUOTED([CLASSPATH_CLASSES], "${CLASSPATH_CLASSES}", [Java core library classes]) + + + +{ echo "$as_me:$LINENO: checking where Java core library classes are installed on the target" >&5 +echo $ECHO_N "checking where Java core library classes are installed on the target... $ECHO_C" >&6; } + +# Check whether --with-target-classpath-classes was given. +if test "${with_target_classpath_classes+set}" = set; then + withval=$with_target_classpath_classes; TARGET_CLASSPATH_CLASSES=${withval} +else + TARGET_CLASSPATH_CLASSES=${CLASSPATH_CLASSES} +fi + +{ echo "$as_me:$LINENO: result: ${TARGET_CLASSPATH_CLASSES}" >&5 +echo "${ECHO_T}${TARGET_CLASSPATH_CLASSES}" >&6; } @@ -25396,8 +25414,6 @@ { echo "$as_me:$LINENO: result: ${CLASSPATH_LIBDIR}" >&5 echo "${ECHO_T}${CLASSPATH_LIBDIR}" >&6; } -#AS_AC_EXPAND([CLASSPATH_LIBDIR], ${CLASSPATH_LIBDIR}) -#AC_DEFINE_UNQUOTED([CLASSPATH_LIBDIR], "${CLASSPATH_LIBDIR}", [Java core library native libraries installation directory]) @@ -25534,7 +25550,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 25537 "configure" */ +/* #line 25553 "configure" */ public class Test { } EOF @@ -43415,6 +43431,7 @@ VM_LIBS!$VM_LIBS$ac_delim CLASSPATH_PREFIX!$CLASSPATH_PREFIX$ac_delim CLASSPATH_CLASSES!$CLASSPATH_CLASSES$ac_delim +TARGET_CLASSPATH_CLASSES!$TARGET_CLASSPATH_CLASSES$ac_delim CLASSPATH_LIBDIR!$CLASSPATH_LIBDIR$ac_delim GLIBJ_ZIP!$GLIBJ_ZIP$ac_delim JAVAC!$JAVAC$ac_delim @@ -43435,7 +43452,6 @@ HAVE_JASMIN_FALSE!$HAVE_JASMIN_FALSE$ac_delim KAFFE_LIBS!$KAFFE_LIBS$ac_delim M_LIBS!$M_LIBS$ac_delim -ZIP_LIBS!$ZIP_LIBS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -43477,6 +43493,7 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +ZIP_LIBS!$ZIP_LIBS$ac_delim LIBADD_GMP!$LIBADD_GMP$ac_delim USE_GMP!$USE_GMP$ac_delim GC_NAME!$GC_NAME$ac_delim @@ -43541,7 +43558,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 Index: kaffe/configure.ac diff -u kaffe/configure.ac:1.300 kaffe/configure.ac:1.301 --- kaffe/configure.ac:1.300 Fri Jan 18 18:49:00 2008 +++ kaffe/configure.ac Sat Jan 19 18:23:34 2008 @@ -704,6 +704,7 @@ AC_CHECK_WITH_CLASSPATH_PREFIX AC_CHECK_WITH_CLASSPATH_CLASSES +AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES AC_CHECK_WITH_CLASSPATH_LIBDIR AC_CHECK_WITH_CLASSPATH_INCLUDEDIR Index: kaffe/config/Makefile.in diff -u kaffe/config/Makefile.in:1.251 kaffe/config/Makefile.in:1.252 --- kaffe/config/Makefile.in:1.251 Sun Jan 6 19:05:16 2008 +++ kaffe/config/Makefile.in Sat Jan 19 18:23:36 2008 @@ -200,6 +200,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/include/Makefile.in diff -u kaffe/include/Makefile.in:1.315 kaffe/include/Makefile.in:1.316 --- kaffe/include/Makefile.in:1.315 Sun Jan 6 19:05:17 2008 +++ kaffe/include/Makefile.in Sat Jan 19 18:23:38 2008 @@ -215,6 +215,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/Makefile.in diff -u kaffe/kaffe/Makefile.in:1.200 kaffe/kaffe/Makefile.in:1.201 --- kaffe/kaffe/Makefile.in:1.200 Sun Jan 6 19:05:18 2008 +++ kaffe/kaffe/Makefile.in Sat Jan 19 18:23:38 2008 @@ -204,6 +204,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/jvmpi/Makefile.in diff -u kaffe/kaffe/jvmpi/Makefile.in:1.125 kaffe/kaffe/jvmpi/Makefile.in:1.126 --- kaffe/kaffe/jvmpi/Makefile.in:1.125 Sun Jan 6 19:05:18 2008 +++ kaffe/kaffe/jvmpi/Makefile.in Sat Jan 19 18:23:38 2008 @@ -215,6 +215,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffe/Makefile.in diff -u kaffe/kaffe/kaffe/Makefile.in:1.224 kaffe/kaffe/kaffe/Makefile.in:1.225 --- kaffe/kaffe/kaffe/Makefile.in:1.224 Sun Jan 6 19:05:19 2008 +++ kaffe/kaffe/kaffe/Makefile.in Sat Jan 19 18:23:39 2008 @@ -216,6 +216,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffeh/Makefile.in diff -u kaffe/kaffe/kaffeh/Makefile.in:1.206 kaffe/kaffe/kaffeh/Makefile.in:1.207 --- kaffe/kaffe/kaffeh/Makefile.in:1.206 Sun Jan 6 19:41:27 2008 +++ kaffe/kaffe/kaffeh/Makefile.in Sat Jan 19 18:23:39 2008 @@ -219,6 +219,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/Makefile.in diff -u kaffe/kaffe/kaffevm/Makefile.in:1.279 kaffe/kaffe/kaffevm/Makefile.in:1.280 --- kaffe/kaffe/kaffevm/Makefile.in:1.279 Sat Jan 19 15:13:39 2008 +++ kaffe/kaffe/kaffevm/Makefile.in Sat Jan 19 18:23:41 2008 @@ -281,6 +281,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.91 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.92 --- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.91 Sat Jan 19 15:13:40 2008 +++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Sat Jan 19 18:23:42 2008 @@ -213,6 +213,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/gcj/Makefile.in diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.180 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.181 --- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.180 Sun Jan 6 19:05:22 2008 +++ kaffe/kaffe/kaffevm/gcj/Makefile.in Sat Jan 19 18:23:43 2008 @@ -221,6 +221,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/intrp/Makefile.in diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.189 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.190 --- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.189 Sun Jan 6 19:05:23 2008 +++ kaffe/kaffe/kaffevm/intrp/Makefile.in Sat Jan 19 18:23:43 2008 @@ -214,6 +214,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/jit/Makefile.in diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.199 kaffe/kaffe/kaffevm/jit/Makefile.in:1.200 --- kaffe/kaffe/kaffevm/jit/Makefile.in:1.199 Sun Jan 6 19:05:23 2008 +++ kaffe/kaffe/kaffevm/jit/Makefile.in Sat Jan 19 18:23:44 2008 @@ -222,6 +222,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/jit3/Makefile.in diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.169 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.170 --- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.169 Sun Jan 6 19:05:24 2008 +++ kaffe/kaffe/kaffevm/jit3/Makefile.in Sat Jan 19 18:23:45 2008 @@ -222,6 +222,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.89 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.90 --- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.89 Sat Jan 19 15:13:42 2008 +++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in Sat Jan 19 18:23:46 2008 @@ -214,6 +214,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/systems/Makefile.in diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.189 kaffe/kaffe/kaffevm/systems/Makefile.in:1.190 --- kaffe/kaffe/kaffevm/systems/Makefile.in:1.189 Sun Jan 6 19:05:25 2008 +++ kaffe/kaffe/kaffevm/systems/Makefile.in Sat Jan 19 18:23:46 2008 @@ -203,6 +203,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.180 kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.181 --- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.180 Sun Jan 6 19:05:25 2008 +++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in Sat Jan 19 18:23:47 2008 @@ -213,6 +213,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in diff -u kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.44 kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.45 --- kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.44 Sun Jan 6 19:05:26 2008 +++ kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in Sat Jan 19 18:23:48 2008 @@ -208,6 +208,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in diff -u kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.186 kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.187 --- kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.186 Sun Jan 6 19:05:26 2008 +++ kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in Sat Jan 19 18:23:48 2008 @@ -213,6 +213,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.190 kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.191 --- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.190 Sun Jan 6 19:05:27 2008 +++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in Sat Jan 19 18:23:49 2008 @@ -213,6 +213,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.166 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.167 --- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.166 Sun Jan 6 19:05:27 2008 +++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in Sat Jan 19 18:23:49 2008 @@ -218,6 +218,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/man/Makefile.in diff -u kaffe/kaffe/man/Makefile.in:1.187 kaffe/kaffe/man/Makefile.in:1.188 --- kaffe/kaffe/man/Makefile.in:1.187 Sun Jan 6 19:05:28 2008 +++ kaffe/kaffe/man/Makefile.in Sat Jan 19 18:23:50 2008 @@ -197,6 +197,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/scripts/Makefile.in diff -u kaffe/kaffe/scripts/Makefile.in:1.231 kaffe/kaffe/scripts/Makefile.in:1.232 --- kaffe/kaffe/scripts/Makefile.in:1.231 Sun Jan 6 19:05:29 2008 +++ kaffe/kaffe/scripts/Makefile.in Sat Jan 19 18:23:50 2008 @@ -213,6 +213,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/scripts/bat/Makefile.in diff -u kaffe/kaffe/scripts/bat/Makefile.in:1.180 kaffe/kaffe/scripts/bat/Makefile.in:1.181 --- kaffe/kaffe/scripts/bat/Makefile.in:1.180 Sun Jan 6 19:05:29 2008 +++ kaffe/kaffe/scripts/bat/Makefile.in Sat Jan 19 18:23:50 2008 @@ -192,6 +192,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/scripts/compat/Makefile.in diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.208 kaffe/kaffe/scripts/compat/Makefile.in:1.209 --- kaffe/kaffe/scripts/compat/Makefile.in:1.208 Sun Jan 6 19:05:29 2008 +++ kaffe/kaffe/scripts/compat/Makefile.in Sat Jan 19 18:23:51 2008 @@ -201,6 +201,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/kaffe/xprof/Makefile.in diff -u kaffe/kaffe/xprof/Makefile.in:1.155 kaffe/kaffe/xprof/Makefile.in:1.156 --- kaffe/kaffe/xprof/Makefile.in:1.155 Sun Jan 6 19:05:29 2008 +++ kaffe/kaffe/xprof/Makefile.in Sat Jan 19 18:23:51 2008 @@ -231,6 +231,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/Makefile.in diff -u kaffe/libraries/Makefile.in:1.183 kaffe/libraries/Makefile.in:1.184 --- kaffe/libraries/Makefile.in:1.183 Sun Jan 6 19:05:30 2008 +++ kaffe/libraries/Makefile.in Sat Jan 19 18:23:51 2008 @@ -204,6 +204,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/clib/Makefile.in diff -u kaffe/libraries/clib/Makefile.in:1.205 kaffe/libraries/clib/Makefile.in:1.206 --- kaffe/libraries/clib/Makefile.in:1.205 Sun Jan 6 19:05:30 2008 +++ kaffe/libraries/clib/Makefile.in Sat Jan 19 18:23:52 2008 @@ -207,6 +207,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/clib/awt/Makefile.in diff -u kaffe/libraries/clib/awt/Makefile.in:1.198 kaffe/libraries/clib/awt/Makefile.in:1.199 --- kaffe/libraries/clib/awt/Makefile.in:1.198 Sun Jan 6 19:05:30 2008 +++ kaffe/libraries/clib/awt/Makefile.in Sat Jan 19 18:23:53 2008 @@ -214,6 +214,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/clib/awt/X/Makefile.in diff -u kaffe/libraries/clib/awt/X/Makefile.in:1.194 kaffe/libraries/clib/awt/X/Makefile.in:1.195 --- kaffe/libraries/clib/awt/X/Makefile.in:1.194 Tue Jan 15 19:25:17 2008 +++ kaffe/libraries/clib/awt/X/Makefile.in Sat Jan 19 18:23:54 2008 @@ -229,6 +229,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/clib/awt/nano-X/Makefile.in diff -u kaffe/libraries/clib/awt/nano-X/Makefile.in:1.65 kaffe/libraries/clib/awt/nano-X/Makefile.in:1.66 --- kaffe/libraries/clib/awt/nano-X/Makefile.in:1.65 Sun Jan 6 19:05:31 2008 +++ kaffe/libraries/clib/awt/nano-X/Makefile.in Sat Jan 19 18:23:54 2008 @@ -237,6 +237,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/clib/awt/qt/Makefile.in diff -u kaffe/libraries/clib/awt/qt/Makefile.in:1.146 kaffe/libraries/clib/awt/qt/Makefile.in:1.147 --- kaffe/libraries/clib/awt/qt/Makefile.in:1.146 Sun Jan 6 19:05:31 2008 +++ kaffe/libraries/clib/awt/qt/Makefile.in Sat Jan 19 18:23:54 2008 @@ -237,6 +237,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/clib/awt/xynth/Makefile.in diff -u kaffe/libraries/clib/awt/xynth/Makefile.in:1.21 kaffe/libraries/clib/awt/xynth/Makefile.in:1.22 --- kaffe/libraries/clib/awt/xynth/Makefile.in:1.21 Sun Jan 6 19:05:32 2008 +++ kaffe/libraries/clib/awt/xynth/Makefile.in Sat Jan 19 18:23:55 2008 @@ -229,6 +229,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/clib/math/Makefile.in diff -u kaffe/libraries/clib/math/Makefile.in:1.196 kaffe/libraries/clib/math/Makefile.in:1.197 --- kaffe/libraries/clib/math/Makefile.in:1.196 Sun Jan 6 19:05:32 2008 +++ kaffe/libraries/clib/math/Makefile.in Sat Jan 19 18:23:55 2008 @@ -223,6 +223,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/clib/zip/Makefile.in diff -u kaffe/libraries/clib/zip/Makefile.in:1.201 kaffe/libraries/clib/zip/Makefile.in:1.202 --- kaffe/libraries/clib/zip/Makefile.in:1.201 Sun Jan 6 19:05:33 2008 +++ kaffe/libraries/clib/zip/Makefile.in Sat Jan 19 18:23:55 2008 @@ -225,6 +225,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/javalib/Makefile.am diff -u kaffe/libraries/javalib/Makefile.am:1.465 kaffe/libraries/javalib/Makefile.am:1.466 --- kaffe/libraries/javalib/Makefile.am:1.465 Wed Jan 2 16:18:27 2008 +++ kaffe/libraries/javalib/Makefile.am Sat Jan 19 18:23:56 2008 @@ -38,7 +38,7 @@ install-data-local: installdirs if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \ - $(LN_S) $(CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar ; \ + $(LN_S) $(TARGET_CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar ; \ fi uninstall-local: Index: kaffe/libraries/javalib/Makefile.in diff -u kaffe/libraries/javalib/Makefile.in:1.595 kaffe/libraries/javalib/Makefile.in:1.596 --- kaffe/libraries/javalib/Makefile.in:1.595 Sun Jan 6 19:05:33 2008 +++ kaffe/libraries/javalib/Makefile.in Sat Jan 19 18:23:57 2008 @@ -206,6 +206,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ @@ -646,7 +647,7 @@ install-data-local: installdirs if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \ - $(LN_S) $(CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar ; \ + $(LN_S) $(TARGET_CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar ; \ fi uninstall-local: Index: kaffe/libraries/javalib/awt-implementations/Makefile.in diff -u kaffe/libraries/javalib/awt-implementations/Makefile.in:1.77 kaffe/libraries/javalib/awt-implementations/Makefile.in:1.78 --- kaffe/libraries/javalib/awt-implementations/Makefile.in:1.77 Sun Jan 6 19:05:34 2008 +++ kaffe/libraries/javalib/awt-implementations/Makefile.in Sat Jan 19 18:23:58 2008 @@ -207,6 +207,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.100 kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.101 --- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.100 Wed Jan 16 03:53:05 2008 +++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in Sat Jan 19 18:23:59 2008 @@ -197,6 +197,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/javalib/gmp-math/Makefile.in diff -u kaffe/libraries/javalib/gmp-math/Makefile.in:1.86 kaffe/libraries/javalib/gmp-math/Makefile.in:1.87 --- kaffe/libraries/javalib/gmp-math/Makefile.in:1.86 Sun Jan 6 19:05:35 2008 +++ kaffe/libraries/javalib/gmp-math/Makefile.in Sat Jan 19 18:23:59 2008 @@ -197,6 +197,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/javalib/vmspecific/Makefile.in diff -u kaffe/libraries/javalib/vmspecific/Makefile.in:1.29 kaffe/libraries/javalib/vmspecific/Makefile.in:1.30 --- kaffe/libraries/javalib/vmspecific/Makefile.in:1.29 Sun Jan 6 19:05:35 2008 +++ kaffe/libraries/javalib/vmspecific/Makefile.in Sat Jan 19 18:24:00 2008 @@ -197,6 +197,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/libraries/javalib/zlib-zip/Makefile.in diff -u kaffe/libraries/javalib/zlib-zip/Makefile.in:1.23 kaffe/libraries/javalib/zlib-zip/Makefile.in:1.24 --- kaffe/libraries/javalib/zlib-zip/Makefile.in:1.23 Sun Jan 6 19:05:35 2008 +++ kaffe/libraries/javalib/zlib-zip/Makefile.in Sat Jan 19 18:24:00 2008 @@ -196,6 +196,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/m4/classpath.m4 diff -u kaffe/m4/classpath.m4:1.2 kaffe/m4/classpath.m4:1.3 --- kaffe/m4/classpath.m4:1.2 Thu Jun 14 13:17:20 2007 +++ kaffe/m4/classpath.m4 Sat Jan 19 18:24:00 2008 @@ -34,7 +34,6 @@ [CLASSPATH_PREFIX=${withval}], [CLASSPATH_PREFIX=/usr/local/classpath]) AC_MSG_RESULT(${CLASSPATH_PREFIX}) -#AC_DEFINE_UNQUOTED([CLASSPATH_PREFIX], "${CLASSPATH_PREFIX}", [Java core library installation directory]) AC_SUBST(CLASSPATH_PREFIX) ]) @@ -48,10 +47,20 @@ [CLASSPATH_CLASSES=${withval}], [CLASSPATH_CLASSES=${CLASSPATH_PREFIX}/share/classpath/glibj.zip]) AC_MSG_RESULT(${CLASSPATH_CLASSES}) -#AC_DEFINE_UNQUOTED([CLASSPATH_CLASSES], "${CLASSPATH_CLASSES}", [Java core library classes]) AC_SUBST(CLASSPATH_CLASSES) ]) +dnl where are Java core library classes installed on the target + +AC_DEFUN([AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES],[ +AC_MSG_CHECKING(where Java core library classes are installed on the target) +AC_ARG_WITH([target-classpath-classes], + [AS_HELP_STRING(--with-target-classpath-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=/usr/local/classpath/share/classpath/glibj.zip]])], + [TARGET_CLASSPATH_CLASSES=${withval}], + [TARGET_CLASSPATH_CLASSES=${CLASSPATH_CLASSES}]) +AC_MSG_RESULT(${TARGET_CLASSPATH_CLASSES}) +AC_SUBST(TARGET_CLASSPATH_CLASSES) +]) dnl where are Java core library native libraries installed @@ -64,8 +73,6 @@ AC_MSG_RESULT(${CLASSPATH_LIBDIR}) dnl expand CLASSPATH_LIBDIR to something that is usable in C code -#AS_AC_EXPAND([CLASSPATH_LIBDIR], ${CLASSPATH_LIBDIR}) -#AC_DEFINE_UNQUOTED([CLASSPATH_LIBDIR], "${CLASSPATH_LIBDIR}", [Java core library native libraries installation directory]) AC_SUBST(CLASSPATH_LIBDIR) ]) Index: kaffe/replace/Makefile.in diff -u kaffe/replace/Makefile.in:1.143 kaffe/replace/Makefile.in:1.144 --- kaffe/replace/Makefile.in:1.143 Sun Jan 6 19:05:36 2008 +++ kaffe/replace/Makefile.in Sat Jan 19 18:24:00 2008 @@ -218,6 +218,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/test/Makefile.in diff -u kaffe/test/Makefile.in:1.192 kaffe/test/Makefile.in:1.193 --- kaffe/test/Makefile.in:1.192 Sun Jan 6 19:05:37 2008 +++ kaffe/test/Makefile.in Sat Jan 19 18:24:01 2008 @@ -203,6 +203,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/test/internal/Makefile.in diff -u kaffe/test/internal/Makefile.in:1.168 kaffe/test/internal/Makefile.in:1.169 --- kaffe/test/internal/Makefile.in:1.168 Sun Jan 6 19:05:37 2008 +++ kaffe/test/internal/Makefile.in Sat Jan 19 18:24:01 2008 @@ -227,6 +227,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/test/jni/Makefile.in diff -u kaffe/test/jni/Makefile.in:1.99 kaffe/test/jni/Makefile.in:1.100 --- kaffe/test/jni/Makefile.in:1.99 Sun Jan 6 19:05:38 2008 +++ kaffe/test/jni/Makefile.in Sat Jan 19 18:24:01 2008 @@ -244,6 +244,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/test/regression/Makefile.in diff -u kaffe/test/regression/Makefile.in:1.271 kaffe/test/regression/Makefile.in:1.272 --- kaffe/test/regression/Makefile.in:1.271 Sun Jan 6 19:05:38 2008 +++ kaffe/test/regression/Makefile.in Sat Jan 19 18:24:02 2008 @@ -275,6 +275,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/test/regression/compile_time/Makefile.in diff -u kaffe/test/regression/compile_time/Makefile.in:1.120 kaffe/test/regression/compile_time/Makefile.in:1.121 --- kaffe/test/regression/compile_time/Makefile.in:1.120 Sun Jan 6 19:05:38 2008 +++ kaffe/test/regression/compile_time/Makefile.in Sat Jan 19 18:24:02 2008 @@ -199,6 +199,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ Index: kaffe/test/regression/compiler/Makefile.in diff -u kaffe/test/regression/compiler/Makefile.in:1.104 kaffe/test/regression/compiler/Makefile.in:1.105 --- kaffe/test/regression/compiler/Makefile.in:1.104 Sun Jan 6 19:05:39 2008 +++ kaffe/test/regression/compiler/Makefile.in Sat Jan 19 18:24:03 2008 *** Patch too long, truncated *** _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe