build system: reorganize TeX specific libraries

git-svn-id: svn://tug.org/texlive/trunk@17878 c570f23f-e606-0410-a88d-b1316a301751
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
parent: baca7ad14b15829e67151e08e25e35b916046c4e (diff)
16 files changed, 870 insertions, 775 deletions
diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am
index d6652f52b3d..5437e3ed15b 100644
--- a/Build/source/Makefile.am
+++ b/Build/source/Makefile.am
@@ -28,12 +28,53 @@ EXTRA_DIST = \
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-if build_kpathsea
-SUBDIRS = texk/kpathsea libs utils texk
-else !build_kpathsea
-SUBDIRS = libs utils texk
-endif !build_kpathsea
-DIST_SUBDIRS = auxdir/auxsub texk/kpathsea libs utils texk
+CONFIG_AUX = subsubdir-conf.cmd
+
+SUBDIRS = . $(TEXLIBS) libs utils texk
+DIST_SUBDIRS = auxdir/auxsub $(DIST_TEXLIBS) libs utils texk
+
+all-local: texlibs
+
+.PHONY: texlibs
+# We must configure all texk subdirs since 'make dist' needs the Makefile.
+# For those not required for the current set of configure options
+# we append '--disable-build' so they can skip tests that would
+# fail because other libraries were not built.
+#
+# Sequentially configure and optionally build all texk subdirs;
+# code inspired by automake's way to handle recursive targets.
+texlibs: $(CONFIG_AUX)
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	list='$(DIST_TEXLIBS)'; for texlibs in $$list; do \
+	  if test ! -f $$texlibs/Makefile; then \
+	    test -d $$texlibs || $(MKDIR_P) $$texlibs; \
+	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,$$texlibs,g"`; \
+	    case " $(TEXLIBS) " in \
+	      *" $$texlibs "*) skip=;; \
+	      *) skip=' --disable-build';; \
+	    esac; \
+	    (cd $$texlibs && echo "=== configuring in $$texlibs (`pwd`)" && \
+	      echo "make: running $(SHELL) $$cmd$$skip" && \
+	      CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
+	      eval $(SHELL) $$cmd$$skip || \
+	        { echo "=== configuring in $$texlibs failed"; exit 1; }) && \
+	    if test "x$$skip" = x; then \
+	      echo "Making all in $$texlibs" && \
+	      (cd $$texlibs && $(MAKE) $(AM_MAKEFLAGS) all); \
+	    fi || eval $$failcom; \
+	  fi; \
+	done; test -z "$$fail"
+
+subsubdir-conf.cmd:
+	@echo "configure in auxdir/auxsub failed to create the file $@"
+	exit 1
+
 
 # This is the default target for the Build script in TeX Live.
 .PHONY: world
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index 3bd06b7b4a3..c4e6ea15350 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -74,7 +74,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 \
@@ -114,8 +113,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 \
@@ -128,6 +125,10 @@ 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)/texk/kpathsea/ac/kpathsea.ac \
 	$(top_srcdir)/libs/zlib/ac/zlib.ac \
 	$(top_srcdir)/libs/libpng/ac/libpng.ac \
 	$(top_srcdir)/libs/t1lib/ac/t1lib.ac \
@@ -138,9 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \
 	$(top_srcdir)/libs/zziplib/ac/zziplib.ac \
 	$(top_srcdir)/libs/graphite/ac/graphite.ac \
 	$(top_srcdir)/libs/teckit/ac/teckit.ac \
-	$(top_srcdir)/libs/icu/ac/icu.ac \
-	$(top_srcdir)/texk/kpathsea/ac/kpathsea.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/libs/icu/ac/icu.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -218,6 +217,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DIST_TEXLIBS = @DIST_TEXLIBS@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -266,6 +266,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEXLIBS = @TEXLIBS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
@@ -343,9 +344,9 @@ EXTRA_DIST = \
 	m4/README \
 	reautoconf
 
