diff options
| author | Mark Wielaard <mark@klomp.org> | 2004-02-01 16:57:24 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2004-02-01 16:57:24 +0000 |
| commit | 75391dcfdd29b824f5ff770506e891cdb7c7d10f (patch) | |
| tree | 70e7a1f2d79677d202342297f8da6ae917823154 | |
| parent | 9dd85db02eea0e0108433d7bad043047231fbbec (diff) | |
| download | classpath-75391dcfdd29b824f5ff770506e891cdb7c7d10f.tar.gz | |
* 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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | native/jni/gtk-peer/Makefile.am | 3 |
3 files changed, 14 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2004-02-01 Mark Wielaard <mark@klomp.org> + * 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 <mark@klomp.org> + * doc/hacking.texinfo (Programming Standards): Escape { and } with @ in examples. diff --git a/configure.ac b/configure.ac index e18fb900c..ece1a06ca 100644 --- a/configure.ac +++ b/configure.ac @@ -120,8 +120,12 @@ if test "x${COMPILE_JNI}" = xyes; then 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) diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am index d02c168e7..dd1ed4b3b 100644 --- a/native/jni/gtk-peer/Makefile.am +++ b/native/jni/gtk-peer/Makefile.am @@ -35,9 +35,10 @@ libgtkpeer_la_SOURCES = \ 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 \ |