Hi,
I checked in the following on the trunk, release and generics branch:
2006-08-02 Mark Wielaard <[EMAIL PROTECTED]>
PR 28535
* configure.ac (gconf-peer): Check for gdk-2.0.
* native/jni/gconf-peer/Makefile.am
(AM_LDFLAGS): Use GDK_LIBS.
(AM_CFLAGS): Use GDK_CFLAGS.
Should make sure both gconf and gdk are always available when the user
compiles the gconf peers.
Cheers,
Mark
? .ChangeLog.swp
? GregorianCalendar.patch
? JComponent-isPaintingDoubleBuffered.patch
? Provider.patch
? avoid-version.patch
? classpath-0.92-pre.tar.gz
? classpath-0.93-pre.tar.gz
? collections.patch
? gconf-auto.patch
? java/util/GregorianCalendar.java.mark
? lib/collections.jar
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.175
diff -u -r1.175 configure.ac
--- configure.ac 2 Aug 2006 19:32:45 -0000 1.175
+++ configure.ac 2 Aug 2006 23:26:27 -0000
@@ -478,6 +478,10 @@
PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.11.2)
AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS)
+ dnl we also need gdk for locking
+ PKG_CHECK_MODULES(GDK, gdk-2.0 >= 2.8)
+ AC_SUBST(GDK_CFLAGS)
+ AC_SUBST(GDK_LIBS)
dnl check if the config value was given form the command line,
dnl if not, overwrite the default if we have the gconf backend
dnl compiled in
Index: native/jni/gconf-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gconf-peer/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- native/jni/gconf-peer/Makefile.am 15 Jul 2006 22:59:23 -0000 1.3
+++ native/jni/gconf-peer/Makefile.am 2 Aug 2006 23:26:28 -0000
@@ -5,8 +5,8 @@
libgconfpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
$(top_builddir)/native/jni/classpath/jcl.lo
-AM_LDFLAGS = @CLASSPATH_MODULE@ @GCONF_LIBS@ @GTK_LIBS@
+AM_LDFLAGS = @CLASSPATH_MODULE@ @GCONF_LIBS@ @GDK_LIBS@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
-AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GCONF_CFLAGS@ @GTK_CFLAGS@
+AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GCONF_CFLAGS@ @GDK_CFLAGS@
