[kaffe] CVS kaffe (robilad): Added support for using an existing GNU Classpath installation.
Kaffe CVS
cvs-commits at kaffe.org
Tue Jun 12 19:20:41 PDT 2007
PatchSet 7484
Date: 2007/06/13 02:19:29
Author: robilad
Branch: HEAD
Tag: (none)
Log:
2007-06-11 Dalibor Topic <robilad at kaffe.org>
Added support for using an existing GNU Classpath installation.
* Makefile.am (BUILD_ENVIRONMENT-make): Add the installed GNU Classpath
libraries to the KAFFELIBRARPATH.
* configure.ac: Added support for using an existing GNU Classpath installation.
Set GLIBJ_ZIP according to the class library used.
* developers/autogen.sh: Removed fastjar-related parts.
* kaffe/scripts/kaffe.in (KAFFELIBRARYPATH): Add the installed GNU Classpath
libraries.
* libraries/javalib/Makefile.am (USE_SYSTEM_CLASSPATH): Added section to
handle an existing GNU Classpath installation.
* test/internal/Makefile.am (LIBNATIVE): Set according to the source of native
class library code.
* test/regression/TestScript.in (JAVA_COMPILER): Use GLIBJ_ZIP.
Members:
ChangeLog:1.4983->1.4984
Makefile.am:1.124->1.125
Makefile.in:1.277->1.278
aclocal.m4:1.134->1.135
configure:1.584->1.585
configure.ac:1.261->1.262
config/Makefile.in:1.234->1.235
config/config.h.in:1.164->1.165
developers/autogen.sh:1.75->1.76
include/Makefile.in:1.298->1.299
kaffe/Makefile.in:1.188->1.189
kaffe/jvmpi/Makefile.in:1.112->1.113
kaffe/kaffe/Makefile.in:1.210->1.211
kaffe/kaffeh/Makefile.in:1.193->1.194
kaffe/kaffevm/Makefile.in:1.259->1.260
kaffe/kaffevm/boehm-gc/Makefile.in:1.75->1.76
kaffe/kaffevm/boehm-gc/boehm/config.guess:1.4->1.5
kaffe/kaffevm/boehm-gc/boehm/config.sub:1.5->1.6
kaffe/kaffevm/boehm-gc/boehm/configure:1.21->1.22
kaffe/kaffevm/boehm-gc/boehm/libtool.m4:1.4->1.5
kaffe/kaffevm/boehm-gc/boehm/ltmain.sh:1.7->1.8
kaffe/kaffevm/gcj/Makefile.in:1.168->1.169
kaffe/kaffevm/intrp/Makefile.in:1.177->1.178
kaffe/kaffevm/jit/Makefile.in:1.187->1.188
kaffe/kaffevm/jit3/Makefile.in:1.157->1.158
kaffe/kaffevm/jni/Makefile.in:1.81->1.82
kaffe/kaffevm/kaffe-gc/Makefile.in:1.74->1.75
kaffe/kaffevm/systems/Makefile.in:1.177->1.178
kaffe/kaffevm/systems/beos-native/Makefile.in:1.168->1.169
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.31->1.32
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.174->1.175
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.178->1.179
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.154->1.155
kaffe/kaffevm/verifier/Makefile.in:1.80->1.81
kaffe/man/Makefile.in:1.175->1.176
kaffe/scripts/Makefile.in:1.217->1.218
kaffe/scripts/kaffe.in:1.39->1.40
kaffe/scripts/bat/Makefile.in:1.168->1.169
kaffe/scripts/compat/Makefile.in:1.195->1.196
kaffe/xprof/Makefile.in:1.143->1.144
libltdl/acinclude.m4:1.38->1.39
libltdl/config.guess:1.15->1.16
libltdl/config.sub:1.20->1.21
libltdl/configure:1.100->1.101
libltdl/ltdl.c:1.49->1.50
libltdl/ltmain.sh:1.17->1.18
libraries/Makefile.in:1.171->1.172
libraries/clib/Makefile.in:1.192->1.193
libraries/clib/awt/Makefile.in:1.186->1.187
libraries/clib/awt/X/Makefile.in:1.180->1.181
libraries/clib/awt/nano-X/Makefile.in:1.52->1.53
libraries/clib/awt/qt/Makefile.in:1.134->1.135
libraries/clib/awt/xynth/Makefile.in:1.8->1.9
libraries/clib/management/Makefile.in:1.189->1.190
libraries/clib/math/Makefile.in:1.183->1.184
libraries/clib/security/Makefile.in:1.155->1.156
libraries/clib/sound/Makefile.in:1.80->1.81
libraries/clib/sound/alsa/Makefile.in:1.81->1.82
libraries/clib/sound/common/Makefile.in:1.80->1.81
libraries/clib/sound/esd/Makefile.in:1.81->1.82
libraries/clib/zip/Makefile.in:1.188->1.189
libraries/javalib/Makefile.am:1.457->1.458
libraries/javalib/Makefile.in:1.577->1.578
libraries/javalib/awt-implementations/Makefile.in:1.65->1.66
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.84->1.85
libraries/javalib/dnsjava/Makefile.in:1.10->1.11
libraries/javalib/external/classpath/aclocal.m4:1.24->1.25
libraries/javalib/external/classpath/config.guess:1.38->1.39
libraries/javalib/external/classpath/config.sub:1.45->1.46
libraries/javalib/external/classpath/configure:1.40->1.41
libraries/javalib/external/classpath/ltmain.sh:1.36->1.37
libraries/javalib/gmp-math/Makefile.in:1.74->1.75
libraries/javalib/gnu-inet/Makefile.in:1.8->1.9
libraries/javalib/tritonus-sound/Makefile.in:1.10->1.11
libraries/javalib/vmspecific/Makefile.in:1.11->1.12
libraries/javalib/zlib-zip/Makefile.in:1.10->1.11
m4/classpath.m4:INITIAL->1.1
m4/libtool.m4:1.15->1.16
replace/Makefile.in:1.130->1.131
scripts/config.guess:1.14->1.15
scripts/config.sub:1.14->1.15
scripts/ltmain.sh:1.38->1.39
test/Makefile.in:1.180->1.181
test/internal/Makefile.am:1.32->1.33
test/internal/Makefile.in:1.154->1.155
test/jni/Makefile.in:1.84->1.85
test/regression/Makefile.in:1.257->1.258
test/regression/TestScript.in:1.52->1.53
test/regression/compile_time/Makefile.in:1.108->1.109
test/regression/compiler/Makefile.in:1.92->1.93
test/regression/run_time/Makefile.in:1.107->1.108
tools/Makefile.in:1.82->1.83
tools/gjdoc/Makefile.in:1.81->1.82
tools/gjdoc/javalib/Makefile.in:1.98->1.99
tools/javatools/Makefile.in:1.38->1.39
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4983 kaffe/ChangeLog:1.4984
--- kaffe/ChangeLog:1.4983 Fri Jun 8 20:58:19 2007
+++ kaffe/ChangeLog Wed Jun 13 02:19:29 2007
@@ -1,3 +1,26 @@
+2007-06-11 Dalibor Topic <robilad at kaffe.org>
+
+ Added support for using an existing GNU Classpath installation.
+
+ * Makefile.am (BUILD_ENVIRONMENT-make): Add the installed GNU Classpath
+ libraries to the KAFFELIBRARPATH.
+
+ * configure.ac: Added support for using an existing GNU Classpath installation.
+ Set GLIBJ_ZIP according to the class library used.
+
+ * developers/autogen.sh: Removed fastjar-related parts.
+
+ * kaffe/scripts/kaffe.in (KAFFELIBRARYPATH): Add the installed GNU Classpath
+ libraries.
+
+ * libraries/javalib/Makefile.am (USE_SYSTEM_CLASSPATH): Added section to
+ handle an existing GNU Classpath installation.
+
+ * test/internal/Makefile.am (LIBNATIVE): Set according to the source of native
+ class library code.
+
+ * test/regression/TestScript.in (JAVA_COMPILER): Use GLIBJ_ZIP.
+
2007-06-08 Dalibor Topic <robilad at kaffe.org>
* FAQ/FAQ.requiredlibraries: Documented zlib & jar tool requirements.
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.124 kaffe/Makefile.am:1.125
--- kaffe/Makefile.am:1.124 Thu Jun 7 19:58:03 2007
+++ kaffe/Makefile.am Wed Jun 13 02:19:29 2007
@@ -174,7 +174,7 @@
BUILD_ENVIRONMENT-make: Makefile
echo BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(GLIBJ_ZIP)\''$(PATHSEP)'\'\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\; export BOOTCLASSPATH | $(SED) 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | $(SED) 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \
- echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/kaffe/kaffevm/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-lang/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-util/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
+ echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/kaffe/kaffevm/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-lang/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-util/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\''$(PATHSEP)'\'@CLASSPATH_LIBDIR@${DIRSEP}classpath\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new; \
rm -f BUILD_ENVIRONMENT
mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.277 kaffe/Makefile.in:1.278
--- kaffe/Makefile.in:1.277 Thu Jun 7 19:58:03 2007
+++ kaffe/Makefile.in Wed Jun 13 02:19:29 2007
@@ -61,18 +61,18 @@
$(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \
- $(top_srcdir)/m4/binreloc.m4 $(top_srcdir)/m4/compile_value.m4 \
- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/gcc_attribute.m4 \
- $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibcver.m4 $(top_srcdir)/m4/gmp.m4 \
- $(top_srcdir)/m4/gwqt.m4 $(top_srcdir)/m4/herrno.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/in6addr.m4 \
- $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
- $(top_srcdir)/m4/semaphore.m4 $(top_srcdir)/m4/size_max.m4 \
- $(top_srcdir)/m4/sockaddrin6.m4 \
+ $(top_srcdir)/m4/binreloc.m4 $(top_srcdir)/m4/classpath.m4 \
+ $(top_srcdir)/m4/compile_value.m4 $(top_srcdir)/m4/esd.m4 \
+ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/getopt.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibcver.m4 \
+ $(top_srcdir)/m4/gmp.m4 $(top_srcdir)/m4/gwqt.m4 \
+ $(top_srcdir)/m4/herrno.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/in6addr.m4 $(top_srcdir)/m4/lcmessage.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/semaphore.m4 \
+ $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sockaddrin6.m4 \
$(top_srcdir)/m4/sockinttypes.m4 \
$(top_srcdir)/m4/solarispthread.m4 $(top_srcdir)/m4/valist.m4 \
$(top_srcdir)/configure.ac
@@ -132,6 +132,9 @@
CFLAGS = @CFLAGS@
CFLAGS_PG = @CFLAGS_PG@
CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
+CLASSPATH_CLASSES = @CLASSPATH_CLASSES@
+CLASSPATH_LIBDIR = @CLASSPATH_LIBDIR@
+CLASSPATH_PREFIX = @CLASSPATH_PREFIX@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -932,7 +935,7 @@
BUILD_ENVIRONMENT-make: Makefile
echo BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(GLIBJ_ZIP)\''$(PATHSEP)'\'\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\; export BOOTCLASSPATH | $(SED) 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \
echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | $(SED) 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \
- echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/kaffe/kaffevm/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-lang/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-util/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
+ echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/kaffe/kaffevm/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-lang/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-util/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\''$(PATHSEP)'\'@CLASSPATH_LIBDIR@${DIRSEP}classpath\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new; \
rm -f BUILD_ENVIRONMENT
mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.134 kaffe/aclocal.m4:1.135
--- kaffe/aclocal.m4:1.134 Tue Jan 9 23:45:18 2007
+++ kaffe/aclocal.m4 Wed Jun 13 02:19:29 2007
@@ -963,6 +963,7 @@
m4_include([m4/ax_cflags_warn_all.m4])
m4_include([m4/ax_create_stdint_h.m4])
m4_include([m4/binreloc.m4])
+m4_include([m4/classpath.m4])
m4_include([m4/compile_value.m4])
m4_include([m4/esd.m4])
m4_include([m4/gcc_attribute.m4])
Index: kaffe/configure
diff -u kaffe/configure:1.584 kaffe/configure:1.585
--- kaffe/configure:1.584 Thu Jun 7 19:58:03 2007
+++ kaffe/configure Wed Jun 13 02:19:29 2007
@@ -964,6 +964,11 @@
CREATE_GTK_PEER_LIBRARIES_FALSE
CREATE_PLUGIN_TRUE
CREATE_PLUGIN_FALSE
+USE_SYSTEM_CLASSPATH_TRUE
+USE_SYSTEM_CLASSPATH_FALSE
+CLASSPATH_PREFIX
+CLASSPATH_CLASSES
+CLASSPATH_LIBDIR
USE_PRECOMPILED_RT_JAR_TRUE
USE_PRECOMPILED_RT_JAR_FALSE
GLIBJ_ZIP
@@ -1765,6 +1770,21 @@
[default=unix-pthreads]
--with-gc=GC Force use given execution engine (kaffe-gc or
boehm-gc)
+ --with-system-classpath use the system install of GNU Classpath (per default
+ in /usr/local/classpath)
+ --with-classpath-prefix=<dir>
+ installation directory of Java core library
+ [default=/usr/local/classpath]
+ --with-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]
+ --with-classpath-includedir=<dir>
+ installation directory of Java core library headers
+ [default=/usr/local/classpath/include]
--with-glibj-zip=ABS.PATH
use precompiled kaffe class library
--with-ecj=ECJ Define to use ECJ as the java compiler instead of
@@ -6984,7 +7004,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -7038,11 +7058,11 @@
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -7157,7 +7177,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7160 "configure"' > conftest.$ac_ext
+ echo '#line 7180 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8900,7 +8920,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
-linux*)
+linux* | k*bsd*-gnu)
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -9710,11 +9730,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:9713: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9733: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9717: \$? = $ac_status" >&5
+ echo "$as_me:9737: \$? = $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.
@@ -9872,7 +9892,7 @@
lt_prog_compiler_static='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
@@ -9978,11 +9998,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:9981: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10001: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9985: \$? = $ac_status" >&5
+ echo "$as_me:10005: \$? = $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.
@@ -10082,11 +10102,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:10085: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10105: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10089: \$? = $ac_status" >&5
+ echo "$as_me:10109: \$? = $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
@@ -10311,7 +10331,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -10337,12 +10357,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs=no
else
ld_shlibs=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -10770,7 +10791,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -10872,7 +10893,7 @@
link_all_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -11362,18 +11383,6 @@
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -11529,7 +11538,7 @@
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -11558,7 +11567,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
+netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -11567,7 +11576,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+ dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
@@ -12390,7 +12399,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12393 "configure"
+#line 12402 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12490,7 +12499,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12493 "configure"
+#line 12502 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13803,7 +13812,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
@@ -13962,7 +13971,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -14064,7 +14073,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -14635,7 +14644,7 @@
;;
esac
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -14678,7 +14687,7 @@
;;
esac
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -14721,7 +14730,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -14830,11 +14839,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:14833: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14842: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14837: \$? = $ac_status" >&5
+ echo "$as_me:14846: \$? = $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.
@@ -14934,11 +14943,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:14937: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14946: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14941: \$? = $ac_status" >&5
+ echo "$as_me:14950: \$? = $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
@@ -15006,6 +15015,9 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
+ link_all_deplibs_CXX=no
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -15285,18 +15297,6 @@
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -15452,7 +15452,7 @@
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -15481,7 +15481,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
+netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -15490,7 +15490,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+ dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
@@ -16398,7 +16398,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
@@ -16837,7 +16837,7 @@
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -16863,12 +16863,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_F77=no
else
ld_shlibs_F77=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -17276,7 +17277,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
@@ -17378,7 +17379,7 @@
link_all_deplibs_F77=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -17868,18 +17869,6 @@
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -18035,7 +18024,7 @@
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -18064,7 +18053,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
+netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -18073,7 +18062,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+ dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
@@ -18810,11 +18799,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:18813: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18802: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18817: \$? = $ac_status" >&5
+ echo "$as_me:18806: \$? = $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.
@@ -18972,7 +18961,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
@@ -19078,11 +19067,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:19081: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19070: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19085: \$? = $ac_status" >&5
+ echo "$as_me:19074: \$? = $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.
@@ -19182,11 +19171,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:19185: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19174: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19189: \$? = $ac_status" >&5
+ echo "$as_me:19178: \$? = $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
@@ -19411,7 +19400,7 @@
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -19437,12 +19426,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_GCJ=no
else
ld_shlibs_GCJ=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -19870,7 +19860,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
@@ -19972,7 +19962,7 @@
link_all_deplibs_GCJ=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -20462,18 +20452,6 @@
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -20629,7 +20607,7 @@
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -20658,7 +20636,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
+netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -20667,7 +20645,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+ dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
@@ -24191,7 +24169,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
-linux*)
+linux* | k*bsd*-gnu)
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -26281,6 +26259,242 @@
+
+# Check whether --with-system-classpath was given.
+if test "${with_system_classpath+set}" = set; then
+ withval=$with_system_classpath;
+fi
+
+
+ if test x$with_system_classpath = xyes; then
+ USE_SYSTEM_CLASSPATH_TRUE=
+ USE_SYSTEM_CLASSPATH_FALSE='#'
+else
+ USE_SYSTEM_CLASSPATH_TRUE='#'
+ USE_SYSTEM_CLASSPATH_FALSE=
+fi
+
+
+
+{ echo "$as_me:$LINENO: checking where Java core library is installed" >&5
+echo $ECHO_N "checking where Java core library is installed... $ECHO_C" >&6; }
+
+# Check whether --with-classpath-prefix was given.
+if test "${with_classpath_prefix+set}" = set; then
+ withval=$with_classpath_prefix; CLASSPATH_PREFIX=${withval}
+else
+ CLASSPATH_PREFIX=/usr/local/classpath
+fi
+
+{ 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])
+
+
+
+{ echo "$as_me:$LINENO: checking where Java core library classes are installed" >&5
+echo $ECHO_N "checking where Java core library classes are installed... $ECHO_C" >&6; }
+
+# Check whether --with-classpath-classes was given.
+if test "${with_classpath_classes+set}" = set; then
+ withval=$with_classpath_classes; CLASSPATH_CLASSES=${withval}
+else
+ CLASSPATH_CLASSES=${CLASSPATH_PREFIX}/share/classpath/glibj.zip
+fi
+
+{ 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 native libraries are installed" >&5
+echo $ECHO_N "checking where Java core library native libraries are installed... $ECHO_C" >&6; }
+
+# Check whether --with-classpath-libdir was given.
+if test "${with_classpath_libdir+set}" = set; then
+ withval=$with_classpath_libdir; CLASSPATH_LIBDIR=${withval}
+else
+ CLASSPATH_LIBDIR=${CLASSPATH_PREFIX}/lib
+fi
+
+{ 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])
+
+
+
+{ echo "$as_me:$LINENO: checking where Java core library headers are installed" >&5
+echo $ECHO_N "checking where Java core library headers are installed... $ECHO_C" >&6; }
+
+# Check whether --with-classpath-includedir was given.
+if test "${with_classpath_includedir+set}" = set; then
+ withval=$with_classpath_includedir; CLASSPATH_INCLUDEDIR=${withval}
+else
+ CLASSPATH_INCLUDEDIR=${CLASSPATH_PREFIX}/include
+fi
+
+{ echo "$as_me:$LINENO: result: ${CLASSPATH_INCLUDEDIR}" >&5
+echo "${ECHO_T}${CLASSPATH_INCLUDEDIR}" >&6; }
+
+as_ac_Header=`echo "ac_cv_header_${CLASSPATH_INCLUDEDIR}/jni.h" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for ${CLASSPATH_INCLUDEDIR}/jni.h" >&5
+echo $ECHO_N "checking for ${CLASSPATH_INCLUDEDIR}/jni.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking ${CLASSPATH_INCLUDEDIR}/jni.h usability" >&5
+echo $ECHO_N "checking ${CLASSPATH_INCLUDEDIR}/jni.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <${CLASSPATH_INCLUDEDIR}/jni.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking ${CLASSPATH_INCLUDEDIR}/jni.h presence" >&5
+echo $ECHO_N "checking ${CLASSPATH_INCLUDEDIR}/jni.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
*** Patch too long, truncated ***
More information about the kaffe
mailing list