diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-04-14 16:19:18 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-04-14 16:19:18 +0000 |
commit | 7a3c6f66dd4ba13faaf4bb6153984d435ca4d8f3 (patch) | |
tree | 20768b21cc4a6221eb7b672dd99c2f972c2cabb5 /Build/source/texk/web2c/luatexdir | |
parent | 7c3f181e032655af0a5e3dd571f5bf6b76722e80 (diff) |
luaTeX and poppler build system updates
git-svn-id: svn://tug.org/texlive/trunk@22085 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/utils/utils.w | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index a34e1d3ed9b..0fdd9ed366c 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,5 +1,11 @@ 2011-04-13 Peter Breitenlohner <peb@mppmu.mpg.de> + * utils/utils.w (POPPLER_VERSION): Now defined in + poppler-config.h for poppler from the TeX Live tree, or in the + Makefile for an installed version. + +2011-04-13 Peter Breitenlohner <peb@mppmu.mpg.de> + * am/libluatex.am, am/txt2zlib.am: When cross compiling skip txt2zlib and use installed luascripts/pdflua.c. diff --git a/Build/source/texk/web2c/luatexdir/utils/utils.w b/Build/source/texk/web2c/luatexdir/utils/utils.w index e3dc26bc6bf..4acb9f2d9dd 100644 --- a/Build/source/texk/web2c/luatexdir/utils/utils.w +++ b/Build/source/texk/web2c/luatexdir/utils/utils.w @@ -50,11 +50,9 @@ static const char _svn_version[] = #include "png.h" +/* POPPLER_VERSION is defined in poppler-config.h for poppler from + * the TeX Live tree, or in the Makefile for an installed version. */ #include "poppler-config.h" -#ifndef POPPLER_VERSION -# include "aconf.h" -# define POPPLER_VERSION POPPLER_PACKAGE_VERSION -#endif @ @c #define check_nprintf(size_get, size_want) \ |