From e613b107a864c23e8c22a5f2967a66d73a8b4104 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 26 Nov 2012 13:50:15 +0000 Subject: poppler: Reduce the requirement to 0.18 or better git-svn-id: svn://tug.org/texlive/trunk@28368 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 7 ++++--- Build/source/m4/ChangeLog | 3 +-- Build/source/m4/kpse-poppler-flags.m4 | 7 ++++--- Build/source/texk/web2c/configure | 7 ++++--- 4 files changed, 13 insertions(+), 11 deletions(-) (limited to 'Build/source') diff --git a/Build/source/configure b/Build/source/configure index 6302531abf5..33ef2c39461 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -20182,11 +20182,12 @@ 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.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 - as_fn_error $? "did not find poppler-0.20 or better" "$LINENO" 5 + as_fn_error $? "did not find poppler-0.18 or better" "$LINENO" 5 fi if $PKG_CONFIG zziplib --atleast-version=0.12; then 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 - * kpse-poppler-flags.m4: Require poppler-0.20 or better for - definition of POPPLER_VERSION in . + * kpse-poppler-flags.m4: Restore -DPOPPLER_VERSION for 0.18. 2012-11-20 Peter Breitenlohner 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 diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index c3856551c70..f927d1cab8b 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -22688,11 +22688,12 @@ 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.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 - as_fn_error $? "did not find poppler-0.20 or better" "$LINENO" 5 + as_fn_error $? "did not find poppler-0.18 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" -- cgit v1.2.3