summaryrefslogtreecommitdiff
path: root/Build/source/libs/configure
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-05-14 17:47:47 +0000
committerKarl Berry <karl@freefriends.org>2020-05-14 17:47:47 +0000
commit6e1a96b95f6423b72c0f2910ce53464859477907 (patch)
tree62680adee8d9d400428e1e2ca9b8bfabab283fd5 /Build/source/libs/configure
parent4aabfd8ab8cb4d327dcbac9b7318ff1718e505d5 (diff)
remove poppler support from TL
git-svn-id: svn://tug.org/texlive/trunk@55138 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/configure')
-rwxr-xr-xBuild/source/libs/configure52
1 files changed, 2 insertions, 50 deletions
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 9f165065bda..b01a80c8350 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -812,8 +812,6 @@ with_system_icu
with_system_teckit
with_system_graphite2
with_system_zziplib
-with_system_xpdf
-with_system_poppler
with_system_mpfr
with_mpfr_includes
with_mpfr_libdir
@@ -1642,10 +1640,6 @@ Optional Packages:
(requires pkg-config)
--with-system-zziplib use installed zziplib headers and library (requires
pkg-config)
- --with-system-xpdf use installed poppler headers and library instead of
- xpdf library from TL (requires pkg-config)
- --with-system-poppler use installed poppler headers and library (requires
- pkg-config)
--with-system-mpfr use installed mpfr headers and library
--with-mpfr-includes=DIR
mpfr headers installed in DIR
@@ -4007,7 +4001,7 @@ if test "${enable_xetex_synctex+set}" = set; then :
fi
test "x$enable_web2c:$enable_xetex" = xyes:yes && {
- need_poppler=yes
+ need_pplib=yes
need_libpng=yes
need_freetype2=yes
need_teckit=yes
@@ -5119,11 +5113,7 @@ test "x$need_zziplib" = xyes && {
## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
## configure options and TL libraries required for xpdf
-
-# Check whether --with-system-xpdf was given.
-if test "${with_system_xpdf+set}" = set; then :
- withval=$with_system_xpdf;
-fi
+: "kpse_xpdf_options - no-op"
if test "x$with_system_xpdf" = x; then
if test -f $srcdir/../libs/xpdf/configure; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`xpdf' headers and library from TL tree" >&5
@@ -5137,40 +5127,6 @@ $as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;}
ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'"
fi
-## libs/poppler/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/
-## configure options and TL libraries required for poppler
-
-# Check whether --with-system-poppler was given.
-if test "${with_system_poppler+set}" = set; then :
- withval=$with_system_poppler;
-fi
-if test "x$with_system_poppler" = x; then
- if test -f $srcdir/../libs/poppler/configure; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`poppler' headers and library from TL tree" >&5
-$as_echo "$as_me: Assuming \`poppler' headers and library from TL tree" >&6;}
- with_system_poppler=no
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`poppler' headers and library" >&5
-$as_echo "$as_me: Assuming installed \`poppler' headers and library" >&6;}
- with_system_poppler=yes
- fi
- ac_configure_args="$ac_configure_args '--with-system-poppler=$with_system_poppler'"
-fi
-if test "x$with_system_poppler" = xyes; then
- if test "x$with_system_zlib" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5
-$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;}
- with_system_zlib=yes
- ac_configure_args="$ac_configure_args '--with-system-zlib'"
- elif test "x$with_system_zlib" != xyes; then
- as_fn_error $? "Sorry, \`--with-system-poppler' requires \`--with-system-zlib'" "$LINENO" 5
- fi
-fi
-
-test "x$need_poppler" = xyes && {
- need_zlib=yes
-}
-
## libs/mpfr/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfr/
## configure options and TL libraries required for mpfr
@@ -6503,10 +6459,6 @@ if test -x $srcdir/xpdf/configure; then
test "x$with_system_xpdf" != xyes && test "x$need_xpdf" = xyes && MAKE_SUBDIRS="xpdf $MAKE_SUBDIRS"
CONF_SUBDIRS="xpdf $CONF_SUBDIRS"
fi
-if test -x $srcdir/poppler/configure; then
- test "x$with_system_poppler" != xyes && test "x$need_poppler" = xyes && MAKE_SUBDIRS="poppler $MAKE_SUBDIRS"
- CONF_SUBDIRS="poppler $CONF_SUBDIRS"
-fi
if test -x $srcdir/mpfr/configure; then
test "x$with_system_mpfr" != xyes && test "x$need_mpfr" = xyes && MAKE_SUBDIRS="mpfr $MAKE_SUBDIRS"
CONF_SUBDIRS="mpfr $CONF_SUBDIRS"