diff options
Diffstat (limited to 'Build/source/libs/configure')
-rwxr-xr-x | Build/source/libs/configure | 44 |
1 files changed, 41 insertions, 3 deletions
diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 09536f423cf..fdf7464781e 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -771,6 +771,7 @@ with_graphite with_system_graphite with_system_zziplib with_system_xpdf +with_system_poppler with_system_gd with_gd_includes with_gd_libdir @@ -814,6 +815,7 @@ teckit graphite zziplib xpdf +poppler gd freetype2 freetype @@ -1589,6 +1591,8 @@ Optional Packages: pkg-config) --with-system-xpdf use installed poppler headers and library instead of xpdf (requires pkg-config) + --with-system-poppler use installed poppler headers and library instead of + poppler (requires pkg-config) --with-system-gd use installed gd headers and library --with-gd-includes=DIR gd headers installed in DIR --with-gd-libdir=DIR gd library installed in DIR @@ -3548,7 +3552,7 @@ case $enable_luatex in #( esac test "x$enable_web2c:$enable_luatex" = xyes:yes && { - need_xpdf=yes + need_poppler=yes need_libpng=yes need_obsdcompat=yes need_zziplib=yes @@ -4638,6 +4642,27 @@ $as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;} 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 + + ## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ ## configure options and TL libraries required for gd @@ -5779,6 +5804,19 @@ if test -x $srcdir/xpdf/configure; then fi +if test -x $srcdir/poppler/configure; then + if test "x$with_system_poppler" != xyes && \ + test "x$need_poppler" = xyes; then + SUBLIBS="poppler $SUBLIBS" + fi + DIST_SUBLIBS="poppler $DIST_SUBLIBS" + if false; then + subdirs="$subdirs poppler" + + fi +fi + + if test -x $srcdir/gd/configure; then if test "x$with_system_gd" != xyes && \ test "x$need_gd" = xyes; then @@ -6474,8 +6512,8 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_commands="`echo $ac_config_commands`" _ACEOF |