From f437333cf5d63d69f5ab9fd1eb553af4175037d0 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 12 Apr 2011 17:19:46 +0000 Subject: Allow to build luaTeX with libpng-1.5.x git-svn-id: svn://tug.org/texlive/trunk@22060 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/xpdfopen/aclocal.m4 | 4 ++-- Build/source/utils/xpdfopen/configure | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'Build/source/utils/xpdfopen') diff --git a/Build/source/utils/xpdfopen/aclocal.m4 b/Build/source/utils/xpdfopen/aclocal.m4 index f004a0e2d53..8cd538d37dc 100644 --- a/Build/source/utils/xpdfopen/aclocal.m4 +++ b/Build/source/utils/xpdfopen/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) diff --git a/Build/source/utils/xpdfopen/configure b/Build/source/utils/xpdfopen/configure index 0934b265f0e..05821a2f6c2 100755 --- a/Build/source/utils/xpdfopen/configure +++ b/Build/source/utils/xpdfopen/configure @@ -673,7 +673,8 @@ LDFLAGS LIBS CPPFLAGS XMKMF -CPP' +CPP +CPPFLAGS' # Initialize some variables set by options. @@ -4942,8 +4943,8 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="`echo $ac_config_files`" -config_commands="`echo $ac_config_commands`" +config_files="$ac_config_files" +config_commands="$ac_config_commands" _ACEOF -- cgit v1.2.3