-@build_kpathsea_FALSE@SUBDIRS = libs utils texk
-@build_kpathsea_TRUE@SUBDIRS = texk/kpathsea libs utils texk
-DIST_SUBDIRS = auxdir/auxsub texk/kpathsea libs utils texk
+CONFIG_AUX = subsubdir-conf.cmd
+SUBDIRS = . $(TEXLIBS) libs utils texk
+DIST_SUBDIRS = auxdir/auxsub $(DIST_TEXLIBS) libs utils texk
 @cross_compiling_FALSE@check_target = check
 
 # Allow for skipping make check if needed.
@@ -712,7 +713,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile all-local
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
@@ -814,26 +815,69 @@ uninstall-am:
 	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am
+	all all-am all-local am--refresh check check-am clean \
+	clean-generic clean-libtool ctags ctags-recursive dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-generic distclean-libtool distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 
 # just in case a subdirectory has added directories
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
+all-local: texlibs
+
+.PHONY: texlibs
+# We must configure all texk subdirs since 'make dist' needs the Makefile.
+# For those not required for the current set of configure options
+# we append '--disable-build' so they can skip tests that would
+# fail because other libraries were not built.
+#
+# Sequentially configure and optionally build all texk subdirs;
+# code inspired by automake's way to handle recursive targets.
+texlibs: $(CONFIG_AUX)
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	list='$(DIST_TEXLIBS)'; for texlibs in $$list; do \
+	  if test ! -f $$texlibs/Makefile; then \
+	    test -d $$texlibs || $(MKDIR_P) $$texlibs; \
+	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,$$texlibs,g"`; \
+	    case " $(TEXLIBS) " in \
+	      *" $$texlibs "*) skip=;; \
+	      *) skip=' --disable-build';; \
+	    esac; \
+	    (cd $$texlibs && echo "=== configuring in $$texlibs (`pwd`)" && \
+	      echo "make: running $(SHELL) $$cmd$$skip" && \
+	      CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
+	      eval $(SHELL) $$cmd$$skip || \
+	        { echo "=== configuring in $$texlibs failed"; exit 1; }) && \
+	    if test "x$$skip" = x; then \
+	      echo "Making all in $$texlibs" && \
+	      (cd $$texlibs && $(MAKE) $(AM_MAKEFLAGS) all); \
+	    fi || eval $$failcom; \
+	  fi; \
+	done; test -z "$$fail"
+
+subsubdir-conf.cmd:
+	@echo "configure in auxdir/auxsub failed to create the file $@"
+	exit 1
+
 # This is the default target for the Build script in TeX Live.
 .PHONY: world
 # Run texlinks here since the binaries won't be there
diff --git a/Build/source/configure b/Build/source/configure
index 08e821d9fbe..326986836f9 100755
--- a/Build/source/configure
+++ b/Build/source/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 2010-02-01.
+# Generated by GNU Autoconf 2.65 for TeX Live 2010-04-15.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='TeX Live'
 PACKAGE_TARNAME='tex-live'
-PACKAGE_VERSION='2010-02-01'
-PACKAGE_STRING='TeX Live 2010-02-01'
+PACKAGE_VERSION='2010-04-15'
+PACKAGE_STRING='TeX Live 2010-04-15'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -748,14 +748,14 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-subdirs
 cross_compiling_FALSE
 cross_compiling_TRUE
-build_kpathsea_FALSE
-build_kpathsea_TRUE
 ICU_CONFIG
 PKG_CONFIG
 FT2_CONFIG
+DIST_TEXLIBS
+TEXLIBS
+subdirs
 CXXCPP
 WARNING_CXXFLAGS
 am__fastdepCXX_FALSE
@@ -902,7 +902,6 @@ enable_xindy_docs
 with_clisp_runtime
 with_xindy_recode
 enable_xindy
-enable_ptexenc
 enable_web2c
 with_tex_banner
 with_editor
@@ -981,16 +980,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
@@ -1015,6 +1004,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
 enable_shared
 enable_static
@@ -1042,7 +1041,9 @@ CXX
 CXXFLAGS
 CCC
 CXXCPP'
