Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.4
diff -u -b -B -r1.4 configure.ac
--- configure.ac	1 Feb 2004 16:57:24 -0000	1.4
+++ configure.ac	4 Feb 2004 08:21:06 -0000
@@ -19,9 +19,6 @@
 AC_CONFIG_HEADERS([include/config.h])
 AC_PREFIX_DEFAULT(/usr/local/classpath)
 
-dnl required if SUBDIRS is used
-AC_PROG_MAKE_SET
-
 AC_ARG_ENABLE([java],
               [AS_HELP_STRING(--enable-java,compile Java source [default=yes])],
               [case "${enableval}" in 
@@ -30,6 +27,7 @@
                  *) COMPILE_JAVA=yes ;;
                esac],
               [COMPILE_JAVA=yes])
+AM_CONDITIONAL(BUILD_GLIBJ_ZIP, test "x${COMPILE_JAVA}" = xyes)
 
 AC_ARG_ENABLE([jni],
               [AS_HELP_STRING(--enable-jni,compile JNI source [default=yes])],
@@ -122,17 +120,9 @@
 
   dnl Check for AWT related gthread/gtk/libart_lgpl
   if test "x${COMPILE_GTK_PEER}" = xyes; then
-     PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.2)
-     AC_SUBST(GTHREAD_CFLAGS)
-     AC_SUBST(GTHREAD_LIBS)
-
-     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2)
+     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2 gthread >= 2.2 libart-2.0)
      AC_SUBST(GTK_CFLAGS)
      AC_SUBST(GTK_LIBS)
-
-     PKG_CHECK_MODULES(LIBART, libart-2.0)
-     AC_SUBST(LIBART_CFLAGS)
-     AC_SUBST(LIBART_LIBS)
   fi
 
 fi
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.53
diff -u -b -B -r1.53 Makefile.am
--- lib/Makefile.am	30 Jan 2004 21:37:09 -0000	1.53
+++ lib/Makefile.am	4 Feb 2004 08:21:07 -0000
@@ -72,7 +72,7 @@
 
 JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) .:$(USER_CLASSLIB)
 
-
+if BUILD_GLIBJ_ZIP
 if HAVE_ZIP
 dist_pkgdata_DATA = glibj.zip
 noinst_DATA = genclasses
@@ -93,6 +93,8 @@
 	rm -rf $(DESTDIR)$(pkgdatadir)/java
 	rm -rf $(DESTDIR)$(pkgdatadir)/javax
 	rm -rf $(DESTDIR)$(pkgdatadir)/org
+
+endif # BUILD_GLIBJ_ZIP
 
 .PHONY: genclasses
 
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.5
diff -u -b -B -r1.5 Makefile.am
--- native/jni/gtk-peer/Makefile.am	1 Feb 2004 16:57:24 -0000	1.5
+++ native/jni/gtk-peer/Makefile.am	4 Feb 2004 08:21:07 -0000
@@ -35,12 +35,10 @@
 			gtkpeer.h 
 
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo
-libgtkpeer_la_LDFLAGS = -module -version-info @LIBVERSION@ @GTHREAD_LIBS@ @GTK_LIBS@ @LIBART_LIBS@
+libgtkpeer_la_LDFLAGS = -module -version-info @LIBVERSION@ @GTK_LIBS@
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
-	   @GTHREAD_CFLAGS@ \
 	   @GTK_CFLAGS@ \
-	   @LIBART_CFLAGS@ \
 	   -I$(top_srcdir)/native/jni/classpath \
            -I$(top_srcdir)/include \
 	   -I$(top_builddir)/include