Re: Cinco de Mayo

[Carlos Cavanna]

> > Could we add an option to 'make install' which
> would copy all .class
> > files to a $prefix/share/classpath/classes
> directory?
> 
> Someone mentioned doing this recently, it is easy
> and I planned to add
> it myself before the release.

Hi,

I did the -enable-zip / -disable-zip change.
I attach you the patch for that and for
-enable-gtk-peer / -disable-gtk-peer that I
did some time ago. Someone may find it useful.
I don't remember why I needed it, though.

In configure.in I also include a change
in AC_OUTPUT that is necessary for javax/swing
to compile.

Regards,
CC

Index: classpath/configure.in
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.in,v
retrieving revision 1.95
diff -u -r1.95 configure.in
--- classpath/configure.in      1 Apr 2002 07:38:57
-0000       1.95
+++ classpath/configure.in      3 May 2002 21:39:08
-0000
@@ -55,10 +55,28 @@
 esac],
 [COMPILE_CNI=no])

+dnl
-----------------------------------------------------------
+dnl GTK native peer
+dnl
-----------------------------------------------------------
+AC_ARG_ENABLE(gtk-peer,
+[  --enable-gtk-peer            compile GTK native
peers
+[default=yes]],
+[case "${enableval}" in
+  yes) COMPILE_GTK_PEER=yes ;;
+  no) COMPILE_GTK_PEER=no ;;
+  *) COMPILE_GTK_PEER=yes ;;
+esac],
+[COMPILE_GTK_PEER=yes])
+
 AM_CONDITIONAL(CREATE_JNI_HEADERS, test
"x${COMPILE_JNI}" = xyes)
 AM_CONDITIONAL(CREATE_JNI_LIBRARIES, test
"x${COMPILE_JNI}" = xyes)
 AM_CONDITIONAL(CREATE_CNI_LIBRARIES, test
"x${COMPILE_CNI}" = xyes)

+dnl
-----------------------------------------------------------
+dnl GTK native peer
+dnl
-----------------------------------------------------------
+AM_CONDITIONAL(CREATE_GTK_PEER_LIBRARIES, test
x$COMPILE_GTK_PEER = xyes)
+
 AC_PROG_LN_S
 AC_PROG_INSTALL

@@ -108,8 +126,15 @@
   fi

   dnl Check for AWT related glib/gtk/libart_lgpl
-  AM_PATH_GTK(1.2.4,,exit 1)
-  AM_PATH_GLIB(1.2.4,,exit 1,gthread)
+
+  dnl
-----------------------------------------------------------
+  dnl If GTK native peer is enabled
+  dnl
-----------------------------------------------------------
+  if test "${COMPILE_GTK_PEER}" = "yes"; then
+    dnl Check for AWT related glib/gtk/libart_lgpl
+    AM_PATH_GTK(1.2.4,,exit 1)
+    AM_PATH_GLIB(1.2.4,,exit 1,gthread)
+  fi

   dnl XXX Fix me when libart.m4 has the compile test
fixed!
   enable_libarttest=no
@@ -216,18 +241,47 @@
 REMOVE=""
 AC_SUBST(REMOVE)

+dnl
-----------------------------------------------------------
+dnl Hack
+dnl Configure libjavaio_la_LIBADD
+dnl
-----------------------------------------------------------
+
+libjavaio_la_LIBADD=${libjavaio_la_LIBADD}
+AC_SUBST(libjavaio_la_LIBADD)
+
+dnl
-----------------------------------------------------------
+
+dnl
-----------------------------------------------------------
+dnl ZIP
+dnl
-----------------------------------------------------------
+
 dnl This is probably useless.
 AC_PATH_PROG(SH, sh)

+AC_ARG_ENABLE(zip,
+[  --enable-zip            generate glibj.zip
+[default=yes]],
+[case "${enableval}" in
+  yes) USE_ZIP=yes;
+       AC_PATH_PROG(ZIP, zip)
+       dnl AC_PATH_PROG(UNZIP, unzip)
+       ;;
+  no) USE_ZIP=no ;;
+  *) USE_ZIP=yes ;;
+esac],
+[USE_ZIP=yes])
+
 dnl According to the GNU coding guide, we shouldn't
require find,
 dnl zip, and perl, however it should be okay since it
is only used
 dnl in maintainer mode.
 AC_PATH_PROG(FIND, find)
-AC_PATH_PROG(ZIP, zip)
-dnl AC_PATH_PROG(UNZIP, unzip)
 dnl AC_PATH_PROG(PERL, perl)

-AM_CONDITIONAL(HAVE_ZIP, test "x${ZIP}" != x)
+dnl use of zip is enabled and it was found on the
path
+AM_CONDITIONAL(HAVE_ZIP, test "x${USE_ZIP}" = xyes -a
"x${ZIP}" != x)
+dnl AM_CONDITIONAL(HAVE_ZIP, test "x${ZIP}" != x)
+
+dnl
-----------------------------------------------------------

 AC_OUTPUT(Makefile
 com/Makefile
@@ -320,6 +374,16 @@
 javax/naming/Makefile
 javax/naming/directory/Makefile
 javax/naming/spi/Makefile
+javax/swing/Makefile
+javax/swing/border/Makefile
+javax/swing/event/Makefile
+javax/swing/plaf/basic/Makefile
+javax/swing/plaf/Makefile
+javax/swing/plaf/metal/Makefile
+javax/swing/table/Makefile
+javax/swing/text/Makefile
+javax/swing/tree/Makefile
+javax/swing/undo/Makefile
 native/Makefile
 native/fdlibm/Makefile
 native/cni/Makefile
@@ -352,5 +416,4 @@
 lib/gen_nio.sh,
 [ chmod 755 lib/gen-classlist.sh
 ])
-

Index: classpath/native/jni/Makefile.am
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- classpath/native/jni/Makefile.am    5 Nov 2001
02:56:47 -0000       1.5
+++ classpath/native/jni/Makefile.am    3 May 2002
21:39:10 -0000
@@ -1 +1,9 @@
-SUBDIRS = classpath java-io java-lang java-net
java-util gtk-peer
+MODULE_SUBDIRS = classpath java-io java-lang java-net
java-util
+GTK_PEER_SUBDIRS = gtk-peer
+
+if CREATE_GTK_PEER_LIBRARIES
+SUBDIRS = $(MODULE_SUBDIRS) $(GTK_PEER_SUBDIRS)
+else
+SUBDIRS = $(MODULE_SUBDIRS)
+endif
+


__________________________________________________
Do You Yahoo!?
Yahoo! Health - your guide to health and wellness
http://health.yahoo.com