diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-12 14:42:02 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-12 14:42:02 +0000 |
commit | e96d533771de7ceeb155f9e2a093e67e0dc40ab1 (patch) | |
tree | e307e1ae0d17abcb640c37be30b7bdf5e370e074 /Build/source/m4/kpse-poppler-flags.m4 | |
parent | 43053489cfb1957b1779be81ba6bd1ac96f71165 (diff) |
Build system: Reorganize flags for system (installed) libraries
git-svn-id: svn://tug.org/texlive/trunk@36495 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4/kpse-poppler-flags.m4')
-rw-r--r-- | Build/source/m4/kpse-poppler-flags.m4 | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4 index 1ba2d5bf729..2883395cfdb 100644 --- a/Build/source/m4/kpse-poppler-flags.m4 +++ b/Build/source/m4/kpse-poppler-flags.m4 @@ -28,12 +28,7 @@ AC_DEFUN([KPSE_POPPLER_OPTIONS], [_KPSE_LIB_OPTIONS([poppler], [$1], [pkg-config # KPSE_POPPLER_SYSTEM_FLAGS # ------------------------- AC_DEFUN([KPSE_POPPLER_SYSTEM_FLAGS], [dnl -AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -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.18 or better]) -fi +_KPSE_PKG_CONFIG_FLAGS([poppler], [poppler], [0.18]) +POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' +POPPLER_INCLUDES="$POPPLER_VERSION $POPPLER_INCLUDES" ]) # KPSE_POPPLER_SYSTEM_FLAGS |