Re-enable --with-openjdk-src-dir support for IcedTea7

[Andrew John Hughes]

This patch re-enables the ability to use --with-openjdk-src-dir
to point to an OpenJDK tree in the filesystem.  A copy is taken
so that the original tree is not affected by the IcedTea build
patches.

ChangeLog:

2008-08-04  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* Makefile.am:
	Don't download and extract when an external source dir is
	specified.  Instead, obtain a local copy of the tree.
	* acinclude.m4:
	Use a more meaningful name for the OpenJDK srcdir
	conditional.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 1af9afe21773 Makefile.am
--- a/Makefile.am	Sun Jul 27 22:30:04 2008 +0100
+++ b/Makefile.am	Mon Aug 04 02:21:27 2008 +0100
@@ -280,6 +280,7 @@
 
 
 stamps/download.stamp:
+if !OPENJDK_SRC_DIR_FOUND
 if USE_ALT_OPENJDK_SRC_ZIP
 else
 if USE_HG
@@ -308,6 +309,7 @@
 	  fi ; \
 	  $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
 	fi
+endif
 endif
 endif
 if WITH_CACAO
@@ -464,6 +466,9 @@
 	$(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp
+if OPENJDK_SRC_DIR_FOUND
+	cp -a $(OPENJDK_SRC_DIR) openjdk
+else
 	if ! test -d openjdk ; then \
 	  if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
 	    $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \
@@ -472,6 +477,7 @@
 	    false; \
 	  fi; \
 	fi; 
+endif
 	chmod -R ug+w openjdk 
 	sh $(srcdir)/fsg.sh ; 
 	mkdir -p stamps 
diff -r 1af9afe21773 acinclude.m4
--- a/acinclude.m4	Sun Jul 27 22:30:04 2008 +0100
+++ b/acinclude.m4	Mon Aug 04 02:21:27 2008 +0100
@@ -174,7 +174,7 @@
     AC_MSG_RESULT(${OPENJDK_SRC_DIR})
   ])
   AC_SUBST(OPENJDK_SRC_DIR)
-  AM_CONDITIONAL(GNU_CLASSLIB_FOUND, test "x${conditional_with_openjdk_sources}" = xtrue)
+  AM_CONDITIONAL(OPENJDK_SRC_DIR_FOUND, test "x${conditional_with_openjdk_sources}" = xtrue)
 ])
 
 AC_DEFUN([FIND_ECJ_JAR],