From 58f62d572085ddd427b07f15d26b719b2f84cbe2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 17 Feb 2017 22:52:17 +0000 Subject: reautoconf after the no-descent-into-disabled-subdirs change git-svn-id: svn://tug.org/texlive/trunk@43263 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) (limited to 'Build/source/configure') diff --git a/Build/source/configure b/Build/source/configure index 16957a20cd4..fe6336c7714 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -637,14 +637,14 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +subdirs cross_FALSE cross_TRUE ICU_CONFIG FT2_CONFIG PKG_CONFIG -CONF_SUBDIRS MAKE_SUBDIRS -subdirs +CONF_SUBDIRS CXXCPP WARNING_CXXFLAGS am__fastdepCXX_FALSE @@ -963,9 +963,7 @@ CXX CXXFLAGS CCC CXXCPP' -ac_subdirs_all='texk/ptexenc -texk/kpathsea -auxdir/auxsub libs utils texk' +ac_subdirs_all='auxdir/auxsub libs utils texk' # Initialize some variables set by options. ac_init_help= @@ -5211,7 +5209,6 @@ test "x$enable_dvipsk" = xno || { need_kpathsea=yes } -# $Id: withenable.ac 43246 2017-02-16 18:45:03Z karl $ # texk/dvisvgm/ac/withenable.ac: configure.ac fragment ## configure options and TL libraries required for dvisvgm # Check whether --enable-dvisvgm was given. @@ -21079,27 +21076,17 @@ $as_echo "$as_me: which requires to locate the header fil fi fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TeX specific libraries to build" >&5 $as_echo_n "checking for TeX specific libraries to build... " >&6; } -MAKE_SUBDIRS= CONF_SUBDIRS= -if test -x $srcdir/texk/ptexenc/configure; then - test "x$with_system_ptexenc" != xyes && test "x$need_ptexenc" = xyes && MAKE_SUBDIRS="texk/ptexenc $MAKE_SUBDIRS" +MAKE_SUBDIRS= +if test -x $srcdir/texk/ptexenc/configure && test "x$with_system_ptexenc" != xyes && test "x$need_ptexenc" = xyes; then CONF_SUBDIRS="texk/ptexenc $CONF_SUBDIRS" - if false; then - subdirs="$subdirs texk/ptexenc" - - fi + MAKE_SUBDIRS="texk/ptexenc $MAKE_SUBDIRS" fi -if test -x $srcdir/texk/kpathsea/configure; then - test "x$with_system_kpathsea" != xyes && test "x$need_kpathsea" = xyes && MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS" +if test -x $srcdir/texk/kpathsea/configure && test "x$with_system_kpathsea" != xyes && test "x$need_kpathsea" = xyes; then CONF_SUBDIRS="texk/kpathsea $CONF_SUBDIRS" - if false; then - subdirs="$subdirs texk/kpathsea" - - fi + MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5 @@ -22155,6 +22142,8 @@ else fi + + subdirs="$subdirs auxdir/auxsub libs utils texk" -- cgit v1.2.3