diff options
Diffstat (limited to 'Build/source/libs/configure')
-rwxr-xr-x | Build/source/libs/configure | 107 |
1 files changed, 52 insertions, 55 deletions
diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 80e284a2f65..243aa4c8b5c 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -716,7 +716,6 @@ enable_tektronixwin enable_unitermwin enable_mp enable_web_progs -enable_one enable_afm2pl enable_bibtex8 enable_cjkutils @@ -802,6 +801,7 @@ enable_maintainer_mode host_alias target_alias' ac_subdirs_all='dummy +icu teckit graphite xpdf @@ -1458,25 +1458,24 @@ Optional Features: --disable-dump-share make fmt/base/mem files architecture-dependent --enable-fmtutil use fmtutil for build dumps --enable-ipc enable TeX's --ipc option, i.e., pipe to a program - --disable-tex do not compile and install TeX - --enable-etex compile and install e-TeX - --disable-aleph do not compile and install Aleph - --disable-pdftex do not compile and install pdfTeX - --disable-luatex do not compile and install luaTeX - --enable-xetex compile and install XeTeX + --disable-tex do not compile and install TeX + --enable-etex compile and install e-TeX + --disable-aleph do not compile and install Aleph + --disable-pdftex do not compile and install pdfTeX + --disable-luatex do not compile and install luaTeX + --disable-xetex do not compile and install XeTeX --disable-mf do not build METAFONT - --enable-mf-nowin build a separate non-windows-capable METAFONT - --enable-epsfwin include EPSF pseudo window support - --enable-hp2627win include HP 2627 window support - --enable-mftalkwin include mftalk (generic server) window support - --enable-nextwin include NeXT window support - --enable-regiswin include Regis window support - --enable-suntoolswin include old Suntools (not X) window support - --enable-tektronixwin include Tektronix window support - --enable-unitermwin include Uniterm window support + --enable-mf-nowin build a separate non-windows-capable METAFONT + --enable-epsfwin include EPSF pseudo window support + --enable-hp2627win include HP 2627 window support + --enable-mftalkwin include mftalk (generic server) window support + --enable-nextwin include NeXT window support + --enable-regiswin include Regis window support + --enable-suntoolswin include old Suntools (not X) window support + --enable-tektronixwin include Tektronix window support + --enable-unitermwin include Uniterm window support --disable-mp do not build METAPOST --disable-web-progs do not build WEB programs bibtex ... weave - --enable-one build the one (testing) package --disable-afm2pl do not build the afm2pl package --disable-bibtex8 do not build the bibtex8 package --disable-cjkutils do not build the cjkutils package @@ -1523,13 +1522,14 @@ Optional Features: --disable-xdvipdfmx do not build the xdvipdfmx package --disable-tetex do not build the tetex (teTeX scripts) package --disable-texlive do not build the texlive (TeX Live scripts) package - --disable-mktexmf-default do not run mktexmf if MF source missing - --disable-mktexpk-default do not run mktexpk if PK font missing - --disable-mktextfm-default do not run mktextfm if TFM file missing - --disable-mkocp-default do not run mkocp if OCP file missing - --disable-mkofm-default do not run mkofm if OFM file missing - --enable-mktexfmt-default run mktexfmt if format file missing - --enable-mktextex-default run mktextex if TeX source missing + --disable-mktexmf-default do not run mktexmf if MF source missing + --disable-mktexpk-default do not run mktexpk if PK font missing + --disable-mktextfm-default + do not run mktextfm if TFM file missing + --disable-mkocp-default do not run mkocp if OCP file missing + --disable-mkofm-default do not run mkofm if OFM file missing + --enable-mktexfmt-default run mktexfmt if format file missing + --enable-mktextex-default run mktextex if TeX source missing --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer @@ -2289,7 +2289,7 @@ esac ## texk/ac/withenable.ac -## texk/web2c/ac/withenable.ac +## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options and TL libraries required for web2c # Check whether --enable-web2c was given. if test "${enable_web2c+set}" = set; then @@ -2308,7 +2308,7 @@ test "x$enable_web2c" = xno || { need_zlib=yes } -## texk/web2c/ac/web2c.ac +## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options for TeX and MF # Check whether --with-editor was given. @@ -2365,7 +2365,7 @@ case $enable_pdftex in *) enable_pdftex=yes ;; esac -test "x$enable_pdftex" = xno || { +test "x$enable_web2c:$enable_pdftex" = xyes:yes && { need_xpdf=yes need_libpng=yes need_obsdcompat=yes @@ -2379,7 +2379,7 @@ case $enable_luatex in *) enable_luatex=yes ;; esac -test "x$enable_luatex" = xno || { +test "x$enable_web2c:$enable_luatex" = xyes:yes && { need_xpdf=yes need_libpng=yes need_obsdcompat=yes @@ -2390,13 +2390,16 @@ if test "${enable_xetex+set}" = set; then fi case $enable_xetex in yes|no) : ;; - *) enable_xetex=no ;; + *) enable_xetex=yes ;; esac -test "x$enable_xetex" = xno || { +test "x$enable_web2c:$enable_xetex" = xyes:yes && { need_xpdf=yes need_libpng=yes need_freetype2=yes + need_icu=yes + need_teckit=yes + need_graphite=yes } ## configure options for MF # Check whether --enable-mf was given. @@ -2456,29 +2459,6 @@ if test "${enable_web_progs+set}" = set; then fi -## texk/one/ac/withenable.ac -## configure options and TL libraries required for one -# Check whether --enable-one was given. -if test "${enable_one+set}" = set; then - enableval=$enable_one; -fi -case $enable_one in #( - yes|no);; #( - *) enable_one=no - { $as_echo "$as_me:$LINENO: Assuming \`--enable-one=$enable_one'" >&5 -$as_echo "$as_me: Assuming \`--enable-one=$enable_one'" >&6;} - ac_configure_args="$ac_configure_args '--enable-one=$enable_one'";; -esac - -test "x$enable_one" = xno || { - need_freetype2=yes - need_t1lib=yes - need_gd=yes - need_teckit=yes - need_graphite=yes -} - - ## texk/afm2pl/ac/withenable.ac ## configure options and TL libraries required for afm2pl # Check whether --enable-afm2pl was given. @@ -3113,7 +3093,7 @@ esac -## texk/kpathsea/ac/withenable.ac +## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/ ## configure options and TL libraries required for kpathsea # Check whether --with-system-kpathsea was given. @@ -3143,7 +3123,7 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;} ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'" fi -## texk/kpathsea/ac/web2c.ac +## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/ ## configure options for mktextmf-default & Co # Check whether --enable-mktexmf-default was given. if test "${enable_mktexmf_default+set}" = set; then @@ -3205,6 +3185,10 @@ esac ## libs/ac/withenable.ac +## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/ +## configure options and TL libraries required for icu (modified for XeTeX) + + ## libs/teckit/ac/withenable.ac ## configure options and TL libraries required for teckit @@ -4063,6 +4047,19 @@ $as_echo_n "checking for libraries to build... " >&6; } SUBLIBS= DIST_SUBLIBS= +if test -x $srcdir/icu/configure; then + if test "x$with_system_icu" != xyes && \ + test "x$need_icu" = xyes; then + SUBLIBS="icu $SUBLIBS" + fi + DIST_SUBLIBS="icu $DIST_SUBLIBS" + if false; then + subdirs="$subdirs icu" + + fi +fi + + if test -x $srcdir/teckit/configure; then if test "x$with_system_teckit" != xyes && \ test "x$need_teckit" = xyes; then |