summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-23 16:33:37 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-23 16:33:37 +0000
commitb789d9d640329830153fd0b4ec23c7545100969b (patch)
treec4a428db3de017c18afac09b8a5648162e960e8e /Build/source/m4
parent6fe018282ebe6acac6f4c9aab818346f304e7373 (diff)
build system cleanup
git-svn-id: svn://tug.org/texlive/trunk@12807 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/README2
-rw-r--r--Build/source/m4/cho-kpse.m42
-rw-r--r--Build/source/m4/cho-libs.m42
-rw-r--r--Build/source/m4/kpse-asm.m43
-rw-r--r--Build/source/m4/kpse-common.m4144
-rw-r--r--Build/source/m4/kpse-cxx-hack.m42
-rw-r--r--Build/source/m4/kpse-fontconfig-flags.m44
-rw-r--r--Build/source/m4/kpse-freetype-flags.m420
-rw-r--r--Build/source/m4/kpse-freetype2-flags.m439
-rw-r--r--Build/source/m4/kpse-gd-flags.m422
-rw-r--r--Build/source/m4/kpse-graphite-flags.m422
-rw-r--r--Build/source/m4/kpse-icu-flags.m412
-rw-r--r--Build/source/m4/kpse-kpathsea-flags.m420
-rw-r--r--Build/source/m4/kpse-libpng-flags.m421
-rw-r--r--Build/source/m4/kpse-macos-framework.m42
-rw-r--r--Build/source/m4/kpse-obsdcompat-flags.m413
-rw-r--r--Build/source/m4/kpse-options.m42
-rw-r--r--Build/source/m4/kpse-pkgs.m42
-rw-r--r--Build/source/m4/kpse-setup.m449
-rw-r--r--Build/source/m4/kpse-socket-libs.m42
-rw-r--r--Build/source/m4/kpse-t1lib-flags.m417
-rw-r--r--Build/source/m4/kpse-teckit-flags.m422
-rw-r--r--Build/source/m4/kpse-web2c.m42
-rw-r--r--Build/source/m4/kpse-win32.m42
-rw-r--r--Build/source/m4/kpse-xpdf-flags.m423
-rw-r--r--Build/source/m4/kpse-zlib-flags.m417
-rw-r--r--Build/source/m4/maw-time.m42
27 files changed, 225 insertions, 245 deletions
diff --git a/Build/source/m4/README b/Build/source/m4/README
index ee5af011a98..beeb13a3989 100644
--- a/Build/source/m4/README
+++ b/Build/source/m4/README
@@ -2,7 +2,7 @@ Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
You may freely use, modify and/or distribute this file.
This directory is the central repository for Autoconf macros needed to build
-the teTeX / TeX Live (TL) tree.
+the TeX Live (TL) tree.
(1) Public macros such as libtool.m4 used to build the libraries and
programs in the TL subdirectories libs/*/, utils/*/, and texk/*/ that are
diff --git a/Build/source/m4/cho-kpse.m4 b/Build/source/m4/cho-kpse.m4
index 34ea0ff1e37..abecf850bbf 100644
--- a/Build/source/m4/cho-kpse.m4
+++ b/Build/source/m4/cho-kpse.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 1998 - 2008 Jin-Hwan Cho <chofchof@ktug.or.kr>
# Copyright (C) 2008 - 2009 Peter Breitenlohner <tex-live@tug.org>
#
diff --git a/Build/source/m4/cho-libs.m4 b/Build/source/m4/cho-libs.m4
index fa3d6f812f2..a6de533f8d1 100644
--- a/Build/source/m4/cho-libs.m4
+++ b/Build/source/m4/cho-libs.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 1998 - 2008 Jin-Hwan Cho <chofchof@ktug.or.kr>
# Copyright (C) 2008 - 2009 Peter Breitenlohner <tex-live@tug.org>
#
diff --git a/Build/source/m4/kpse-asm.m4 b/Build/source/m4/kpse-asm.m4
index 2063c474bb0..e9e415355c3 100644
--- a/Build/source/m4/kpse-asm.m4
+++ b/Build/source/m4/kpse-asm.m4
@@ -1,5 +1,4 @@
-# Private macro for the teTeX / TeX Live (TL) tree.
-# by Peter Breitenlohner, April 15, 1996.
+# Private macro for the TeX Live (TL) tree.
# Copyright (C) 1996 - 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4
index 05386a7b70d..667bd81d047 100644
--- a/Build/source/m4/kpse-common.m4
+++ b/Build/source/m4/kpse-common.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 1995 - 2009 Karl Berry <tex-live@tug.org>
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
@@ -34,7 +34,7 @@ AC_DEFUN([KPSE_INIT],
[AC_REQUIRE([_KPSE_INIT])])
# _KPSE_USE_LIBTOOL()
-# ------------------
+# -------------------
AC_DEFUN([_KPSE_USE_LIBTOOL],
[## $0: Generate a libtool script for use in configure tests
AC_PROVIDE_IFELSE([LT_INIT], ,
@@ -50,28 +50,30 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
AC_LANG(_AC_LANG)[]dnl
]) # _KPSE_USE_LIBTOOL
-# _KPSE_LIB_FLAGS(LIBDIR, LIBNAME,
-# [SHELL-CODE=DEFAULT-SHELL-CODE],
-# INCLUDES, LIBS, OPTIONS,
+# _KPSE_LIB_FLAGS(LIBDIR, LIBNAME, OPTIONS,
+# TL-INCLUDES, TL-LIBS, TL-EXTRA,
# [REBUILD-SRC-DEPENDENCIES],
# [REBUILD-BLD-DEPENDENCIES])
-# ------------------------------------------------
+# -----------------------------------------------
# Provide the configure options '--with-system-LIBDIR' (if in the TL tree),
# '--with-LIBDIR-includes', and '--with-LIBDIR-libdir'.
+# Options:
+# lt - this is a Libtool library
+# tree - only use library from the TL tree
#
# Set the make variables LIBDIR_INCLUDES and LIBDIR_LIBS to the CPPFLAGS and
# LIBS required for the library in the directory libs/LIBDIR/ of the TL tree.
#
# If an installed (system) version of the library has been selected or is
-# implied, then execute SHELL-CODE to set the two variables.
-# In most cases DEFAULT-SHELL-CODE will do the right thing, based on the
-# values of with_LIBDIR_includes and with_LIBDIR_libdir.
+# implied, then execute KPSE_LIBDIR_SYSTEM_FLAGS to set the two variables.
#
-# Otherwise, set LIBDIR_INCLUDES based on the value of INCLUDES and
-# LIBDIR_LIBS based on the value of LIBS. If OPTIONS specifies a libtool
-# library, then arrange that future configure test use libtool.
+# Otherwise, set LIBDIR_INCLUDES based on the value of TL_INCLUDES and
+# LIBDIR_LIBS based on the value of TL_LIBS; the optional shell code
+# TL-EXTRA may modifiy these values.
+# If OPTIONS specifies a Libtool library, then arrange that future configure
+# test use Libtool.
# Furthermore, set LIBDIR_DEPEND and LIBDIR_RULE to values suitable as
-# dependency and rule to rebuild the library (assuming that
+# dependency and (multiline) Make rule to rebuild the library (assuming that
# '${top_srcdir}/../../' and '${top_builddir}/../../' point to the root of
# the TL tree).
AC_DEFUN([_KPSE_LIB_FLAGS],
@@ -87,30 +89,27 @@ AC_SUBST(AS_TR_CPP($1)[_RULE])[]dnl
m4_provide_if([AM_INIT_AUTOMAKE], [_AM_SUBST_NOTMAKE(AS_TR_CPP($1)[_RULE])])[]dnl
]) # _KPSE_LIB_FLAGS
-# _KPSE_LIB_FLAGS_TL(LIBDIR, LIBNAME,
-# [SHELL-CODE=DEFAULT-SHELL-CODE],
-# INCLUDES, LIBS, OPTIONS,
+# _KPSE_LIB_FLAGS_TL(LIBDIR, LIBNAME, OPTIONS,
+# TL-INCLUDES, TL-LIBS, TL-EXTRA,
# [REBUILD-SRC-DEPENDENCIES],
# [REBUILD-BLD-DEPENDENCIES])
-# ---------------------------------------------------
+# --------------------------------------------------
# Internal subroutine for use of _KPSE_LIB_FLAGS inside the TL tree.
m4_define([_KPSE_LIB_FLAGS_TL],
-[m4_if(m4_index([ $6 ], [ lt ]), [-1], ,
+[m4_if(m4_index([ $3 ], [ lt ]), [-1], ,
[AC_REQUIRE([_KPSE_USE_LIBTOOL])])[]dnl m4_if
-m4_if(m4_index([ $6 ], [ tree ]), [-1],
- [AC_ARG_WITH([system-$1],
- [AS_HELP_STRING([--with-system-$1],
- [use installed $1 headers and library])])[]dnl
-_KPSE_LIB_FLAGS_WITH([$1])[]dnl
+m4_if(m4_index([ $3 ], [ tree ]), [-1],
+[KPSE_]AS_TR_CPP([$1])[_OPTIONS([with-system])[]dnl
if test "x$with_system_[]AS_TR_SH($1)" = xyes; then
- m4_ifval([$3], [$3], AS_TR_CPP([kpse-$1-system-flags]))[]dnl
+ AS_TR_CPP([kpse-$1-system-flags])[]dnl
else
])[]dnl m4_if
AS_TR_CPP($1)[_INCLUDES=`echo '$4' | sed \
-e "s,SRC/,$kpse_SRC/,g" \
-e "s,BLD/,$kpse_BLD/,g"`]
AS_TR_CPP($1)[_LIBS=`echo '$5' | sed \
- -e "s,BLD/,$kpse_BLD/,g"`]
+ -e "s,BLD/,$kpse_BLD/,g"`
+ $6]
m4_if([$1], [kpathsea],
[AS_TR_CPP($1)[_DEPEND=`echo '$5' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`]
@@ -128,38 +127,41 @@ $(]AS_TR_CPP($1)[_DEPEND):]m4_ifval([$7],
cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS)
$8:]])[
cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS)']])
-m4_if(m4_index([ $6 ], [ tree ]), [-1],
+m4_if(m4_index([ $3 ], [ tree ]), [-1],
[fi
])[]dnl m4_if
]) # _KPSE_LIB_FLAGS_TL
-# _KPSE_LIB_FLAGS_STANDALONE(LIBDIR, LIBNAME,
-# [SHELL-CODE=DEFAULT-SHELL-CODE],
-# INCLUDES, LIBS, OPTIONS)
-# ------------------------------------------------
-# Internal subroutine for standalone use of_KPSE_LIB_FLAGS.
+# _KPSE_LIB_FLAGS_STANDALONE(LIBDIR, LIBNAME, OPTIONS)
+# ----------------------------------------------------
+# Internal subroutine for standalone use of _KPSE_LIB_FLAGS.
m4_define([_KPSE_LIB_FLAGS_STANDALONE],
-[m4_if(m4_index([ $6 ], [ tree ]), [-1], ,
+[m4_if(m4_index([ $3 ], [ tree ]), [-1],
+[KPSE_]AS_TR_CPP([$1])[_OPTIONS([])]dnl
+[KPSE_]AS_TR_CPP([$1])[_SYSTEM_FLAGS],
[m4_fatal([$0: not in TL tree])])[]dnl m4_if
-_KPSE_LIB_FLAGS_WITH([$1])[]dnl
-m4_ifval([$3], [$3], [_KPSE_LIB_FLAGS_SYSTEM([$1], [$2])])[]dnl
]) # _KPSE_LIB_FLAGS_STANDALONE
-# _KPSE_LIB_FLAGS_WITH(LIBDIR)
-# ----------------------------
-# Internal subroutine for of_KPSE_LIB_FLAGS: configure options.
-m4_define([_KPSE_LIB_FLAGS_WITH],
-[AC_ARG_WITH([$1-includes],
- [AS_HELP_STRING([--with-$1-includes=DIR],
- [$1 headers installed in DIR])])[]dnl
+# _KPSE_LIB_OPTIONS(LIBDIR, [WITH-SYSTEM])
+# ----------------------------------------
+# Internal subroutine: default configure options for system library,
+# including '--with-system-LIBDIR' if WITH-SYSTEM is nonempty.
+m4_define([_KPSE_LIB_OPTIONS],
+[m4_ifval([$2],
+ [AC_ARG_WITH([system-$1],
+ AS_HELP_STRING([--with-system-$1],
+ [use installed $1 headers and library]))])[]dnl
+AC_ARG_WITH([$1-includes],
+ AS_HELP_STRING([--with-$1-includes=DIR],
+ [$1 headers installed in DIR]))[]dnl
AC_ARG_WITH([$1-libdir],
- [AS_HELP_STRING([--with-$1-libdir=DIR],
- [$1 library installed in DIR])])[]dnl
-]) # _KPSE_LIB_FLAGS_WITH
+ AS_HELP_STRING([--with-$1-libdir=DIR],
+ [$1 library installed in DIR]))[]dnl
+]) # _KPSE_LIB_OPTIONS
# _KPSE_LIB_FLAGS_SYSTEM(LIBDIR, LIBNAME)
# ---------------------------------------
-# Internal subroutine for of_KPSE_LIB_FLAGS: default flags for system library.
+# Internal subroutine: default flags for system library.
m4_define([_KPSE_LIB_FLAGS_SYSTEM],
[if test "x$with_[]AS_TR_SH($1)_includes" != x && test "x$with_[]AS_TR_SH($1)_includes" != xyes; then
AS_TR_CPP($1)_INCLUDES="-I$with_[]AS_TR_SH($1)_includes"
@@ -170,6 +172,32 @@ if test "x$with_[]AS_TR_SH($1)_libdir" != x && test "x$with_[]AS_TR_SH($1)_libdi
fi
]) # _KPSE_LIB_FLAGS_SYSTEM
+# KPSE_SAVE_FLAGS
+# ---------------
+# Save values of CPPFLAGS and LIBS.
+AC_DEFUN([KPSE_SAVE_FLAGS],
+[kpse_save_CPPFLAGS=$CPPFLAGS
+kpse_save_LIBS=$LIBS
+]) # KPSE_SAVE_FLAGS
+
+# KPSE_RESTORE_FLAGS
+# ------------------
+# Restore values of CPPFLAGS and LIBS.
+AC_DEFUN([KPSE_RESTORE_FLAGS],
+[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
+CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
+]) # KPSE_RESTORE_FLAGS
+
+# KPSE_ADD_FLAGS(LIBDIR)
+# ----------------------
+# Add flags for LIBDIR to values of CPPFLAGS and LIBS.
+AC_DEFUN([KPSE_ADD_FLAGS],
+[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
+CPPFLAGS="$CPPFLAGS $[]AS_TR_CPP($1)_INCLUDES"
+LIBS="$[]AS_TR_CPP($1)_LIBS $LIBS"
+]) # KPSE_ADD_FLAGS
+
# KPSE_COMMON(PACKAGE-NAME, [MORE-AUTOMAKE-OPTIONS])
# --------------------------------------------------
# Common Autoconf code for all programs using libkpathsea.
@@ -234,32 +262,6 @@ if test "$kb_cv_var_program_inv_name" = yes; then
fi
]) # KPSE_COMMON
-# KPSE_SAVE_FLAGS
-# ---------------
-# Save values of CPPFLAGS and LIBS.
-AC_DEFUN([KPSE_SAVE_FLAGS],
-[kpse_save_CPPFLAGS=$CPPFLAGS
-kpse_save_LIBS=$LIBS
-]) # KPSE_SAVE_FLAGS
-
-# KPSE_RESTORE_FLAGS
-# ------------------
-# Restore values of CPPFLAGS and LIBS.
-AC_DEFUN([KPSE_RESTORE_FLAGS],
-[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
-CPPFLAGS=$kpse_save_CPPFLAGS
-LIBS=$kpse_save_LIBS
-]) # KPSE_RESTORE_FLAGS
-
-# KPSE_ADD_FLAGS(LIBDIR)
-# ----------------------
-# Add flags for LIBDIR to values of CPPFLAGS and LIBS.
-AC_DEFUN([KPSE_ADD_FLAGS],
-[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
-CPPFLAGS="$CPPFLAGS $[]AS_TR_CPP($1)_INCLUDES"
-LIBS="$[]AS_TR_CPP($1)_LIBS $LIBS"
-]) # KPSE_ADD_FLAGS
-
# KPSE_MSG_ERROR(PACKAGE, ERROR, [EXIT-STATUS = 1])
# -------------------------------------------------
# Same as AC_MSG_ERROR(ERROR, EXIT-STATUS), except when building this
diff --git a/Build/source/m4/kpse-cxx-hack.m4 b/Build/source/m4/kpse-cxx-hack.m4
index e8fbd8533a4..5a093fc2ec5 100644
--- a/Build/source/m4/kpse-cxx-hack.m4
+++ b/Build/source/m4/kpse-cxx-hack.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2002 Olaf Weber <olaf@infovore.xs4all.nl>
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
diff --git a/Build/source/m4/kpse-fontconfig-flags.m4 b/Build/source/m4/kpse-fontconfig-flags.m4
index 40a95bf9d25..fd1e5406a6f 100644
--- a/Build/source/m4/kpse-fontconfig-flags.m4
+++ b/Build/source/m4/kpse-fontconfig-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -13,7 +13,7 @@
# installed fontconfig headers and library.
# Check or set the cache variables kpse_cv_have_fontconfig,
# kpse_cv_fontconfig_includes, and kpse_cv_fontconfig_libs.
-# If found set the make variables FONTCONFIG_INCLUDES and FONTCONFIG_LIBS
+# If found set the Make variables FONTCONFIG_INCLUDES and FONTCONFIG_LIBS
# to the CPPFLAGS and LIBS required for the installed '-lfontconfig'
# library and define HAVE_LIBFONTCONFIG.
AC_DEFUN([KPSE_FONTCONFIG_FLAGS],
diff --git a/Build/source/m4/kpse-freetype-flags.m4 b/Build/source/m4/kpse-freetype-flags.m4
index a8b7746dda9..ed28c506d6d 100644
--- a/Build/source/m4/kpse-freetype-flags.m4
+++ b/Build/source/m4/kpse-freetype-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -7,23 +7,23 @@
# serial 0
-# KPSE_FREETYPE_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE])
-# ----------------------------------------------------
+# KPSE_FREETYPE_FLAGS
+# -------------------
# Provide the configure options '--with-system-freetype' (if in the TL tree),
# '--with-freetype-includes', and '--with-freetype-libdir'.
#
# Set the make variables FREETYPE_INCLUDES and FREETYPE_LIBS to the CPPFLAGS and
# LIBS required for the `-lttf' library in libs/freetype/ of the TL tree.
AC_DEFUN([KPSE_FREETYPE_FLAGS],
-[_KPSE_LIB_FLAGS([freetype], [ttf],
- [$1],
- [-IBLD/libs/freetype/freetype],
- [BLD/libs/freetype/libttf.a], [],
+[_KPSE_LIB_FLAGS([freetype], [ttf], [],
+ [-IBLD/libs/freetype/freetype], [BLD/libs/freetype/libttf.a], [],
[], [${top_builddir}/../../libs/freetype/freetype/freetype.h])[]dnl
]) # KPSE_FREETYPE_FLAGS
+# KPSE_FREETYPE_OPTIONS([WITH-SYSTEM])
+# ------------------------------------
+AC_DEFUN([KPSE_FREETYPE_OPTIONS], [_KPSE_LIB_OPTIONS([freetype], [$1])])
+
# KPSE_FREETYPE_SYSTEM_FLAGS
# --------------------------
-AC_DEFUN([KPSE_FREETYPE_SYSTEM_FLAGS],
-[_KPSE_LIB_FLAGS_SYSTEM([freetype], [ttf])[]dnl
-]) # KPSE_FREETYPE_SYSTEM_FLAGS
+AC_DEFUN([KPSE_FREETYPE_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([freetype], [ttf])])
diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4
index 387aeaa3262..13477851c0f 100644
--- a/Build/source/m4/kpse-freetype2-flags.m4
+++ b/Build/source/m4/kpse-freetype2-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -7,33 +7,32 @@
# serial 0
-# KPSE_FREETYPE2_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE])
-# -----------------------------------------------------
+# KPSE_FREETYPE2_FLAGS
+# --------------------
# Provide the configure options '--with-system-freetype2' (if in the TL tree).
#
# Set the make variables FREETYPE2_INCLUDES and FREETYPE2_LIBS to the CPPFLAGS and
# LIBS required for the `-lfreetype' library in libs/freetype2/ of the TL tree.
-dnl AC_DEFUN([KPSE_FREETYPE2_FLAGS],
-dnl [AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl
-dnl _KPSE_LIB_FLAGS([freetype2], [freetype],
-dnl [$1],
-dnl [-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2],
-dnl [BLD/libs/freetype2/libfreetype.a], [],
-dnl [], [${top_builddir}/../../libs/freetype2/ft2build.h])[]dnl
-dnl ]) # KPSE_FREETYPE2_FLAGS
AC_DEFUN([KPSE_FREETYPE2_FLAGS],
-[AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl
-_KPSE_LIB_FLAGS([freetype2], [freetype],
- [$1],
- [cat BLD/libs/freetype2/ft-],
- [BLD/libs/freetype2/libfreetype.a], [],
+[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
+AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl
+_KPSE_LIB_FLAGS([freetype2], [freetype], [],
+ [BLD/libs/freetype2],
+ [BLD/libs/freetype2/libfreetype.a],
+ [FREETYPE2_LIBS=`cat $FREETYPE2_INCLUDES/ft-libs`
+ FREETYPE2_INCLUDES=`cat $FREETYPE2_INCLUDES/ft-includes`],
[], [${top_builddir}/../../libs/freetype2/ft2build.h])[]dnl
-if test "x$with_system_freetype2" = xno; then
- FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`'
- FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`'
-fi
]) # KPSE_FREETYPE2_FLAGS
+# KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM])
+# -------------------------------------
+AC_DEFUN([KPSE_FREETYPE2_OPTIONS],
+[m4_ifval([$1],
+ [AC_ARG_WITH([system-freetype2],
+ AS_HELP_STRING([--with-system-freetype2],
+ [use installed freetype2 headers and library (requires freetype-config)]))])[]dnl
+]) # KPSE_FREETYPE2_OPTIONS
+
# KPSE_FREETYPE2_SYSTEM_FLAGS
# ---------------------------
AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS],
diff --git a/Build/source/m4/kpse-gd-flags.m4 b/Build/source/m4/kpse-gd-flags.m4
index b29ff411be1..243fbfcaeba 100644
--- a/Build/source/m4/kpse-gd-flags.m4
+++ b/Build/source/m4/kpse-gd-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -7,8 +7,8 @@
# serial 0
-# KPSE_GD_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE])
-# ----------------------------------------------
+# KPSE_GD_FLAGS
+# -------------
# Provide the configure options '--with-system-gd' (if in the TL tree),
# '--with-gd-includes', and '--with-gd-libdir'.
#
@@ -16,14 +16,16 @@
# LIBS required for the `-lgd' library in libs/gd/ of the TL tree.
AC_DEFUN([KPSE_GD_FLAGS],
[AC_REQUIRE([KPSE_LIBPNG_FLAGS])[]dnl
-_KPSE_LIB_FLAGS([gd], [gd],
- [$1],
- [-IBLD/libs/gd], [BLD/libs/gd/libgd.a], [],
- [], [${top_builddir}/../../libs/gd/gd.h])[]dnl
+AC_REQUIRE([KPSE_FREETYPE2_FLAGS])[]dnl
+_KPSE_LIB_FLAGS([gd], [gd], [],
+ [-IBLD/libs/gd], [BLD/libs/gd/libgd.a], [],
+ [], [${top_builddir}/../../libs/gd/gd.h])[]dnl
]) # KPSE_GD_FLAGS
+# KPSE_GD_OPTIONS([WITH-SYSTEM])
+# ------------------------------
+AC_DEFUN([KPSE_GD_OPTIONS], [_KPSE_LIB_OPTIONS([gd], [$1])])
+
# KPSE_GD_SYSTEM_FLAGS
# --------------------
-AC_DEFUN([KPSE_GD_SYSTEM_FLAGS],
-[_KPSE_LIB_FLAGS_SYSTEM([gd], [gd])[]dnl
-]) # KPSE_GD_SYSTEM_FLAGS
+AC_DEFUN([KPSE_GD_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([gd], [gd])])
diff --git a/Build/source/m4/kpse-graphite-flags.m4 b/Build/source/m4/kpse-graphite-flags.m4
index 35276889cab..443a1958dfe 100644
--- a/Build/source/m4/kpse-graphite-flags.m4
+++ b/Build/source/m4/kpse-graphite-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -7,8 +7,8 @@
# serial 0
-# KPSE_GRAPHITE_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE])
-# ----------------------------------------------------
+# KPSE_GRAPHITE_FLAGS
+# -------------------
# Provide the configure options '--with-system-graphite' (if in the TL tree),
# '--with-graphite-includes', and '--with-graphite-libdir'.
#
@@ -16,15 +16,15 @@
# and LIBS required for the `-lgraphite' library in libs/graphite/ of the TL tree.
AC_DEFUN([KPSE_GRAPHITE_FLAGS],
[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
-_KPSE_LIB_FLAGS([graphite], [graphite],
- [$1],
- [-ISRC/libs/graphite/include],
- [BLD/libs/graphite/libgraphite.a], [],
- [], [])[]dnl
+_KPSE_LIB_FLAGS([graphite], [graphite], [],
+ [-ISRC/libs/graphite/include], [BLD/libs/graphite/libgraphite.a], [],
+ [], [])[]dnl
]) # KPSE_GRAPHITE_FLAGS
+# KPSE_GRAPHITE_OPTIONS([WITH-SYSTEM])
+# ------------------------------------
+AC_DEFUN([KPSE_GRAPHITE_OPTIONS], [_KPSE_LIB_OPTIONS([graphite], [$1])])
+
# KPSE_GRAPHITE_SYSTEM_FLAGS
# --------------------------
-AC_DEFUN([KPSE_GRAPHITE_SYSTEM_FLAGS],
-[_KPSE_LIB_FLAGS_SYSTEM([graphite], [graphite])[]dnl
-]) # KPSE_GRAPHITE_SYSTEM_FLAGS
+AC_DEFUN([KPSE_GRAPHITE_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([graphite], [graphite])])
diff --git a/Build/source/m4/kpse-icu-flags.m4 b/Build/source/m4/kpse-icu-flags.m4
index 261937388a6..7377f9a1338 100644
--- a/Build/source/m4/kpse-icu-flags.m4
+++ b/Build/source/m4/kpse-icu-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -7,15 +7,15 @@
# serial 0
-# KPSE_ICU_FLAGS()
-# ----------------
+# KPSE_ICU_FLAGS
+# --------------
# Set the make variables ICU_INCLUDES and ICU_LIBS to
# the CPPFLAGS and LIBS required for the icu-xetex libraries in
# libs/icu/ of the TL tree.
AC_DEFUN([KPSE_ICU_FLAGS],
-[_KPSE_LIB_FLAGS([icu], [sicuxxx], [],
+[_KPSE_LIB_FLAGS([icu], [sicuxxx], [tree],
[-IBLD/libs/icu/icu-build/common -ISRC/libs/icu/icu-xetex/common -ISRC/libs/icu/icu-xetex/layout],
[BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicudata.a],
- [tree], [],
- [${top_builddir}/../../libs/icu/icu-build/common/unicode/platform.h])[]dnl
+ [],
+ [], [${top_builddir}/../../libs/icu/icu-build/common/unicode/platform.h])[]dnl
]) # KPSE_ICU_FLAGS
diff --git a/Build/source/m4/kpse-kpathsea-flags.m4 b/Build/source/m4/kpse-kpathsea-flags.m4
index 141cf3c80f1..1fde7db3531 100644
--- a/Build/source/m4/kpse-kpathsea-flags.m4
+++ b/Build/source/m4/kpse-kpathsea-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -7,27 +7,27 @@
# serial 0
-# KPSE_KPATHSEA_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE])
-# ----------------------------------------------------
+# KPSE_KPATHSEA_FLAGS
+# -------------------
# Provide the configure options '--with-system-kpathsea' (if in the TL tree),
# '--with-kpathsea-includes', and '--with-kpathsea-libdir'.
#
# Set the make variables KPATHSEA_INCLUDES and KPATHSEA_LIBS to the CPPFLAGS and
# LIBS required for the `-lkpathsea' library in texk/kpathsea/ of the TL tree.
AC_DEFUN([KPSE_KPATHSEA_FLAGS],
-[_KPSE_LIB_FLAGS([kpathsea], [kpathsea],
- [$1],
- [-IBLD/texk -ISRC/texk],
- [BLD/texk/kpathsea/libkpathsea.la], [lt],
+[_KPSE_LIB_FLAGS([kpathsea], [kpathsea], [lt],
+ [-IBLD/texk -ISRC/texk], [BLD/texk/kpathsea/libkpathsea.la], [],
[${top_srcdir}/../kpathsea/*.[ch]],
[${top_builddir}/../kpathsea/paths.h])[]dnl
]) # KPSE_KPATHSEA_FLAGS
+# KPSE_KPATHSEA_OPTIONS([WITH-SYSTEM])
+# ------------------------------------
+AC_DEFUN([KPSE_KPATHSEA_OPTIONS], [_KPSE_LIB_OPTIONS([kpathsea], [$1])])
+
# KPSE_KPATHSEA_SYSTEM_FLAGS
# --------------------------
-AC_DEFUN([KPSE_KPATHSEA_SYSTEM_FLAGS],
-[_KPSE_LIB_FLAGS_SYSTEM([kpathsea], [kpathsea])[]dnl
-]) # KPSE__SYSTEM_FLAGS
+AC_DEFUN([KPSE_KPATHSEA_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([kpathsea], [kpathsea])])
# KPSE_CHECK_KPSE_FORMAT(FORMAT,
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
diff --git a/Build/source/m4/kpse-libpng-flags.m4 b/Build/source/m4/kpse-libpng-flags.m4
index acf9929d3fe..9a1e2a974ee 100644
--- a/Build/source/m4/kpse-libpng-flags.m4
+++ b/Build/source/m4/kpse-libpng-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -7,8 +7,8 @@
# serial 0
-# KPSE_LIBPNG_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE])
-# --------------------------------------------------
+# KPSE_LIBPNG_FLAGS
+# -----------------
# Provide the configure options '--with-system-libpng' (if in the TL tree),
# '--with-libpng-includes', and '--with-libpng-libdir'.
#
@@ -16,14 +16,15 @@
# LIBS required for the `-lpng' library in libs/libpng/ of the TL tree.
AC_DEFUN([KPSE_LIBPNG_FLAGS],
[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
-_KPSE_LIB_FLAGS([libpng], [png],
- [$1],
- [-IBLD/libs/libpng], [BLD/libs/libpng/libpng.a], [],
- [], [${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h])[]dnl
+_KPSE_LIB_FLAGS([libpng], [png], [],
+ [-IBLD/libs/libpng], [BLD/libs/libpng/libpng.a], [],
+ [], [${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h])[]dnl
]) # KPSE_LIBPNG_FLAGS
+# KPSE_LIBPNG_OPTIONS([WITH-SYSTEM])
+# ----------------------------------
+AC_DEFUN([KPSE_LIBPNG_OPTIONS], [_KPSE_LIB_OPTIONS([libpng], [$1])])
+
# KPSE_LIBPNG_SYSTEM_FLAGS
# ------------------------
-AC_DEFUN([KPSE_LIBPNG_SYSTEM_FLAGS],
-[_KPSE_LIB_FLAGS_SYSTEM([libpng], [png])[]dnl
-]) # KPSE_LIBPNG_SYSTEM_FLAGS
+AC_DEFUN([KPSE_LIBPNG_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([libpng], [png])])
diff --git a/Build/source/m4/kpse-macos-framework.m4 b/Build/source/m4/kpse-macos-framework.m4
index d76413d96a9..9013c1fffe4 100644
--- a/Build/source/m4/kpse-macos-framework.m4
+++ b/Build/source/m4/kpse-macos-framework.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2005 - 2008 Jonathan Kew <...@...>
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
diff --git a/Build/source/m4/kpse-obsdcompat-flags.m4 b/Build/source/m4/kpse-obsdcompat-flags.m4
index 4b374d99e1c..0a093b0be6b 100644
--- a/Build/source/m4/kpse-obsdcompat-flags.m4
+++ b/Build/source/m4/kpse-obsdcompat-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -7,15 +7,14 @@
# serial 0
-# KPSE_OBSDCOMPAT_FLAGS()
-# -----------------------
+# KPSE_OBSDCOMPAT_FLAGS
+# ---------------------
# Set the make variables OBSDCOMPAT_INCLUDES and OBSDCOMPAT_LIBS to
# the CPPFLAGS and LIBS required for the `-lobsdcompat' library in
# libs/obsdcompat/ of the TL tree.
AC_DEFUN([KPSE_OBSDCOMPAT_FLAGS],
-[_KPSE_LIB_FLAGS([obsdcompat], [openbsd-compat], [],
+[_KPSE_LIB_FLAGS([obsdcompat], [openbsd-compat], [tree],
[-IBLD/libs/obsdcompat -ISRC/libs/obsdcompat],
- [BLD/libs/obsdcompat/libopenbsd-compat.a],
- [tree],
- [${top_srcdir}/../../libs/obsdcompat/*.[ch]])[]dnl
+ [BLD/libs/obsdcompat/libopenbsd-compat.a], [],
+ [], [${top_srcdir}/../../libs/obsdcompat/*.[ch]])[]dnl
]) # KPSE_OBSDCOMPAT_FLAGS
diff --git a/Build/source/m4/kpse-options.m4 b/Build/source/m4/kpse-options.m4
index 159c63b5f16..a96edab08c3 100644
--- a/Build/source/m4/kpse-options.m4
+++ b/Build/source/m4/kpse-options.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index 27ac4c7a7db..32708f69d7b 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -1,4 +1,4 @@
-# Private macros for the teTeX / TeX Live (TL) tree.
+# Private macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index b6cfa8ebcb9..a135351f0bb 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -1,4 +1,4 @@
-# Private macros for the teTeX / TeX Live (TL) tree.
+# Private macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -9,7 +9,7 @@
# KPSE_SETUP(TOP-LEVEL)
# ---------------------
-# Initialize path prefix kpse_TL to top-level teTeX / TeX Live (TL) directory.
+# Initialize path prefix kpse_TL to top-level TeX Live (TL) directory.
# Sinclude all withenable.ac files providing:
# configure options --with-system-LIB, --with-LIB-includes, and --with-LIB-libdir
# for libraries
@@ -25,6 +25,7 @@ AC_ARG_ENABLE([all-pkgs],
test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes
KPSE_ENABLE_CXX_HACK
KPSE_OPTIONS
+KPSE_LIBS_PREPARE
KPSE_WEB2C_PREPARE
m4_sinclude(kpse_TL[ac/withenable.ac])
m4_sinclude(kpse_TL[utils/ac/withenable.ac])
@@ -36,60 +37,46 @@ m4_sinclude(kpse_TL[libs/ac/withenable.ac])
KPSE_FOR_PKGS([libs], [m4_sinclude(kpse_TL[libs/]Kpse_Pkg[/ac/withenable.ac])])
]) # KPSE_SETUP
-# KPSE_WITH_PROG(PROG, REQUIRED-LIBS, OPTIONS, [COMMENT])
-# -------------------------------------------------------
-# Provide the configure option --enable-PROG if the option `without' is
+# KPSE_ENABLE_PROG(PROG, REQUIRED-LIBS, OPTIONS, [COMMENT])
+# ---------------------------------------------------------
+# Provide the configure option --enable-PROG if the option `disable' is
# specified, or -disable-PROG otherwise.
# Define the list of libraries required from the TL tree (if any).
# Options:
-# without - do not build by default
-AC_DEFUN([KPSE_WITH_PROG],
-[m4_pushdef([Kpse_with], m4_if(m4_index([ $3 ], [ without ]), [-1], [yes], [no]))[]dnl
+# disable - do not build by default
+AC_DEFUN([KPSE_ENABLE_PROG],
+[m4_pushdef([Kpse_enable], m4_if(m4_index([ $3 ], [ disable ]), [-1], [yes], [no]))[]dnl
AC_ARG_ENABLE([$1],
- AS_HELP_STRING([[--]m4_if(Kpse_with, [yes], [dis], [en])[able-$1]],
- m4_if(Kpse_with, [yes],
+ AS_HELP_STRING([[--]m4_if(Kpse_enable, [yes], [dis], [en])[able-$1]],
+ m4_if(Kpse_enable, [yes],
[do not ])[build the $1 ]m4_ifval([$4],
[($4) ])[package]))[]dnl
case $enable_[]AS_TR_SH($1) in #(
yes|no);; #(
- *) enable_[]AS_TR_SH($1)=m4_if(Kpse_with, [yes], [$enable_all_pkgs], [no])
+ *) enable_[]AS_TR_SH($1)=m4_if(Kpse_enable, [yes], [$enable_all_pkgs], [no])
AC_MSG_NOTICE([Assuming `--enable-$1=$enable_]AS_TR_SH($1)['])
ac_configure_args="$ac_configure_args '--enable-$1=$enable_[]AS_TR_SH($1)'";;
esac
-m4_popdef([Kpse_with])[]dnl
+m4_popdef([Kpse_enable])[]dnl
m4_ifval([$2], [
test "x$enable_[]AS_TR_SH($1)" = xno || {
AC_FOREACH([Kpse_Lib], [$2], [ need_[]AS_TR_SH(Kpse_Lib)=yes
])}
])[]dnl m4_ifval
-]) # KPSE_WITH_PROG
+]) # KPSE_ENABLE_PROG
-# KPSE_WITH_LIB(LIB, REQUIRED-LIBS, OPTIONS, [COMMENT-SYS],
- [COMMENT-INC], [COMMENT-LIB])
+# KPSE_WITH_LIB(LIB, REQUIRED-LIBS, OPTIONS)
# ---------------------------------------------------------
-# Unless the option `tree' is specified, provide the configure option.
-# --with-system-LIB; in addition provide --with-LIB-includes, and
-# --with-LIB-libdir unless the option `nodirs' is specified.
+# Unless the option `tree' is specified, provide the configure options
+# --with-system-LIB, --with-LIB-includes, and --with-LIB-libdir.
# Define the list of libraries required from the TL tree (if any).
# Options:
# tree - only use library from the TL tree
-# nodirs - prevent --with-LIB-*=DIR configure options
-# The last three arguments are optional additions to the help texts.
#
# At the top-level we build a (reversed) list of potential system libraries.
AC_DEFUN([KPSE_WITH_LIB],
[m4_if(m4_index([ $3 ], [ tree ]), [-1],
-[AC_ARG_WITH([system-$1],
- [AS_HELP_STRING([--with-system-$1],
- [use installed $1 headers and library]m4_ifval([$4], [ ($4)]))])[]dnl
-m4_if(m4_index([ $3 ], [ nodirs ]), [-1],
-[AC_ARG_WITH([$1-includes],
- [AS_HELP_STRING([--with-$1-includes=DIR],
- [$1 headers installed in DIR]m4_ifval([$5], [ ($5)]))])[]dnl
-AC_ARG_WITH([$1-libdir],
- [AS_HELP_STRING([--with-$1-libdir=DIR],
- [$1 library installed in DIR]m4_ifval([$6], [ ($6)]))])[]dnl
-])[]dnl m4_if
+[KPSE_]AS_TR_CPP([$1])[_OPTIONS([with-system])[]dnl
if test "x$with_system_[]AS_TR_SH($1)" = x; then
if test -f $srcdir/kpse_TL[]m4_if([$1], [kpathsea], [texk], [libs])/$1/configure; then
AC_MSG_NOTICE([Assuming `$1' headers and library from TL tree])
diff --git a/Build/source/m4/kpse-socket-libs.m4 b/Build/source/m4/kpse-socket-libs.m4
index 1ff41d79914..9a942e938ac 100644
--- a/Build/source/m4/kpse-socket-libs.m4
+++ b/Build/source/m4/kpse-socket-libs.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 1997 Karl Berry <karl@cs.umb.edu>
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
# with help from Taco Hoekwater <taco@luatex.org>
diff --git a/Build/source/m4/kpse-t1lib-flags.m4 b/Build/source/m4/kpse-t1lib-flags.m4
index 7bc197b1d10..5e3a73e9552 100644
--- a/Build/source/m4/kpse-t1lib-flags.m4
+++ b/Build/source/m4/kpse-t1lib-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -7,22 +7,23 @@
# serial 0
-# KPSE_T1LIB_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE])
-# -------------------------------------------------
+# KPSE_T1LIB_FLAGS
+# ----------------
# Provide the configure options '--with-system-t1lib' (if in the TL tree),
# '--with-t1lib-includes', and '--with-t1lib-libdir'.
#
# Set the make variables T1LIB_INCLUDES and T1LIB_LIBS to the CPPFLAGS and
# LIBS required for the `-lt1' library in libs/t1lib/ of the TL tree.
AC_DEFUN([KPSE_T1LIB_FLAGS],
-[_KPSE_LIB_FLAGS([t1lib], [t1],
- [$1],
+[_KPSE_LIB_FLAGS([t1lib], [t1], [],
[-IBLD/libs/t1lib], [BLD/libs/t1lib/libt1.a], [],
[], [${top_builddir}/../../libs/t1lib/t1lib.h])[]dnl
]) # KPSE_T1LIB_FLAGS
+# KPSE_T1LIB_OPTIONS([WITH-SYSTEM])
+# ---------------------------------
+AC_DEFUN([KPSE_T1LIB_OPTIONS], [_KPSE_LIB_OPTIONS([t1lib], [$1])])
+
# KPSE_T1LIB_SYSTEM_FLAGS
# -----------------------
-AC_DEFUN([KPSE_T1LIB_SYSTEM_FLAGS],
-[_KPSE_LIB_FLAGS_SYSTEM([t1lib], [t1])[]dnl
-]) # KPSE_T1LIB_SYSTEM_FLAGS
+AC_DEFUN([KPSE_T1LIB_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([t1lib], [t1])])
diff --git a/Build/source/m4/kpse-teckit-flags.m4 b/Build/source/m4/kpse-teckit-flags.m4
index 434508c361a..cd748a5d5e4 100644
--- a/Build/source/m4/kpse-teckit-flags.m4
+++ b/Build/source/m4/kpse-teckit-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -7,8 +7,8 @@
# serial 0
-# KPSE_TECKIT_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE])
-# --------------------------------------------------
+# KPSE_TECKIT_FLAGS
+# -----------------
# Provide the configure options '--with-system-teckit' (if in the TL tree),
# '--with-teckit-includes', and '--with-teckit-libdir'.
#
@@ -16,15 +16,15 @@
# LIBS required for the `-lTECkit' library in libs/teckit/ of the TL tree.
AC_DEFUN([KPSE_TECKIT_FLAGS],
[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
-_KPSE_LIB_FLAGS([teckit], [TECkit],
- [$1],
- [-ISRC/libs/teckit/source/Public-headers],
- [BLD/libs/teckit/libTECkit.a], [],
- [], [])[]dnl
+_KPSE_LIB_FLAGS([teckit], [TECkit], [],
+ [-ISRC/libs/teckit/source/Public-headers], [BLD/libs/teckit/libTECkit.a], [],
+ [], [])[]dnl
]) # KPSE_TECKIT_FLAGS
+# KPSE_TECKIT_OPTIONS([WITH-SYSTEM])
+# ----------------------------------
+AC_DEFUN([KPSE_TECKIT_OPTIONS], [_KPSE_LIB_OPTIONS([teckit], [$1])])
+
# KPSE_TECKIT_SYSTEM_FLAGS
# ------------------------
-AC_DEFUN([KPSE_TECKIT_SYSTEM_FLAGS],
-[_KPSE_LIB_FLAGS_SYSTEM([teckit], [TECkit])[]dnl
-]) # KPSE_TECKIT_SYSTEM_FLAGS
+AC_DEFUN([KPSE_TECKIT_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([teckit], [TECkit])])
diff --git a/Build/source/m4/kpse-web2c.m4 b/Build/source/m4/kpse-web2c.m4
index 57d80bd9c32..b658ddf4ef1 100644
--- a/Build/source/m4/kpse-web2c.m4
+++ b/Build/source/m4/kpse-web2c.m4
@@ -1,4 +1,4 @@
-# Private macros for the teTeX / TeX Live (TL) tree.
+# Private macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
diff --git a/Build/source/m4/kpse-win32.m4 b/Build/source/m4/kpse-win32.m4
index b953b76ee62..c98d9b80d03 100644
--- a/Build/source/m4/kpse-win32.m4
+++ b/Build/source/m4/kpse-win32.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4
index 82fb20542c7..4595ef6ccff 100644
--- a/Build/source/m4/kpse-xpdf-flags.m4
+++ b/Build/source/m4/kpse-xpdf-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -7,24 +7,13 @@
# serial 0
-# KPSE_XPDF_FLAGS()
-# -----------------
+# KPSE_XPDF_FLAGS
+# ---------------
# Set the make variables XPDF_INCLUDES and XPDF_LIBS to the CPPFLAGS and
# LIBS required for the `-lxpdf' library in libs/xpdf/ of the TL tree.
AC_DEFUN([KPSE_XPDF_FLAGS],
-[_KPSE_LIB_FLAGS([xpdf], [xpdf], [],
- _Kpse_Xpdf_Flags[ -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/fofi -IBLD/libs/xpdf/xpdf],
- [BLD/libs/xpdf/libxpdf.a],
- [tree],
+[_KPSE_LIB_FLAGS([xpdf], [xpdf], [tree],
+ [-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/fofi -IBLD/libs/xpdf/xpdf],
+ [BLD/libs/xpdf/libxpdf.a], [],
[], [${top_builddir}/../../libs/xpdf/xpdf/Stream.h])[]dnl
]) # KPSE_XPDF_FLAGS
-
-# KPSE_XPDF_SELF_FLAGS()
-# ----------------------
-# Flags for building and using libxpdf.
-AC_DEFUN([KPSE_XPDF_SELF_FLAGS],
-[XPDF_SELF_FLAGS=_Kpse_Xpdf_Flags
-AC_SUBST([XPDF_SELF_FLAGS])[]dnl
-]) # KPSE_XPDF_SELF_FLAGS
-
-m4_define([_Kpse_Xpdf_Flags], [-DPDF_PARSER_ONLY])
diff --git a/Build/source/m4/kpse-zlib-flags.m4 b/Build/source/m4/kpse-zlib-flags.m4
index 009528a3b24..15966a6bfb4 100644
--- a/Build/source/m4/kpse-zlib-flags.m4
+++ b/Build/source/m4/kpse-zlib-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -7,22 +7,23 @@
# serial 0
-# KPSE_ZLIB_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE])
-# ------------------------------------------------
+# KPSE_ZLIB_FLAGS
+# ---------------
# Provide the configure options '--with-system-zlib' (if in the TL tree),
# '--with-zlib-includes', and '--with-zlib-libdir'.
#
# Set the make variables ZLIB_INCLUDES and ZLIB_LIBS to the CPPFLAGS and
# LIBS required for the `-lz' library in libs/zlib/ of the TL tree.
AC_DEFUN([KPSE_ZLIB_FLAGS],
-[_KPSE_LIB_FLAGS([zlib], [z],
- [$1],
+[_KPSE_LIB_FLAGS([zlib], [z], [],
[-IBLD/libs/zlib], [BLD/libs/zlib/libz.a], [],
[], [${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h])[]dnl
]) # KPSE_ZLIB_FLAGS
+# KPSE_ZLIB_OPTIONS([WITH-SYSTEM])
+# --------------------------------
+AC_DEFUN([KPSE_ZLIB_OPTIONS], [_KPSE_LIB_OPTIONS([zlib], [$1])])
+
# KPSE_ZLIB_SYSTEM_FLAGS
# ----------------------
-AC_DEFUN([KPSE_ZLIB_SYSTEM_FLAGS],
-[_KPSE_LIB_FLAGS_SYSTEM([zlib], [z])[]dnl
-]) # KPSE_ZLIB_SYSTEM_FLAGS
+AC_DEFUN([KPSE_ZLIB_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([zlib], [z])])
diff --git a/Build/source/m4/maw-time.m4 b/Build/source/m4/maw-time.m4
index 5893b5488c9..faf96e20d36 100644
--- a/Build/source/m4/maw-time.m4
+++ b/Build/source/m4/maw-time.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
# Copyright (C) 1998 - 2008 Mark A. Wicks <mwicks@kettering.edu>
# Kettering University
# Copyright (C) 2008 - 2009 Peter Breitenlohner <tex-live@tug.org>