Patch: libjava/Makefile.am,libjava/Makefile.in fix for compile error with --enable-java-awt=xlib

["Scott Gilbertson" <scottg at mantatest dot com>]

I'm working on xlib, which wouldn't build without modifying libjava/Makefile
(error in natClip.cc).  These changes make the required Makefile changes,
but they preclude building libjava in isolation, by setting include paths
relative to the working directory.  I don't know if this is a no-no, but in
the normal case of building gcc in its entirety, the thing works.

Index: libjava/ChangeLog
from  Scott Gilbertson  <scottg@mantatest.com>

 * Makefile.am, Makefile.in: Added include paths required
for --enable-java-awt=xlib

diff -r -up gcc.patched/libjava/Makefile.am gcc/libjava/Makefile.am
--- gcc.patched/libjava/Makefile.am 2002-12-02 11:45:17.000000000 -0500
+++ gcc/libjava/Makefile.am 2002-11-28 15:26:43.000000000 -0500
@@ -23,10 +23,14 @@ toolexecdir = $(exec_prefix)/$(target_al
 toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
 endif

+# FIXME: Use stuff like /usr/include/c++/3.2.1 in xlib_includes if not
building C++ library
+# (At present, paths are wrong if you're building libjava without the rest
of gcc)
 if XLIB_AWT
 cond_x_ltlibrary = libgcjx.la
+xlib_includes
= -I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_alias) -I$(sr
cdir)/../libstdc++-v3/libsupc++
 else
-cond_x_ltlibrary =
+cond_x_ltlibrary =
+xlib_includes =
 endif

 toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
@@ -105,10 +109,9 @@ JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS
 LIBFFIINCS = @LIBFFIINCS@

 INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
- $(GCINCS) $(THREADINCS) $(INCLTDL) \
+ $(GCINCS) $(THREADINCS) $(INCLTDL) $(xlib_includes) \
  $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS)
-
-
+
 ## ################################################################

 ##
diff -r -up gcc.patched/libjava/Makefile.in gcc/libjava/Makefile.in
--- gcc.patched/libjava/Makefile.in 2002-12-02 11:45:17.000000000 -0500
+++ gcc/libjava/Makefile.in 2002-11-28 15:26:55.000000000 -0500
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am

-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -136,6 +136,8 @@ AUTOMAKE_OPTIONS = foreign
 @USE_LIBDIR_FALSE@toolexecdir =
@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
 @XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@libgcjx.la
 @XLIB_AWT_FALSE@cond_x_ltlibrary =
+@XLIB_AWT_TRUE@xlib_includes =
@XLIB_AWT_TRUE@-I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_
alias) -I$(srcdir)/../libstdc++-v3/libsupc++
+@XLIB_AWT_FALSE@xlib_includes =

 toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
 toolexeclib_DATA = libgcj.spec
@@ -181,7 +183,7 @@ JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS
 LIBFFIINCS = @LIBFFIINCS@

 INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
- $(GCINCS) $(THREADINCS) $(INCLTDL) \
+ $(GCINCS) $(THREADINCS) $(INCLTDL) $(xlib_includes) \
  $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS)


@@ -2940,7 +2942,7 @@ maintainer-clean-recursive:
  dot_seen=no; \
  rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
    rev="$$subdir $$rev"; \
-   test "$$subdir" != "." || dot_seen=yes; \
+   test "$$subdir" = "." && dot_seen=yes; \
  done; \
  test "$$dot_seen" = "no" && rev=". $$rev"; \
  target=`echo $@ | sed s/-recursive//`; \
@@ -3214,6 +3216,7 @@ uninstall-am uninstall all-redirect all-
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean

+

 install-exec-hook:
  cd $(DESTDIR)$(libdir) && \