Index: acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/acinclude.m4,v
retrieving revision 1.33
diff -u -r1.33 acinclude.m4
--- acinclude.m4	8 Apr 2004 20:32:20 -0000	1.33
+++ acinclude.m4	10 Apr 2004 20:26:35 -0000
@@ -555,47 +555,38 @@
 ])
 
 dnl -----------------------------------------------------------
-dnl CLASSPATH_ENABLE_GLIBJ - allow user to specify without zip
+dnl CLASSPATH_WITH_GLIBJ - specify what to install
 dnl -----------------------------------------------------------
-AC_DEFUN([CLASSPATH_ENABLE_GLIBJ],
+AC_DEFUN([CLASSPATH_WITH_GLIBJ],
 [
-  AC_ARG_ENABLE([glibj],
-                [AS_HELP_STRING([--enable-glibj],[enable creation of glibj.zip [default=yes]])],
-                [
-                  if test "x${enableval}" = xyes; then
-      		    AC_PATH_PROG(ZIP, zip)
-                  elif test "x${enableval}" = xno; then
-                    ZIP=
-                  else
-                   ZIP="${enableval}"
-                  fi
-		],
-  		[
+  AC_ARG_WITH([glibj],
+              [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both) [default=zip]])],
+              [
+                if test "x${withval}" = xyes || test "x${withval}" = xzip; then
+      		  AC_PATH_PROG(ZIP, zip)
+		  install_class_files=no
+		elif test "x${withval}" = xboth; then
+		  AC_PATH_PROG(ZIP, zip)
+		  install_class_files=yes
+		elif test "x${withval}" = xflat; then
+		  ZIP=
+		  install_class_files=yes
+                elif test "x${withval}" = xno || test "x${withval}" = xnone; then
                   ZIP=
-		])
-
-  AC_SUBST(ZIP)
-  AM_CONDITIONAL(CREATE_GLIBJ, test "x${ZIP}" != x)
-])
-
-dnl -----------------------------------------------------------
-dnl CLASSPATH_ENABLE_CLASS_INSTALL
-dnl   - allow user to install all classfiles
-dnl -----------------------------------------------------------
-AC_DEFUN([CLASSPATH_ENABLE_CLASS_INSTALL],
-[
-  AC_ARG_ENABLE([class-install],
-		[AS_HELP_STRING([--enable-class-install],[enable installation of class files [default=no]])],
-		[
-                  case "${enableval}" in
-                    yes) ENABLE_CLASS_INSTALL=yes ;;
-                    no) ENABLE_CLASS_INSTALL=no ;;
-                    *) ENABLE_CLASS_INSTALL=no ;;
-                  esac
-		],
-		[ENABLE_CLASS_INSTALL=no])
-
-  AM_CONDITIONAL(INSTALL_CLASSFILES, test "x${ENABLE_CLASS_INSTALL}" = xyes)
+		  install_class_files=no
+                else
+		  AC_MSG_ERROR([unknown value given to --with-glibj])
+                fi
+	      ],
+  	      [
+		AC_PATH_PROG(ZIP, zip)
+		install_class_files=no
+	      ])
+  if test "x${ZIP}" = x && test "x${install_class_files}" = xno; then
+    AC_MSG_ERROR([you need to either install class files or glibj.zip])
+  fi
+  AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${ZIP}" != x)
+  AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes)
 ])
 
 dnl -----------------------------------------------------------
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.14
diff -u -r1.14 configure.ac
--- configure.ac	8 Apr 2004 20:04:12 -0000	1.14
+++ configure.ac	10 Apr 2004 20:26:35 -0000
@@ -251,14 +251,9 @@
 AC_PATH_PROG(FIND, find)
 
 dnl -----------------------------------------------------------
-dnl Create glibj.zip (enabled by default)
+dnl Specify what to install (install only glibj.zip by default)
 dnl -----------------------------------------------------------
-CLASSPATH_ENABLE_GLIBJ
-
-dnl -----------------------------------------------------------
-dnl Install class files (disabled by default)
-dnl -----------------------------------------------------------
-CLASSPATH_ENABLE_CLASS_INSTALL
+CLASSPATH_WITH_GLIBJ
 
 dnl -----------------------------------------------------------
 dnl Enable API documentation generation (disabled by default)
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.56
diff -u -r1.56 Makefile.am
--- lib/Makefile.am	8 Apr 2004 20:32:20 -0000	1.56
+++ lib/Makefile.am	10 Apr 2004 20:26:35 -0000
@@ -62,13 +62,13 @@
 
 JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) .:$(USER_CLASSLIB)
 
-if CREATE_GLIBJ
+if INSTALL_GLIBJ_ZIP
 
 dist_pkgdata_DATA = glibj.zip
 
-endif # CREATE_GLIBJ
+endif # INSTALL_GLIBJ_ZIP
 
-if INSTALL_CLASSFILES
+if INSTALL_CLASS_FILES
 
 noinst_DATA = genclasses compile-classes resources
 
@@ -86,7 +86,7 @@
 	rm -rf $(DESTDIR)$(pkgdatadir)/javax
 	rm -rf $(DESTDIR)$(pkgdatadir)/org
 
-endif # INSTALL_CLASSFILES
+endif # INSTALL_CLASS_FILES
 
 .PHONY: genclasses