diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-04-15 15:04:45 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-04-15 15:04:45 +0000 |
commit | 440f3a0a24a2061ba24309a1c5538be6ecd4e74a (patch) | |
tree | 1e9be1bef248ac63c94d05b11c816c1ebb1da6e2 /Build/source/libs | |
parent | baca7ad14b15829e67151e08e25e35b916046c4e (diff) |
build system: reorganize TeX specific libraries
git-svn-id: svn://tug.org/texlive/trunk@17878 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r-- | Build/source/libs/Makefile.in | 6 | ||||
-rwxr-xr-x | Build/source/libs/configure | 303 | ||||
-rw-r--r-- | Build/source/libs/configure.ac | 6 |
3 files changed, 151 insertions, 164 deletions
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index 0359ac2965c..b3caa05dd15 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/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/libs/configure b/Build/source/libs/configure index b85aa8f1c73..1a231557496 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for TeX Live libs 2009. +# Generated by GNU Autoconf 2.65 for TeX Live libs 2010. # # Report bugs to <tex-k@tug.org>. # @@ -551,8 +551,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TeX Live libs' PACKAGE_TARNAME='tex-live-libs' -PACKAGE_VERSION='2009' -PACKAGE_STRING='TeX Live libs 2009' +PACKAGE_VERSION='2010' +PACKAGE_STRING='TeX Live libs 2010' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -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,6 +759,16 @@ 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 @@ -1327,7 +1326,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures TeX Live libs 2009 to adapt to many kinds of systems. +\`configure' configures TeX Live libs 2010 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1396,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live libs 2009:";; + short | recursive ) echo "Configuration of TeX Live libs 2010:";; esac cat <<\_ACEOF @@ -1425,7 +1424,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 @@ -1536,11 +1534,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 @@ -1578,6 +1571,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 <tex-k@tug.org>. _ACEOF @@ -1642,7 +1640,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live libs configure 2009 +TeX Live libs configure 2010 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1659,7 +1657,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by TeX Live libs $as_me 2009, which was +It was created by TeX Live libs $as_me 2010, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2474,27 +2472,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. @@ -3244,6 +3221,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; @@ -3261,12 +3240,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; @@ -3284,7 +3263,6 @@ $as_echo "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;} esac test "x$enable_mendexk" = xno || { - need_kpathsea=yes need_ptexenc=yes } @@ -3553,111 +3531,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) @@ -4041,6 +3914,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' @@ -4481,7 +4468,7 @@ fi # Define the identity of the package. PACKAGE='tex-live-libs' - VERSION='2009' + VERSION='2010' cat >>confdefs.h <<_ACEOF @@ -4547,8 +4534,8 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries to build" >&5 -$as_echo_n "checking for libraries to build... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for generic libraries to build" >&5 +$as_echo_n "checking for generic libraries to build... " >&6; } SUBLIBS= DIST_SUBLIBS= test "x$need_icu_xetex" = xyes && need_icu=yes && with_system_icu=no @@ -5265,7 +5252,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by TeX Live libs $as_me 2009, which was +This file was extended by TeX Live libs $as_me 2010, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5318,7 +5305,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -TeX Live libs config.status 2009 +TeX Live libs config.status 2010 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/configure.ac b/Build/source/libs/configure.ac index a862303f7be..cafff04f63e 100644 --- a/Build/source/libs/configure.ac +++ b/Build/source/libs/configure.ac @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([TeX Live libs], [2009], [tex-k@tug.org]) +AC_INIT([TeX Live libs], [2010], [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([../build-aux/missing]) AC_CONFIG_AUX_DIR([../build-aux]) @@ -20,7 +20,7 @@ AM_MAINTAINER_MODE AC_PROG_MKDIR_P -AC_MSG_CHECKING([for libraries to build]) +AC_MSG_CHECKING([for generic libraries to build]) SUBLIBS= DIST_SUBLIBS= dnl XeTeX needs the ICU headers and libraries from the TL tree, |