diff options
| author | Mark Wielaard <mark@klomp.org> | 2006-08-02 23:28:12 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2006-08-02 23:28:12 +0000 |
| commit | a70104a340717ff09a0efe811c4f9306fdea1f66 (patch) | |
| tree | 3fc9389412bd94ce104142372cebcecf35c37f3d | |
| parent | 8f065a9a2887bc1e1633a733a36370129abcefe2 (diff) | |
| download | classpath-a70104a340717ff09a0efe811c4f9306fdea1f66.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | native/jni/gconf-peer/Makefile.am | 4 |
3 files changed, 18 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2006-08-02 Mark Wielaard <mark@klomp.org> + + 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. + 2006-08-02 Thomas Minor <1nocentrabidlamb@sexMagnet.com> * java/net/URL.java (getContent(Class[])): Implement. @@ -2704,10 +2712,10 @@ 2006-07-10 Mario Torre <neugens@limasoftware.net> - * java/awt/BasicStroke.java: Removed unused import. - * gnu/java/awt/java2d/CubicSegment.java (clone): Fixed. - * gnu/java/awt/java2d/LineSegment.java (clone): Fixed. - * gnu/java/awt/java2d/QuadSegment.java (clone): Fixed. + * java/awt/BasicStroke.java: Removed unused import. + * gnu/java/awt/java2d/CubicSegment.java (clone): Fixed. + * gnu/java/awt/java2d/LineSegment.java (clone): Fixed. + * gnu/java/awt/java2d/QuadSegment.java (clone): Fixed. 2006-07-10 Matt Wringe <mwringe@redhat.com> diff --git a/configure.ac b/configure.ac index c82750399..4fa1e4948 100644 --- a/configure.ac +++ b/configure.ac @@ -478,6 +478,10 @@ if test "x${COMPILE_JNI}" = xyes; then 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 diff --git a/native/jni/gconf-peer/Makefile.am b/native/jni/gconf-peer/Makefile.am index 8192ddc04..d88218326 100644 --- a/native/jni/gconf-peer/Makefile.am +++ b/native/jni/gconf-peer/Makefile.am @@ -5,8 +5,8 @@ libgconfpeer_la_SOURCES = GConfNativePeer.c 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@ |