diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-02-21 09:28:43 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-02-21 09:28:43 +0000 |
commit | a734173cbba559417924a91e0babca3b3053aa56 (patch) | |
tree | 10771b5e2c860ce110d5465b6ee2cfacdfad00b1 /Build/source/texk/m4 | |
parent | 544143ec1e27925873c115f494b0c4840a28ee9c (diff) |
autoconf changes:
* with --enable-multiplatform modifies libdir (in addition to bindir)
* define lists of optional packages (in texk/PKG/, utils/PKG/) and use
them (1) to generate --without-PKG options, and (2) to select subdirs
git-svn-id: svn://tug.org/texlive/trunk@6698 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/m4')
-rw-r--r-- | Build/source/texk/m4/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/m4/kpse_subdirs.m4 | 28 |
2 files changed, 24 insertions, 9 deletions
diff --git a/Build/source/texk/m4/ChangeLog b/Build/source/texk/m4/ChangeLog index d80afea885d..3a02bab78fb 100644 --- a/Build/source/texk/m4/ChangeLog +++ b/Build/source/texk/m4/ChangeLog @@ -1,3 +1,8 @@ +2008-02-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kpse_subdirs.m4 (KPSE_WITH_SUBDIRS): additional macro to + generate --without-PKG options for a list of packages. + 2008-02-21 Karl Berry <karl@tug.org> * kpse_asm.m4, kpse_cross.m4, kpse_inc.m4, kpse_mtim.m4, diff --git a/Build/source/texk/m4/kpse_subdirs.m4 b/Build/source/texk/m4/kpse_subdirs.m4 index fcbba079de1..4537b26824d 100644 --- a/Build/source/texk/m4/kpse_subdirs.m4 +++ b/Build/source/texk/m4/kpse_subdirs.m4 @@ -5,23 +5,34 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 + +# KPSE_WITH_SUBDIRS(PKGLIST) +# ----------------------- +# Specify optional packages to be built. For each PKG in PKGLIST expand +# AC_ARG_WITH([PKG], [ --without-PKG do not build the PKG package]) +# to produce standardized help messages. +AC_DEFUN([KPSE_WITH_SUBDIRS], +[AC_FOREACH([AC_Pkg], [$1], + [AC_ARG_WITH(AC_Pkg, + AS_HELP_STRING([--without-[]]AC_Pkg, [do not build the ]AC_Pkg[ package]))]) +]) # KPSE_CONFIG_SUBDIRS(PKGLIST, [DIR]) # ----------------------------------- # Specify optional subdirectories to be configured. -# First the shell variable ESUBDIRS initialize (to empty). Then for -# each PKG in PKGLIST, test if PKG (or optionally DIR/PKG) exists as -# subdirectory of $srcdir and the value of the shell variable with_PKG -# differs from "no"; if so append this subdirectoryi to the list of -# subdirectories to be configured and to the shell variable ESUBDIRS. +# First initialize the shell variable ESUBDIRS (to empty). Then for +# each PKG in PKGLIST, test if [DIR/]PKG exists as subdirectory of +# $srcdir and the value of the shell variable with_PKG is not "no"; +# if so append this subdirectory to the list of subdirectories to be +# configured and to the shell variable ESUBDIRS. # Finally ESUBDIRS is AC_SUBSTed. # # Examples: KPSE_CONFIG_SUBDIRS([dialog lcdf-typetools], [utils]) is # roughly equivalent to the shell code # ESUBDIRS= # test -d utils || mkdir utils -# for pkg in $PKGS; do +# for pkg in dialog lcdf-typetools; do # if test -d $srcdir/utils/$pkg; then # if eval "test \"`echo '$with_'${pkg}|sed 's/-/_/g'`\" != no"; then # ESUBDIRS="$ESUBDIRS utils/$pkg" @@ -32,7 +43,7 @@ # AC_SUBST(ESUBDIRS) # whereas KPSE_CONFIG_SUBDIRS([afm2pl bibtex8]) corresponds to # ESUBDIRS= -# for pkg in $PKGS; do +# for pkg in afm2pl bibtex8; do # if test -d $srcdir/utils/$pkg; then # if eval "test \"x`echo '$with_'${pkg}`\" != xno"; then # ESUBDIRS="$ESUBDIRS $pkg" @@ -46,7 +57,6 @@ # an M4 loop and therefore M4 variables (i.e., shell literals) are # passed as arguments to AC_CONFIG_SUBDIRS, as required by modern # versions of Autoconf and Automake. - AC_DEFUN([KPSE_CONFIG_SUBDIRS], [ESUBDIRS= m4_ifval([$2], [test -d $2 || mkdir $2]) |