diff options
Diffstat (limited to 'Build/source/configure')
| -rwxr-xr-x | Build/source/configure | 101 |
1 files changed, 5 insertions, 96 deletions
diff --git a/Build/source/configure b/Build/source/configure index 5377b4984c7..1ae91cdcf19 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -894,8 +894,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 @@ -1752,9 +1750,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 @@ -4553,9 +4548,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. @@ -5655,45 +5651,6 @@ $as_echo "$as_me: Using \`graphite2' headers and library from TL tree" >&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'" -elif test "x$with_system_graphite" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`graphite' headers and library" >&5 -$as_echo "$as_me: Using installed \`graphite' headers and library" >&6;} -else - { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`graphite' headers and library from TL tree" >&5 -$as_echo "$as_me: Using \`graphite' headers and library from TL tree" >&6;} - if test "x$with_system_graphite" != xno; then - with_system_graphite=no - ac_configure_args="$ac_configure_args '--without-system-graphite'" - fi -fi - - ## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/ ## configure options and TL libraries required for zziplib @@ -20447,13 +20404,6 @@ elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then as_fn_error $? "did not find zziplib-0.12 or better" "$LINENO" 5 fi -if $PKG_CONFIG silgraphite --atleast-version=2.3; then - GRAPHITE_INCLUDES="`$PKG_CONFIG silgraphite --cflags`" - GRAPHITE_LIBS=`$PKG_CONFIG silgraphite --libs` -elif test "x$need_graphite:$with_system_graphite" = xyes:yes; then - as_fn_error $? "did not find silgraphite 2.3 or better" "$LINENO" 5 -fi - if $PKG_CONFIG graphite2; then GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags` GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs` @@ -20569,11 +20519,11 @@ elif test "x$need_icu:$with_system_icu" = xyes:yes; then as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5 fi -if $PKG_CONFIG harfbuzz; then +if $PKG_CONFIG harfbuzz --atleast-version=0.9.10; then HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz --cflags` HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz --libs` elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then - as_fn_error $? "did not find harfbuzz" "$LINENO" 5 + as_fn_error $? "did not find harfbuzz-0.9.10 or better" "$LINENO" 5 fi @@ -20998,47 +20948,6 @@ $as_echo "$kpse_res" >&6; } fi -## libs/graphite/ac/graphite.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/ -## basic check of system graphite -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test "x$need_graphite:$with_system_graphite" = xyes:yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`graphite' library" >&5 -$as_echo_n "checking requested system \`graphite' library... " >&6; } - CPPFLAGS="$GRAPHITE_INCLUDES $CPPFLAGS" - LIBS="$GRAPHITE_LIBS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <graphite/GrClient.h> -#include <graphite/Font.h> -int -main () -{ -gr::Font *font; font->getDPIx(); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - syslib_used=yes kpse_res=ok -else - syslib_status=no kpse_res=failed -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 -$as_echo "$kpse_res" >&6; } -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - ## libs/graphite2/ac/graphite2.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/ ## basic check of system graphite2 if test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then |