2004-04-12 Michael Koch <konqueror@gmx.de>

	* configure.ac: Call only CLASSPATH_WITH_GLIBJ to get what to install.
	* acinclude.m4
	(CLASSPATH_WITH_GLIBJ): New function to specify what to install.
	(CLASSPATH_ENABLE_GLIBJ): Removed.
	(CLASSPATH_ENABLE_CLASS_INSTALL): Removed.
	* lib/Makefile.am: Handle INSTALL_GLIBJ_ZIP and INSTALL_CLASS_FILES.

4 files changed, 44 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index 39ffd8928..7bbe44481 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-04-12  Michael Koch  <konqueror@gmx.de>
+
+	* configure.ac: Call only CLASSPATH_WITH_GLIBJ to get what to install.
+	* acinclude.m4
+	(CLASSPATH_WITH_GLIBJ): New function to specify what to install.
+	(CLASSPATH_ENABLE_GLIBJ): Removed.
+	(CLASSPATH_ENABLE_CLASS_INSTALL): Removed.
+	* lib/Makefile.am: Handle INSTALL_GLIBJ_ZIP and INSTALL_CLASS_FILES.
+
 2004-04-11  Mark Wielaard  <mark@klomp.org>
 
 	* configure.ac (CFLAGS): Remove definition.
diff --git a/acinclude.m4 b/acinclude.m4
index 166558047..29dacc49c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -555,47 +555,38 @@ AC_DEFUN([CLASSPATH_WITH_INCLUDEDIR],
 ])
 
 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 -----------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index beae5a6d9..9bd895d12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,14 +250,9 @@ dnl -----------------------------------------------------------
 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)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3ebc23b01..09dc2af1b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -62,13 +62,13 @@ ARG_CLASSPATH_JAVAH = -classpath
 
 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 @@ uninstall-local:
 	rm -rf $(DESTDIR)$(pkgdatadir)/javax
 	rm -rf $(DESTDIR)$(pkgdatadir)/org
 
-endif # INSTALL_CLASSFILES
+endif # INSTALL_CLASS_FILES
 
 .PHONY: genclasses