# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1310040627 -3600
# Node ID b36e263a2d9c6d9a17e8055acff2c203e98ec9b0
# Parent  91be8105cfa776b99e658de77c3081bdbecbd9ac
PR icedtea/751: Make javah patch conditional so IcedTea7 can bootstrap itself.

2011-07-05  Andrew John Hughes  <ahughes@redhat.com>

	PR icedtea/751:
	(ICEDTEA_BOOT_PATCHES): Make application of
	javah.patch dependent on javah presenting
	with bug 40188.

diff -r 91be8105cfa7 -r b36e263a2d9c ChangeLog
--- a/ChangeLog	Tue Jul 05 13:48:51 2011 +0100
+++ b/ChangeLog	Thu Jul 07 13:10:27 2011 +0100
@@ -1,3 +1,10 @@
+2011-07-05  Andrew John Hughes  <ahughes@redhat.com>
+
+	PR icedtea/751:
+	(ICEDTEA_BOOT_PATCHES): Make application of
+	javah.patch dependent on javah presenting
+	with bug 40188.
+
 2011-07-05  Andrew John Hughes  <ahughes@redhat.com>
 
 	PR icedtea/751
diff -r 91be8105cfa7 -r b36e263a2d9c Makefile.am
--- a/Makefile.am	Tue Jul 05 13:48:51 2011 +0100
+++ b/Makefile.am	Thu Jul 07 13:10:27 2011 +0100
@@ -345,7 +345,6 @@
 	patches/boot/xbootclasspath.patch \
 	patches/boot/icedteart.patch \
 	patches/boot/jar.patch \
-	patches/boot/javah.patch \
 	patches/boot/symbols.patch \
 	patches/boot/tobin.patch \
 	patches/boot/test_gamma.patch \
@@ -373,7 +372,8 @@
 endif
 
 if CP40188_JAVAH
-ICEDTEA_BOOT_PATCHES += patches/boot/pr40188.patch
+ICEDTEA_BOOT_PATCHES += patches/boot/pr40188.patch \
+	patches/boot/javah.patch
 endif
 
 if CP40616