summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-23 13:32:28 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-23 13:32:28 +0000
commit0af56a69384564cd03264928f7c602319a12128d (patch)
tree00462d1427e11067c71016f234a324ea124cbc6d /Build/source/m4
parentb0bee8af3780b8627f7225040c8020f84516a6f1 (diff)
require poppler 0.18 or better
git-svn-id: svn://tug.org/texlive/trunk@28338 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog4
-rw-r--r--Build/source/m4/kpse-poppler-flags.m47
2 files changed, 7 insertions, 4 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 90a04b9eacf..d617e2f6fbc 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-poppler-flags.m4: Require poppler-0.18 or better.
+
2012-10-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-poppler-flags.m4 [WIN32]: Add '-lgdi32' to POPPLER_LIBS.
diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4
index 029e495d64c..4e3823f0036 100644
--- a/Build/source/m4/kpse-poppler-flags.m4
+++ b/Build/source/m4/kpse-poppler-flags.m4
@@ -33,11 +33,10 @@ 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.12; then
- POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
- POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
+if $PKG_CONFIG poppler --atleast-version=0.18; then
+ POPPLER_INCLUDES=`$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.12 or better])
+ AC_MSG_ERROR([did not find poppler-0.18 or better])
fi
]) # KPSE_POPPLER_SYSTEM_FLAGS