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/texk/web2c | |
| 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/texk/web2c')
| -rwxr-xr-x | Build/source/texk/web2c/configure | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 3a1ca87248c..c3856551c70 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -22688,11 +22688,11 @@ if test "${with_system_poppler+set}" = set; then : withval=$with_system_poppler; fi if test "x$with_system_poppler" = xyes; then - if $PKG_CONFIG poppler --atleast-version=0.18; then + 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.18 or better" "$LINENO" 5 + as_fn_error $? "did not find poppler-0.20 or better" "$LINENO" 5 fi else POPPLER_INCLUDES="-I$kpse_BLD/libs/poppler -I$kpse_BLD/libs/poppler/goo -I$kpse_BLD/libs/poppler/poppler" @@ -22860,10 +22860,8 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5 fi else - FREETYPE2_INCLUDES="$kpse_BLD/libs/freetype2" + FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2" FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" - FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" - FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h |