# HG changeset patch
# User gnu_andrew@member.fsf.org
# Date 1202673755 0
# Node ID 8a91abc2e5ff6c1a89121414e1850f35153596e1
# Parent  e765f7636072264790602f3f59482c852a0c40ef
Add support for Classpath zip file.

diff -r e765f7636072 -r 8a91abc2e5ff ChangeLog
--- a/ChangeLog	Sun Feb 10 19:24:11 2008 +0000
+++ b/ChangeLog	Sun Feb 10 20:02:35 2008 +0000
@@ -1,4 +1,12 @@
-2008-01-08  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-02-10  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* configure.ac:
+	Only use CVS and patch Classpath when
+	not using a Classpath install.
+	* m4/acinclude.m4:
+	Add support for an existing Classpath install.
+	
+2008-02-10  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* configure.ac:
 	Call GET_JDK and INSTALL_JDK.
diff -r e765f7636072 -r 8a91abc2e5ff configure.ac
--- a/configure.ac	Sun Feb 10 19:24:11 2008 +0000
+++ b/configure.ac	Sun Feb 10 20:02:35 2008 +0000
@@ -1,23 +1,22 @@
 AC_PREREQ([2.61])
 AC_INIT([brandweg], [0.1], [gnu_andrew@member.fsf.org])
 AM_INIT_AUTOMAKE([tar-pax])
-AC_CONFIG_FILES([Makefile])
 AC_CANONICAL_HOST
 
 AC_PREFIX_DEFAULT([/usr/local/brandweg])
 
-BW_SUBDIRS="classpath"
-AC_SUBST(BW_SUBDIRS)
-
 WITH_OPENJDK_SRC_ZIP
 WITH_CLASSPATH_SRC_ZIP
+WITH_CLASSPATH_GLIBJ_ZIP
 
-if test "$CLASSPATH_SRC_ZIP" = "not specified"; then
-   FIND_TOOL([CVS], [cvs])
-   GET_CLASSPATH   
-else
-   FIND_TOOL([UNZIP], [unzip])
-   ${UNZIP} -q ${CLASSPATH_SRC_ZIP}
+if test "$CLASSPATH_GLIBJ_ZIP" = "not specified"; then
+   if test "$CLASSPATH_SRC_ZIP" = "not specified"; then
+      FIND_TOOL([CVS], [cvs])
+      GET_CLASSPATH   
+   else
+      FIND_TOOL([UNZIP], [unzip])
+      ${UNZIP} -q ${CLASSPATH_SRC_ZIP}
+   fi
 fi
 
 if test "$OPENJDK_SRC_ZIP" = "not specified"; then
@@ -29,9 +28,15 @@
    ${UNZIP} -q ${OPENJDK_SRC_ZIP}
 fi
 
-INSTALL_JAXWS
-INSTALL_JDK
-FIND_TOOL([PATCH], [patch])
-PATCH_CLASSPATH
-AC_CONFIG_SUBDIRS([classpath])
+if test "$CLASSPATH_GLIBJ_ZIP" = "not specified"; then
+   INSTALL_JAXWS
+   INSTALL_JDK
+   FIND_TOOL([PATCH], [patch])
+   PATCH_CLASSPATH
+   BW_SUBDIRS="classpath"
+   AC_SUBST(BW_SUBDIRS)
+   AC_CONFIG_SUBDIRS([classpath])
+fi
+
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff -r e765f7636072 -r 8a91abc2e5ff m4/acinclude.m4
--- a/m4/acinclude.m4	Sun Feb 10 19:24:11 2008 +0000
+++ b/m4/acinclude.m4	Sun Feb 10 20:02:35 2008 +0000
@@ -32,6 +32,23 @@
   AC_SUBST(CLASSPATH_SRC_ZIP)
 ])
 
+AC_DEFUN([WITH_CLASSPATH_GLIBJ_ZIP],
+[
+  AC_MSG_CHECKING(GNU Classpath classes)
+  AC_ARG_WITH([classpath-jar],
+              [AS_HELP_STRING(--with-classpath-jar,specify the location of Classpath's class files)],
+  [
+    CLASSPATH_GLIBJ_ZIP=${withval}
+    AM_CONDITIONAL(USE_CLASSPATH_GLIBJ_ZIP, test x = x)
+  ],
+  [ 
+    CLASSPATH_SRC_ZIP="not specified"
+    AM_CONDITIONAL(USE_CLASSPATH_GLIBJ_ZIP, test x != x)
+  ])
+  AC_MSG_RESULT(${CLASSPATH_GLIBJ_ZIP})
+  AC_SUBST(CLASSPATH_GLIBJ_ZIP)
+])
+
 AC_DEFUN([FIND_TOOL],
 [AC_PATH_TOOL([$1],[$2])
  if test x"$$1" = x ; then