diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-26 08:10:55 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-26 08:10:55 +0000 |
commit | 3c06d717b891d74b66f02b12ba0d4ad0f6437f5c (patch) | |
tree | 51bd46e7acd2ce72f2be14de4c9bfe854a47341c /Build/source/configure | |
parent | 6650155057159411fc2dddd0ae020266eb3509b5 (diff) |
poppler: Require 0.20 or better for POPPLER_VERSION
build system: Better dependencies for parallel builds
git-svn-id: svn://tug.org/texlive/trunk@28367 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/configure')
-rwxr-xr-x | Build/source/configure | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Build/source/configure b/Build/source/configure index ec0695aaa2d..6302531abf5 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -4859,7 +4859,6 @@ esac test "x$enable_dvipng" = xno || { need_kpathsea=yes - need_freetype2=yes need_gd=yes need_t1lib=yes } @@ -20183,12 +20182,11 @@ elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5 fi -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.20; then + POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags` POPPLER_LIBS=`$PKG_CONFIG poppler --libs` elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then - as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5 + as_fn_error $? "did not find poppler-0.20 or better" "$LINENO" 5 fi if $PKG_CONFIG zziplib --atleast-version=0.12; then |