[kaffe] CVS kaffe (robilad): Removed Kaffe's copy of libxmlj since it already exists in merged in GNU Classpa
Kaffe CVS
cvs-commits at kaffe.org
Mon Oct 24 16:16:39 PDT 2005
PatchSet 6960
Date: 2005/10/24 21:36:04
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Removed Kaffe's copy of libxmlj since it already exists in merged in GNU Classpath
Members:
ChangeLog:1.4483->1.4484
Makefile.am:1.101->1.102
Makefile.in:1.229->1.230
aclocal.m4:1.128->1.129
configure:1.503->1.504
configure.ac:1.182->1.183
config/Makefile.in:1.196->1.197
include/Makefile.am:1.113->1.114
include/Makefile.in:1.247->1.248
kaffe/Makefile.in:1.156->1.157
kaffe/jvmpi/Makefile.in:1.80->1.81
kaffe/kaffe/Makefile.in:1.178->1.179
kaffe/kaffeh/Makefile.in:1.157->1.158
kaffe/kaffevm/Makefile.in:1.210->1.211
kaffe/kaffevm/boehm-gc/Makefile.in:1.43->1.44
kaffe/kaffevm/gcj/Makefile.in:1.136->1.137
kaffe/kaffevm/intrp/Makefile.in:1.145->1.146
kaffe/kaffevm/jit/Makefile.in:1.155->1.156
kaffe/kaffevm/jit3/Makefile.in:1.125->1.126
kaffe/kaffevm/jni/Makefile.in:1.49->1.50
kaffe/kaffevm/kaffe-gc/Makefile.in:1.42->1.43
kaffe/kaffevm/systems/Makefile.in:1.144->1.145
kaffe/kaffevm/systems/beos-native/Makefile.in:1.136->1.137
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.142->1.143
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.146->1.147
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.121->1.122
kaffe/kaffevm/verifier/Makefile.in:1.48->1.49
kaffe/man/Makefile.in:1.143->1.144
kaffe/scripts/Makefile.in:1.183->1.184
kaffe/scripts/bat/Makefile.in:1.135->1.136
kaffe/scripts/compat/Makefile.in:1.162->1.163
kaffe/xprof/Makefile.in:1.111->1.112
libraries/Makefile.in:1.139->1.140
libraries/clib/Makefile.am:1.18->1.19
libraries/clib/Makefile.in:1.154->1.155
libraries/clib/awt/Makefile.in:1.154->1.155
libraries/clib/awt/X/Makefile.in:1.146->1.147
libraries/clib/awt/nano-X/Makefile.in:1.19->1.20
libraries/clib/awt/qt/Makefile.in:1.102->1.103
libraries/clib/classpath/Makefile.in:1.29->1.30
libraries/clib/fdlibm/Makefile.in:1.17->1.18
libraries/clib/io/Makefile.in:1.151->1.152
libraries/clib/libxmlj/Makefile.am:1.8->1.9(DEAD)
libraries/clib/libxmlj/Makefile.in:1.54->1.55(DEAD)
libraries/clib/libxmlj/xmlj_dom.c:1.8->1.9(DEAD)
libraries/clib/libxmlj/xmlj_dom.h:1.7->1.8(DEAD)
libraries/clib/libxmlj/xmlj_error.c:1.7->1.8(DEAD)
libraries/clib/libxmlj/xmlj_error.h:1.5->1.6(DEAD)
libraries/clib/libxmlj/xmlj_io.c:1.9->1.10(DEAD)
libraries/clib/libxmlj/xmlj_io.h:1.7->1.8(DEAD)
libraries/clib/libxmlj/xmlj_node.c:1.7->1.8(DEAD)
libraries/clib/libxmlj/xmlj_node.h:1.3->1.4(DEAD)
libraries/clib/libxmlj/xmlj_sax.c:1.9->1.10(DEAD)
libraries/clib/libxmlj/xmlj_sax.h:1.4->1.5(DEAD)
libraries/clib/libxmlj/xmlj_transform.c:1.9->1.10(DEAD)
libraries/clib/libxmlj/xmlj_util.c:1.10->1.11(DEAD)
libraries/clib/libxmlj/xmlj_util.h:1.7->1.8(DEAD)
libraries/clib/libxmlj/xmlj_xpath.c:1.6->1.7(DEAD)
libraries/clib/management/Makefile.in:1.156->1.157
libraries/clib/math/Makefile.in:1.151->1.152
libraries/clib/native/Makefile.in:1.196->1.197
libraries/clib/net/Makefile.in:1.161->1.162
libraries/clib/nio/Makefile.in:1.84->1.85
libraries/clib/security/Makefile.in:1.122->1.123
libraries/clib/sound/Makefile.in:1.48->1.49
libraries/clib/sound/alsa/Makefile.in:1.49->1.50
libraries/clib/sound/common/Makefile.in:1.48->1.49
libraries/clib/sound/esd/Makefile.in:1.49->1.50
libraries/clib/target/Makefile.in:1.8->1.9
libraries/clib/target/Linux/Makefile.in:1.8->1.9
libraries/clib/target/generic/Makefile.in:1.8->1.9
libraries/clib/zip/Makefile.in:1.153->1.154
libraries/extensions/Makefile.in:1.131->1.132
libraries/extensions/comm/Makefile.in:1.125->1.126
libraries/extensions/comm/javalib/Makefile.in:1.126->1.127
libraries/extensions/microsoft/Makefile.in:1.117->1.118
libraries/extensions/microsoft/clib/Makefile.in:1.121->1.122
libraries/extensions/microsoft/javalib/Makefile.in:1.119->1.120
libraries/extensions/pjava/Makefile.in:1.125->1.126
libraries/extensions/pjava/javalib/Makefile.in:1.126->1.127
libraries/extensions/servlet/Makefile.in:1.125->1.126
libraries/extensions/servlet/javalib/Makefile.in:1.126->1.127
libraries/javalib/Makefile.in:1.495->1.496
libraries/javalib/awt-implementations/Makefile.in:1.33->1.34
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.37->1.38
libraries/javalib/gmp-math/Makefile.in:1.40->1.41
replace/Makefile.in:1.98->1.99
test/Makefile.in:1.148->1.149
test/internal/Makefile.in:1.116->1.117
test/jni/Makefile.in:1.51->1.52
test/regression/Makefile.in:1.223->1.224
test/regression/compile_time/Makefile.in:1.76->1.77
test/regression/compiler/Makefile.in:1.60->1.61
test/regression/run_time/Makefile.in:1.75->1.76
tools/Makefile.in:1.50->1.51
tools/gjdoc/Makefile.in:1.49->1.50
tools/gjdoc/javalib/Makefile.in:1.63->1.64
tools/javatools/Makefile.in:1.3->1.4
tools/javatools/javalib/Makefile.in:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4483 kaffe/ChangeLog:1.4484
--- kaffe/ChangeLog:1.4483 Mon Oct 24 19:39:59 2005
+++ kaffe/ChangeLog Mon Oct 24 21:36:04 2005
@@ -1,5 +1,38 @@
2005-10-24 Dalibor Topic <robilad at kaffe.org>
+ Removed Kaffe's copy of GNU Classpath's libxmlj, since it
+ already exists in the merged in classpath tree.
+
+ * Makefile.am: Removed handling of libxmlj.
+
+ * configure.ac: (--enable-libxmlj) Removed. Removed output of
+ libxmlj Makefile.
+
+ * include/Makefile.am: (LIBXMLJ_JNI_HDRS, MAYBE_LIBXMLJ_JNI_HDRS,
+ stamp-libxmlj) Removed.
+
+ * libraries/clib/Makefile.am: (MAYBE_LIBXMLJ_DIR) Removed.
+
+ * libraries/clib/libxmlj/Makefile.am,
+ libraries/clib/libxmlj/Makefile.in,
+ libraries/clib/libxmlj/xmlj_dom.c,
+ libraries/clib/libxmlj/xmlj_dom.h,
+ libraries/clib/libxmlj/xmlj_error.c,
+ libraries/clib/libxmlj/xmlj_error.h,
+ libraries/clib/libxmlj/xmlj_io.c,
+ libraries/clib/libxmlj/xmlj_io.h,
+ libraries/clib/libxmlj/xmlj_node.c,
+ libraries/clib/libxmlj/xmlj_node.h,
+ libraries/clib/libxmlj/xmlj_sax.c,
+ libraries/clib/libxmlj/xmlj_sax.h,
+ libraries/clib/libxmlj/xmlj_transform.c,
+ libraries/clib/libxmlj/xmlj_util.c,
+ libraries/clib/libxmlj/xmlj_util.h,
+ libraries/clib/libxmlj/xmlj_xpath.c:
+ Removed.
+
+2005-10-24 Dalibor Topic <robilad at kaffe.org>
+
Removed Kaffe's copy of GNU Classpath's AWT peers, since they
already exist in the merged in classpath tree.
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.101 kaffe/Makefile.am:1.102
--- kaffe/Makefile.am:1.101 Mon Oct 24 19:40:05 2005
+++ kaffe/Makefile.am Mon Oct 24 21:36:11 2005
@@ -217,10 +217,6 @@
RUN_PO=
endif
-if COND_LIBXMLJ
-DIRECTORIES_AFTER_RTJAR += libraries/clib/libxmlj
-endif
-
if COND_SOUND_ALSA
DIRECTORIES_AFTER_RTJAR += libraries/clib/sound
else
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.229 kaffe/Makefile.in:1.230
--- kaffe/Makefile.in:1.229 Mon Oct 24 19:40:05 2005
+++ kaffe/Makefile.in Mon Oct 24 21:36:12 2005
@@ -47,10 +47,9 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
- at COND_LIBXMLJ_TRUE@am__append_1 = libraries/clib/libxmlj
- at COND_SOUND_ALSA_TRUE@am__append_2 = libraries/clib/sound
- at COND_SOUND_ALSA_FALSE@@COND_SOUND_ESD_TRUE at am__append_3 = libraries/clib/sound
- at COND_KAFFE_X_AWT_TRUE@@COND_NATIVE_AWT_TRUE at am__append_4 = libraries/clib/awt/X
+ at COND_SOUND_ALSA_TRUE@am__append_1 = libraries/clib/sound
+ at COND_SOUND_ALSA_FALSE@@COND_SOUND_ESD_TRUE at am__append_2 = libraries/clib/sound
+ at COND_KAFFE_X_AWT_TRUE@@COND_NATIVE_AWT_TRUE at am__append_3 = libraries/clib/awt/X
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/project.properties.in \
$(srcdir)/project.xml.in $(top_srcdir)/configure ABOUT-NLS \
@@ -73,7 +72,6 @@
$(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/semaphore.m4 \
$(top_srcdir)/m4/sockaddrin6.m4 \
@@ -145,8 +143,6 @@
COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
-COND_LIBXMLJ_FALSE = @COND_LIBXMLJ_FALSE@
-COND_LIBXMLJ_TRUE = @COND_LIBXMLJ_TRUE@
COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
COND_NATIVE_SOUND_FALSE = @COND_NATIVE_SOUND_FALSE@
@@ -305,12 +301,6 @@
VERSION = @VERSION@
VM_LIBS = @VM_LIBS@
XGETTEXT = @XGETTEXT@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CFLAGS = @XML_CFLAGS@
-XML_LIBS = @XML_LIBS@
-XSLT_CFLAGS = @XSLT_CFLAGS@
-XSLT_CONFIG = @XSLT_CONFIG@
-XSLT_LIBS = @XSLT_LIBS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
@@ -530,7 +520,7 @@
# things we need to compile after we have compiled rt.jar
#
DIRECTORIES_AFTER_RTJAR = tools test $(RUN_PO) $(am__append_1) \
- $(am__append_2) $(am__append_3) $(am__append_4)
+ $(am__append_2) $(am__append_3)
@MAY_RUN_PO_FALSE at RUN_PO =
@MAY_RUN_PO_TRUE at RUN_PO = po
all: all-recursive
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.128 kaffe/aclocal.m4:1.129
--- kaffe/aclocal.m4:1.128 Mon Oct 24 19:40:06 2005
+++ kaffe/aclocal.m4 Mon Oct 24 21:36:12 2005
@@ -965,8 +965,6 @@
m4_include([m4/lib-link.m4])
m4_include([m4/lib-prefix.m4])
m4_include([m4/libtool.m4])
-m4_include([m4/libxml.m4])
-m4_include([m4/libxslt.m4])
m4_include([m4/nls.m4])
m4_include([m4/po.m4])
m4_include([m4/progtest.m4])
Index: kaffe/configure
diff -u kaffe/configure:1.503 kaffe/configure:1.504
--- kaffe/configure:1.503 Mon Oct 24 19:40:06 2005
+++ kaffe/configure Mon Oct 24 21:36:12 2005
@@ -492,7 +492,7 @@
ac_subdirs_all="$ac_subdirs_all kaffe/kaffevm/boehm-gc/boehm"
ac_subdirs_all="$ac_subdirs_all libraries/javalib/external/classpath"
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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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 CCAS CCASFLAGS 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 MAY_RUN_PO_TRUE MAY_RUN_PO_FALSE 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 ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_S 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 NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE COND_NATIVE_AWT_TRUE COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS COND_KAFFE_QT_AWT_TRUE COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS 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_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS PROFILE XML2_CONFIG XML_CFLAGS XML_LIBS XSLT_CONFIG XSLT_CFLAGS XSLT_LIBS COND_LIBXMLJ_TRUE COND_LIBXMLJ_FALSE COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE BINRELOC_CFLAGS BINRELOC_LIBS 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 CLASSPATH_INCLUDES 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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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 CCAS CCASFLAGS 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 MAY_RUN_PO_TRUE MAY_RUN_PO_FALSE 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 ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_S 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 NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE COND_NATIVE_AWT_TRUE COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS COND_KAFFE_QT_AWT_TRUE COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS 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_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS PROFILE COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE BINRELOC_CFLAGS BINRELOC_LIBS 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 CLASSPATH_INCLUDES LTLIBOBJS'
ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
# Initialize some variables set by options.
@@ -1101,9 +1101,6 @@
--disable-sound Disable javax.sound support
--enable-pure-java-math Enable pure java java.math.* package
[default=native]
- --enable-libxmlj Enable building of libxmlj
- --disable-xmltest Do not try to compile and run a test LIBXML program
- --disable-xslttest Do not try to compile and run a test LIBXSLT program
--enable-gjdoc Enable building of gjdoc
--enable-classpath-load-library
enable to use JNI native methods default=yes
@@ -1179,10 +1176,6 @@
http://www.dmalloc.com/dmalloc.tar.gz
--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)
- --with-xslt-prefix=PFX Prefix where libxslt is installed (optional)
- --with-xslt-exec-prefix=PFX Exec prefix where libxslt is installed (optional)
--with-jni-library-path=dir
additional directories to search for native jni
libraries
@@ -5940,7 +5933,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5943 "configure"' > conftest.$ac_ext
+ echo '#line 5936 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7293,7 +7286,7 @@
# Provide some information about the compiler.
-echo "$as_me:7296:" \
+echo "$as_me:7289:" \
"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
@@ -8393,11 +8386,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8396: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8389: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8400: \$? = $ac_status" >&5
+ echo "$as_me:8393: \$? = $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.
@@ -8655,11 +8648,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8658: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8651: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8662: \$? = $ac_status" >&5
+ echo "$as_me:8655: \$? = $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.
@@ -8717,11 +8710,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8720: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8713: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8724: \$? = $ac_status" >&5
+ echo "$as_me:8717: \$? = $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
@@ -10948,7 +10941,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10951 "configure"
+#line 10944 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11046,7 +11039,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11049 "configure"
+#line 11042 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13296,11 +13289,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13299: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13292: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13303: \$? = $ac_status" >&5
+ echo "$as_me:13296: \$? = $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.
@@ -13358,11 +13351,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13361: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13354: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13365: \$? = $ac_status" >&5
+ echo "$as_me:13358: \$? = $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
@@ -14720,7 +14713,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14723 "configure"
+#line 14716 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14818,7 +14811,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14821 "configure"
+#line 14814 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15703,11 +15696,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15706: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15699: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15710: \$? = $ac_status" >&5
+ echo "$as_me:15703: \$? = $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.
@@ -15765,11 +15758,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15768: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15761: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15772: \$? = $ac_status" >&5
+ echo "$as_me:15765: \$? = $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
@@ -17889,11 +17882,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17892: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17885: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17896: \$? = $ac_status" >&5
+ echo "$as_me:17889: \$? = $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.
@@ -18151,11 +18144,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18154: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18147: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18158: \$? = $ac_status" >&5
+ echo "$as_me:18151: \$? = $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.
@@ -18213,11 +18206,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18216: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18209: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18220: \$? = $ac_status" >&5
+ echo "$as_me:18213: \$? = $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
@@ -20444,7 +20437,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20447 "configure"
+#line 20440 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20542,7 +20535,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20545 "configure"
+#line 20538 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -47978,647 +47971,6 @@
-# Check whether --enable-libxmlj or --disable-libxmlj was given.
-if test "${enable_libxmlj+set}" = set; then
- enableval="$enable_libxmlj"
-
-fi;
-
-if test x"$enable_libxmlj" = x"yes" ; then
- if test x"$with_threads" = x"unix-pthreads" ; then
-
-
-# Check whether --with-xml-prefix or --without-xml-prefix was given.
-if test "${with_xml_prefix+set}" = set; then
- withval="$with_xml_prefix"
- xml_config_prefix="$withval"
-else
- xml_config_prefix=""
-fi;
-
-# Check whether --with-xml-exec-prefix or --without-xml-exec-prefix was given.
-if test "${with_xml_exec_prefix+set}" = set; then
- withval="$with_xml_exec_prefix"
- xml_config_exec_prefix="$withval"
-else
- xml_config_exec_prefix=""
-fi;
-# Check whether --enable-xmltest or --disable-xmltest was given.
-if test "${enable_xmltest+set}" = set; then
- enableval="$enable_xmltest"
-
-else
- enable_xmltest=yes
-fi;
-
- if test x$xml_config_exec_prefix != x ; then
- xml_config_args="$xml_config_args"
- if test x${XML2_CONFIG+set} != xset ; then
- XML2_CONFIG=$xml_config_exec_prefix/bin/xml2-config
- fi
- fi
- if test x$xml_config_prefix != x ; then
- xml_config_args="$xml_config_args --prefix=$xml_config_prefix"
- if test x${XML2_CONFIG+set} != xset ; then
- XML2_CONFIG=$xml_config_prefix/bin/xml2-config
- fi
- fi
-
- # Extract the first word of "xml2-config", so it can be a program name with args.
-set dummy xml2-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_XML2_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $XML2_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_XML2_CONFIG="$XML2_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_XML2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- test -z "$ac_cv_path_XML2_CONFIG" && ac_cv_path_XML2_CONFIG="no"
- ;;
-esac
-fi
-XML2_CONFIG=$ac_cv_path_XML2_CONFIG
-
-if test -n "$XML2_CONFIG"; then
- echo "$as_me:$LINENO: result: $XML2_CONFIG" >&5
-echo "${ECHO_T}$XML2_CONFIG" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- min_xml_version=2.6.8
- echo "$as_me:$LINENO: checking for libxml - version >= $min_xml_version" >&5
-echo $ECHO_N "checking for libxml - version >= $min_xml_version... $ECHO_C" >&6
- no_xml=""
- if test "$XML2_CONFIG" = "no" ; then
- no_xml=yes
- else
- XML_CFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
- XML_LIBS=`$XML2_CONFIG $xml_config_args --libs`
- xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
- xml_config_minor_version=`$XML2_CONFIG $xml_config_args --version | \
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
- xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
- if test "x$enable_xmltest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $XML_CFLAGS"
- LIBS="$XML_LIBS $LIBS"
- rm -f conf.xmltest
- if test "$cross_compiling" = yes; then
- echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <libxml/xmlversion.h>
-
-int
-main()
-{
- int xml_major_version, xml_minor_version, xml_micro_version;
- int major, minor, micro;
- char *tmp_version;
-
- system("touch conf.xmltest");
-
- /* Capture xml2-config output via autoconf/configure variables */
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = (char *)strdup("$min_xml_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string from xml2-config\n", "$min_xml_version");
- exit(1);
- }
- free(tmp_version);
-
- /* Capture the version information from the header files */
- tmp_version = (char *)strdup(LIBXML_DOTTED_VERSION);
- if (sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) {
- printf("%s, bad version string from libxml includes\n", "LIBXML_DOTTED_VERSION");
- exit(1);
- }
- free(tmp_version);
-
- /* Compare xml2-config output to the libxml headers */
- if ((xml_major_version != $xml_config_major_version) ||
- (xml_minor_version != $xml_config_minor_version) ||
- (xml_micro_version != $xml_config_micro_version))
- {
- printf("*** libxml header files (version %d.%d.%d) do not match\n",
- xml_major_version, xml_minor_version, xml_micro_version);
- printf("*** xml2-config (version %d.%d.%d)\n",
- $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
- return 1;
- }
-/* Compare the headers to the library to make sure we match */
- /* Less than ideal -- doesn't provide us with return value feedback,
- * only exits if there's a serious mismatch between header and library.
- */
- LIBXML_TEST_VERSION;
-
- /* Test that the library is greater than our minimum version */
- if ((xml_major_version > major) ||
- ((xml_major_version == major) && (xml_minor_version > minor)) ||
- ((xml_major_version == major) && (xml_minor_version == minor) &&
- (xml_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of libxml (%d.%d.%d) was found.\n",
- xml_major_version, xml_minor_version, xml_micro_version);
- printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** libxml is always available from ftp://ftp.xmlsoft.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the xml2-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n");
- printf("*** correct copy of xml2-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- return 1;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (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
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-no_xml=yes
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
-
- if test "x$no_xml" = x ; then
- echo "$as_me:$LINENO: result: yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)" >&5
-echo "${ECHO_T}yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)" >&6
- CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LIBS="${XML_LIBS} ${LIBS}"
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- if test "$XML2_CONFIG" = "no" ; then
- echo "*** The xml2-config script installed by LIBXML could not be found"
- echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the XML2_CONFIG environment variable to the"
- echo "*** full path to xml2-config."
- else
- if test -f conf.xmltest ; then
- :
- else
- echo "*** Could not run libxml test program, checking why..."
- CFLAGS="$CFLAGS $XML_CFLAGS"
- LIBS="$LIBS $XML_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <libxml/xmlversion.h>
-#include <stdio.h>
-
-int
-main ()
-{
- LIBXML_TEST_VERSION; return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 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); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (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); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (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
- echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding LIBXML or finding the wrong"
- echo "*** version of LIBXML. If it is not finding LIBXML, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
- echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
- echo "*** may want to edit the xml2-config script: $XML2_CONFIG"
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
-
- XML_CFLAGS=""
- XML_LIBS=""
- { { echo "$as_me:$LINENO: error: unable to locate libxml." >&5
-echo "$as_me: error: unable to locate libxml." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
- rm -f conf.xmltest
-
-
-
-# Check whether --with-xslt-prefix or --without-xslt-prefix was given.
-if test "${with_xslt_prefix+set}" = set; then
- withval="$with_xslt_prefix"
- xslt_config_prefix="$withval"
-else
- xslt_config_prefix=""
-fi;
-
-# Check whether --with-xslt-exec-prefix or --without-xslt-exec-prefix was given.
-if test "${with_xslt_exec_prefix+set}" = set; then
- withval="$with_xslt_exec_prefix"
- xslt_config_exec_prefix="$withval"
-else
- xslt_config_exec_prefix=""
-fi;
-# Check whether --enable-xslttest or --disable-xslttest was given.
-if test "${enable_xslttest+set}" = set; then
- enableval="$enable_xslttest"
-
-else
- enable_xslttest=no
-fi;
-
- if test x$xslt_config_exec_prefix != x ; then
- xslt_config_args="$xslt_config_args --exec-prefix=$xslt_config_exec_prefix"
- if test x${XSLT_CONFIG+set} != xset ; then
- XSLT_CONFIG=$xslt_config_exec_prefix/bin/xslt-config
- fi
- fi
- if test x$xslt_config_prefix != x ; then
- xslt_config_args="$xslt_config_args --prefix=$xslt_config_prefix"
- if test x${XSLT_CONFIG+set} != xset ; then
- XSLT_CONFIG=$xslt_config_prefix/bin/xslt-config
- fi
- fi
-
- # Extract the first word of "xslt-config", so it can be a program name with args.
-set dummy xslt-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_XSLT_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $XSLT_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_XSLT_CONFIG="$XSLT_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_XSLT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- test -z "$ac_cv_path_XSLT_CONFIG" && ac_cv_path_XSLT_CONFIG="no"
- ;;
-esac
-fi
-XSLT_CONFIG=$ac_cv_path_XSLT_CONFIG
-
-if test -n "$XSLT_CONFIG"; then
- echo "$as_me:$LINENO: result: $XSLT_CONFIG" >&5
-echo "${ECHO_T}$XSLT_CONFIG" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- min_xslt_version=1.1.11
- echo "$as_me:$LINENO: checking for libxslt - version >= $min_xslt_version" >&5
-echo $ECHO_N "checking for libxslt - version >= $min_xslt_version... $ECHO_C" >&6
- no_xslt=""
- if test "$XSLT_CONFIG" = "no" ; then
- no_xslt=yes
- else
- XSLT_CFLAGS=`$XSLT_CONFIG $xslt_config_args --cflags`
- XSLT_LIBS=`$XSLT_CONFIG $xslt_config_args --libs`
- xslt_config_major_version=`$XSLT_CONFIG $xslt_config_args --version | \
- sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
- xslt_config_minor_version=`$XSLT_CONFIG $xslt_config_args --version | \
- sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
- xslt_config_micro_version=`$XSLT_CONFIG $xslt_config_args --version | \
- sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
- if test "x$enable_xslttest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $XSLT_CFLAGS"
- LIBS="$XSLT_LIBS $LIBS"
- rm -f conf.xslttest
- if test "$cross_compiling" = yes; then
- echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <libxslt/xslt.h>
-#include <libxslt/xsltconfig.h>
-int
-main()
-{
- int xslt_major_version, xslt_minor_version, xslt_micro_version;
- int major, minor, micro;
- char *tmp_version;
-
- system("touch conf.xslttest");
-
- /* Capture xslt-config output via autoconf/configure variables */
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = (char *)strdup("$min_xslt_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string from xslt-config\n", "$min_xslt_version");
- exit(1);
- }
- free(tmp_version);
-
- /* Capture the version information from the header files */
- tmp_version = (char *)strdup(LIBXSLT_DOTTED_VERSION);
- if (sscanf(tmp_version, "%d.%d.%d", &xslt_major_version, &xslt_minor_version, &xslt_micro_version) != 3) {
- printf("%s, bad version string from libxslt includes\n", "LIBXSLT_DOTTED_VERSION");
- exit(1);
- }
- free(tmp_version);
-
- /* Compare xslt-config output to the libxslt headers */
- if ((xslt_major_version != $xslt_config_major_version) ||
- (xslt_minor_version != $xslt_config_minor_version) ||
- (xslt_micro_version != $xslt_config_micro_version))
- {
- printf("*** libxslt header files (version %d.%d.%d) do not match\n",
- xslt_major_version, xslt_minor_version, xslt_micro_version);
- printf("*** xslt-config (version %d.%d.%d)\n",
- $xslt_config_major_version, $xslt_config_minor_version, $xslt_config_micro_version);
- return 1;
- }
-/* Compare the headers to the library to make sure we match */
- /* Less than ideal -- doesn't provide us with return value feedback,
- * only exits if there's a serious mismatch between header and library.
- */
- /* copied from LIBXXML_TEST_VERSION; */
- xmlCheckVersion(LIBXSLT_VERSION_STRING);
-
- /* Test that the library is greater than our minimum version */
- if ((xslt_major_version > major) ||
- ((xslt_major_version == major) && (xslt_minor_version > minor)) ||
- ((xslt_major_version == major) && (xslt_minor_version == minor) &&
- (xslt_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of libxslt (%d.%d.%d) was found.\n",
- xslt_major_version, xslt_minor_version, xslt_micro_version);
- printf("*** You need a version of libxslt newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** libxslt is always available from ftp://ftp.xmlsoft.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the xslt-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of LIBXSLT, but you can also set the XSLT_CONFIG environment to point to the\n");
- printf("*** correct copy of xslt-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- return 1;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (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
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
*** Patch too long, truncated ***
More information about the kaffe
mailing list