# HG changeset patch
# User gnu_andrew@member.fsf.org
# Date 1202671392 0
# Node ID 3442db5e9533a230c1a3d053cc563a2fb46b0bbd
# Parent  c1c8a1548463563852c808f398b8f292f703b61e
Add build of Scanner.java from JDK

diff -r c1c8a1548463 -r 3442db5e9533 configure.ac
--- a/configure.ac	Wed Jan 09 09:08:16 2008 +0000
+++ b/configure.ac	Sun Feb 10 19:23:12 2008 +0000
@@ -23,12 +23,14 @@
 if test "$OPENJDK_SRC_ZIP" = "not specified"; then
    FIND_TOOL([HG], [hg])
    GET_JAXWS
+   GET_JDK
 else
    FIND_TOOL([UNZIP], [unzip])
    ${UNZIP} -q ${OPENJDK_SRC_ZIP}
 fi
 
 INSTALL_JAXWS
+INSTALL_JDK
 FIND_TOOL([PATCH], [patch])
 PATCH_CLASSPATH
 AC_CONFIG_SUBDIRS([classpath])
diff -r c1c8a1548463 -r 3442db5e9533 m4/acinclude.m4
--- a/m4/acinclude.m4	Wed Jan 09 09:08:16 2008 +0000
+++ b/m4/acinclude.m4	Sun Feb 10 19:23:12 2008 +0000
@@ -68,6 +68,21 @@
 fi
 ])
 
+AC_DEFUN([GET_JDK],
+[if ! test -d jdk ; then
+ AC_MSG_NOTICE([Checking out JDK sources])
+ ${HG} clone http://hg.openjdk.java.net/jdk7/jdk7/jdk &> /dev/null
+fi
+])
+
+AC_DEFUN([INSTALL_JDK],
+[if ! test -f classpath/java/util/Scanner.java ; then
+ AC_MSG_NOTICE([Installing elements of OpenJDK])
+ mv jdk/src/share/classes/java/util/Scanner.java classpath/java/util
+ mv jdk/src/share/classes/sun/misc/LRUCache.java classpath/sun/misc
+fi
+])
+
 AC_DEFUN([PATCH_CLASSPATH],
 [
  AC_MSG_NOTICE([Patching Classpath])