[kaffe] CVS kaffe (dalibor): Reworked support for class library profiles and big math
Kaffe CVS
cvs-commits at kaffe.org
Sun Jul 18 09:16:32 PDT 2004
PatchSet 4982
Date: 2004/07/18 15:27:23
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Reworked support for class library profiles and big math
2004-07-18 Dalibor Topic <robilad at kaffe.org>
* FAQ/FAQ.classlibrary-compile: Updated information on
profiles.
* m4/gmp.m4: New file, taken from GNU m4.
* THIRDPARTY: Added section on m4/gmp.m4.
* libraries/javalib/java/math/BigDecimal.java,
libraries/javalib/java/math/BigInteger.java:
Made GNU Classpath's implementation the default.
* FAQ/FAQ.bignum: New file. Documentation for BigInteger
implementations.
* libraries/javalib/all.files: New file, listing the default
profile.
* libraries/javalib/gmp-math/Makefile.am,
libraries/javalib/gmp-math/Makefile.in,
libraries/javalib/gmp-math/java/math/BigDecimal.java,
libraries/javalib/gmp-math/BigInteger.java:
Moved over GNU MP using java.math implementation over here.
* kaffe/kaffe/main.c:
Include prefix.h if BinReloc is enabled.
(options) Handle -Xnative-big-math option.
(usage) Added -Xnative-big-math.
* configure.ac:
Use m4_LIB_GMP to test for GNU MP and add a --without-gmp option.
(--with-class-library-profile) Require profile to be an absolute
path. Create libraries/javalib/gmp-math/Makefile.
* Makefile.am:
(EXTRA_DIST) Add FAQ/FAQ.bignum.
* libraries/clib/Makefile.am:
(SUBDIRS) Always build the math libraries.
* libraries/clib/math/BigInteger.c:
Changed guards to use USE_GMP.
* libraries/clib/math/Makefile.am,
(libmath_la_LIBADD) Use LIBADD_GMP.
* libraries/javalib/Makefile.am.in:
(SUBDIRS) Build rt.jar first, and then recurse into gmp-math.
(EXTRA_DIST) Removed no longer necessary files and directories.
Added all.files.
(compile-classes) Simplified.
* Makefile.in,
aclocal.m4,
configure,
config/Makefile.in,
config/config.h.in,
include/Makefile.in,
kaffe/Makefile.in,
kaffe/jvmpi/Makefile.in,
kaffe/kaffe/Makefile.in,
kaffe/kaffeh/Makefile.in,
kaffe/kaffevm/Makefile.in,
kaffe/kaffevm/boehm-gc/Makefile.in,
kaffe/kaffevm/gcj/Makefile.in,
kaffe/kaffevm/intrp/Makefile.in,
kaffe/kaffevm/jit/Makefile.in,
kaffe/kaffevm/jit3/Makefile.in,
kaffe/kaffevm/jni/Makefile.in,
kaffe/kaffevm/kaffe-gc/Makefile.in,
kaffe/kaffevm/systems/Makefile.in,
kaffe/kaffevm/systems/beos-native/Makefile.in,
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
kaffe/kaffevm/verifier/Makefile.in,
kaffe/man/Makefile.in,
kaffe/scripts/Makefile.in,
kaffe/scripts/bat/Makefile.in,
kaffe/scripts/compat/Makefile.in,
kaffe/xprof/Makefile.in,
libraries/Makefile.in,
libraries/clib/Makefile.in,
libraries/clib/awt/Makefile.in,
libraries/clib/awt/X/Makefile.in,
libraries/clib/awt/qt/Makefile.in,
libraries/clib/io/Makefile.in,
libraries/clib/libxmlj/Makefile.in,
libraries/clib/management/Makefile.in,
libraries/clib/math/Makefile.in,
libraries/clib/native/Makefile.in,
libraries/clib/net/Makefile.in,
libraries/clib/nio/Makefile.in,
libraries/clib/security/Makefile.in,
libraries/clib/sound/Makefile.in,
libraries/clib/sound/alsa/Makefile.in,
libraries/clib/sound/common/Makefile.in,
libraries/clib/sound/esd/Makefile.in,
libraries/clib/zip/Makefile.in,
libraries/extensions/Makefile.in,
libraries/extensions/comm/Makefile.in,
libraries/extensions/comm/javalib/Makefile.in,
libraries/extensions/microsoft/Makefile.in,
libraries/extensions/microsoft/clib/Makefile.in,
libraries/extensions/microsoft/javalib/Makefile.in,
libraries/extensions/pjava/Makefile.in,
libraries/extensions/pjava/javalib/Makefile.in,
libraries/extensions/servlet/Makefile.in,
libraries/extensions/servlet/javalib/Makefile.in,
libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in,
replace/Makefile.in,
test/Makefile.in,
test/internal/Makefile.in,
test/jni/Makefile.in,
test/regression/Makefile.in,
test/regression/compile_time/Makefile.in,
test/regression/compiler/Makefile.in,
test/regression/run_time/Makefile.in,
tools/Makefile.in,
tools/gjdoc/Makefile.in,
tools/gjdoc/javalib/Makefile.in:
Regenerated.
Members:
ChangeLog:1.2546->1.2547
Makefile.am:1.73->1.74
Makefile.in:1.169->1.170
THIRDPARTY:1.20->1.21
aclocal.m4:1.106->1.107
configure:1.356->1.357
configure.ac:1.54->1.55
FAQ/FAQ.bignum:INITIAL->1.1
FAQ/FAQ.classlibrary-compile:1.14->1.15
config/Makefile.in:1.145->1.146
config/config.h.in:1.118->1.119
include/Makefile.in:1.170->1.171
kaffe/Makefile.in:1.120->1.121
kaffe/jvmpi/Makefile.in:1.42->1.43
kaffe/kaffe/Makefile.in:1.137->1.138
kaffe/kaffe/main.c:1.60->1.61
kaffe/kaffeh/Makefile.in:1.119->1.120
kaffe/kaffevm/Makefile.in:1.165->1.166
kaffe/kaffevm/boehm-gc/Makefile.in:1.1->1.2
kaffe/kaffevm/gcj/Makefile.in:1.100->1.101
kaffe/kaffevm/intrp/Makefile.in:1.108->1.109
kaffe/kaffevm/jit/Makefile.in:1.114->1.115
kaffe/kaffevm/jit3/Makefile.in:1.85->1.86
kaffe/kaffevm/jni/Makefile.in:1.12->1.13
kaffe/kaffevm/kaffe-gc/Makefile.in:1.1->1.2
kaffe/kaffevm/systems/Makefile.in:1.108->1.109
kaffe/kaffevm/systems/beos-native/Makefile.in:1.100->1.101
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.106->1.107
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.110->1.111
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.81->1.82
kaffe/kaffevm/verifier/Makefile.in:1.11->1.12
kaffe/man/Makefile.in:1.106->1.107
kaffe/scripts/Makefile.in:1.143->1.144
kaffe/scripts/bat/Makefile.in:1.99->1.100
kaffe/scripts/compat/Makefile.in:1.124->1.125
kaffe/xprof/Makefile.in:1.74->1.75
libraries/Makefile.in:1.103->1.104
libraries/clib/Makefile.am:1.8->1.9
libraries/clib/Makefile.in:1.112->1.113
libraries/clib/awt/Makefile.in:1.116->1.117
libraries/clib/awt/X/Makefile.in:1.107->1.108
libraries/clib/awt/qt/Makefile.in:1.63->1.64
libraries/clib/io/Makefile.in:1.111->1.112
libraries/clib/libxmlj/Makefile.in:1.15->1.16
libraries/clib/management/Makefile.in:1.119->1.120
libraries/clib/math/BigInteger.c:1.21->1.22
libraries/clib/math/Makefile.am:1.10->1.11
libraries/clib/math/Makefile.in:1.114->1.115
libraries/clib/native/Makefile.in:1.147->1.148
libraries/clib/net/Makefile.in:1.123->1.124
libraries/clib/nio/Makefile.in:1.38->1.39
libraries/clib/security/Makefile.in:1.85->1.86
libraries/clib/sound/Makefile.in:1.12->1.13
libraries/clib/sound/alsa/Makefile.in:1.12->1.13
libraries/clib/sound/common/Makefile.in:1.12->1.13
libraries/clib/sound/esd/Makefile.in:1.12->1.13
libraries/clib/zip/Makefile.in:1.116->1.117
libraries/extensions/Makefile.in:1.95->1.96
libraries/extensions/comm/Makefile.in:1.89->1.90
libraries/extensions/comm/javalib/Makefile.in:1.89->1.90
libraries/extensions/microsoft/Makefile.in:1.81->1.82
libraries/extensions/microsoft/clib/Makefile.in:1.85->1.86
libraries/extensions/microsoft/javalib/Makefile.in:1.82->1.83
libraries/extensions/pjava/Makefile.in:1.89->1.90
libraries/extensions/pjava/javalib/Makefile.in:1.89->1.90
libraries/extensions/servlet/Makefile.in:1.89->1.90
libraries/extensions/servlet/javalib/Makefile.in:1.89->1.90
libraries/javalib/Makefile.am:1.199->1.200
libraries/javalib/Makefile.am.in:1.12->1.13
libraries/javalib/Makefile.in:1.273->1.274
libraries/javalib/all.files:INITIAL->1.1
libraries/javalib/essential.files:1.48->1.49(DEAD)
libraries/javalib/native_java_math.files:1.1->1.2(DEAD)
libraries/javalib/pure_java_math.files:1.1->1.2(DEAD)
libraries/javalib/gmp-math/Makefile.am:INITIAL->1.1
libraries/javalib/gmp-math/Makefile.in:INITIAL->1.1
libraries/javalib/gmp-math/java/math/BigDecimal.java:INITIAL->1.1
libraries/javalib/gmp-math/java/math/BigInteger.java:INITIAL->1.1
libraries/javalib/gnu/java/math/MPN.java:INITIAL->1.1
libraries/javalib/java/math/BigDecimal.java:1.8->1.9
libraries/javalib/java/math/BigInteger.java:1.27->1.28
libraries/javalib/profiles/allatonce/all.files:1.53->1.54(DEAD)
libraries/javalib/profiles/allatonce/profile:1.1->1.2(DEAD)
libraries/javalib/profiles/default/awt.files:1.9->1.10(DEAD)
libraries/javalib/profiles/default/core.files:1.30->1.31(DEAD)
libraries/javalib/profiles/default/coreawt.files:1.11->1.12(DEAD)
libraries/javalib/profiles/default/imageio.files:1.1->1.2(DEAD)
libraries/javalib/profiles/default/inet.files:1.2->1.3(DEAD)
libraries/javalib/profiles/default/jsse.files:1.2->1.3(DEAD)
libraries/javalib/profiles/default/moreawt.files:1.7->1.8(DEAD)
libraries/javalib/profiles/default/print.files:1.1->1.2(DEAD)
libraries/javalib/profiles/default/profile:1.6->1.7(DEAD)
libraries/javalib/profiles/default/rest.files:1.12->1.13(DEAD)
libraries/javalib/profiles/default/rmi.files:1.6->1.7(DEAD)
libraries/javalib/profiles/default/sound.files:1.2->1.3(DEAD)
libraries/javalib/profiles/default/xml.files:1.3->1.4(DEAD)
libraries/javalib/profiles/minimal/profile:1.1->1.2(DEAD)
m4/gmp.m4:INITIAL->1.1
replace/Makefile.in:1.54->1.55
test/Makefile.in:1.110->1.111
test/internal/Makefile.in:1.68->1.69
test/jni/Makefile.in:1.4->1.5
test/regression/Makefile.in:1.178->1.179
test/regression/compile_time/Makefile.in:1.40->1.41
test/regression/compiler/Makefile.in:1.21->1.22
test/regression/run_time/Makefile.in:1.39->1.40
tools/Makefile.in:1.13->1.14
tools/gjdoc/Makefile.in:1.13->1.14
tools/gjdoc/javalib/Makefile.in:1.16->1.17
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2546 kaffe/ChangeLog:1.2547
--- kaffe/ChangeLog:1.2546 Sat Jul 17 15:33:33 2004
+++ kaffe/ChangeLog Sun Jul 18 15:27:23 2004
@@ -1,3 +1,128 @@
+2004-07-18 Dalibor Topic <robilad at kaffe.org>
+
+ * FAQ/FAQ.classlibrary-compile: Updated information on
+ profiles.
+
+ * m4/gmp.m4: New file, taken from GNU m4.
+
+ * THIRDPARTY: Added section on m4/gmp.m4.
+
+ * libraries/javalib/java/math/BigDecimal.java,
+ libraries/javalib/java/math/BigInteger.java:
+ Made GNU Classpath's implementation the default.
+
+ * FAQ/FAQ.bignum: New file. Documentation for BigInteger
+ implementations.
+
+ * libraries/javalib/all.files: New file, listing the default
+ profile.
+
+ * libraries/javalib/gmp-math/Makefile.am,
+ libraries/javalib/gmp-math/Makefile.in,
+ libraries/javalib/gmp-math/java/math/BigDecimal.java,
+ libraries/javalib/gmp-math/BigInteger.java:
+ Moved over GNU MP using java.math implementation over here.
+
+ * kaffe/kaffe/main.c:
+ Include prefix.h if BinReloc is enabled.
+ (options) Handle -Xnative-big-math option.
+ (usage) Added -Xnative-big-math.
+
+ * configure.ac:
+ Use m4_LIB_GMP to test for GNU MP and add a --without-gmp option.
+ (--with-class-library-profile) Require profile to be an absolute
+ path. Create libraries/javalib/gmp-math/Makefile.
+
+ * Makefile.am:
+ (EXTRA_DIST) Add FAQ/FAQ.bignum.
+
+ * libraries/clib/Makefile.am:
+ (SUBDIRS) Always build the math libraries.
+
+ * libraries/clib/math/BigInteger.c:
+ Changed guards to use USE_GMP.
+
+ * libraries/clib/math/Makefile.am,
+ (libmath_la_LIBADD) Use LIBADD_GMP.
+
+ * libraries/javalib/Makefile.am.in:
+ (SUBDIRS) Build rt.jar first, and then recurse into gmp-math.
+ (EXTRA_DIST) Removed no longer necessary files and directories.
+ Added all.files.
+ (compile-classes) Simplified.
+
+ * Makefile.in,
+ aclocal.m4,
+ configure,
+ config/Makefile.in,
+ config/config.h.in,
+ include/Makefile.in,
+ kaffe/Makefile.in,
+ kaffe/jvmpi/Makefile.in,
+ kaffe/kaffe/Makefile.in,
+ kaffe/kaffeh/Makefile.in,
+ kaffe/kaffevm/Makefile.in,
+ kaffe/kaffevm/boehm-gc/Makefile.in,
+ kaffe/kaffevm/gcj/Makefile.in,
+ kaffe/kaffevm/intrp/Makefile.in,
+ kaffe/kaffevm/jit/Makefile.in,
+ kaffe/kaffevm/jit3/Makefile.in,
+ kaffe/kaffevm/jni/Makefile.in,
+ kaffe/kaffevm/kaffe-gc/Makefile.in,
+ kaffe/kaffevm/systems/Makefile.in,
+ kaffe/kaffevm/systems/beos-native/Makefile.in,
+ kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
+ kaffe/kaffevm/verifier/Makefile.in,
+ kaffe/man/Makefile.in,
+ kaffe/scripts/Makefile.in,
+ kaffe/scripts/bat/Makefile.in,
+ kaffe/scripts/compat/Makefile.in,
+ kaffe/xprof/Makefile.in,
+ libraries/Makefile.in,
+ libraries/clib/Makefile.in,
+ libraries/clib/awt/Makefile.in,
+ libraries/clib/awt/X/Makefile.in,
+ libraries/clib/awt/qt/Makefile.in,
+ libraries/clib/io/Makefile.in,
+ libraries/clib/libxmlj/Makefile.in,
+ libraries/clib/management/Makefile.in,
+ libraries/clib/math/Makefile.in,
+ libraries/clib/native/Makefile.in,
+ libraries/clib/net/Makefile.in,
+ libraries/clib/nio/Makefile.in,
+ libraries/clib/security/Makefile.in,
+ libraries/clib/sound/Makefile.in,
+ libraries/clib/sound/alsa/Makefile.in,
+ libraries/clib/sound/common/Makefile.in,
+ libraries/clib/sound/esd/Makefile.in,
+ libraries/clib/zip/Makefile.in,
+ libraries/extensions/Makefile.in,
+ libraries/extensions/comm/Makefile.in,
+ libraries/extensions/comm/javalib/Makefile.in,
+ libraries/extensions/microsoft/Makefile.in,
+ libraries/extensions/microsoft/clib/Makefile.in,
+ libraries/extensions/microsoft/javalib/Makefile.in,
+ libraries/extensions/pjava/Makefile.in,
+ libraries/extensions/pjava/javalib/Makefile.in,
+ libraries/extensions/servlet/Makefile.in,
+ libraries/extensions/servlet/javalib/Makefile.in,
+ libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in,
+ replace/Makefile.in,
+ test/Makefile.in,
+ test/internal/Makefile.in,
+ test/jni/Makefile.in,
+ test/regression/Makefile.in,
+ test/regression/compile_time/Makefile.in,
+ test/regression/compiler/Makefile.in,
+ test/regression/run_time/Makefile.in,
+ tools/Makefile.in,
+ tools/gjdoc/Makefile.in,
+ tools/gjdoc/javalib/Makefile.in:
+ Regenerated.
+
2004-07-17 Riccardo Mottola <rmottola at users.sf.net>
* libraries/clib/native/TimeZone.c
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.73 kaffe/Makefile.am:1.74
--- kaffe/Makefile.am:1.73 Sat Jul 17 07:56:54 2004
+++ kaffe/Makefile.am Sun Jul 18 15:27:25 2004
@@ -39,6 +39,7 @@
FAQ/FAQ.automake \
FAQ/FAQ.awt \
FAQ/FAQ.benchmarking \
+ FAQ/FAQ.bignum \
FAQ/FAQ.class-states \
FAQ/FAQ.classlibrary-compile \
FAQ/FAQ.code-layout \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.169 kaffe/Makefile.in:1.170
--- kaffe/Makefile.in:1.169 Sat Jul 17 07:56:54 2004
+++ kaffe/Makefile.in Sun Jul 18 15:27:25 2004
@@ -65,14 +65,15 @@
$(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/gettext.m4 $(top_srcdir)/m4/glibcver.m4 \
- $(top_srcdir)/m4/gnu-crypto.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/libxml.m4 $(top_srcdir)/m4/libxslt.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/sockaddrin6.m4 \
+ $(top_srcdir)/m4/gmp.m4 $(top_srcdir)/m4/gnu-crypto.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/libxml.m4 \
+ $(top_srcdir)/m4/libxslt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.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
@@ -215,6 +216,7 @@
KVMBINFLAGS = @KVMBINFLAGS@
KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
+LIBADD_GMP = @LIBADD_GMP@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
@@ -232,7 +234,6 @@
MAKEINFO = @MAKEINFO@
MAKE_KAFFEH = @MAKE_KAFFEH@
MATH_LIB = @MATH_LIB@
-MATH_LIBS = @MATH_LIBS@
MKINSTALLDIRS = @MKINSTALLDIRS@
MKTEMP = @MKTEMP@
MOC = @MOC@
@@ -278,6 +279,7 @@
USER_WANT_GNU_CRYPTO_TRUE = @USER_WANT_GNU_CRYPTO_TRUE@
USE_COMPAT_IFADDRS_FALSE = @USE_COMPAT_IFADDRS_FALSE@
USE_COMPAT_IFADDRS_TRUE = @USE_COMPAT_IFADDRS_TRUE@
+USE_GMP = @USE_GMP@
USE_JIT_FALSE = @USE_JIT_FALSE@
USE_JIT_TRUE = @USE_JIT_TRUE@
USE_NLS = @USE_NLS@
@@ -381,6 +383,7 @@
FAQ/FAQ.automake \
FAQ/FAQ.awt \
FAQ/FAQ.benchmarking \
+ FAQ/FAQ.bignum \
FAQ/FAQ.class-states \
FAQ/FAQ.classlibrary-compile \
FAQ/FAQ.code-layout \
Index: kaffe/THIRDPARTY
diff -u kaffe/THIRDPARTY:1.20 kaffe/THIRDPARTY:1.21
--- kaffe/THIRDPARTY:1.20 Wed Jul 7 22:15:04 2004
+++ kaffe/THIRDPARTY Sun Jul 18 15:27:25 2004
@@ -371,6 +371,15 @@
agrees to be bound by the terms and conditions of this License
Agreement.
+* m4/gmp.m4
+
+This code has been taken from GNU m4. Kaffe is tracking this project's CVS.
+The code is licensed under GNU General Public License v2 or later.
+
+See license.terms for the text of GNU General Public License v2.
+
+More information on GNU m4 is available at http://www.gnu.org/software/m4/.
+
* binreloc
Merged in BinReloc from http://www.autopackage.org/docs/binreloc/ . BinReloc
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.106 kaffe/aclocal.m4:1.107
--- kaffe/aclocal.m4:1.106 Sun Jul 11 08:54:17 2004
+++ kaffe/aclocal.m4 Sun Jul 18 15:27:25 2004
@@ -994,6 +994,7 @@
m4_include([m4/gcc_attribute.m4])
m4_include([m4/gettext.m4])
m4_include([m4/glibcver.m4])
+m4_include([m4/gmp.m4])
m4_include([m4/gnu-crypto.m4])
m4_include([m4/gwqt.m4])
m4_include([m4/herrno.m4])
Index: kaffe/configure
diff -u kaffe/configure:1.356 kaffe/configure:1.357
--- kaffe/configure:1.356 Sat Jul 17 13:56:00 2004
+++ kaffe/configure Sun Jul 18 15:27:26 2004
@@ -490,7 +490,7 @@
#endif"
ac_subdirs_all="$ac_subdirs_all libltdl"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE DNSJAVA_JAR HAVE_DNSJAVA_TRUE HAVE_DNSJAVA_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR GC_NAME BOEHMGC_SPECIFIC_FLAGS JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS VM_LIBS NET_LIBS ZIP_LIBS MATH_LIBS SECURITY_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK AWT_DIR ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS GNU_CRYPTO_HOME GNU_CRYPTO_JAR JAVAX_CRYPTO_JAR JAVAX_SECURITY_JAR USER_WANT_GNU_CRYPTO_TRUE USER_WANT_GNU_CRYPTO_FALSE PROFILE XML2_CONFIG XML_CFLAGS XML_LIBS XSLT_CONFIG XSLT_CFLAGS XSLT_LIBS COND_LIBXMLJ_TRUE COND_LIBXMLJ_FALSE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS BINRELOC_CFLAGS ENABLE_BINRELOC_TRUE ENABLE_BINRELOC_FALSE KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG subdirs LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE DNSJAVA_JAR HAVE_DNSJAVA_TRUE HAVE_DNSJAVA_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR GC_NAME BOEHMGC_SPECIFIC_FLAGS JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS VM_LIBS NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK AWT_DIR ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS GNU_CRYPTO_HOME GNU_CRYPTO_JAR JAVAX_CRYPTO_JAR JAVAX_SECURITY_JAR USER_WANT_GNU_CRYPTO_TRUE USER_WANT_GNU_CRYPTO_FALSE PROFILE XML2_CONFIG XML_CFLAGS XML_LIBS XSLT_CONFIG XSLT_CFLAGS XSLT_LIBS COND_LIBXMLJ_TRUE COND_LIBXMLJ_FALSE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS BINRELOC_CFLAGS ENABLE_BINRELOC_TRUE ENABLE_BINRELOC_FALSE KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG subdirs LTLIBOBJS'
ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
# Initialize some variables set by options.
@@ -1124,6 +1124,7 @@
boehm-gc)
--with-jikes<=JIKES> Define to use jikes compiler [default=no]
--with-libffi Use libffi for sysdepCallMethod
+ --without-gmp don't use GNU multiple precision arithmetic library
--with-x use the X Window System
--with-stats Gather statistics on vm execution
--with-awt=GRAPHICSYS specify AWT engine (no, X, qt)
@@ -1145,7 +1146,7 @@
unspecified, /usr/local/gnu-crypto, /usr/local,
/usr, /opt/gnu-crypto, and /opt are considered, in
that order
- --with-class-library-profile=PROFILE
+ --with-class-library-profile=ABS.PATH
specify class library profile
--with-xml-prefix=PFX Prefix where libxml is installed (optional)
--with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)
@@ -8995,7 +8996,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8998 "configure"' > conftest.$ac_ext
+ echo '#line 8999 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10345,7 +10346,7 @@
# Provide some information about the compiler.
-echo "$as_me:10348:" \
+echo "$as_me:10349:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -11383,11 +11384,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11386: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11387: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11390: \$? = $ac_status" >&5
+ echo "$as_me:11391: \$? = $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
@@ -11616,11 +11617,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11619: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11620: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11623: \$? = $ac_status" >&5
+ echo "$as_me:11624: \$? = $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
@@ -11676,11 +11677,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11679: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11680: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11683: \$? = $ac_status" >&5
+ echo "$as_me:11684: \$? = $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
@@ -13860,7 +13861,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13863 "configure"
+#line 13864 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13958,7 +13959,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13961 "configure"
+#line 13962 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16141,11 +16142,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16144: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16145: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16148: \$? = $ac_status" >&5
+ echo "$as_me:16149: \$? = $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
@@ -16201,11 +16202,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16204: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16205: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16208: \$? = $ac_status" >&5
+ echo "$as_me:16209: \$? = $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
@@ -17562,7 +17563,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17565 "configure"
+#line 17566 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17660,7 +17661,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17663 "configure"
+#line 17664 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18487,11 +18488,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18490: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18491: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18494: \$? = $ac_status" >&5
+ echo "$as_me:18495: \$? = $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
@@ -18547,11 +18548,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18550: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18551: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18554: \$? = $ac_status" >&5
+ echo "$as_me:18555: \$? = $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
@@ -20585,11 +20586,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:20588: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:20589: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:20592: \$? = $ac_status" >&5
+ echo "$as_me:20593: \$? = $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
@@ -20818,11 +20819,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:20821: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:20822: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:20825: \$? = $ac_status" >&5
+ echo "$as_me:20826: \$? = $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
@@ -20878,11 +20879,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:20881: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:20882: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:20885: \$? = $ac_status" >&5
+ echo "$as_me:20886: \$? = $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
@@ -23062,7 +23063,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 23065 "configure"
+#line 23066 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -23160,7 +23161,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 23163 "configure"
+#line 23164 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -31781,41 +31782,28 @@
ZIP_LIBS="$CTLIBS $ZIP_LIBS"
-KSAVE_LIBS="$LIBS"
-LIBS="$MATH_LIBS $KSAVE_LIBS"
-echo "$as_me:$LINENO: checking for mpz_get_d in -lgmp" >&5
-echo $ECHO_N "checking for mpz_get_d in -lgmp... $ECHO_C" >&6
-if test "${ac_cv_lib_gmp_mpz_get_d+set}" = set; then
+for ac_header in gmp.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgmp $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+ 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
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char mpz_get_d ();
-int
-main ()
-{
-mpz_get_d ();
- ;
- return 0;
-}
+#include <$ac_header>
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -31829,66 +31817,51 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_gmp_mpz_get_d=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_gmp_mpz_get_d=no
+eval "$as_ac_Header=no"
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gmp_mpz_get_d" >&5
-echo "${ECHO_T}$ac_cv_lib_gmp_mpz_get_d" >&6
-if test $ac_cv_lib_gmp_mpz_get_d = yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGMP 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- LIBS="-lgmp $LIBS"
-
fi
-MATH_LIBS=`echo "$LIBS" | sed "s% $KSAVE_LIBS$%%"`
-LIBS="$KSAVE_LIBS"
+done
-if test $ac_cv_lib_gmp_mpz_get_d = no; then
- KSAVE_LIBS="$LIBS"
-LIBS="$MATH_LIBS $KSAVE_LIBS"
-echo "$as_me:$LINENO: checking for __gmpz_get_d in -lgmp" >&5
-echo $ECHO_N "checking for __gmpz_get_d in -lgmp... $ECHO_C" >&6
-if test "${ac_cv_lib_gmp___gmpz_get_d+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgmp $LIBS"
+
+# Some versions of gmp provide mpq_init as a macro, so we need to
+# include the header file, otherwise the detection will fail.
+m4_gmp_save_LIBS="$LIBS"
+LIBS="$LIBS -lgmp"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
+#if HAVE_GMP_H
+# include <gmp.h>
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char __gmpz_get_d ();
int
main ()
{
-__gmpz_get_d ();
+mpq_t n; mpq_init (n);
;
return 0;
}
@@ -31915,33 +31888,67 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_gmp___gmpz_get_d=yes
+ LIBADD_GMP=-lgmp
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_gmp___gmpz_get_d=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gmp___gmpz_get_d" >&5
-echo "${ECHO_T}$ac_cv_lib_gmp___gmpz_get_d" >&6
-if test $ac_cv_lib_gmp___gmpz_get_d = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGMP 1
-_ACEOF
+LIBS=$m4_gmp_save_LIBS
- LIBS="-lgmp $LIBS"
+
+echo "$as_me:$LINENO: checking if using GNU multiple precision arithmetic library" >&5
+echo $ECHO_N "checking if using GNU multiple precision arithmetic library... $ECHO_C" >&6
+if test "${m4_cv_using_lib_gmp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+# Check whether --with-gmp or --without-gmp was given.
+if test "${with_gmp+set}" = set; then
+ withval="$with_gmp"
+ use_gmp=$withval
+else
+ use_gmp=yes
+fi;
+
+case $use_gmp:$LIBADD_GMP:$ac_cv_header_gmp_h in
+ *::yes)
+ { echo "$as_me:$LINENO: WARNING: gmp library not found or does not appear to work
+ but \`gmp.h' is present" >&5
+echo "$as_me: WARNING: gmp library not found or does not appear to work
+ but \`gmp.h' is present" >&2;}
+ m4_cv_using_lib_gmp=no
+ ;;
+ *:-lgmp:no)
+ { echo "$as_me:$LINENO: WARNING: gmp works but \`gmp.h' is missing" >&5
+echo "$as_me: WARNING: gmp works but \`gmp.h' is missing" >&2;}
+ m4_cv_using_lib_gmp=no
+ ;;
+ yes:*:yes)
+ m4_cv_using_lib_gmp=yes
+ ;;
+ no:*)
+ m4_cv_using_lib_gmp=no
+ ;;
+esac
fi
+echo "$as_me:$LINENO: result: $m4_cv_using_lib_gmp" >&5
+echo "${ECHO_T}$m4_cv_using_lib_gmp" >&6
-MATH_LIBS=`echo "$LIBS" | sed "s% $KSAVE_LIBS$%%"`
-LIBS="$KSAVE_LIBS"
+# Don't try to link in libgmp if we are not using it after the last call
+if test "$m4_cv_using_lib_gmp" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_GMP 1
+_ACEOF
fi
-MATH_LIBS="$CTLIBS $MATH_LIBS"
+
+USE_GMP=$m4_cv_using_lib_gmp
+
@@ -55659,6 +55666,8 @@
ac_config_files="$ac_config_files libraries/javalib/Makefile"
+ ac_config_files="$ac_config_files libraries/javalib/gmp-math/Makefile"
+
ac_config_files="$ac_config_files libraries/clib/Makefile"
ac_config_files="$ac_config_files libraries/clib/native/Makefile"
@@ -56538,6 +56547,7 @@
"kaffe/scripts/bat/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/bat/Makefile" ;;
"kaffe/scripts/compat/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/compat/Makefile" ;;
"libraries/javalib/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/Makefile" ;;
+ "libraries/javalib/gmp-math/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/gmp-math/Makefile" ;;
"libraries/clib/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/Makefile" ;;
"libraries/clib/native/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/native/Makefile" ;;
"libraries/clib/io/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/io/Makefile" ;;
@@ -56838,7 +56848,8 @@
s, at VM_LIBS@,$VM_LIBS,;t t
s, at NET_LIBS@,$NET_LIBS,;t t
s, at ZIP_LIBS@,$ZIP_LIBS,;t t
-s, at MATH_LIBS@,$MATH_LIBS,;t t
+s, at LIBADD_GMP@,$LIBADD_GMP,;t t
+s, at USE_GMP@,$USE_GMP,;t t
s, at SECURITY_LIBS@,$SECURITY_LIBS,;t t
s, at X_CFLAGS@,$X_CFLAGS,;t t
s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.54 kaffe/configure.ac:1.55
--- kaffe/configure.ac:1.54 Sat Jul 17 13:56:03 2004
+++ kaffe/configure.ac Sun Jul 18 15:27:35 2004
@@ -967,14 +967,7 @@
ZIP_LIBS="$CTLIBS $ZIP_LIBS"
AC_SUBST(ZIP_LIBS)
-dnl Check for libraries for math library.
-AC_CHECK_LIBRARY(gmp,mpz_get_d,MATH_LIBS)
-if test $ac_cv_lib_gmp_mpz_get_d = no; then
- dnl with gmp3 it's a #define, use real function name
- AC_CHECK_LIBRARY(gmp,__gmpz_get_d,MATH_LIBS)
-fi
-MATH_LIBS="$CTLIBS $MATH_LIBS"
-AC_SUBST(MATH_LIBS)
+m4_LIB_GMP
dnl Check for libraries for security library.
AC_CHECK_FUNCS(MD2Init MD4Init MD5Init)
@@ -1792,7 +1785,7 @@
dnl Support for different class library profiles
dnl -----------------------------------------------------------------------
AC_ARG_WITH([class_library_profile],
- AS_HELP_STRING([--with-class-library-profile=PROFILE],
+ AS_HELP_STRING([--with-class-library-profile=ABS.PATH],
[specify class library profile]))
if test x"$with_class_library_profile" = x"" ; then
@@ -2076,6 +2069,7 @@
*** Patch too long, truncated ***
More information about the kaffe
mailing list