From cb11c984d4aefadee81d3d6d21f58dfbe660b6a0 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Thu, 3 Jan 2013 09:49:14 +0000 Subject: autoreconf git-svn-id: svn://tug.org/texlive/trunk@28712 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/Makefile.in | 2 -- Build/source/utils/aclocal.m4 | 1 - Build/source/utils/configure | 39 +++------------------------------------ 3 files changed, 3 insertions(+), 39 deletions(-) (limited to 'Build/source/utils') diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index 25414b17db1..3930a70764c 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -67,7 +67,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \ $(top_srcdir)/../m4/kpse-freetype-flags.m4 \ $(top_srcdir)/../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../m4/kpse-gd-flags.m4 \ - $(top_srcdir)/../m4/kpse-graphite-flags.m4 \ $(top_srcdir)/../m4/kpse-graphite2-flags.m4 \ $(top_srcdir)/../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../m4/kpse-icu-flags.m4 \ @@ -145,7 +144,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \ $(top_srcdir)/../libs/icu/ac/withenable.ac \ $(top_srcdir)/../libs/teckit/ac/withenable.ac \ $(top_srcdir)/../libs/graphite2/ac/withenable.ac \ - $(top_srcdir)/../libs/graphite/ac/withenable.ac \ $(top_srcdir)/../libs/zziplib/ac/withenable.ac \ $(top_srcdir)/../libs/xpdf/ac/withenable.ac \ $(top_srcdir)/../libs/poppler/ac/withenable.ac \ diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4 index 48de20af88f..08bba25fe7f 100644 --- a/Build/source/utils/aclocal.m4 +++ b/Build/source/utils/aclocal.m4 @@ -1041,7 +1041,6 @@ m4_include([../m4/kpse-cxx-hack.m4]) m4_include([../m4/kpse-freetype-flags.m4]) m4_include([../m4/kpse-freetype2-flags.m4]) m4_include([../m4/kpse-gd-flags.m4]) -m4_include([../m4/kpse-graphite-flags.m4]) m4_include([../m4/kpse-graphite2-flags.m4]) m4_include([../m4/kpse-harfbuzz-flags.m4]) m4_include([../m4/kpse-icu-flags.m4]) 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 -- cgit v1.2.3