diff options
Diffstat (limited to 'Build/source/m4')
| -rw-r--r-- | Build/source/m4/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/m4/kpse-freetype2-flags.m4 | 6 | ||||
| -rw-r--r-- | Build/source/m4/kpse-poppler-flags.m4 | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index d617e2f6fbc..b0bf1658fc8 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,6 +1,12 @@ +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>. + 2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> * kpse-poppler-flags.m4: Require poppler-0.18 or better. + * kpse-freetype2-flags.m4: Simplify flags for lib from TL tree. 2012-10-19 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4 index 40d4e2a6fb0..18f0edaba5c 100644 --- a/Build/source/m4/kpse-freetype2-flags.m4 +++ b/Build/source/m4/kpse-freetype2-flags.m4 @@ -17,10 +17,8 @@ AC_DEFUN([KPSE_FREETYPE2_FLAGS], [AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl _KPSE_LIB_FLAGS([freetype2], [freetype], [lt], - [BLD/libs/freetype2], - [BLD/libs/freetype2/libfreetype.la], - [FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" - FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`"], + [-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2], + [BLD/libs/freetype2/libfreetype.la], [], [], [${top_builddir}/../../libs/freetype2/ft2build.h])[]dnl ]) # KPSE_FREETYPE2_FLAGS diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4 index 4e3823f0036..40371a11161 100644 --- a/Build/source/m4/kpse-poppler-flags.m4 +++ b/Build/source/m4/kpse-poppler-flags.m4 @@ -33,10 +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.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 - AC_MSG_ERROR([did not find poppler-0.18 or better]) + AC_MSG_ERROR([did not find poppler-0.20 or better]) fi ]) # KPSE_POPPLER_SYSTEM_FLAGS |