diff options
Diffstat (limited to 'Build/source/utils/configure')
| -rwxr-xr-x | Build/source/utils/configure | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/Build/source/utils/configure b/Build/source/utils/configure index b6f40bfc1ab..b71ce96e707 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -806,8 +806,6 @@ with_system_teckit with_teckit_includes with_teckit_libdir with_system_graphite2 -with_graphite -with_system_graphite with_system_zziplib with_system_xpdf with_system_poppler @@ -1646,9 +1644,6 @@ Optional Packages: teckit library installed in DIR --with-system-graphite2 use installed graphite2 headers and library (requires pkg-config) - --without-graphite build XeTeX without graphite support - --with-system-graphite use installed silgraphite headers and library - (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 @@ -3797,9 +3792,10 @@ test "x$enable_web2c:$enable_xetex" = xyes:yes && { need_poppler=yes need_libpng=yes need_freetype2=yes - need_icu_xetex=yes + need_icu=yes need_teckit=yes - need_graphite=yes + need_graphite2=yes + need_harfbuzz=yes } ## configure options for MF # Check whether --enable-mf was given. @@ -4859,35 +4855,6 @@ $as_echo "$as_me: Assuming installed \`graphite2' headers and library" >&6;} fi -## libs/graphite/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/ -## XeTeX can be built without graphite support - -# Check whether --with-graphite was given. -if test "${with_graphite+set}" = set; then : - withval=$with_graphite; -fi - -test "x$with_graphite" = xno && need_graphite=no -## configure options and TL libraries required for graphite - -# Check whether --with-system-graphite was given. -if test "${with_system_graphite+set}" = set; then : - withval=$with_system_graphite; -fi -if test "x$with_system_graphite" = x; then - if test -f $srcdir/../libs/graphite/configure; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`graphite' headers and library from TL tree" >&5 -$as_echo "$as_me: Assuming \`graphite' headers and library from TL tree" >&6;} - with_system_graphite=no - else - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite' headers and library" >&5 -$as_echo "$as_me: Assuming installed \`graphite' headers and library" >&6;} - with_system_graphite=yes - fi - ac_configure_args="$ac_configure_args '--with-system-graphite=$with_system_graphite'" -fi - - ## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/ ## configure options and TL libraries required for zziplib |