diff options
Diffstat (limited to 'Build/source/texk')
| -rw-r--r-- | Build/source/texk/Makefile.in | 6 | ||||
| -rwxr-xr-x | Build/source/texk/configure | 292 | ||||
| -rw-r--r-- | Build/source/texk/makejvf/ac/withenable.ac | 8 | ||||
| -rw-r--r-- | Build/source/texk/mendexk/ac/withenable.ac | 6 | ||||
| -rw-r--r-- | Build/source/texk/ptexenc/ac/withenable.ac | 8 |
5 files changed, 154 insertions, 166 deletions
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 7071b6dfb17..82a4109c532 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -76,7 +76,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../utils/xindy-new/ac/clisp.ac \ $(top_srcdir)/../utils/xindy/ac/withenable.ac \ $(top_srcdir)/../utils/xindy/ac/xindy.ac \ - $(top_srcdir)/../texk/ptexenc/ac/withenable.ac \ $(top_srcdir)/../texk/web2c/ac/withenable.ac \ $(top_srcdir)/../texk/web2c/ac/web2c.ac \ $(top_srcdir)/../texk/afm2pl/ac/withenable.ac \ @@ -116,8 +115,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../texk/xdvipdfmx/ac/withenable.ac \ $(top_srcdir)/../texk/tetex/ac/withenable.ac \ $(top_srcdir)/../texk/texlive/ac/withenable.ac \ - $(top_srcdir)/../texk/kpathsea/ac/withenable.ac \ - $(top_srcdir)/../texk/kpathsea/ac/web2c.ac \ $(top_srcdir)/../libs/icu/ac/withenable.ac \ $(top_srcdir)/../libs/teckit/ac/withenable.ac \ $(top_srcdir)/../libs/graphite/ac/withenable.ac \ @@ -130,6 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../libs/obsdcompat/ac/withenable.ac \ $(top_srcdir)/../libs/libpng/ac/withenable.ac \ $(top_srcdir)/../libs/zlib/ac/withenable.ac \ + $(top_srcdir)/../texk/ptexenc/ac/withenable.ac \ + $(top_srcdir)/../texk/kpathsea/ac/withenable.ac \ + $(top_srcdir)/../texk/kpathsea/ac/web2c.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/texk/configure b/Build/source/texk/configure index d69f255e94e..4d379a26944 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -657,7 +657,6 @@ enable_xindy_docs with_clisp_runtime with_xindy_recode enable_xindy -enable_ptexenc enable_web2c with_tex_banner with_editor @@ -736,16 +735,6 @@ with_xdvi_x_toolkit enable_xdvipdfmx enable_tetex enable_texlive -with_system_kpathsea -with_kpathsea_includes -with_kpathsea_libdir -enable_mktexmf_default -enable_mktexpk_default -enable_mktextfm_default -enable_mkocp_default -enable_mkofm_default -enable_mktexfmt_default -enable_mktextex_default with_system_icu with_system_teckit with_teckit_includes @@ -770,13 +759,22 @@ with_libpng_libdir with_system_zlib with_zlib_includes with_zlib_libdir +with_system_kpathsea +with_kpathsea_includes +with_kpathsea_libdir +enable_mktexmf_default +enable_mktexpk_default +enable_mktextfm_default +enable_mkocp_default +enable_mkofm_default +enable_mktexfmt_default +enable_mktextex_default enable_maintainer_mode ' ac_precious_vars='build_alias host_alias target_alias' -ac_subdirs_all='ptexenc -web2c +ac_subdirs_all='web2c afm2pl bibtex8 bibtexu @@ -1447,7 +1445,6 @@ Optional Features: --enable-xindy-rules build and install make-rules package --enable-xindy-docs build and install documentation --enable-xindy build the xindy package - --disable-ptexenc do not build the ptexenc package --disable-web2c do not build the web2c (TeX & Co.) package --enable-auto-core cause TeX&MF to dump core, given a certain filename @@ -1558,11 +1555,6 @@ Optional Packages: --with-xdvi-x-toolkit=KIT Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi [default: Motif if available, else Xaw] - --with-system-kpathsea use installed kpathsea headers and library - --with-kpathsea-includes=DIR - kpathsea headers installed in DIR - --with-kpathsea-libdir=DIR - kpathsea library installed in DIR --with-system-icu use installed ICU headers and libraries (requires icu-config, not for XeTeX) --with-system-teckit use installed teckit headers and library @@ -1600,6 +1592,11 @@ Optional Packages: --with-zlib-includes=DIR zlib headers installed in DIR --with-zlib-libdir=DIR zlib library installed in DIR + --with-system-kpathsea use installed kpathsea headers and library + --with-kpathsea-includes=DIR + kpathsea headers installed in DIR + --with-kpathsea-libdir=DIR + kpathsea library installed in DIR Report bugs to <peb@mppmu.mpg.de>. _ACEOF @@ -2496,27 +2493,6 @@ fi -# Check whether --enable-ptexenc was given. -if test "${enable_ptexenc+set}" = set; then : - enableval=$enable_ptexenc; -fi -case $enable_ptexenc in #( - yes|no) : - ;; #( - *) : - - enable_ptexenc=$enable_all_pkgs - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ptexenc=$enable_ptexenc'" >&5 -$as_echo "$as_me: Assuming \`--enable-ptexenc=$enable_ptexenc'" >&6;} - ac_configure_args="$ac_configure_args '--enable-ptexenc=$enable_ptexenc'" - ;; -esac - -test "x$enable_ptexenc" = xno || { - need_kpathsea=yes -} - - ## 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. @@ -3266,6 +3242,8 @@ test "x$enable_makeindexk" = xno || { } +## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/ +## configure options and TL libraries required for makejvf # Check whether --enable-makejvf was given. if test "${enable_makejvf+set}" = set; then : enableval=$enable_makejvf; @@ -3283,12 +3261,12 @@ $as_echo "$as_me: Assuming \`--enable-makejvf=$enable_makejvf'" >&6;} esac test "x$enable_makejvf" = xno || { - need_kpathsea=yes + need_ptexenc=yes } ## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/ -## configure options and TL libraries required for makeindexk +## configure options and TL libraries required for mendexk # Check whether --enable-mendexk was given. if test "${enable_mendexk+set}" = set; then : enableval=$enable_mendexk; @@ -3306,7 +3284,6 @@ $as_echo "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;} esac test "x$enable_mendexk" = xno || { - need_kpathsea=yes need_ptexenc=yes } @@ -3575,111 +3552,6 @@ esac -## 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. -if test "${with_system_kpathsea+set}" = set; then : - withval=$with_system_kpathsea; -fi - -# Check whether --with-kpathsea-includes was given. -if test "${with_kpathsea_includes+set}" = set; then : - withval=$with_kpathsea_includes; -fi - -# Check whether --with-kpathsea-libdir was given. -if test "${with_kpathsea_libdir+set}" = set; then : - withval=$with_kpathsea_libdir; -fi -if test "x$with_system_kpathsea" = x; then - if test -f $srcdir/../texk/kpathsea/configure; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`kpathsea' headers and library from TL tree" >&5 -$as_echo "$as_me: Assuming \`kpathsea' headers and library from TL tree" >&6;} - with_system_kpathsea=no - else - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`kpathsea' headers and library" >&5 -$as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;} - with_system_kpathsea=yes - fi - ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'" -fi - -## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live -## subdirectory texk/kpathsea. -## configure defaults for mktexfmt & Co. -# Check whether --enable-mktexmf-default was given. -if test "${enable_mktexmf_default+set}" = set; then : - enableval=$enable_mktexmf_default; -fi -case $enable_mktexmf_default in #( - yes|no) : - ;; #( - *) : - enable_mktexmf_default=yes ;; -esac -# Check whether --enable-mktexpk-default was given. -if test "${enable_mktexpk_default+set}" = set; then : - enableval=$enable_mktexpk_default; -fi -case $enable_mktexpk_default in #( - yes|no) : - ;; #( - *) : - enable_mktexpk_default=yes ;; -esac -# Check whether --enable-mktextfm-default was given. -if test "${enable_mktextfm_default+set}" = set; then : - enableval=$enable_mktextfm_default; -fi -case $enable_mktextfm_default in #( - yes|no) : - ;; #( - *) : - enable_mktextfm_default=yes ;; -esac -# Check whether --enable-mkocp-default was given. -if test "${enable_mkocp_default+set}" = set; then : - enableval=$enable_mkocp_default; -fi -case $enable_mkocp_default in #( - yes|no) : - ;; #( - *) : - enable_mkocp_default=yes ;; -esac -# Check whether --enable-mkofm-default was given. -if test "${enable_mkofm_default+set}" = set; then : - enableval=$enable_mkofm_default; -fi -case $enable_mkofm_default in #( - yes|no) : - ;; #( - *) : - enable_mkofm_default=yes ;; -esac -# Check whether --enable-mktexfmt-default was given. -if test "${enable_mktexfmt_default+set}" = set; then : - enableval=$enable_mktexfmt_default; -fi -case $enable_mktexfmt_default in #( - yes|no) : - ;; #( - *) : - enable_mktexfmt_default=yes ;; -esac -# Check whether --enable-mktextex-default was given. -if test "${enable_mktextex_default+set}" = set; then : - enableval=$enable_mktextex_default; -fi -case $enable_mktextex_default in #( - yes|no) : - ;; #( - *) : - enable_mktextex_default=no ;; -esac - - ## 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) @@ -4063,6 +3935,120 @@ fi +## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/ +## configure options and TL libraries required for ptexenc + +test "x$need_ptexenc" = xyes && { + need_kpathsea=yes +} + + +## 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. +if test "${with_system_kpathsea+set}" = set; then : + withval=$with_system_kpathsea; +fi + +# Check whether --with-kpathsea-includes was given. +if test "${with_kpathsea_includes+set}" = set; then : + withval=$with_kpathsea_includes; +fi + +# Check whether --with-kpathsea-libdir was given. +if test "${with_kpathsea_libdir+set}" = set; then : + withval=$with_kpathsea_libdir; +fi +if test "x$with_system_kpathsea" = x; then + if test -f $srcdir/../texk/kpathsea/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`kpathsea' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`kpathsea' headers and library from TL tree" >&6;} + with_system_kpathsea=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`kpathsea' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;} + with_system_kpathsea=yes + fi + ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'" +fi + +## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live +## subdirectory texk/kpathsea. +## configure defaults for mktexfmt & Co. +# Check whether --enable-mktexmf-default was given. +if test "${enable_mktexmf_default+set}" = set; then : + enableval=$enable_mktexmf_default; +fi +case $enable_mktexmf_default in #( + yes|no) : + ;; #( + *) : + enable_mktexmf_default=yes ;; +esac +# Check whether --enable-mktexpk-default was given. +if test "${enable_mktexpk_default+set}" = set; then : + enableval=$enable_mktexpk_default; +fi +case $enable_mktexpk_default in #( + yes|no) : + ;; #( + *) : + enable_mktexpk_default=yes ;; +esac +# Check whether --enable-mktextfm-default was given. +if test "${enable_mktextfm_default+set}" = set; then : + enableval=$enable_mktextfm_default; +fi +case $enable_mktextfm_default in #( + yes|no) : + ;; #( + *) : + enable_mktextfm_default=yes ;; +esac +# Check whether --enable-mkocp-default was given. +if test "${enable_mkocp_default+set}" = set; then : + enableval=$enable_mkocp_default; +fi +case $enable_mkocp_default in #( + yes|no) : + ;; #( + *) : + enable_mkocp_default=yes ;; +esac +# Check whether --enable-mkofm-default was given. +if test "${enable_mkofm_default+set}" = set; then : + enableval=$enable_mkofm_default; +fi +case $enable_mkofm_default in #( + yes|no) : + ;; #( + *) : + enable_mkofm_default=yes ;; +esac +# Check whether --enable-mktexfmt-default was given. +if test "${enable_mktexfmt_default+set}" = set; then : + enableval=$enable_mktexfmt_default; +fi +case $enable_mktexfmt_default in #( + yes|no) : + ;; #( + *) : + enable_mktexfmt_default=yes ;; +esac +# Check whether --enable-mktextex-default was given. +if test "${enable_mktextex_default+set}" = set; then : + enableval=$enable_mktextex_default; +fi +case $enable_mktextex_default in #( + yes|no) : + ;; #( + *) : + enable_mktextex_default=no ;; +esac + + + am__api_version='1.11' @@ -4576,16 +4562,6 @@ DIST_SUBTEXK= -if test -x $srcdir/ptexenc/configure; then - test "x$enable_ptexenc" = xno || SUBTEXK="$SUBTEXK ptexenc" - DIST_SUBTEXK="$DIST_SUBTEXK ptexenc" - if false; then - subdirs="$subdirs ptexenc" - - fi -fi - - if test -x $srcdir/web2c/configure; then test "x$enable_web2c" = xno || SUBTEXK="$SUBTEXK web2c" DIST_SUBTEXK="$DIST_SUBTEXK web2c" diff --git a/Build/source/texk/makejvf/ac/withenable.ac b/Build/source/texk/makejvf/ac/withenable.ac index 8ae8a7c33bf..683c7ef0334 100644 --- a/Build/source/texk/makejvf/ac/withenable.ac +++ b/Build/source/texk/makejvf/ac/withenable.ac @@ -1 +1,7 @@ -KPSE_ENABLE_PROG([makejvf], [kpathsea]) +## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/ +dnl +dnl Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl +## configure options and TL libraries required for makejvf +KPSE_ENABLE_PROG([makejvf], [ptexenc]) diff --git a/Build/source/texk/mendexk/ac/withenable.ac b/Build/source/texk/mendexk/ac/withenable.ac index dc4867f7a38..9af3f084ec1 100644 --- a/Build/source/texk/mendexk/ac/withenable.ac +++ b/Build/source/texk/mendexk/ac/withenable.ac @@ -1,7 +1,7 @@ ## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/ dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl -## configure options and TL libraries required for makeindexk -KPSE_ENABLE_PROG([mendexk], [kpathsea ptexenc]) +## configure options and TL libraries required for mendexk +KPSE_ENABLE_PROG([mendexk], [ptexenc]) diff --git a/Build/source/texk/ptexenc/ac/withenable.ac b/Build/source/texk/ptexenc/ac/withenable.ac index db3748bbcbc..38d9a4152bd 100644 --- a/Build/source/texk/ptexenc/ac/withenable.ac +++ b/Build/source/texk/ptexenc/ac/withenable.ac @@ -1 +1,7 @@ -KPSE_ENABLE_PROG([ptexenc], [kpathsea]) +## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/ +dnl +dnl Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl +## configure options and TL libraries required for ptexenc +KPSE_WITH_LIB([ptexenc], [kpathsea], [tree]) |