summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-26 13:50:15 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-26 13:50:15 +0000
commite613b107a864c23e8c22a5f2967a66d73a8b4104 (patch)
treea8be287482becb1058b5227b362d85fb3b29f40a /Build/source/m4
parent3c06d717b891d74b66f02b12ba0d4ad0f6437f5c (diff)
poppler: Reduce the requirement to 0.18 or better
git-svn-id: svn://tug.org/texlive/trunk@28368 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog3
-rw-r--r--Build/source/m4/kpse-poppler-flags.m47
2 files changed, 5 insertions, 5 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index b0bf1658fc8..a3fb7691a41 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,7 +1,6 @@
2012-11-26 Peter Breitenlohner <peb@mppmu.mpg.de>
- * kpse-poppler-flags.m4: Require poppler-0.20 or better for
- definition of POPPLER_VERSION in <poppler-config.h>.
+ * kpse-poppler-flags.m4: Restore -DPOPPLER_VERSION for 0.18.
2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4
index 40371a11161..c11d727f1d2 100644
--- a/Build/source/m4/kpse-poppler-flags.m4
+++ b/Build/source/m4/kpse-poppler-flags.m4
@@ -33,10 +33,11 @@ AC_DEFUN([KPSE_POPPLER_OPTIONS],
# ----------------------
AC_DEFUN([KPSE_POPPLER_SYSTEM_FLAGS],
[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
-if $PKG_CONFIG poppler --atleast-version=0.20; then
- POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags`
+if $PKG_CONFIG poppler --atleast-version=0.18; then
+ POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
+ POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
- AC_MSG_ERROR([did not find poppler-0.20 or better])
+ AC_MSG_ERROR([did not find poppler-0.18 or better])
fi
]) # KPSE_POPPLER_SYSTEM_FLAGS