PatchSet 5065
Date: 2004/08/15 20:02:05
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: Added Cairo support for Graphics2D
2004-08-15 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:
Add gtk_cairo_c_source_files when GTK_CAIRO is set.
*
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c,
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
Resynced with GNU Classpath.
* configure.ac: Add --enable-gtk-cairo checking (cairo, pangoft2).
* Makefile.in,
configure,
config/Makefile.in,
include/Makefile.am,
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,
libltdl/configure,
libraries/Makefile.in,
libraries/clib/Makefile.in,
libraries/clib/awt/Makefile.in,
libraries/clib/awt/X/Makefile.in,
libraries/clib/awt/classpath-gtk/Makefile.in,
libraries/clib/awt/classpath-gtk/classpath/Makefile.in,
libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in,
libraries/clib/awt/classpath-gtk/resource/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.in,
libraries/javalib/awt-implementations/Makefile.in,
libraries/javalib/awt-implementations/kaffe/Makefile.in,
libraries/javalib/gmp-math/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-08-14 Mark Wielaard <[EMAIL PROTECTED]>
* configure.ac: Add --enable-gtk-cairo checking (cairo, pangoft2).
* native/jni/gtk-peer/Makefile.am: Add gtk_cairo_c_source_files when
GTK_CAIRO is set.
* native/jni/gtk-peer/
gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c: Declare variables
at top of functions/block.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Likewise.
Members:
ChangeLog:1.2623->1.2624
Makefile.in:1.179->1.180
configure:1.370->1.371
configure.ac:1.68->1.69
config/Makefile.in:1.153->1.154
include/Makefile.am:1.70->1.71
include/Makefile.in:1.182->1.183
kaffe/Makefile.in:1.127->1.128
kaffe/jvmpi/Makefile.in:1.49->1.50
kaffe/kaffe/Makefile.in:1.144->1.145
kaffe/kaffeh/Makefile.in:1.126->1.127
kaffe/kaffevm/Makefile.in:1.174->1.175
kaffe/kaffevm/boehm-gc/Makefile.in:1.11->1.12
kaffe/kaffevm/gcj/Makefile.in:1.107->1.108
kaffe/kaffevm/intrp/Makefile.in:1.115->1.116
kaffe/kaffevm/jit/Makefile.in:1.121->1.122
kaffe/kaffevm/jit3/Makefile.in:1.92->1.93
kaffe/kaffevm/jni/Makefile.in:1.19->1.20
kaffe/kaffevm/kaffe-gc/Makefile.in:1.9->1.10
kaffe/kaffevm/systems/Makefile.in:1.115->1.116
kaffe/kaffevm/systems/beos-native/Makefile.in:1.107->1.108
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.113->1.114
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.117->1.118
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.89->1.90
kaffe/kaffevm/verifier/Makefile.in:1.18->1.19
kaffe/man/Makefile.in:1.113->1.114
kaffe/scripts/Makefile.in:1.150->1.151
kaffe/scripts/bat/Makefile.in:1.106->1.107
kaffe/scripts/compat/Makefile.in:1.131->1.132
kaffe/xprof/Makefile.in:1.81->1.82
libltdl/configure:1.64->1.65
libraries/Makefile.in:1.110->1.111
libraries/clib/Makefile.in:1.120->1.121
libraries/clib/awt/Makefile.in:1.124->1.125
libraries/clib/awt/X/Makefile.in:1.115->1.116
libraries/clib/awt/classpath-gtk/Makefile.in:1.4->1.5
libraries/clib/awt/classpath-gtk/classpath/Makefile.in:1.4->1.5
libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.3->1.4
libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.5->1.6
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c:1.1->1.2
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:1.2->1.3
libraries/clib/awt/classpath-gtk/resource/Makefile.in:1.4->1.5
libraries/clib/awt/qt/Makefile.in:1.72->1.73
libraries/clib/io/Makefile.in:1.118->1.119
libraries/clib/libxmlj/Makefile.in:1.22->1.23
libraries/clib/management/Makefile.in:1.126->1.127
libraries/clib/math/Makefile.in:1.121->1.122
libraries/clib/native/Makefile.in:1.154->1.155
libraries/clib/net/Makefile.in:1.130->1.131
libraries/clib/nio/Makefile.in:1.45->1.46
libraries/clib/security/Makefile.in:1.92->1.93
libraries/clib/sound/Makefile.in:1.19->1.20
libraries/clib/sound/alsa/Makefile.in:1.19->1.20
libraries/clib/sound/common/Makefile.in:1.19->1.20
libraries/clib/sound/esd/Makefile.in:1.19->1.20
libraries/clib/zip/Makefile.in:1.123->1.124
libraries/extensions/Makefile.in:1.102->1.103
libraries/extensions/comm/Makefile.in:1.96->1.97
libraries/extensions/comm/javalib/Makefile.in:1.96->1.97
libraries/extensions/microsoft/Makefile.in:1.88->1.89
libraries/extensions/microsoft/clib/Makefile.in:1.92->1.93
libraries/extensions/microsoft/javalib/Makefile.in:1.89->1.90
libraries/extensions/pjava/Makefile.in:1.96->1.97
libraries/extensions/pjava/javalib/Makefile.in:1.96->1.97
libraries/extensions/servlet/Makefile.in:1.96->1.97
libraries/extensions/servlet/javalib/Makefile.in:1.96->1.97
libraries/javalib/Makefile.in:1.295->1.296
libraries/javalib/awt-implementations/Makefile.in:1.4->1.5
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.5->1.6
libraries/javalib/gmp-math/Makefile.in:1.7->1.8
replace/Makefile.in:1.61->1.62
test/Makefile.in:1.117->1.118
test/internal/Makefile.in:1.75->1.76
test/jni/Makefile.in:1.11->1.12
test/regression/Makefile.in:1.186->1.187
test/regression/compile_time/Makefile.in:1.47->1.48
test/regression/compiler/Makefile.in:1.28->1.29
test/regression/run_time/Makefile.in:1.46->1.47
tools/Makefile.in:1.20->1.21
tools/gjdoc/Makefile.in:1.20->1.21
tools/gjdoc/javalib/Makefile.in:1.23->1.24
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2623 kaffe/ChangeLog:1.2624
--- kaffe/ChangeLog:1.2623 Sat Aug 14 18:17:14 2004
+++ kaffe/ChangeLog Sun Aug 15 20:02:05 2004
@@ -1,3 +1,102 @@
+2004-08-15 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:
+ Add gtk_cairo_c_source_files when GTK_CAIRO is set.
+
+ *
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c,
+
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
+ Resynced with GNU Classpath.
+
+ * configure.ac: Add --enable-gtk-cairo checking (cairo, pangoft2).
+
+ * Makefile.in,
+ configure,
+ config/Makefile.in,
+ include/Makefile.am,
+ 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,
+ libltdl/configure,
+ libraries/Makefile.in,
+ libraries/clib/Makefile.in,
+ libraries/clib/awt/Makefile.in,
+ libraries/clib/awt/X/Makefile.in,
+ libraries/clib/awt/classpath-gtk/Makefile.in,
+ libraries/clib/awt/classpath-gtk/classpath/Makefile.in,
+ libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in,
+ libraries/clib/awt/classpath-gtk/resource/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.in,
+ libraries/javalib/awt-implementations/Makefile.in,
+ libraries/javalib/awt-implementations/kaffe/Makefile.in,
+ libraries/javalib/gmp-math/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-08-14 Mark Wielaard <[EMAIL PROTECTED]>
+
+ * configure.ac: Add --enable-gtk-cairo checking (cairo, pangoft2).
+ * native/jni/gtk-peer/Makefile.am: Add gtk_cairo_c_source_files when
+ GTK_CAIRO is set.
+ * native/jni/gtk-peer/
+ gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c: Declare variables
+ at top of functions/block.
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Likewise.
+
2004-08-14 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/java/awt/Rectangle.java:
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.179 kaffe/Makefile.in:1.180
--- kaffe/Makefile.in:1.179 Sat Aug 14 15:02:43 2004
+++ kaffe/Makefile.in Sun Aug 15 20:02:11 2004
@@ -127,6 +127,8 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CCLD = @CCLD@
@@ -185,6 +187,8 @@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
+GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
+GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
@@ -261,6 +265,8 @@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
+PANGOFT2_LIBS = @PANGOFT2_LIBS@
PATHSEP = @PATHSEP@
PATH_SEPARATOR = @PATH_SEPARATOR@
PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
Index: kaffe/configure
diff -u kaffe/configure:1.370 kaffe/configure:1.371
--- kaffe/configure:1.370 Fri Aug 13 15:18:26 2004
+++ kaffe/configure Sun Aug 15 20:02:12 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 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 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 VM_LIBS 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 NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS 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 COND_CLASSPATH_GTK_AWT_TRUE COND_CLASSPATH_GTK_AWT_FALSE PKG_CONFIG
GTK_CFLAGS GTK_LIBS 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
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 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 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 VM_LIBS 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 NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS HAVE_GCJ_SUPPORT_TRUE
HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE
GTK_CAIRO_TRUE GTK_CAIRO_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 COND_CLASSPATH_GTK_AWT_TRUE COND_CLASSPATH_GTK_AWT_FALSE
PKG_CONFIG GTK_CFLAGS GTK_LIBS CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS
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
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.
@@ -1080,6 +1080,8 @@
--enable-gcj Enable GCJ support
--disable-mips2 Disable MIPS II instructions
--enable-xscale Enable XScale support
+ --enable-gtk-cairo build the cairo Graphics2D implementation on GTK
+ default=no
--disable-native-awt disable build of Kaffe's all native AWT backends
(enabled by default)
--disable-alsatest Do not try to compile and run a test Alsa program
@@ -9017,7 +9019,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 9020 "configure"' > conftest.$ac_ext
+ echo '#line 9022 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10367,7 +10369,7 @@
# Provide some information about the compiler.
-echo "$as_me:10370:" \
+echo "$as_me:10372:" \
"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
@@ -11421,11 +11423,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11424: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11426: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11428: \$? = $ac_status" >&5
+ echo "$as_me:11430: \$? = $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
@@ -11664,11 +11666,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11667: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11669: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11671: \$? = $ac_status" >&5
+ echo "$as_me:11673: \$? = $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
@@ -11724,11 +11726,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11727: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11729: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11731: \$? = $ac_status" >&5
+ echo "$as_me:11733: \$? = $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
@@ -13909,7 +13911,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13912 "configure"
+#line 13914 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14007,7 +14009,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14010 "configure"
+#line 14012 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16200,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:16203: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16205: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16207: \$? = $ac_status" >&5
+ echo "$as_me:16209: \$? = $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
@@ -16260,11 +16262,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16263: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16265: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16267: \$? = $ac_status" >&5
+ echo "$as_me:16269: \$? = $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
@@ -17621,7 +17623,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17624 "configure"
+#line 17626 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17719,7 +17721,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17722 "configure"
+#line 17724 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18556,11 +18558,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18559: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18561: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18563: \$? = $ac_status" >&5
+ echo "$as_me:18565: \$? = $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
@@ -18616,11 +18618,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18619: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18621: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18623: \$? = $ac_status" >&5
+ echo "$as_me:18625: \$? = $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
@@ -20655,11 +20657,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:20658: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:20660: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:20662: \$? = $ac_status" >&5
+ echo "$as_me:20664: \$? = $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
@@ -20898,11 +20900,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:20901: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:20903: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:20905: \$? = $ac_status" >&5
+ echo "$as_me:20907: \$? = $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
@@ -20958,11 +20960,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:20961: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:20963: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:20965: \$? = $ac_status" >&5
+ echo "$as_me:20967: \$? = $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
@@ -23143,7 +23145,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 23146 "configure"
+#line 23148 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -23241,7 +23243,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 23244 "configure"
+#line 23246 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -50226,6 +50228,28 @@
fi
+# Check whether --enable-gtk-cairo or --disable-gtk-cairo was given.
+if test "${enable_gtk_cairo+set}" = set; then
+ enableval="$enable_gtk_cairo"
+ case "${enableval}" in
+ yes) GTK_CAIRO=yes ;;
+ no) GTK_CAIRO=no ;;
+ *) GTK_CAIRO=yes ;;
+ esac
+else
+ GTK_CAIRO=no
+fi;
+
+
+if test "x${enable_gtk_cairo}" = xyes; then
+ GTK_CAIRO_TRUE=
+ GTK_CAIRO_FALSE='#'
+else
+ GTK_CAIRO_TRUE='#'
+ GTK_CAIRO_FALSE=
+fi
+
+
# Check whether --enable-native-awt or --disable-native-awt was given.
if test "${enable_native_awt+set}" = set; then
@@ -52999,6 +53023,7 @@
if test x"$enable_native_awt" = x"yes"; then
if test x"$with_classpath_gtk_awt" = x"yes"; then
+
if test x"$with_threads" != x"unix-pthreads"; then
{ { echo "$as_me:$LINENO: error: Configuration
--with-classpath-gtk-awt not supported - only available with pthreads" >&5
echo "$as_me: error: Configuration --with-classpath-gtk-awt not supported - only
available with pthreads" >&2;}
@@ -53107,6 +53132,210 @@
+ if test "x${enable_gtk_cairo}" = xyes
+ then
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-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_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_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_PKG_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_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get
pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ echo "$as_me:$LINENO: checking for cairo" >&5
+echo $ECHO_N "checking for cairo... $ECHO_C" >&6
+
+ if $PKG_CONFIG --exists "cairo" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ succeeded=yes
+
+ echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5
+echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6
+ CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo"`
+ echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5
+echo "${ECHO_T}$CAIRO_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5
+echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6
+ CAIRO_LIBS=`$PKG_CONFIG --libs "cairo"`
+ echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5
+echo "${ECHO_T}$CAIRO_LIBS" >&6
+ else
+ CAIRO_CFLAGS=""
+ CAIRO_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo"`
+ echo $CAIRO_PKG_ERRORS
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version
$PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig";
+ fi
+ fi
+
+ if test $succeeded = yes; then
+ :
+ else
+ { { echo "$as_me:$LINENO: error: Library requirements (cairo) not met; consider
adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a
nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (cairo) not met; consider adjusting the
PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so
pkg-config can find them." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-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_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_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_PKG_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_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get
pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ echo "$as_me:$LINENO: checking for pangoft2" >&5
+echo $ECHO_N "checking for pangoft2... $ECHO_C" >&6
+
+ if $PKG_CONFIG --exists "pangoft2" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ succeeded=yes
+
+ echo "$as_me:$LINENO: checking PANGOFT2_CFLAGS" >&5
+echo $ECHO_N "checking PANGOFT2_CFLAGS... $ECHO_C" >&6
+ PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
+ echo "$as_me:$LINENO: result: $PANGOFT2_CFLAGS" >&5
+echo "${ECHO_T}$PANGOFT2_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking PANGOFT2_LIBS" >&5
+echo $ECHO_N "checking PANGOFT2_LIBS... $ECHO_C" >&6
+ PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
+ echo "$as_me:$LINENO: result: $PANGOFT2_LIBS" >&5
+echo "${ECHO_T}$PANGOFT2_LIBS" >&6
+ else
+ PANGOFT2_CFLAGS=""
+ PANGOFT2_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"pangoft2"`
+ echo $PANGOFT2_PKG_ERRORS
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version
$PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig";
+ fi
+ fi
+
+ if test $succeeded = yes; then
+ :
+ else
+ { { echo "$as_me:$LINENO: error: Library requirements (pangoft2) not met;
consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a
nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (pangoft2) not met; consider adjusting the
PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so
pkg-config can find them." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ fi
+
+
+
+
+
AWT_LIB="$AWT_LIB
\$(top_builddir)/libraries/clib/awt/classpath-gtk/gtk-peer/libgtkpeer.la"
fi
fi
@@ -55858,6 +56087,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${GTK_CAIRO_TRUE}" && test -z "${GTK_CAIRO_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"GTK_CAIRO\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"GTK_CAIRO\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${COND_NATIVE_AWT_TRUE}" && test -z "${COND_NATIVE_AWT_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"COND_NATIVE_AWT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -56727,6 +56963,8 @@
s,@LIBOBJS@,$LIBOBJS,;t t
s,@USE_COMPAT_IFADDRS_TRUE@,$USE_COMPAT_IFADDRS_TRUE,;t t
s,@USE_COMPAT_IFADDRS_FALSE@,$USE_COMPAT_IFADDRS_FALSE,;t t
+s,@GTK_CAIRO_TRUE@,$GTK_CAIRO_TRUE,;t t
+s,@GTK_CAIRO_FALSE@,$GTK_CAIRO_FALSE,;t t
s,@COND_NATIVE_AWT_TRUE@,$COND_NATIVE_AWT_TRUE,;t t
s,@COND_NATIVE_AWT_FALSE@,$COND_NATIVE_AWT_FALSE,;t t
s,@COND_KAFFE_X_AWT_TRUE@,$COND_KAFFE_X_AWT_TRUE,;t t
@@ -56749,6 +56987,10 @@
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
s,@GTK_LIBS@,$GTK_LIBS,;t t
+s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t
+s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t
+s,@PANGOFT2_CFLAGS@,$PANGOFT2_CFLAGS,;t t
+s,@PANGOFT2_LIBS@,$PANGOFT2_LIBS,;t t
s,@ALSA_CFLAGS@,$ALSA_CFLAGS,;t t
s,@ALSA_LIBS@,$ALSA_LIBS,;t t
s,@ESD_CONFIG@,$ESD_CONFIG,;t t
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.68 kaffe/configure.ac:1.69
--- kaffe/configure.ac:1.68 Sun Aug 1 21:34:16 2004
+++ kaffe/configure.ac Sun Aug 15 20:02:22 2004
@@ -1465,6 +1465,19 @@
AC_DEFINE(HAVE_DECLARED_SWAB, 1, [Is function swab declared])
fi
+dnl ------------------------------------------------------------
+dnl determine whether to enable the cairo GTK Graphics2D backend
+dnl ------------------------------------------------------------
+AC_ARG_ENABLE([gtk-cairo],
+ [AS_HELP_STRING(--enable-gtk-cairo,build the cairo Graphics2D
implementation on GTK [default=no])],
+ [case "${enableval}" in
+ yes) GTK_CAIRO=yes ;;
+ no) GTK_CAIRO=no ;;
+ *) GTK_CAIRO=yes ;;
+ esac],
+ [GTK_CAIRO=no])
+AM_CONDITIONAL(GTK_CAIRO, test "x${enable_gtk_cairo}" = xyes)
+
dnl -------------------------------------------------------------------------
dnl Configure AWT engine
dnl -------------------------------------------------------------------------
@@ -1586,6 +1599,7 @@
if test x"$enable_native_awt" = x"yes"; then
if test x"$with_classpath_gtk_awt" = x"yes"; then
+
dnl -----------------------------------------------------------------------
dnl Classpath Gtk peer support
dnl -----------------------------------------------------------------------
@@ -1599,6 +1613,16 @@
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
+
+ if test "x${enable_gtk_cairo}" = xyes
+ then
+ PKG_CHECK_MODULES(CAIRO, cairo)
+ PKG_CHECK_MODULES(PANGOFT2, pangoft2)
+ fi
+ AC_SUBST(CAIRO_LIBS)
+ AC_SUBST(CAIRO_CFLAGS)
+ AC_SUBST(PANGOFT2_LIBS)
+ AC_SUBST(PANGOFT2_CFLAGS)
AWT_LIB="$AWT_LIB
\$(top_builddir)/libraries/clib/awt/classpath-gtk/gtk-peer/libgtkpeer.la"
fi
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.153 kaffe/config/Makefile.in:1.154
--- kaffe/config/Makefile.in:1.153 Sat Aug 14 15:02:46 2004
+++ kaffe/config/Makefile.in Sun Aug 15 20:02:26 2004
@@ -96,6 +96,8 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CCLD = @CCLD@
@@ -154,6 +156,8 @@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
+GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
+GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
@@ -230,6 +234,8 @@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
+PANGOFT2_LIBS = @PANGOFT2_LIBS@
PATHSEP = @PATHSEP@
PATH_SEPARATOR = @PATH_SEPARATOR@
PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.70 kaffe/include/Makefile.am:1.71
--- kaffe/include/Makefile.am:1.70 Wed Aug 4 18:38:27 2004
+++ kaffe/include/Makefile.am Sun Aug 15 20:02:27 2004
@@ -185,8 +185,12 @@
gnu_xml_libxmlj_transform_JavaContext.h
LIBGTKPEER_JNI_HDRS = \
+ gnu_java_awt_peer_gtk_GdkClasspathFontPeer.h \
+ gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.h \
gnu_java_awt_peer_gtk_GdkFontMetrics.h \
+ gnu_java_awt_peer_gtk_GdkGlyphVector.h \
gnu_java_awt_peer_gtk_GdkGraphics.h \
+ gnu_java_awt_peer_gtk_GdkGraphics2D.h \
gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
gnu_java_awt_peer_gtk_GtkButtonPeer.h \
gnu_java_awt_peer_gtk_GtkCanvasPeer.h \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.182 kaffe/include/Makefile.in:1.183
--- kaffe/include/Makefile.in:1.182 Sat Aug 14 15:02:47 2004
+++ kaffe/include/Makefile.in Sun Aug 15 20:02:27 2004
@@ -112,6 +112,8 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CCLD = @CCLD@
@@ -170,6 +172,8 @@
FFLAGS = @FFLAGS@
GC_NAME = @GC_NAME@
GMSGFMT = @GMSGFMT@
+GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
+GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
@@ -246,6 +250,8 @@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
+PANGOFT2_LIBS = @PANGOFT2_LIBS@
PATHSEP = @PATHSEP@
PATH_SEPARATOR = @PATH_SEPARATOR@
PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
@@ -517,8 +523,12 @@
gnu_xml_libxmlj_transform_JavaContext.h
LIBGTKPEER_JNI_HDRS = \
+ gnu_java_awt_peer_gtk_GdkClasspathFontPeer.h \
+ gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.h \
gnu_java_awt_peer_gtk_GdkFontMetrics.h \
+ gnu_java_awt_peer_gtk_GdkGlyphVector.h \
gnu_java_awt_peer_gtk_GdkGraphics.h \
+ gnu_java_awt_peer_gtk_GdkGraphics2D.h \
gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
gnu_java_awt_peer_gtk_GtkButtonPeer.h \
gnu_java_awt_peer_gtk_GtkCanvasPeer.h \
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.127 kaffe/kaffe/Makefile.in:1.128
--- kaffe/kaffe/Makefile.in:1.127 Sat Aug 14 15:02:48 2004
+++ kaffe/kaffe/Makefile.in Sun Aug 15 20:02:28 2004
@@ -98,6 +98,8 @@
BCEL_JAR = @BCEL_JAR@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CCLD = @CCLD@
@@ -156,6 +158,8 @@
FFLAGS = @FFLAGS@
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
