[kaffe] CVS kaffe (robilad): Merged in Qt4 peers from Classpath and added build machinery
Kaffe CVS
cvs-commits at kaffe.org
Sat Aug 13 08:40:53 PDT 2005
PatchSet 6819
Date: 2005/08/13 15:38:40
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Merged in Qt4 peers from Classpath and added build machinery
Members:
ChangeLog:1.4344->1.4345
Makefile.in:1.216->1.217
configure:1.476->1.477
configure.ac:1.159->1.160
config/Makefile.in:1.188->1.189
include/Makefile.am:1.109->1.110
include/Makefile.in:1.238->1.239
kaffe/Makefile.in:1.149->1.150
kaffe/jvmpi/Makefile.in:1.73->1.74
kaffe/kaffe/Makefile.in:1.171->1.172
kaffe/kaffeh/Makefile.in:1.149->1.150
kaffe/kaffevm/Makefile.in:1.203->1.204
kaffe/kaffevm/boehm-gc/Makefile.in:1.35->1.36
kaffe/kaffevm/gcj/Makefile.in:1.129->1.130
kaffe/kaffevm/intrp/Makefile.in:1.138->1.139
kaffe/kaffevm/jit/Makefile.in:1.147->1.148
kaffe/kaffevm/jit3/Makefile.in:1.118->1.119
kaffe/kaffevm/jni/Makefile.in:1.42->1.43
kaffe/kaffevm/kaffe-gc/Makefile.in:1.34->1.35
kaffe/kaffevm/systems/Makefile.in:1.137->1.138
kaffe/kaffevm/systems/beos-native/Makefile.in:1.129->1.130
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.135->1.136
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.139->1.140
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.114->1.115
kaffe/kaffevm/verifier/Makefile.in:1.41->1.42
kaffe/man/Makefile.in:1.136->1.137
kaffe/scripts/Makefile.in:1.175->1.176
kaffe/scripts/bat/Makefile.in:1.128->1.129
kaffe/scripts/compat/Makefile.in:1.153->1.154
kaffe/xprof/Makefile.in:1.104->1.105
libraries/Makefile.in:1.132->1.133
libraries/clib/Makefile.in:1.147->1.148
libraries/clib/awt/Makefile.am:INITIAL->1.11
libraries/clib/awt/Makefile.in:1.146->1.147
libraries/clib/awt/X/Makefile.in:1.139->1.140
libraries/clib/awt/classpath-gtk/Makefile.in:1.27->1.28
libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.40->1.41
libraries/clib/awt/classpath-gtk/resource/Makefile.in:1.26->1.27
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4344 kaffe/ChangeLog:1.4345
--- kaffe/ChangeLog:1.4344 Fri Aug 12 20:42:35 2005
+++ kaffe/ChangeLog Sat Aug 13 15:38:40 2005
@@ -1,3 +1,124 @@
+2005-08-13 Dalibor Topic <robilad at kaffe.org>
+
+ * configure.ac,
+ libraries/clib/awt/classpath-qt/Makefile.am,
+ include/Makefile.am: Added build machinery for GNU Classpath
+ Qt4 based AWT peers.
+
+ Resynced with GNU Classpath.
+
+ 2005-08-12 Mark Wielaard <mark at klomp.org>
+
+ * gnu/java/awt/peer/qt/QtButtonPeer.java: Replace uses of
+ toolkit.eventQueue.postEvent() with QtToolkit.eventQueue.postEvent().
+ * gnu/java/awt/peer/qt/QtCheckboxPeer.java: Likewise.
+ * gnu/java/awt/peer/qt/QtChoicePeer.java: Likewise.
+ * gnu/java/awt/peer/qt/QtComponentPeer.java: Likewise and for
+ guiThread.QApplicationPointer and graphicsEnv.getScreenDevices().
+ * gnu/java/awt/peer/qt/QtMenuItemPeer.java: Likewise.
+ * gnu/java/awt/peer/qt/QtMenuPeer.java: Likewise.
+ * gnu/java/awt/peer/qt/QtScrollbarPeer.java: Likewise.
+ * gnu/java/security/PolicyFile.javai (refresh): Assign only outside
+ if statement.
+
+ 2005-08-11 Sven de Marothy <sven at physto.se>
+
+ * gnu/java/awt/peer/qt/QtMenuComponentPeer.java,
+ gnu/java/awt/peer/qt/QtGraphics.java,
+ gnu/java/awt/peer/qt/QtTextFieldPeer.java,
+ gnu/java/awt/peer/qt/QtFramePeer.java,
+ gnu/java/awt/peer/qt/QtPanelPeer.java,
+ gnu/java/awt/peer/qt/QtToolkit.java,
+ gnu/java/awt/peer/qt/QtWindowPeer.java,
+ gnu/java/awt/peer/qt/QtButtonPeer.java,
+ gnu/java/awt/peer/qt/QtImageGraphics.java,
+ gnu/java/awt/peer/qt/QtContainerPeer.java,
+ gnu/java/awt/peer/qt/QtComponentPeer.java,
+ gnu/java/awt/peer/qt/QtListPeer.java,
+ gnu/java/awt/peer/qt/QtChoicePeer.java,
+ gnu/java/awt/peer/qt/QtScrollPanePeer.java,
+ gnu/java/awt/peer/qt/MainQtThread.java,
+ gnu/java/awt/peer/qt/QtImage.java,
+ gnu/java/awt/peer/qt/NativeWrapper.java,
+ gnu/java/awt/peer/qt/QtCheckboxPeer.java,
+ gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java,
+ gnu/java/awt/peer/qt/QtTextAreaPeer.java,
+ gnu/java/awt/peer/qt/QtDialogPeer.java,
+ gnu/java/awt/peer/qt/QPen.java,
+ gnu/java/awt/peer/qt/QtCanvasPeer.java,
+ gnu/java/awt/peer/qt/QtLabelPeer.java,
+ gnu/java/awt/peer/qt/QtGraphicsEnvironment.java,
+ gnu/java/awt/peer/qt/QtImageConsumer.java,
+ gnu/java/awt/peer/qt/QtScrollbarPeer.java,
+ gnu/java/awt/peer/qt/QtFontMetrics.java,
+ gnu/java/awt/peer/qt/QtMenuBarPeer.java,
+ gnu/java/awt/peer/qt/QtFontPeer.java,
+ gnu/java/awt/peer/qt/QMatrix.java,
+ gnu/java/awt/peer/qt/QtVolatileImage.java,
+ gnu/java/awt/peer/qt/QPainterPath.java,
+ gnu/java/awt/peer/qt/QtComponentGraphics.java,
+ gnu/java/awt/peer/qt/QtScreenDevice.java,
+ gnu/java/awt/peer/qt/QtMenuPeer.java,
+ gnu/java/awt/peer/qt/QtAudioClip.java,
+ gnu/java/awt/peer/qt/QtPopupMenuPeer.java,
+ gnu/java/awt/peer/qt/QtFileDialogPeer.java,
+ gnu/java/awt/peer/qt/QtMenuItemPeer.java,
+ * native/jni/qt-peer/qpen.cpp,
+ native/jni/qt-peer/keybindings.cpp,
+ native/jni/qt-peer/qtcomponentpeer.cpp,
+ native/jni/qt-peer/buttonevent.h,
+ native/jni/qt-peer/qtdialogpeer.cpp,
+ native/jni/qt-peer/qtmenubarpeer.cpp,
+ native/jni/qt-peer/mainqtthread.cpp,
+ native/jni/qt-peer/qtpanelpeer.cpp,
+ native/jni/qt-peer/qmatrix.cpp,
+ native/jni/qt-peer/qtmenucomponentpeer.cpp,
+ native/jni/qt-peer/qtgraphics.cpp,
+ native/jni/qt-peer/qttoolkit.cpp,
+ native/jni/qt-peer/qtbuttonpeer.cpp,
+ native/jni/qt-peer/keybindings.h,
+ native/jni/qt-peer/qtvolatileimage.cpp,
+ native/jni/qt-peer/qtcomponent.h,
+ native/jni/qt-peer/slotcallbacks.cpp,
+ native/jni/qt-peer/qtpopupmenupeer.cpp,
+ native/jni/qt-peer/qtmenuitempeer.cpp,
+ native/jni/qt-peer/qtchoicepeer.cpp,
+ native/jni/qt-peer/nativewrapper.cpp,
+ native/jni/qt-peer/qtscreendevice.cpp,
+ native/jni/qt-peer/qtfontpeer.cpp,
+ native/jni/qt-peer/qpainterpath.cpp,
+ native/jni/qt-peer/qtstrings.h,
+ native/jni/qt-peer/qttextfieldpeer.cpp,
+ native/jni/qt-peer/qtimage.cpp,
+ native/jni/qt-peer/componentevent.h,
+ native/jni/qt-peer/qtwindowpeer.cpp,
+ native/jni/qt-peer/qtframepeer.cpp,
+ native/jni/qt-peer/qtscrollpanepeer.cpp,
+ native/jni/qt-peer/qtfontmetrics.cpp,
+ native/jni/qt-peer/qtlistpeer.cpp,
+ native/jni/qt-peer/mainthreadinterface.h
+ native/jni/qt-peer/slotcallbacks.h
+ native/jni/qt-peer/qtfiledialogpeer.cpp,
+ native/jni/qt-peer/eventmethods.cpp,
+ native/jni/qt-peer/qtimage.h,
+ native/jni/qt-peer/qtstrings.cpp,
+ native/jni/qt-peer/nativewrapper.h
+ native/jni/qt-peer/qtaudioclip.cpp,
+ native/jni/qt-peer/qtfont.h,
+ native/jni/qt-peer/qtscrollbarpeer.cpp,
+ native/jni/qt-peer/containers.h,
+ native/jni/qt-peer/qtcheckboxpeer.cpp,
+ native/jni/qt-peer/mainthreadinterface.cpp,
+ native/jni/qt-peer/componentevent.cpp,
+ native/jni/qt-peer/qttextareapeer.cpp,
+ native/jni/qt-peer/qtcomponent.cpp,
+ native/jni/qt-peer/qtmenupeer.cpp,
+ native/jni/qt-peer/qtlabelpeer.cpp,
+ native/jni/qt-peer/slotcallbacks.moc
+ native/jni/qt-peer/qtcanvaspeer.cpp,
+ native/jni/qt-peer/qtgraphics.h,
+ New files.
+
2005-08-10 Ito Kazumitsu <kaz at maczuka.gcd.org>
* replace/getifaddrs.c: Added missing include for GNU/Linux 2.4.x
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.216 kaffe/Makefile.in:1.217
--- kaffe/Makefile.in:1.216 Tue Jul 19 01:15:58 2005
+++ kaffe/Makefile.in Sat Aug 13 15:38:43 2005
@@ -144,6 +144,8 @@
CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_CLASSPATH_QT_AWT_FALSE = @COND_CLASSPATH_QT_AWT_FALSE@
+COND_CLASSPATH_QT_AWT_TRUE = @COND_CLASSPATH_QT_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
@@ -294,9 +296,11 @@
PTHREAD_LIBS = @PTHREAD_LIBS@
QASSISTANTCLIENT_LDADD = @QASSISTANTCLIENT_LDADD@
QEMBED = @QEMBED@
+QT_CFLAGS = @QT_CFLAGS@
QT_CXXFLAGS = @QT_CXXFLAGS@
QT_GUILINK = @QT_GUILINK@
QT_LDADD = @QT_LDADD@
+QT_LIBS = @QT_LIBS@
RANLIB = @RANLIB@
REGEN_FORWARD = @REGEN_FORWARD@
SECURITY_LIBS = @SECURITY_LIBS@
Index: kaffe/configure
diff -u kaffe/configure:1.476 kaffe/configure:1.477
--- kaffe/configure:1.476 Sun Aug 7 22:58:00 2005
+++ kaffe/configure Sat Aug 13 15:38:43 2005
@@ -491,7 +491,7 @@
ac_subdirs_all="$ac_subdirs_all kaffe/kaffevm/boehm-gc/boehm"
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 GTK_CAIRO_ENABLED 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 QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS 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_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 ANTLR_JAR COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY 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 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 GTK_CAIRO_ENABLED 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 QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS COND_CLASSPATH_GTK_AWT_TRUE COND_CLASSPATH_GTK_AWT_FALSE COND_CLASSPATH_QT_AWT_TRUE COND_CLASSPATH_QT_AWT_FALSE PKG_CONFIG GTK_CFLAGS GTK_LIBS CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS QT_CFLAGS QT_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_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 ANTLR_JAR COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY 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 CLASSPATH_INCLUDES LTLIBOBJS'
ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
# Initialize some variables set by options.
@@ -1158,6 +1158,8 @@
--without-classpath-gtk-awt
disable build of GNU Classpath's Gtk+-based AWT
engine (built by default)
+ --with-classpath-qt-awt enable build of GNU Classpath's Qt4-based AWT engine
+ (not built by default)
--with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)
--with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)
--with-esd-prefix=PFX Prefix where ESD is installed (optional)
@@ -5761,7 +5763,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5764 "configure"' > conftest.$ac_ext
+ echo '#line 5766 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7118,7 +7120,7 @@
# Provide some information about the compiler.
-echo "$as_me:7121:" \
+echo "$as_me:7123:" \
"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
@@ -8220,11 +8222,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8223: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8225: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8227: \$? = $ac_status" >&5
+ echo "$as_me:8229: \$? = $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.
@@ -8482,11 +8484,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8485: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8487: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8489: \$? = $ac_status" >&5
+ echo "$as_me:8491: \$? = $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.
@@ -8544,11 +8546,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8547: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8549: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8551: \$? = $ac_status" >&5
+ echo "$as_me:8553: \$? = $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
@@ -10784,7 +10786,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10787 "configure"
+#line 10789 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10882,7 +10884,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10885 "configure"
+#line 10887 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13134,11 +13136,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13137: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13139: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13141: \$? = $ac_status" >&5
+ echo "$as_me:13143: \$? = $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.
@@ -13196,11 +13198,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13199: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13201: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13203: \$? = $ac_status" >&5
+ echo "$as_me:13205: \$? = $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
@@ -14565,7 +14567,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14568 "configure"
+#line 14570 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14663,7 +14665,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14666 "configure"
+#line 14668 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15548,11 +15550,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15551: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15553: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15555: \$? = $ac_status" >&5
+ echo "$as_me:15557: \$? = $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.
@@ -15610,11 +15612,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15613: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15615: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15617: \$? = $ac_status" >&5
+ echo "$as_me:15619: \$? = $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
@@ -17736,11 +17738,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17739: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17741: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17743: \$? = $ac_status" >&5
+ echo "$as_me:17745: \$? = $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.
@@ -17998,11 +18000,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18001: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18003: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18005: \$? = $ac_status" >&5
+ echo "$as_me:18007: \$? = $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.
@@ -18060,11 +18062,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18063: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18065: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18067: \$? = $ac_status" >&5
+ echo "$as_me:18069: \$? = $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
@@ -20300,7 +20302,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20303 "configure"
+#line 20305 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20398,7 +20400,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20401 "configure"
+#line 20403 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -46831,6 +46833,28 @@
fi
+
+# Check whether --with-classpath-qt-awt or --without-classpath-qt-awt was given.
+if test "${with_classpath_qt_awt+set}" = set; then
+ withval="$with_classpath_qt_awt"
+
+else
+ with_classpath_qt_awt=no
+
+fi;
+
+
+
+if test x"$with_classpath_qt_awt" != x"no"; then
+ COND_CLASSPATH_QT_AWT_TRUE=
+ COND_CLASSPATH_QT_AWT_FALSE='#'
+else
+ COND_CLASSPATH_QT_AWT_TRUE='#'
+ COND_CLASSPATH_QT_AWT_FALSE=
+fi
+
+
+
if test x"$enable_native_awt" = x"yes"; then
if test x"$with_classpath_gtk_awt" = x"yes"; then
@@ -48613,6 +48637,146 @@
AWT_LIB="$AWT_LIB \$(top_builddir)/libraries/clib/awt/classpath-gtk/gtk-peer/libgtkpeer.la"
fi
+
+ if test x"$with_classpath_qt_awt" = x"yes"; 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 QtGui >= 4.0" >&5
+echo $ECHO_N "checking for QtGui >= 4.0... $ECHO_C" >&6
+
+ if $PKG_CONFIG --exists "QtGui >= 4.0" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ succeeded=yes
+
+ echo "$as_me:$LINENO: checking QT_CFLAGS" >&5
+echo $ECHO_N "checking QT_CFLAGS... $ECHO_C" >&6
+ QT_CFLAGS=`$PKG_CONFIG --cflags "QtGui >= 4.0"`
+ echo "$as_me:$LINENO: result: $QT_CFLAGS" >&5
+echo "${ECHO_T}$QT_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking QT_LIBS" >&5
+echo $ECHO_N "checking QT_LIBS... $ECHO_C" >&6
+ QT_LIBS=`$PKG_CONFIG --libs "QtGui >= 4.0"`
+ echo "$as_me:$LINENO: result: $QT_LIBS" >&5
+echo "${ECHO_T}$QT_LIBS" >&6
+ else
+ QT_CFLAGS=""
+ QT_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ QT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtGui >= 4.0"`
+ echo $QT_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 (QtGui >= 4.0) 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 (QtGui >= 4.0) 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
+
+
+
+ # Extract the first word of "moc", so it can be a program name with args.
+set dummy moc; 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_prog_MOC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$MOC"; then
+ ac_cv_prog_MOC="$MOC" # Let the user override the test.
+else
+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_prog_MOC="moc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+MOC=$ac_cv_prog_MOC
+if test -n "$MOC"; then
+ echo "$as_me:$LINENO: result: $MOC" >&5
+echo "${ECHO_T}$MOC" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+ AWT_LIB="$AWT_LIB \$(top_builddir)/libraries/clib/awt/classpath-qt/libqtpeer.la"
+ fi
fi
@@ -51083,6 +51247,8 @@
ac_config_files="$ac_config_files libraries/clib/awt/classpath-gtk/resource/Makefile"
+ ac_config_files="$ac_config_files libraries/clib/awt/classpath-qt/Makefile"
+
ac_config_files="$ac_config_files libraries/clib/awt/X/Makefile"
ac_config_files="$ac_config_files libraries/clib/awt/qt/Makefile"
@@ -51454,6 +51620,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${COND_CLASSPATH_QT_AWT_TRUE}" && test -z "${COND_CLASSPATH_QT_AWT_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"COND_CLASSPATH_QT_AWT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"COND_CLASSPATH_QT_AWT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${COND_SOUND_ALSA_TRUE}" && test -z "${COND_SOUND_ALSA_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"COND_SOUND_ALSA\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -52026,6 +52199,7 @@
"libraries/clib/awt/classpath-gtk/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/classpath-gtk/Makefile" ;;
"libraries/clib/awt/classpath-gtk/gtk-peer/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/classpath-gtk/gtk-peer/Makefile" ;;
"libraries/clib/awt/classpath-gtk/resource/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/classpath-gtk/resource/Makefile" ;;
+ "libraries/clib/awt/classpath-qt/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/classpath-qt/Makefile" ;;
"libraries/clib/awt/X/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/X/Makefile" ;;
"libraries/clib/awt/qt/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/qt/Makefile" ;;
"libraries/clib/awt/nano-X/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/nano-X/Makefile" ;;
@@ -52356,6 +52530,8 @@
s, at NANOX_CFLAGS@,$NANOX_CFLAGS,;t t
s, at COND_CLASSPATH_GTK_AWT_TRUE@,$COND_CLASSPATH_GTK_AWT_TRUE,;t t
s, at COND_CLASSPATH_GTK_AWT_FALSE@,$COND_CLASSPATH_GTK_AWT_FALSE,;t t
+s, at COND_CLASSPATH_QT_AWT_TRUE@,$COND_CLASSPATH_QT_AWT_TRUE,;t t
+s, at COND_CLASSPATH_QT_AWT_FALSE@,$COND_CLASSPATH_QT_AWT_FALSE,;t t
s, at PKG_CONFIG@,$PKG_CONFIG,;t t
s, at GTK_CFLAGS@,$GTK_CFLAGS,;t t
s, at GTK_LIBS@,$GTK_LIBS,;t t
@@ -52363,6 +52539,8 @@
s, at CAIRO_LIBS@,$CAIRO_LIBS,;t t
s, at PANGOFT2_CFLAGS@,$PANGOFT2_CFLAGS,;t t
s, at PANGOFT2_LIBS@,$PANGOFT2_LIBS,;t t
+s, at QT_CFLAGS@,$QT_CFLAGS,;t t
+s, at QT_LIBS@,$QT_LIBS,;t t
s, at ALSA_CFLAGS@,$ALSA_CFLAGS,;t t
s, at ALSA_LIBS@,$ALSA_LIBS,;t t
s, at ESD_CONFIG@,$ESD_CONFIG,;t t
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.159 kaffe/configure.ac:1.160
--- kaffe/configure.ac:1.159 Sun Aug 7 22:58:05 2005
+++ kaffe/configure.ac Sat Aug 13 15:38:48 2005
@@ -1783,6 +1783,16 @@
AM_CONDITIONAL(COND_CLASSPATH_GTK_AWT, test x"$with_classpath_gtk_awt" != x"no")
+AC_ARG_WITH([classpath-qt-awt],
+ AS_HELP_STRING([--with-classpath-qt-awt],
+ [enable build of GNU Classpath's Qt4-based AWT engine (not built by default)]),
+ [],
+ [with_classpath_qt_awt=no]
+)
+
+AM_CONDITIONAL(COND_CLASSPATH_QT_AWT, test x"$with_classpath_qt_awt" != x"no")
+
+
if test x"$enable_native_awt" = x"yes"; then
if test x"$with_classpath_gtk_awt" = x"yes"; then
@@ -1823,6 +1833,15 @@
AWT_LIB="$AWT_LIB \$(top_builddir)/libraries/clib/awt/classpath-gtk/gtk-peer/libgtkpeer.la"
fi
+
+ if test x"$with_classpath_qt_awt" = x"yes"; then
+ PKG_CHECK_MODULES(QT, QtGui >= 4.0)
+ AC_SUBST(QT_CFLAGS)
+ AC_SUBST(QT_LIBS)
+ AC_CHECK_PROG(MOC, [moc], [moc])
+
+ AWT_LIB="$AWT_LIB \$(top_builddir)/libraries/clib/awt/classpath-qt/libqtpeer.la"
+ fi
fi
dnl -------------------------------------------------------------------------
@@ -2319,6 +2338,7 @@
AC_CONFIG_FILES([libraries/clib/awt/classpath-gtk/Makefile])
AC_CONFIG_FILES([libraries/clib/awt/classpath-gtk/gtk-peer/Makefile])
AC_CONFIG_FILES([libraries/clib/awt/classpath-gtk/resource/Makefile])
+AC_CONFIG_FILES([libraries/clib/awt/classpath-qt/Makefile])
AC_CONFIG_FILES([libraries/clib/awt/X/Makefile])
AC_CONFIG_FILES([libraries/clib/awt/qt/Makefile])
AC_CONFIG_FILES([libraries/clib/awt/nano-X/Makefile])
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.188 kaffe/config/Makefile.in:1.189
--- kaffe/config/Makefile.in:1.188 Sun Aug 7 22:58:06 2005
+++ kaffe/config/Makefile.in Sat Aug 13 15:38:51 2005
@@ -113,6 +113,8 @@
CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_CLASSPATH_QT_AWT_FALSE = @COND_CLASSPATH_QT_AWT_FALSE@
+COND_CLASSPATH_QT_AWT_TRUE = @COND_CLASSPATH_QT_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
@@ -263,9 +265,11 @@
PTHREAD_LIBS = @PTHREAD_LIBS@
QASSISTANTCLIENT_LDADD = @QASSISTANTCLIENT_LDADD@
QEMBED = @QEMBED@
+QT_CFLAGS = @QT_CFLAGS@
QT_CXXFLAGS = @QT_CXXFLAGS@
QT_GUILINK = @QT_GUILINK@
QT_LDADD = @QT_LDADD@
+QT_LIBS = @QT_LIBS@
RANLIB = @RANLIB@
REGEN_FORWARD = @REGEN_FORWARD@
SECURITY_LIBS = @SECURITY_LIBS@
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.109 kaffe/include/Makefile.am:1.110
--- kaffe/include/Makefile.am:1.109 Mon Aug 8 15:39:21 2005
+++ kaffe/include/Makefile.am Sat Aug 13 15:38:52 2005
@@ -183,6 +183,48 @@
gnu_java_awt_peer_gtk_GtkWindowPeer.h \
gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
+LIBQTPEER_JNI_HDRS = \
+ gnu_java_awt_peer_qt_MainQtThread.h \
+ gnu_java_awt_peer_qt_NativeWrapper.h \
+ gnu_java_awt_peer_qt_QMatrix.h \
+ gnu_java_awt_peer_qt_QPainterPath.h \
+ gnu_java_awt_peer_qt_QPen.h \
+ gnu_java_awt_peer_qt_QtAudioClip.h \
+ gnu_java_awt_peer_qt_QtButtonPeer.h \
+ gnu_java_awt_peer_qt_QtCanvasPeer.h \
+ gnu_java_awt_peer_qt_QtCheckboxPeer.h \
+ gnu_java_awt_peer_qt_QtChoicePeer.h \
+ gnu_java_awt_peer_qt_QtComponentGraphics.h \
+ gnu_java_awt_peer_qt_QtComponentPeer.h \
+ gnu_java_awt_peer_qt_QtContainerPeer.h \
+ gnu_java_awt_peer_qt_QtDialogPeer.h \
+ gnu_java_awt_peer_qt_QtFileDialogPeer.h \
+ gnu_java_awt_peer_qt_QtFontMetrics.h \
+ gnu_java_awt_peer_qt_QtFontPeer.h \
+ gnu_java_awt_peer_qt_QtFramePeer.h \
+ gnu_java_awt_peer_qt_QtGraphics.h \
+ gnu_java_awt_peer_qt_QtGraphicsEnvironment.h \
+ gnu_java_awt_peer_qt_QtImage.h \
+ gnu_java_awt_peer_qt_QtImageConsumer.h \
+ gnu_java_awt_peer_qt_QtImageGraphics.h \
+ gnu_java_awt_peer_qt_QtLabelPeer.h \
+ gnu_java_awt_peer_qt_QtListPeer.h \
+ gnu_java_awt_peer_qt_QtMenuBarPeer.h \
+ gnu_java_awt_peer_qt_QtMenuComponentPeer.h \
+ gnu_java_awt_peer_qt_QtMenuItemPeer.h \
+ gnu_java_awt_peer_qt_QtMenuPeer.h \
+ gnu_java_awt_peer_qt_QtPanelPeer.h \
+ gnu_java_awt_peer_qt_QtPopupMenuPeer.h \
+ gnu_java_awt_peer_qt_QtScreenDevice.h \
+ gnu_java_awt_peer_qt_QtScreenDeviceConfiguration.h \
+ gnu_java_awt_peer_qt_QtScrollPanePeer.h \
+ gnu_java_awt_peer_qt_QtScrollbarPeer.h \
+ gnu_java_awt_peer_qt_QtTextAreaPeer.h \
+ gnu_java_awt_peer_qt_QtTextFieldPeer.h \
+ gnu_java_awt_peer_qt_QtToolkit.h \
+ gnu_java_awt_peer_qt_QtVolatileImage.h \
+ gnu_java_awt_peer_qt_QtWindowPeer.h
+
# Only create headers for AWT, Sound and libxmlj if they are going to be built.
if COND_LIBXMLJ
@@ -202,6 +244,10 @@
if COND_CLASSPATH_GTK_AWT
MAYBE_LIBGTKPEER_JNI_HDRS = $(LIBGTKPEER_JNI_HDRS)
endif
+
+if COND_CLASSPATH_QT_AWT
+ MAYBE_LIBQTPEER_JNI_HDRS = $(LIBQTPEER_JNI_HDRS)
+endif
endif
if COND_CLASSPATH_GTK_AWT
@@ -237,7 +283,8 @@
$(MAYBE_LIBTRITONUSALSA_JNI_HDRS) \
$(MAYBE_LIBTRITONUSESD_JNI_HDRS) \
$(MAYBE_LIBXMLJ_JNI_HDRS) \
- $(MAYBE_LIBGTKPEER_JNI_HDRS)
+ $(MAYBE_LIBGTKPEER_JNI_HDRS) \
+ $(MAYBE_LIBQTPEER_JNI_HDRS)
JNI_DERIVED_HDRS = \
$(INSTALL_JNI_DERIVED_HDRS) \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.238 kaffe/include/Makefile.in:1.239
--- kaffe/include/Makefile.in:1.238 Mon Aug 8 15:39:21 2005
+++ kaffe/include/Makefile.in Sat Aug 13 15:38:52 2005
@@ -130,6 +130,8 @@
CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_CLASSPATH_QT_AWT_FALSE = @COND_CLASSPATH_QT_AWT_FALSE@
+COND_CLASSPATH_QT_AWT_TRUE = @COND_CLASSPATH_QT_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
@@ -280,9 +282,11 @@
PTHREAD_LIBS = @PTHREAD_LIBS@
QASSISTANTCLIENT_LDADD = @QASSISTANTCLIENT_LDADD@
QEMBED = @QEMBED@
+QT_CFLAGS = @QT_CFLAGS@
QT_CXXFLAGS = @QT_CXXFLAGS@
QT_GUILINK = @QT_GUILINK@
QT_LDADD = @QT_LDADD@
+QT_LIBS = @QT_LIBS@
RANLIB = @RANLIB@
REGEN_FORWARD = @REGEN_FORWARD@
SECURITY_LIBS = @SECURITY_LIBS@
@@ -543,12 +547,55 @@
gnu_java_awt_peer_gtk_GtkWindowPeer.h \
gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
+LIBQTPEER_JNI_HDRS = \
+ gnu_java_awt_peer_qt_MainQtThread.h \
+ gnu_java_awt_peer_qt_NativeWrapper.h \
+ gnu_java_awt_peer_qt_QMatrix.h \
+ gnu_java_awt_peer_qt_QPainterPath.h \
+ gnu_java_awt_peer_qt_QPen.h \
+ gnu_java_awt_peer_qt_QtAudioClip.h \
+ gnu_java_awt_peer_qt_QtButtonPeer.h \
+ gnu_java_awt_peer_qt_QtCanvasPeer.h \
+ gnu_java_awt_peer_qt_QtCheckboxPeer.h \
+ gnu_java_awt_peer_qt_QtChoicePeer.h \
+ gnu_java_awt_peer_qt_QtComponentGraphics.h \
+ gnu_java_awt_peer_qt_QtComponentPeer.h \
+ gnu_java_awt_peer_qt_QtContainerPeer.h \
+ gnu_java_awt_peer_qt_QtDialogPeer.h \
+ gnu_java_awt_peer_qt_QtFileDialogPeer.h \
+ gnu_java_awt_peer_qt_QtFontMetrics.h \
+ gnu_java_awt_peer_qt_QtFontPeer.h \
+ gnu_java_awt_peer_qt_QtFramePeer.h \
+ gnu_java_awt_peer_qt_QtGraphics.h \
+ gnu_java_awt_peer_qt_QtGraphicsEnvironment.h \
+ gnu_java_awt_peer_qt_QtImage.h \
+ gnu_java_awt_peer_qt_QtImageConsumer.h \
+ gnu_java_awt_peer_qt_QtImageGraphics.h \
+ gnu_java_awt_peer_qt_QtLabelPeer.h \
+ gnu_java_awt_peer_qt_QtListPeer.h \
+ gnu_java_awt_peer_qt_QtMenuBarPeer.h \
+ gnu_java_awt_peer_qt_QtMenuComponentPeer.h \
+ gnu_java_awt_peer_qt_QtMenuItemPeer.h \
+ gnu_java_awt_peer_qt_QtMenuPeer.h \
+ gnu_java_awt_peer_qt_QtPanelPeer.h \
+ gnu_java_awt_peer_qt_QtPopupMenuPeer.h \
+ gnu_java_awt_peer_qt_QtScreenDevice.h \
+ gnu_java_awt_peer_qt_QtScreenDeviceConfiguration.h \
+ gnu_java_awt_peer_qt_QtScrollPanePeer.h \
+ gnu_java_awt_peer_qt_QtScrollbarPeer.h \
+ gnu_java_awt_peer_qt_QtTextAreaPeer.h \
+ gnu_java_awt_peer_qt_QtTextFieldPeer.h \
+ gnu_java_awt_peer_qt_QtToolkit.h \
+ gnu_java_awt_peer_qt_QtVolatileImage.h \
+ gnu_java_awt_peer_qt_QtWindowPeer.h
+
# Only create headers for AWT, Sound and libxmlj if they are going to be built.
@COND_LIBXMLJ_TRUE at MAYBE_LIBXMLJ_JNI_HDRS = $(LIBXMLJ_JNI_HDRS)
@COND_NATIVE_SOUND_TRUE@@COND_SOUND_ALSA_TRUE at MAYBE_LIBTRITONUSALSA_JNI_HDRS = $(LIBTRITONUSALSA_JNI_HDRS)
@COND_NATIVE_SOUND_TRUE@@COND_SOUND_ESD_TRUE at MAYBE_LIBTRITONUSESD_JNI_HDRS = $(LIBTRITONUSESD_JNI_HDRS)
@COND_CLASSPATH_GTK_AWT_TRUE@@COND_NATIVE_AWT_TRUE at MAYBE_LIBGTKPEER_JNI_HDRS = $(LIBGTKPEER_JNI_HDRS)
+ at COND_CLASSPATH_QT_AWT_TRUE@@COND_NATIVE_AWT_TRUE at MAYBE_LIBQTPEER_JNI_HDRS = $(LIBQTPEER_JNI_HDRS)
@COND_CLASSPATH_GTK_AWT_TRUE at JAWT_HDRS = \
@COND_CLASSPATH_GTK_AWT_TRUE@ jawt.h \
@COND_CLASSPATH_GTK_AWT_TRUE@ jawt_md.h
@@ -580,7 +627,8 @@
$(MAYBE_LIBTRITONUSALSA_JNI_HDRS) \
$(MAYBE_LIBTRITONUSESD_JNI_HDRS) \
$(MAYBE_LIBXMLJ_JNI_HDRS) \
- $(MAYBE_LIBGTKPEER_JNI_HDRS)
+ $(MAYBE_LIBGTKPEER_JNI_HDRS) \
+ $(MAYBE_LIBQTPEER_JNI_HDRS)
JNI_DERIVED_HDRS = \
$(INSTALL_JNI_DERIVED_HDRS) \
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.149 kaffe/kaffe/Makefile.in:1.150
--- kaffe/kaffe/Makefile.in:1.149 Tue Jul 19 01:16:07 2005
+++ kaffe/kaffe/Makefile.in Sat Aug 13 15:38:53 2005
@@ -114,6 +114,8 @@
CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_CLASSPATH_QT_AWT_FALSE = @COND_CLASSPATH_QT_AWT_FALSE@
+COND_CLASSPATH_QT_AWT_TRUE = @COND_CLASSPATH_QT_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
@@ -264,9 +266,11 @@
PTHREAD_LIBS = @PTHREAD_LIBS@
QASSISTANTCLIENT_LDADD = @QASSISTANTCLIENT_LDADD@
QEMBED = @QEMBED@
+QT_CFLAGS = @QT_CFLAGS@
QT_CXXFLAGS = @QT_CXXFLAGS@
QT_GUILINK = @QT_GUILINK@
QT_LDADD = @QT_LDADD@
+QT_LIBS = @QT_LIBS@
RANLIB = @RANLIB@
REGEN_FORWARD = @REGEN_FORWARD@
SECURITY_LIBS = @SECURITY_LIBS@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.73 kaffe/kaffe/jvmpi/Makefile.in:1.74
--- kaffe/kaffe/jvmpi/Makefile.in:1.73 Tue Jul 19 16:27:34 2005
+++ kaffe/kaffe/jvmpi/Makefile.in Sat Aug 13 15:38:53 2005
@@ -126,6 +126,8 @@
CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_CLASSPATH_QT_AWT_FALSE = @COND_CLASSPATH_QT_AWT_FALSE@
+COND_CLASSPATH_QT_AWT_TRUE = @COND_CLASSPATH_QT_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
@@ -276,9 +278,11 @@
PTHREAD_LIBS = @PTHREAD_LIBS@
QASSISTANTCLIENT_LDADD = @QASSISTANTCLIENT_LDADD@
QEMBED = @QEMBED@
+QT_CFLAGS = @QT_CFLAGS@
QT_CXXFLAGS = @QT_CXXFLAGS@
QT_GUILINK = @QT_GUILINK@
QT_LDADD = @QT_LDADD@
+QT_LIBS = @QT_LIBS@
RANLIB = @RANLIB@
REGEN_FORWARD = @REGEN_FORWARD@
SECURITY_LIBS = @SECURITY_LIBS@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.171 kaffe/kaffe/kaffe/Makefile.in:1.172
--- kaffe/kaffe/kaffe/Makefile.in:1.171 Tue Jul 19 01:16:08 2005
+++ kaffe/kaffe/kaffe/Makefile.in Sat Aug 13 15:38:54 2005
@@ -131,6 +131,8 @@
CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_CLASSPATH_QT_AWT_FALSE = @COND_CLASSPATH_QT_AWT_FALSE@
+COND_CLASSPATH_QT_AWT_TRUE = @COND_CLASSPATH_QT_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
@@ -281,9 +283,11 @@
PTHREAD_LIBS = @PTHREAD_LIBS@
QASSISTANTCLIENT_LDADD = @QASSISTANTCLIENT_LDADD@
QEMBED = @QEMBED@
+QT_CFLAGS = @QT_CFLAGS@
QT_CXXFLAGS = @QT_CXXFLAGS@
QT_GUILINK = @QT_GUILINK@
QT_LDADD = @QT_LDADD@
+QT_LIBS = @QT_LIBS@
RANLIB = @RANLIB@
REGEN_FORWARD = @REGEN_FORWARD@
SECURITY_LIBS = @SECURITY_LIBS@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.149 kaffe/kaffe/kaffeh/Makefile.in:1.150
--- kaffe/kaffe/kaffeh/Makefile.in:1.149 Tue Jul 19 01:16:09 2005
+++ kaffe/kaffe/kaffeh/Makefile.in Sat Aug 13 15:38:55 2005
@@ -136,6 +136,8 @@
CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
COND_CLASSPATH_GTK_AWT_FALSE = @COND_CLASSPATH_GTK_AWT_FALSE@
COND_CLASSPATH_GTK_AWT_TRUE = @COND_CLASSPATH_GTK_AWT_TRUE@
+COND_CLASSPATH_QT_AWT_FALSE = @COND_CLASSPATH_QT_AWT_FALSE@
+COND_CLASSPATH_QT_AWT_TRUE = @COND_CLASSPATH_QT_AWT_TRUE@
COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
@@ -286,9 +288,11 @@
PTHREAD_LIBS = @PTHREAD_LIBS@
QASSISTANTCLIENT_LDADD = @QASSISTANTCLIENT_LDADD@
QEMBED = @QEMBED@
+QT_CFLAGS = @QT_CFLAGS@
QT_CXXFLAGS = @QT_CXXFLAGS@
QT_GUILINK = @QT_GUILINK@
QT_LDADD = @QT_LDADD@
+QT_LIBS = @QT_LIBS@
RANLIB = @RANLIB@
REGEN_FORWARD = @REGEN_FORWARD@
SECURITY_LIBS = @SECURITY_LIBS@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.203 kaffe/kaffe/kaffevm/Makefile.in:1.204
--- kaffe/kaffe/kaffevm/Makefile.in:1.203 Tue Jul 19 01:16:09 2005
+++ kaffe/kaffe/kaffevm/Makefile.in Sat Aug 13 15:38:55 2005
*** Patch too long, truncated ***
More information about the kaffe
mailing list