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-xpdf-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-xpdf-flags.m4')
-rw-r--r-- | Build/source/m4/kpse-xpdf-flags.m4 | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4 index 8b3afd369a2..e2207b8ad5e 100644 --- a/Build/source/m4/kpse-xpdf-flags.m4 +++ b/Build/source/m4/kpse-xpdf-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -31,13 +31,8 @@ AC_DEFUN([KPSE_XPDF_OPTIONS], # KPSE_XPDF_SYSTEM_FLAGS # ---------------------- -AC_DEFUN([KPSE_XPDF_SYSTEM_FLAGS], -[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -if $PKG_CONFIG poppler --atleast-version=0.12; then - POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' - XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" - XPDF_LIBS=`$PKG_CONFIG poppler --libs` -elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then - AC_MSG_ERROR([did not find poppler-0.12 or better]) -fi +AC_DEFUN([KPSE_XPDF_SYSTEM_FLAGS], [dnl +_KPSE_PKG_CONFIG_FLAGS([xpdf], [poppler], [0.12]) +POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' +XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES" ]) # KPSE_XPDF_SYSTEM_FLAGS |