Mercurial > hg > release > icedtea6-1.4
changeset 1268:62b109d14405
Fix XRender build where srcdir != builddir.
2008-12-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am:
Make XRender patch wildcard work where
srcdir != builddir.
* configure.ac:
Capitalise 'XRender' in configure option.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Tue, 09 Dec 2008 20:09:24 +0000 |
| parents | f22738446a8f |
| children | 7e85e3fd25d7 |
| files | ChangeLog Makefile.am configure.ac |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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_andrew@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@member.fsf.org> * 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 @@ 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 += \
--- 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$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])],