summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/README.config40
-rw-r--r--Build/source/README.layout61
-rw-r--r--Build/source/texk/dvipdfmx/ChangeLog.TL6
-rw-r--r--Build/source/texk/xdvik/configure.in.work5
-rw-r--r--Build/source/texk/xdvik/m4/acinclude.m446
-rw-r--r--Build/source/texk/xdvipdfmx/ChangeLog.TL6
6 files changed, 71 insertions, 93 deletions
diff --git a/Build/source/README.config b/Build/source/README.config
index 34a34e1e33c..330ad3cb245 100644
--- a/Build/source/README.config
+++ b/Build/source/README.config
@@ -32,11 +32,17 @@ Options explicitly specified on the command will never be modified.
-----------------------------------
If enabled (by default) build for a TeX Live binary distribution as
shipped by the user groups; this implies '--enable-multiplatform' and
-'--enable-cxx-runtime-hack' unless they are explicitly disabled.
+'--enable-cxx-runtime-hack' unless they are explicitly disabled and
+enforces '--disable-shared'.
If building TL for a GNU/Linux or other distribution, this would be
disabled and system versions of most libraries would be used (see below).
+A related option '--enable-texlive-build' is automatically passed to all
+subdirectories (and can not be disabled). Programs that could also be built
+independent from the TL tree (such as utils/xindy/ or texk/dvipng/) use this
+option, e.g., to choose TL specific installation directories.
+
1.2. --enable-multiplatform
---------------------------
If enabled, install executables and libraries in platform dependent
@@ -48,17 +54,31 @@ any program or library package.
1.3. --enable-cxx-runtime-hack
------------------------------
-If enabled and when using gcc, try to statically link with libstc++,
+If enabled and when using g++, try to statically link with libstc++,
somewhat improving portability.
-1.4. --disable-largefile
+1.4. --enable-shared
+---------------------
+Build a shared Kpathsea library (not allowed for a TeX Live native build).
+
+1.5. --disable-largefile
------------------------
Omit support for large files (>=2GB).
-1.5. --without-x
+1.6. --without-x
----------------
Do not use the X Window System.
+1.7. --enable-compiler-warnings=[no|min|yes|max]
+------------------------------------------------
+Enable various degrees of compiler warnings for C and C++. The default is
+'yes' in maintainer-mode and 'min' otherwise. This options defines
+additional CFLAGS or CXXFLAGS, but these flags are not yet used by all
+library and program packages (actually only by a few of them). Using these
+compiler warnings should help to resolve portability problems.
+
+At the moment these warning flags are only defined for the GNU compilers gcc
+and g++, but flags for other compilers could be added when needed.
2. Configure options for program packages
=========================================
@@ -132,16 +152,17 @@ Hardwire the location of GhostScript (gs).
Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi, default: Motif if
available, else Xaw.
+
3. Configure options for libraries
==================================
-3.1. --with-system-Lib
+3.1. --with-system-LIB
----------------------
-Use an installed (system) version of the library `Lib'; this option exists
-for most but not all libraries.
+Use an installed (system) version of the library `LIB'; this option exists
+for most but not all libraries (not allowed for a TeX Live native build).
-For many libraries there are in addition '--with-Lib-includes=DIR' and
-'--with-Lib-libdir=DIR' to indicate that the library is installed in an
+For many libraries there are in addition '--with-LIB-includes=DIR' and
+'--with-LIB-libdir=DIR' to indicate that the library is installed in an
unusual location.
The top-level configure script performs a consistency check for all
@@ -164,6 +185,7 @@ The flags for a system freetype library are determined via freetype-config.
3.4.1. --with-system-xpdf
Use libpoppler instead of xpdf (and pkg-config to obtain the required flags).
+
4. Interesting and/or important VAR=value configure arguments
==========================================
Used instead of searching for programs in PATH.
diff --git a/Build/source/README.layout b/Build/source/README.layout
index e23626f8044..590911f48dc 100644
--- a/Build/source/README.layout
+++ b/Build/source/README.layout
@@ -82,7 +82,7 @@ utils/Util/ac/withenable.ac defines libraries required by Util, provides the
======================
Running 'configure' for the top-level directory will in addition configure
-the directories texk/kpathsea/, libs/, libs/dummy/, utils/, utils/dummy,
+the directories texk/kpathsea/, libs/, libs/dummy/, utils/, utils/dummy/,
texk/, and texk/dummy/. This will determine the programs (utils/Util/ and
texk/Prog) to be built and libraries from the TL tree (texk/kpathsea/ and
libs/Lib) required by these programs.
@@ -96,7 +96,7 @@ texk/kpathsea/, libs/, utils/, and texk/.
3.1. Running `make' in libs/
----------------------------
-First, for each subdirectory libs/Lib not yet configured, this runs
+First, for each subdirectory libs/Lib/ not yet configured, this runs
`configure' and if required `make all' in that directory. Then this
recurses into all required subdirectories for the selected Make target:
`default' or `all' to (re-)build, `check' to run tests, `install' etc.
@@ -104,7 +104,7 @@ recurses into all required subdirectories for the selected Make target:
3.2. Running `make' in utils/ and texk/
---------------------------------------
-Quite similarly, for each subdirectory utils/Util and texk/Prog not yet
+Quite similarly, for each subdirectory utils/Util/ and texk/Prog/ not yet
configured, this first runs `configure' and if required `make all' in that
directory. Subsequently, this recurses into all required subdirectories to
(re-)build, run tests, install, etc.
@@ -180,26 +180,28 @@ build e-TeX (although there is no simple way to have e-TeX installed).
4.1 Adding a new program directory
----------------------------------
-To add a new program directory utils/Util (not using Kpathsea) or texk/Prog
-(possibly using Kpathsea) you first have to add the directory Util to the M4
-list kpse_utils_pkgs or Prog to the M4 list kpse_texk_pkgs defined in
+To add a new program directory utils/Util/ (not using Kpathsea) or
+texk/Prog/ (possibly using Kpathsea) you must add the directory Util to the
+M4 list kpse_utils_pkgs or Prog to the M4 list kpse_texk_pkgs defined in
m4/kpse-pkgs.m4. In addition you must create a configure.ac fragment
utils/Util/ac/witheanble.ac or texk/Prog/ac/witheanble.ac defining any
required libraries from the TL tree and whether this new program is to be
built by default (in the absence of the corresponding '--enable-Util/Prog'
-or '--disable-Util/Prog' configure options). If a program texk/Prog
-requires specific configure options to be seen at the top-level, they should
-be defined in an additional configure.ac fragment texk/Prog/ac/Prog.ac
-included from texk/Prog/ac/withenable.ac and texk/Prog/configure.ac (as,
-e.g., for texk/web2c/ and texk/xdvik/).
+or '--disable-Util/Prog' configure options). If a program in texk/Prog/ or
+utils/Util/ requires specific configure options to be seen at the top-level,
+they should be defined in an additional configure.ac fragment
+texk/Prog/ac/Prog.ac or utils/Util/ac/Util.ac (included from
+texk/Prog/ac/withenable.ac or utils/Util/ac/withenable.ac and
+texk/Prog/configure.ac (as, e.g., for texk/web2c/, texk/xdvik/, and
+utils/xindy/).
4.2 Adding a new library directory
----------------------------------
-To add a new library directory libs/Lib you first have to add the directory
-Lib to the M4 list kpse_libs_pkgs defined in m4/kpse-pkgs.m4. In addition
-you must create a configure.ac fragment libs/Lib/ac/witheanble.ac defining
-any required libraries from the TL tree and whether an installed (system)
+To add a new library directory libs/Lib/ you must add the directory Lib to
+the M4 list kpse_libs_pkgs defined in m4/kpse-pkgs.m4. In addition you must
+create a configure.ac fragment libs/Lib/ac/witheanble.ac defining any
+required libraries from the TL tree and whether an installed (system)
version of this library can be used. If that is the case, another
configure.ac fragment libs/Lib/ac/Lib.ac must define (AC_CHECK_FUNCS and
AC_CHECK_HEADERS) tests for a system version to be acceptable. Finally you
@@ -211,10 +213,10 @@ for CPPFLAGS, LDADD, and dependencies, as well as LIB_RULE with a
If a system version of the library can be used, another M4 macro
KPSE_LIB_SYSTEM_FLAGS in m4/kpse-Lib-flags.m4 must define values for
-LIB_INCLUDES and LIB_LIBS, depending on values for the configure options
-'--with-Lib-includes' and/or '--with-Lib-libdir', and you must add the line
-'AC_REQUIRE([KPSE_LIB_SYSTEM_FLAGS])' to the definition of the M4 macro
-KPSE_ALL_SYSTEM_FLAGS in m4/kpse-pkgs.m4.
+LIB_INCLUDES and LIB_LIBS, usually depending on values for the configure
+options '--with-Lib-includes' and/or '--with-Lib-libdir', and you must add
+the line 'AC_REQUIRE([KPSE_LIB_SYSTEM_FLAGS])' to the definition of the M4
+macro KPSE_ALL_SYSTEM_FLAGS in m4/kpse-pkgs.m4.
5. Updating the TL build system
===============================
@@ -222,23 +224,16 @@ KPSE_ALL_SYSTEM_FLAGS in m4/kpse-pkgs.m4.
When anything in the TL build system (configure.ac and Makefile.am files
with their fragments or M4 macros in m4/) has been modified you have to
rebuild the coresponding configure, Makefile.in, and config.h or c-auto,h
-files.
+files.
-This is most easily done automatically using maintainer-mode. Due to some
-dependencies known to Makefile but not recognized by Aclocal it may,
-however, happen that Aclocal is run again and agin, keeping the aclocal.m4
-files unmodified. This can be fixed by
- touch {,libs/texk/,utils/}aclocal.m4
-from the top-level.
+This is most easily done automatically using maintainer-mode. The files in
+the SVN repository are all up to date, but some of them may be rebuilt in
+maintainer-mode due to their relative timestamps. This will eventually be
+fixed, once everything has stabilized.
-The files in the SVN repository are all up to date, but some of them may be
-rebuilt when using maintainer-mode due to their relative timestamps. This
-will eventually be fixed, once everything has stabilized.
+Alternatively, you can run the 'reautoconf' script from the top-level.
-Alternatively, you can run the 'reautoconf' script from the top-level (yet
-to be done).
-
-The 'config.guess', 'config.sub', etc. files for most packages are now kept
+The 'config.guess', 'config.sub', etc. files for most packages are kept
centrally in build-aux/. There are, however, independent copies in, e.g.,
libs/freetype/freetype-1.5/, libs/freetype2/freetype-2.3.8/builds/unix/, and
similar places that might need updating (not done automatically by the
diff --git a/Build/source/texk/dvipdfmx/ChangeLog.TL b/Build/source/texk/dvipdfmx/ChangeLog.TL
index 0ab7893e3fb..7ac977344ca 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/dvipdfmx/ChangeLog.TL
@@ -1,6 +1,12 @@
ChangeLog.TL: Changes for dvipdfmx (teTeX / TeX Live)
=====================================================
+2009-06-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: replace '--enable-tetex-build' by
+ '--enable-texlive-build' (automatic if configured as part of the
+ TeXLive tree).
+
2009-06-04 Karl Berry <karl@tug.org>
* src/Makefile.am (dist_bin_SCRIPTS): dvipdft.
diff --git a/Build/source/texk/xdvik/configure.in.work b/Build/source/texk/xdvik/configure.in.work
index ab0e576256d..fc63e55bac1 100644
--- a/Build/source/texk/xdvik/configure.in.work
+++ b/Build/source/texk/xdvik/configure.in.work
@@ -1,11 +1,6 @@
dnl ##########
-dnl SU: added flags to turn on gcc warnings, taken from gnome/compiler-flags.m4 and put into aclocal.m4
-COMPILER_WARNINGS
-
-dnl ##########
-
dnl First, check for libXp and libXext:
if test -z "$x_ext_lib"; then # allow envvar override
if test -n "$x_libraries"; then
diff --git a/Build/source/texk/xdvik/m4/acinclude.m4 b/Build/source/texk/xdvik/m4/acinclude.m4
deleted file mode 100644
index 6a6c3ad25f7..00000000000
--- a/Build/source/texk/xdvik/m4/acinclude.m4
+++ /dev/null
@@ -1,46 +0,0 @@
-dnl SU: the following is copied from gnome/compiler-flags.m4: turn on warnings for gcc
-dnl
-dnl COMPILER_WARNINGS
-dnl Turn on many useful compiler warnings
-dnl For now, only works on GCC
-AC_DEFUN([COMPILER_WARNINGS],[
- AC_ARG_ENABLE(compiler-warnings,
- [ --enable-compiler-warnings=[no/minimum/yes/maximum]
- Turn on compiler warnings],,enable_compiler_warnings=minimum)
-
- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
- warnCFLAGS=
- if test "x$GCC" != xyes; then
- enable_compiler_warnings=no
- fi
-
- if test "x$enable_compiler_warnings" != "xno"; then
- if test "x$GCC" = "xyes"; then
- case " $CFLAGS " in
- *[\ \ ]-Wall[\ \ ]*) ;;
- *) warnCFLAGS="-W -Wall -Wunused" ;;
- esac
-
- ## -W is not all that useful. And it cannot be controlled
- ## with individual -Wno-xxx flags, unlike -Wall
- if test "x$enable_compiler_warnings" = "xyes"; then
- warnCFLAGS="$warnCFLAGS -pedantic -Wmissing-prototypes -Wmissing-declarations"
- elif test "x$enable_compiler_warnings" = "xmaximum"; then
- ## just turn on about everything:
- warnCFLAGS="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wimplicit -Wparentheses -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings"
- fi
- fi
- fi
- AC_MSG_RESULT($warnCFLAGS)
-
- ### FIXME: if we restrict setting the flags to this case only, they will get overridden
- ### somehwere else further up in the configure process.
- if test "x$cflags_set" != "xyes"; then
- XTRA_WARN_CFLAGS=$warnCFLAGS
- AC_SUBST(XTRA_WARN_CFLAGS)
-# CFLAGS="$CFLAGS $warnCFLAGS"
- cflags_set=yes
- AC_SUBST(cflags_set)
- fi
-])
-
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index 63465352cc1..711551e80aa 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -1,6 +1,12 @@
ChangeLog.TL: Changes for xdvipdfmx (teTeX / TeX Live)
======================================================
+2009-06-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: replace '--enable-tetex-build' by
+ '--enable-texlive-build' (automatic if configured as part of the
+ TeXLive tree).
+
2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de>
Adapt to TL2009 build system.