commit-classpath
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

PATCH: Use gthread for gtk-peers


From: Mark Wielaard
Subject: PATCH: Use gthread for gtk-peers
Date: Sun, 01 Feb 2004 17:56:28 +0100

Hi,

I needed the following patch to get the AWT peers working with JamVM.

Cheers,

Mark

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1861
diff -u -r1.1861 ChangeLog
--- ChangeLog   1 Feb 2004 16:46:37 -0000       1.1861
+++ ChangeLog   1 Feb 2004 16:53:46 -0000
@@ -1,5 +1,12 @@
 2004-02-01  Mark Wielaard  <address@hidden>
 
+       * configure.ac: Add PKG_CHECK_MODULES check for GTHREAD.
+       * native/jni/gtk-peer/Makefile.am (libgtkpeer_la_LDFLAGS): Remove
+       GLIB_LIBS, add GTHREAD_LIBS.
+       (INCLUDES): Add GTHREAD_CFLAGS.
+
+2004-02-01  Mark Wielaard  <address@hidden>
+
        * doc/hacking.texinfo (Programming Standards): Escape { and } with @
        in examples.
 
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.3
diff -u -r1.3 configure.ac
--- configure.ac        30 Jan 2004 21:37:09 -0000      1.3
+++ configure.ac        1 Feb 2004 16:53:46 -0000
@@ -120,8 +120,12 @@
     JAPHAR_GREP_CFLAGS(-Wall, [ CFLAGS="$CFLAGS -Wall" ])
   fi
 
-  dnl Check for AWT related glib/gtk/libart_lgpl
+  dnl Check for AWT related gthread/gtk/libart_lgpl
   if test "x${COMPILE_GTK_PEER}" = xyes; then
+     PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.2)
+     AC_SUBST(GTHREAD_CFLAGS)
+     AC_SUBST(GTHREAD_LIBS)
+
      PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2)
      AC_SUBST(GTK_CFLAGS)
      AC_SUBST(GTK_LIBS)
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- native/jni/gtk-peer/Makefile.am     27 Jan 2004 22:30:38 -0000      1.4
+++ native/jni/gtk-peer/Makefile.am     1 Feb 2004 16:53:46 -0000
@@ -35,9 +35,10 @@
                        gtkpeer.h 
 
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo
-libgtkpeer_la_LDFLAGS = -module -version-info @LIBVERSION@ @GTK_LIBS@ 
@GLIB_LIBS@ @LIBART_LIBS@
+libgtkpeer_la_LDFLAGS = -module -version-info @LIBVERSION@ @GTHREAD_LIBS@ 
@GTK_LIBS@ @LIBART_LIBS@
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
+          @GTHREAD_CFLAGS@ \
           @GTK_CFLAGS@ \
           @LIBART_CFLAGS@ \
           -I$(top_srcdir)/native/jni/classpath \

Attachment: signature.asc
Description: This is a digitally signed message part


reply via email to

[Prev in Thread] Current Thread [Next in Thread]