re PR libgcj/20251 (libgcj configured with --enable-gtk-cairo fails on installation)

	PR libgcj/20251
	* Makefile.am (libjawt_la_LIBADD): Add -L$(here)/.libs.
	* Makefile.in: Rebuilt.

From-SVN: r96533

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 59db600596f6daeb2f8486e5183d87e0affa50ee..10f1ba4a906be0fd8323ee28233890f9f31a1e88 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-15  Jakub Jelinek  <jakub@redhat.com>
+
+       PR libgcj/20251
+       * Makefile.am (libjawt_la_LIBADD): Add -L$(here)/.libs.
+       * Makefile.in: Rebuilt.
+
 2005-03-15  David Daney  <ddaney@avtrex.com>
 
        * gnu/java/net/natPlainSocketImplPosix.cc (read_helper): Handle

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 2b1314e714d0020894297b8ec5ae2c62bd4c8593..41a262e1d01425a829f39cc139c973863fe34e4c 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -488,7 +488,8 @@ lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
 
 libjawt_la_SOURCES = jawt.c
 libjawt_la_CFLAGS = -I$(srcdir)/jni/classpath $(PEDANTIC_CFLAGS) $(X_CFLAGS)
-libjawt_la_LIBADD = lib-gnu-java-awt-peer-gtk.la
+## See jv_convert_LDADD.
+libjawt_la_LIBADD = -L$(here)/.libs lib-gnu-java-awt-peer-gtk.la
 libjawt_la_LDFLAGS = \
        -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
        $(LIBGCJ_LD_SYMBOLIC)

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 04d4ad783d493edabe9e78c1c8bb6efdfa9a1fc9..966e137a8460b8336eb7d45a9485cc74a798d2bb 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -5320,7 +5320,7 @@ lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \
 lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
 libjawt_la_SOURCES = jawt.c
 libjawt_la_CFLAGS = -I$(srcdir)/jni/classpath $(PEDANTIC_CFLAGS) $(X_CFLAGS)
-libjawt_la_LIBADD = lib-gnu-java-awt-peer-gtk.la
+libjawt_la_LIBADD = -L$(here)/.libs lib-gnu-java-awt-peer-gtk.la
 libjawt_la_LDFLAGS = \
        -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
        $(LIBGCJ_LD_SYMBOLIC)