changeset in /hg/icedtea6: Fix XRender build where srcdir != bui...

[Andrew John Hughes]

changeset 62b109d14405 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=62b109d14405
description:
	Fix XRender build where srcdir != builddir.

	2008-12-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		Make XRender patch wildcard work where
		srcdir != builddir.
		* configure.ac:
		Capitalise 'XRender' in configure option.

diffstat:

3 files changed, 11 insertions(+), 2 deletions(-)
ChangeLog    |    8 ++++++++
Makefile.am  |    3 ++-
configure.ac |    2 +-

diffs (40 lines):

diff -r f22738446a8f -r 62b109d14405 ChangeLog
--- a/ChangeLog	Tue Dec 09 14:42:57 2008 +0000
+++ b/ChangeLog	Tue Dec 09 20:09:24 2008 +0000
@@ -1,3 +1,11 @@ 2008-12-09  Andrew John Hughes  <gnu_and
+2008-12-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Make XRender patch wildcard work where
+	srcdir != builddir.
+	* configure.ac:
+	Capitalise 'XRender' in configure option.
+
 2008-12-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r f22738446a8f -r 62b109d14405 Makefile.am
--- a/Makefile.am	Tue Dec 09 14:42:57 2008 +0000
+++ b/Makefile.am	Tue Dec 09 20:09:24 2008 +0000
@@ -632,7 +632,8 @@ endif
 
 if ENABLE_XRENDER
 XRENDER_PATCHES = patches/xrender/icedtea-???.patch
-ICEDTEA_PATCHES += $(sort $(wildcard $(XRENDER_PATCHES)))
+XRENDER_PATCH_FILES = $(sort $(wildcard $(abs_top_srcdir)/$(XRENDER_PATCHES)))
+ICEDTEA_PATCHES += $(sort $(subst $(abs_top_srcdir)/,,$(XRENDER_PATCH_FILES)))
 endif
 
 ICEDTEA_PATCHES += \
diff -r f22738446a8f -r 62b109d14405 configure.ac
--- a/configure.ac	Tue Dec 09 14:42:57 2008 +0000
+++ b/configure.ac	Tue Dec 09 20:09:24 2008 +0000
@@ -161,7 +161,7 @@ AM_CONDITIONAL([ENABLE_DOCS], [test x$EN
 AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes])
 AC_MSG_RESULT(${ENABLE_DOCS})
 
-AC_MSG_CHECKING(whether to include xrender pipeline)
+AC_MSG_CHECKING(whether to include the XRender pipeline)
 AC_ARG_ENABLE([xrender],
 	      [AS_HELP_STRING([--disable-xrender],
 	      		      [Disable inclusion of xrender pipeline])],