From 72351c3e68ec7574a578bd41f7a0b17578d857af Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 6 May 2009 08:19:56 +0000 Subject: support libpoppler as 'system-xpdf' git-svn-id: svn://tug.org/texlive/trunk@12943 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/pdftexdir/utils.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Build/source/texk/web2c/pdftexdir/utils.c') diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c index 919b9436c69..ecdeb6b8aa9 100644 --- a/Build/source/texk/web2c/pdftexdir/utils.c +++ b/Build/source/texk/web2c/pdftexdir/utils.c @@ -43,7 +43,14 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "zlib.h" #include "ptexlib.h" #include "png.h" +#ifdef POPPLER_VERSION +#include "poppler-config.h" +#define xpdfVersion POPPLER_VERSION +#define xpdfString "poppler" +#else #include "xpdf/config.h" /* just to get the xpdf version */ +#define xpdfString "xpdf" +#endif #define check_nprintf(size_get, size_want) \ if ((unsigned)(size_get) >= (unsigned)(size_want)) \ @@ -1272,9 +1279,9 @@ void initversionstring(char **versions) (void) asprintf(versions, "Compiled with libpng %s; using libpng %s\n" "Compiled with zlib %s; using zlib %s\n" - "Compiled with xpdf version %s\n", + "Compiled with %s version %s\n", PNG_LIBPNG_VER_STRING, png_libpng_ver, - ZLIB_VERSION, zlib_version, xpdfVersion); + ZLIB_VERSION, zlib_version, xpdfString, xpdfVersion); } -- cgit v1.2.3