do not configure in disabled (with --disable-PKG) subdirs

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

3 files changed, 36 insertions, 19 deletions

diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 2dd0e21e50c..d8e2d2d11a8 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,12 @@
+2017-02-17  Karl Berry  <karl@freefriends.org>
+
+	* kpse-setup.m4 (_KPSE_RECURSE): do not add a package to
+	CONF_SUBDIRS if --disable-PKG was given. Thus, the directory for a
+	disabled package will no longer be descended into at all, as if it
+	were nonexistent. This way, if a package's configure causes
+	problems on some systems (like dvisvgm v2's new requirement for
+	C++11), --disable-PKG can be given and work can go on.
+
 2016-03-07  Karl Berry  <karl@tug.org>
 
 	* kpse-pkgs (KPSE_UTILS_PKGS): add autosp.
@@ -440,3 +449,5 @@
 2009-08-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kpse-warnings.m4: Implement Objective C compiler warnings.
+
+(This file public domain.)
diff --git a/Build/source/m4/README b/Build/source/m4/README
index 52e429face6..d2b7dc0cccf 100644
--- a/Build/source/m4/README
+++ b/Build/source/m4/README
@@ -1,8 +1,10 @@
-Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+$Id$
+Copyright 2009-2017 Karl Berry <tex-live@tug.org>
+Copyright 2009-2012 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 TeX Live (TL) tree.
+the TeX Live (TL) tree. They are incorporated into the configure scripts.
 
 (1) Public macros such as libtool.m4 used to build the libraries and
 programs in the TL subdirectories libs/*/, utils/*/, and texk/*/ that are
@@ -25,7 +27,9 @@ owned by the TL tree.
 kpse-pkgs.m4: defines lists of subdirectories libs/Lib/, utils/Util/, and
 	tex/Prog/ with libraries and programs that can be built as part of
 	the TL tree.
+
 kpse-setup.m4: macros that walk through these lists to provide configure
 	options.  They depend on configure fragments */*/ac/withenable.ac
 	defining the dependencies between these libraries and programs.
 
+See also the sibling top-level am/ directory.
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index 192a10b598c..fecf5b1d950 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -1,5 +1,7 @@
+# $Id$  (m4/kpse-setup.m4)
 # Private macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
+# Copyright 2017      Karl Berry <tex-live@tug.org>
+# Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -8,12 +10,13 @@
 # KPSE_SETUP(TOP-LEVEL)
 # ---------------------
 # 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
-#   configure option --disable-PKG or --enable-PKG for programs
-#   additional program specific configure options (if any)
-#   library dependencies for programs and libraries
+# Sinclude all pkgdir/ac/withenable.ac files, which are supposed to provide:
+#   configure options for libraries:
+#     --with-system-LIB --with-LIB-includes --with-LIB-libdir
+#   configure options for programs:
+#     --disable-PROG --enable-PROG
+#   additional package-specific configure options, if any
+#   library dependencies for programs and libraries, if any
 AC_DEFUN([KPSE_SETUP], [dnl
 AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
 AC_REQUIRE([_KPSE_MSG_WARN_PREPARE])[]dnl
@@ -262,25 +265,24 @@ m4_popdef([Kpse_add])[]dnl
 # _KPSE_RECURSE(LIST, TEXT, COND, [PREFIX])
 # -----------------------------------------
 # Internal subroutine.  Determine which of the libraries or programs in
-# kpse_LIST_pkgs to build, and set output variables MAKE_SUBDIRS and
-# CONF_SUBDIRS.  Cause 'make dist', 'configure -hr', and 'autoreconf'
-# to recurse into all existing ones.
+# kpse_LIST_pkgs to build: if a package's source directory contains a
+# configure script, and COND is true, then add to the output variables
+# MAKE_SUBDIRS and CONF_SUBDIRS.  Thus, if a package directory does not
+# exist at all, or if the package has been disabled, it will be ignored.
+#
 m4_define([_KPSE_RECURSE], [dnl
 AC_MSG_CHECKING([for $2 to build])
-MAKE_SUBDIRS=
 CONF_SUBDIRS=
+MAKE_SUBDIRS=
 KPSE_FOR_PKGS([$1], [dnl
 m4_ifdef([have_]Kpse_pkg, [dnl
-if test -x $srcdir/$4Kpse_Pkg/configure; then
-  $3 && Kpse_add([MAKE_SUBDIRS])
+if test -x $srcdir/$4Kpse_Pkg/configure && $3; then
   Kpse_add([CONF_SUBDIRS])
-  if false; then
-    AC_CONFIG_SUBDIRS($4Kpse_Pkg)
-  fi
+  Kpse_add([MAKE_SUBDIRS])
 fi
 ])[]dnl m4_ifdef
 ])
-AC_SUBST([MAKE_SUBDIRS])[]dnl
 AC_SUBST([CONF_SUBDIRS])[]dnl
+AC_SUBST([MAKE_SUBDIRS])[]dnl
 AC_MSG_RESULT([$MAKE_SUBDIRS])[]dnl
 ]) # _KPSE_RECURSE