update build system

git-svn-id: svn://tug.org/texlive/trunk@12676 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 27 insertions, 78 deletions

diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am
index 5f8e2966eb8..d49434ae24e 100644
--- a/Build/source/Makefile.am
+++ b/Build/source/Makefile.am
@@ -8,7 +8,6 @@ EXTRA_DIST = \
 	Build \
 	README.cross \
 	README.layout \
-	README.orig \
 	build-aux/README.TL \
 	m4/README
 
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index d6e69912257..7e1181c0b64 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -281,7 +281,6 @@ EXTRA_DIST = \
 	Build \
 	README.cross \
 	README.layout \
-	README.orig \
 	build-aux/README.TL \
 	m4/README
 
diff --git a/Build/source/README b/Build/source/README
deleted file mode 100644
index df8ea5c456f..00000000000
--- a/Build/source/README
+++ /dev/null
@@ -1,52 +0,0 @@
-	tex-live-2009test-1.4
-	=====================
-
-Purpose:
---------
-
-Testing the mechanism to configure and buid the various TL modules
-	libs/*
-	utils/*
-	texk/*
-in a different order.  If a program or library built in module A (e.g.,
-texk/dvipng) depends on a library supplied by module B (e.g., libs/libpng or
-texk/kpathsea) then module B is built before configuring module A.
-
-This package demonstrates how to first configure and build each of the
-libraries in the TL tree (texk/kpathsea and libs/*), before configuring
-other libraries or programs using that library.
-
-This is mainly important for modules maintained independently, outside the
-TL tree.  Such modules can be configured and built as part of the TL tree or
-independently using installed (system) versions of the required libraries. 
-Building these required libraries before configuring the module, allows to
-perform the same tests to determine features of the (uninstalled or system)
-libraries.  This should considerably reduce the work required to integrate
-new versions of such modules into the LT tree.
-
-This mechanism is intended to become part of the TL build system.  It is
-therefore important to test it now on all different build systems, instead
-of complaining later.
-
-=============================
-
-The tarball is available as
-	ftp://ftpth.mppmu.mpg.de/pub/peb/TL/tex-live-2009test-1.4.tar.bz2
-	ftp://ftpth.mppmu.mpg.de/pub/peb/TL/tex-live-2009test-1.4.tar.gz
-
-=============================
-
-Some remarks:
--------------
-
-At the moment all (sub-)packages use Automake; that's just a lot simpler,
-but translation to plain Autoconf should be straightforward.
-
-All programs use Libtool in order to properly handle (uninstalled or system)
-libtool libraries.
-
-A few libraries use Libtool but most don't.
-
-=============================
-
-2009-02-15	Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/README.layout b/Build/source/README.layout
index dbb5139c2c9..744b5495974 100644
--- a/Build/source/README.layout
+++ b/Build/source/README.layout
@@ -5,8 +5,8 @@ The TL 2009 build system has been completely restructured, using Autoconf,
 Automake, and Libtool.  The main purpose was to configure and build each
 library before configuring any module (program or other library) depending
 on that library.  This allows to check for properties and features of a
-library built as part of the TL tree in much the same as for an installed
-(system) version of that library.
+library built as part of the TL tree in much the same way as for an
+installed (system) version of that library.
 
 This should simplify upgrading of modules maintained independently and/or
 integrating new modules into the TL build system.
@@ -55,7 +55,7 @@ m4/kpse-Lib-flags.m4		defines Autoconf macros for configure options
                                   files and defining Make variables
 
 Several libraries use an unmodified source tree supplemented by a proxy
-build system (bypassing that of the source tree, e.g.,
+build system (bypassing that of the source tree), e.g.,
 
 libs/zlib/zlib-1.2.3/*		(almost) unmodified source tree
 libs/zlib/Makefile.am		proxy Makefile.am
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 5bd78dbf029..a4c4f171094 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -12931,9 +12931,11 @@ case $with_xdvi_x_toolkit in
   "" | x | xa | xaw) val=xaw ;;
   y | ye | yes) val=yes ;;
   m | mo | mot | moti | motif) val=motif ;;
-  *) { $as_echo "$as_me:$LINENO: WARNING: unknown --with-xdvi-x-toolkit argument \`$with_xdvi_x_toolkit'; using xaw." >&5
-$as_echo "$as_me: WARNING: unknown --with-xdvi-x-toolkit argument \`$with_xdvi_x_toolkit'; using xaw." >&2;}
-         val=xaw ;;
+  *) { $as_echo "$as_me:$LINENO: WARNING: unknown --with-xdvi-x-toolkit argument
+                                                     \`$with_xdvi_x_toolkit'; using xaw." >&5
+$as_echo "$as_me: WARNING: unknown --with-xdvi-x-toolkit argument
+                                                     \`$with_xdvi_x_toolkit'; using xaw." >&2;}
+                                        val=xaw ;;
 esac
 
 with_xdvi_x_toolkit=$val
@@ -12951,7 +12953,7 @@ case $with_ps in
   news) PS_DEF=-DPS_NEWS ;;
   *) { $as_echo "$as_me:$LINENO: WARNING: unknown--with-ps argument \`$with_ps'; using gs." >&5
 $as_echo "$as_me: WARNING: unknown--with-ps argument \`$with_ps'; using gs." >&2;}
-         PS_DEF=-DPS_GS ;;
+                          PS_DEF=-DPS_GS ;;
 esac
 
 
@@ -16011,11 +16013,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:16014: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16016: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16018: \$? = $ac_status" >&5
+   echo "$as_me:16020: \$? = $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.
@@ -16110,11 +16112,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:16113: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16115: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16117: \$? = $ac_status" >&5
+   echo "$as_me:16119: \$? = $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
@@ -16162,11 +16164,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:16165: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16167: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16169: \$? = $ac_status" >&5
+   echo "$as_me:16171: \$? = $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
diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac
index c7a6b5a06df..f6e066a947b 100644
--- a/Build/source/texk/xdvik/configure.ac
+++ b/Build/source/texk/xdvik/configure.ac
@@ -18,13 +18,14 @@ KPSE_COMMON([xdvik])
 
 m4_include([ac/xdvik.ac])
 AS_CASE([$with_xdvi_x_toolkit],
-        [next | nextaw | neXtaw], [val=neXtaw],
-        [xaw3d], [val=xaw3d],
-        ["" | x | xa | xaw], [val=xaw],
-        [y | ye | yes], [val=yes],
+        [next | nextaw | neXtaw],      [val=neXtaw],
+        [xaw3d],                       [val=xaw3d],
+        ["" | x | xa | xaw],           [val=xaw],
+        [y | ye | yes],                [val=yes],
         [m | mo | mot | moti | motif], [val=motif],
-        [AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument `$with_xdvi_x_toolkit'; using xaw.])
-         val=xaw])
+                                       [AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument 
+                                                     `$with_xdvi_x_toolkit'; using xaw.])
+                                        val=xaw])
 with_xdvi_x_toolkit=$val
 
 AC_ARG_WITH([ps],
@@ -32,11 +33,11 @@ AC_ARG_WITH([ps],
                            [Use PostScript (PS=no/yes/gs/dps/news, default gs)]))
 AS_CASE([$with_ps],
         ["" | yes | gs], [PS_DEF=-DPS_GS],
-        [no], [PS_DEF=],
-        [dps], [PS_DEF=-DPS_DPS],
-        [news], [PS_DEF=-DPS_NEWS],
-        [AC_MSG_WARN([unknown--with-ps argument `$with_ps'; using gs.])
-         PS_DEF=-DPS_GS])
+        [no],            [PS_DEF=],
+        [dps],           [PS_DEF=-DPS_DPS],
+        [news],          [PS_DEF=-DPS_NEWS],
+                         [AC_MSG_WARN([unknown--with-ps argument `$with_ps'; using gs.])
+                          PS_DEF=-DPS_GS])
 AC_SUBST([PS_DEF])
 
 dnl Required, not optional.