-ac_subdirs_all='auxdir/auxsub texk/kpathsea libs utils texk'
+ac_subdirs_all='texk/ptexenc
+texk/kpathsea
+auxdir/auxsub libs utils texk'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -1583,7 +1584,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 2010-02-01 to adapt to many kinds of systems.
+\`configure' configures TeX Live 2010-04-15 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1657,7 +1658,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live 2010-02-01:";;
+     short | recursive ) echo "Configuration of TeX Live 2010-04-15:";;
    esac
   cat <<\_ACEOF
 
@@ -1685,7 +1686,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
@@ -1807,11 +1807,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
@@ -1849,6 +1844,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
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
@@ -1935,7 +1935,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live configure 2010-02-01
+TeX Live configure 2010-04-15
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2538,7 +2538,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 $as_me 2010-02-01, which was
+It was created by TeX Live $as_me 2010-04-15, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -3353,27 +3353,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.
@@ -4123,6 +4102,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;
@@ -4140,12 +4121,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;
@@ -4163,7 +4144,6 @@ $as_echo "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;}
 esac
 
 test "x$enable_mendexk" = xno || {
-  need_kpathsea=yes
   need_ptexenc=yes
 }
 
@@ -4432,121 +4412,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'"
-elif test "x$with_system_kpathsea" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`kpathsea' headers and library" >&5
-$as_echo "$as_me: Using installed \`kpathsea' headers and library" >&6;}
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`kpathsea' headers and library from TL tree" >&5
-$as_echo "$as_me: Using \`kpathsea' headers and library from TL tree" >&6;}
-  if test "x$with_system_kpathsea" != xno; then
-    with_system_kpathsea=no
-    ac_configure_args="$ac_configure_args '--without-system-kpathsea'"
-  fi
-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)
 
@@ -5040,6 +4905,130 @@ 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'"
+elif test "x$with_system_kpathsea" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`kpathsea' headers and library" >&5
+$as_echo "$as_me: Using installed \`kpathsea' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`kpathsea' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`kpathsea' headers and library from TL tree" >&6;}
+  if test "x$with_system_kpathsea" != xno; then
+    with_system_kpathsea=no
+    ac_configure_args="$ac_configure_args '--without-system-kpathsea'"
+  fi
+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'
@@ -7047,13 +7036,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:7050: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7039: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7053: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7042: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7056: output\"" >&5)
+  (eval echo "\"\$as_me:7045: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -8256,7 +8245,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8259 "configure"' > conftest.$ac_ext
+  echo '#line 8248 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9322,7 +9311,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live'
- VERSION='2010-02-01'
+ VERSION='2010-04-15'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -10186,11 +10175,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10189: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10178: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10193: \$? = $ac_status" >&5
+   echo "$as_me:10182: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10525,11 +10514,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10528: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10517: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10532: \$? = $ac_status" >&5
+   echo "$as_me:10521: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10630,11 +10619,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10633: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10622: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10637: \$? = $ac_status" >&5
+   echo "$as_me:10626: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10685,11 +10674,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10688: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10677: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10692: \$? = $ac_status" >&5
+   echo "$as_me:10681: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13052,7 +13041,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13055 "configure"
+#line 13044 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13148,7 +13137,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13151 "configure"
+#line 13140 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14257,6 +14246,8 @@ fi
 eval kpse_build_alias=\${build_alias-$build}
 
 
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
 $as_echo_n "checking for X... " >&6; }
 
@@ -17633,11 +17624,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17636: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17627: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17640: \$? = $ac_status" >&5
+   echo "$as_me:17631: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17732,11 +17723,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17735: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17726: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17739: \$? = $ac_status" >&5
+   echo "$as_me:17730: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17784,11 +17775,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17787: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17778: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17791: \$? = $ac_status" >&5
+   echo "$as_me:17782: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18770,6 +18761,44 @@ $as_echo "$as_me:     which requires to locate the <kpathsea/paths.h> header fil
   fi
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TeX specific libraries to build" >&5
+$as_echo_n "checking for TeX specific libraries to build... " >&6; }
+TEXLIBS=
+DIST_TEXLIBS=
+
+
+
+if test -x $srcdir/texk/ptexenc/configure; then
+  if test "x$with_system_ptexenc" != xyes && \
+     test "x$need_ptexenc" = xyes; then
+    TEXLIBS="texk/ptexenc $TEXLIBS"
+  fi
+  DIST_TEXLIBS="texk/ptexenc $DIST_TEXLIBS"
+  if false; then
+    subdirs="$subdirs texk/ptexenc"
+
+  fi
+fi
+
+
+if test -x $srcdir/texk/kpathsea/configure; then
+  if test "x$with_system_kpathsea" != xyes && \
+     test "x$need_kpathsea" = xyes; then
+    TEXLIBS="texk/kpathsea $TEXLIBS"
+  fi
+  DIST_TEXLIBS="texk/kpathsea $DIST_TEXLIBS"
+  if false; then
+    subdirs="$subdirs texk/kpathsea"
+
+  fi
+fi
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEXLIBS" >&5
+$as_echo "$TEXLIBS" >&6; }
+
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
@@ -19146,6 +19175,38 @@ elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then
 fi
 
 
+## texk/kpathsea/ac/kpathsea.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
+## basic check of system kpathsea
+if test "x$need_kpathsea:$with_system_kpathsea" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`kpathsea' library" >&5
+$as_echo_n "checking requested system \`kpathsea' library... " >&6; }
+  CPPFLAGS="$KPATHSEA_INCLUDES $CPPFLAGS"
+  LIBS="$KPATHSEA_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <kpathsea/kpathsea.h>
+#include <kpathsea/version.h>
+int
+main ()
+{
+const char *version = kpathsea_version_string;
+kpse_set_program_name("prog", "name");
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_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
+
+
 ## libs/zlib/ac/zlib.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/
 ## basic check of system zlib
 if test "x$need_zlib:$with_system_zlib" = xyes:yes; then
@@ -19522,38 +19583,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-## texk/kpathsea/ac/kpathsea.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
-## basic check of system kpathsea
-if test "x$need_kpathsea:$with_system_kpathsea" = xyes:yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`kpathsea' library" >&5
-$as_echo_n "checking requested system \`kpathsea' library... " >&6; }
-  CPPFLAGS="$KPATHSEA_INCLUDES $CPPFLAGS"
-  LIBS="$KPATHSEA_LIBS $LIBS"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <kpathsea/kpathsea.h>
-#include <kpathsea/version.h>
-int
-main ()
-{
-const char *version = kpathsea_version_string;
-kpse_set_program_name("prog", "name");
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_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
-
-
 if test "x$syslib_status" = xno; then
   as_fn_error "some requested system libraries failed" "$LINENO" 5
 fi
@@ -19564,14 +19593,6 @@ CPPFLAGS=$kpse_save_CPPFLAGS
 LIBS=$kpse_save_LIBS
 
 
- if test "x$need_kpathsea" = xyes && test "x$with_system_kpathsea" != xyes; then
-  build_kpathsea_TRUE=
-  build_kpathsea_FALSE='#'
-else
-  build_kpathsea_TRUE='#'
-  build_kpathsea_FALSE=
-fi
-
 
  if test "x$cross_compiling" = xyes; then
   cross_compiling_TRUE=
@@ -19582,9 +19603,7 @@ else
 fi
 
 
-
-
-subdirs="$subdirs auxdir/auxsub texk/kpathsea libs utils texk"
+subdirs="$subdirs auxdir/auxsub libs utils texk"
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -19751,10 +19770,6 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   as_fn_error "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${build_kpathsea_TRUE}" && test -z "${build_kpathsea_FALSE}"; then
-  as_fn_error "conditional \"build_kpathsea\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${cross_compiling_TRUE}" && test -z "${cross_compiling_FALSE}"; then
   as_fn_error "conditional \"cross_compiling\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20167,7 +20182,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 $as_me 2010-02-01, which was
+This file was extended by TeX Live $as_me 2010-04-15, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20224,7 +20239,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 config.status 2010-02-01
+TeX Live config.status 2010-04-15
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/configure.ac b/Build/source/configure.ac
index 783b4ba1a9b..ab3be1a1074 100644
--- a/Build/source/configure.ac
+++ b/Build/source/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], [2010-02-01], [tex-k@tug.org])
+AC_INIT([TeX Live], [2010-04-15], [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([m4/kpse-pkgs.m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -17,28 +17,28 @@ dnl ## Setup of the TeX Live (TL) infrastructure   ##
 dnl ##    done in ./, libs/, utils/, and texk/     ##
 dnl ## ------------------------------------------- ##
 dnl
-dnl 1. Define three lists of TeXk programs, utility programs,
-dnl    and TL libraries.  These list occur nowhere else.
+dnl 1. Define four lists of TeXk programs, utility programs,
+dnl    and (generic or TeX specific) libraries in the TL tree.
+dnl    These list are defined in m4/kpse-pkgs.m4.
 dnl
-dnl 2. For each program Prog in the list of utility programs:
-dnl    sinclude utils/Prog/ac/withenable.ac
-dnl      providing the configure option --disable-Prog or --enable-Prog
-dnl    if Prog is to be built:
-dnl      set need_Lib=yes for each required TL library Lib (if any)
+dnl 2. For each program Prog in the list of
+dnl      utility programs:
+dnl        sinclude utils/Prog/ac/withenable.ac
+dnl      TeXk programs:
+dnl        sinclude texk/Prog/ac/withenable.ac
+dnl    These fragments usually provide the configure options
+dnl      --disable-Prog or --enable-Prog
+dnl    If Prog is to be built, then set need_SubLib=yes
+dnl      for each TL library SubLib required by Prog (if any)
 dnl
-dnl 3. For each program Prog in the list of TeXk programs:
-dnl    sinclude texk/Prog/ac/withenable.ac
-dnl      providing the configure option --disable-Prog or --enable-Prog
-dnl    if Prog is to be built:
-dnl      set need_Lib=yes for each required TL library Lib (if any)
-dnl
-dnl 4. Sinclude texk/kpathsea/ac/withenable.ac
-dnl
-dnl 5. For each library Lib in the list of TL libraries:
-dnl    sinclude libs/Lib/ac/withenable.ac
-dnl      usually providing the configure options --with-system-Lib,
-dnl        --with-Lib-includes=DIR, and --with-Lib-libdir=DIR
-dnl    for each required TL library SubLib (if any):
+dnl 3. For each library Lib in the list of
+dnl      generic TL libraries:
+dnl        sinclude libs/Lib/ac/withenable.ac
+dnl      TeX specific TL libraries:
+dnl        sinclude texk/Lib/ac/withenable.ac
+dnl    These fragments usually provide the configure options
+dnl      --with-system-Lib, --with-Lib-includes=DIR, and --with-Lib-libdir=DIR
+dnl    For each TL library SubLib required by Lib (if any):
 dnl      disallow with_system_Lib=yes and with_system_SubLib=no
 dnl      if $need_Lib=yes then set need_SubLib=yes 
 dnl
@@ -48,6 +48,8 @@ dnl Common code for all programs using libkpathsea.
 KPSE_COMMON([TeX Live top-level], [dist-xz])
 KPSE_CANONICAL_HOST
 
+AC_PROG_MKDIR_P
+
 AC_PATH_XTRA
 
 AC_PROG_CXX
@@ -93,6 +95,27 @@ if test "x$enable_web2c" = xyes && test "x$with_system_kpathsea" = xyes; then
   fi
 fi
 
+AC_MSG_CHECKING([for TeX specific libraries to build])
+TEXLIBS=
+DIST_TEXLIBS=
+KPSE_FOR_PKGS([texlibs], [
+if test -x $srcdir/texk/Kpse_Pkg/configure; then
+  if test "x$with_system_[]Kpse_pkg" != xyes && \
+     test "x$need_[]Kpse_pkg" = xyes; then
+    TEXLIBS="texk/Kpse_Pkg $TEXLIBS"    
+  fi
+dnl Cause 'make dist' to recurse into all texlibs dirs
+  DIST_TEXLIBS="texk/Kpse_Pkg $DIST_TEXLIBS"
+dnl Cause 'configure -hr' and 'autoreconf' to recurse into all texlibs dirs
+  if false; then
+    AC_CONFIG_SUBDIRS([texk/]Kpse_Pkg)
+  fi
+fi
+])
+AC_SUBST([TEXLIBS])
+AC_SUBST([DIST_TEXLIBS])
+AC_MSG_RESULT([$TEXLIBS])
+
 dnl We check that all required system libraries are usable, and may
 dnl reduce frustration if anything is wrong by doing this first.
 dnl A native TeX Live build must not use any system libraries.
@@ -111,12 +134,12 @@ if test "x$syslib_used:$enable_native_texlive_build" = xyes:yes; then
 fi
 KPSE_RESTORE_FLAGS
 
-AM_CONDITIONAL([build_kpathsea],
-               [test "x$need_kpathsea" = xyes && test "x$with_system_kpathsea" != xyes])
+dnl AM_CONDITIONAL([build_kpathsea],
+dnl                [test "x$need_kpathsea" = xyes && test "x$with_system_kpathsea" != xyes])
 
 AM_CONDITIONAL([cross_compiling], [test "x$cross_compiling" = xyes])
 
-AC_CONFIG_SUBDIRS([auxdir/auxsub texk/kpathsea libs utils texk])
+AC_CONFIG_SUBDIRS([auxdir/auxsub libs utils texk])
 
 AC_CONFIG_FILES([Makefile])
 
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,
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index 9af39fc6db5..2419c02c2f8 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -16,10 +16,16 @@
 
 # KPSE_LIBS_PKGS()
 # ----------------
-# Define the list of library sub-packages, i.e., subdirs 'libs/*'.
+# Define two lists of library sub-packages:
+#   generic libraries, i.e., subdirs 'libs/*', that can be used by
+#   utility and TeXk sub-packages
+# and
+#   TeX specific libraries, i.e., subdirs 'texk/*', that can only
+#   be used by TeXk sub-packages and can't use generic libraries
 # Each library must precede required other libraries (if any).
 AC_DEFUN([KPSE_LIBS_PKGS],
-[m4_define([kpse_libs_pkgs], [
+[dnl generic libraries 'libs/*'
+m4_define([kpse_libs_pkgs], [
 icu
 teckit
 graphite
@@ -32,6 +38,11 @@ t1lib
 obsdcompat
 libpng
 zlib
+])[]dnl
+dnl TeX specific libraries
+m4_define([kpse_texlibs_pkgs], [
+ptexenc
+kpathsea
 ])]) # KPSE_LIBS_PKGS
 
 # KPSE_ALL_SYSTEM_FLAGS()
@@ -76,7 +87,6 @@ xindy
 # excluding 'texk/kpathsea'.
 AC_DEFUN([KPSE_TEXK_PKGS],
 [m4_define([kpse_texk_pkgs], [
-ptexenc
 web2c
 afm2pl
 bibtex8
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index fec25a13f4d..25ea1825288 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -72,8 +72,8 @@ AS_CASE([$with_x],
          ac_configure_args="$ac_configure_args '--with-x'"])
 KPSE_FOR_PKGS([utils], [m4_sinclude(kpse_TL[utils/]Kpse_Pkg[/ac/withenable.ac])])
 KPSE_FOR_PKGS([texk], [m4_sinclude(kpse_TL[texk/]Kpse_Pkg[/ac/withenable.ac])])
-m4_sinclude(kpse_TL[texk/kpathsea/ac/withenable.ac])
 KPSE_FOR_PKGS([libs], [m4_sinclude(kpse_TL[libs/]Kpse_Pkg[/ac/withenable.ac])])
+KPSE_FOR_PKGS([texlibs], [m4_sinclude(kpse_TL[texk/]Kpse_Pkg[/ac/withenable.ac])])
 ]) # KPSE_SETUP
 
 # KPSE_ENABLE_PROG(PROG, REQUIRED-LIBS, OPTIONS, [COMMENT])
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])
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 9f28f203853..eaff694834e 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/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/utils/configure b/Build/source/utils/configure
index e43a49ce1f8..28cb4919415 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/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,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
@@ -1422,7 +1421,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
@@ -1533,11 +1531,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
@@ -1575,6 +1568,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
@@ -2471,27 +2469,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.
@@ -3241,6 +3218,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;
@@ -3258,12 +3237,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;
@@ -3281,7 +3260,6 @@ $as_echo "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;}
 esac
 
 test "x$enable_mendexk" = xno || {
-  need_kpathsea=yes
   need_ptexenc=yes
 }
 
@@ -3550,111 +3528,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)
 
@@ -4038,6 +3911,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'
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
parent	baca7ad14b15829e67151e08e25e35b916046c4e (diff)