[cp-patches] don't include gtk peer and xmlj classes in glibj.zip if disabled

[Christian Thalinger]

As discussed with tromey on #classpath today, here is a patch which
excludes the classes.

lib/standard.omit should be removed from cvs.

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.86
diff -u -3 -p -r1.86 configure.ac
--- configure.ac        10 May 2005 15:20:04 -0000      1.86
+++ configure.ac        12 May 2005 18:08:52 -0000
@@ -30,6 +30,12 @@ AC_CONFIG_HEADERS([include/config.h])
 AC_PREFIX_DEFAULT(/usr/local/classpath)
 
 dnl -----------------------------------------------------------
+dnl Create the standard.omit file
+dnl -----------------------------------------------------------
+echo "../gnu/test/.*$" > lib/standard.omit
+echo "../gnu/javax/swing/plaf/gtk/.*$" >> lib/standard.omit
+
+dnl -----------------------------------------------------------
 dnl Enable JNI libraries (enabled by default)
 dnl -----------------------------------------------------------
 AC_ARG_ENABLE([jni],
@@ -92,6 +98,9 @@ AC_ARG_ENABLE([xmlj],
               esac],
               [COMPILE_XMLJ=no])
 AM_CONDITIONAL(CREATE_XMLJ_LIBRARY, test "x${COMPILE_XMLJ}" = xyes)
+if test "x${COMPILE_XMLJ}" = "xno"; then
+  echo "../gnu/xml/libxmlj/.*$" >> lib/standard.omit
+fi
 
 dnl -----------------------------------------------------------
 dnl GTK native peer (enabled by default)
@@ -105,6 +114,9 @@ AC_ARG_ENABLE([gtk-peer],
               esac],
               [COMPILE_GTK_PEER=yes])
 AM_CONDITIONAL(CREATE_GTK_PEER_LIBRARIES, test "x${COMPILE_GTK_PEER}" =
xyes)
+if test "x${COMPILE_GTK_PEER}" = "xno"; then
+  echo "../gnu/java/awt/peer/.*$" >> lib/standard.omit
+fi
 
 dnl -----------------------------------------------------------
 dnl GTK native peer error checking 
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.80
diff -u -3 -p -r1.80 Makefile.am
--- lib/Makefile.am     2 May 2005 17:15:33 -0000       1.80
+++ lib/Makefile.am     12 May 2005 18:08:52 -0000
@@ -111,6 +111,7 @@ compile-classes: classes $(JAVA_SRCS) Ma
        touch compile-classes
 
 EXTRA_DIST = standard.omit mkcollections.pl.in
+DISTCLEANFILES = standard.omit
 CLEANFILES = compile-classes resources classes \
        classes.standard classes.awt classes.standardx classes.xml \
        classes.locale glibj.zip classes.1 \