summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-06 08:19:56 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-06 08:19:56 +0000
commit72351c3e68ec7574a578bd41f7a0b17578d857af (patch)
tree84f9dfe9627578aee454107602231168c950cc83 /Build/source/texk/web2c/configure
parentf4c2f03b11aecc0d90f836edfd44da8bd24e1bd8 (diff)
support libpoppler as 'system-xpdf'
git-svn-id: svn://tug.org/texlive/trunk@12943 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/configure')
-rwxr-xr-xBuild/source/texk/web2c/configure6
1 files changed, 2 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index de54d5bee10..3931574e757 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -23761,13 +23761,11 @@ fi
if test "x$with_system_xpdf" = xyes; then
if $PKG_CONFIG poppler --atleast-version=0.10; then
POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
- XPDF_INCLUDES=`$PKG_CONFIG poppler --cflags`
- XPDF_INCLUDES=`echo $XPDF_INCLUDES`
- XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES $XPDF_INCLUDES/goo"
+ XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
XPDF_LIBS=`$PKG_CONFIG poppler --libs`
fi
else
- XPDF_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/fofi -IBLD/libs/xpdf/xpdf' | sed \
+ XPDF_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf' | sed \
-e "s,SRC/,$kpse_SRC/,g" \
-e "s,BLD/,$kpse_BLD/,g"`
XPDF_LIBS=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \