summaryrefslogtreecommitdiff
path: root/Build/source/configure
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-17 22:52:17 +0000
committerKarl Berry <karl@freefriends.org>2017-02-17 22:52:17 +0000
commit58f62d572085ddd427b07f15d26b719b2f84cbe2 (patch)
tree41b909f12e85dc0e1d971c2970729d47742d55a7 /Build/source/configure
parent1b08e130d3ded0082d284fb31cce672bdf86b220 (diff)
reautoconf after the no-descent-into-disabled-subdirs change
git-svn-id: svn://tug.org/texlive/trunk@43263 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/configure')
-rwxr-xr-xBuild/source/configure31
1 files changed, 10 insertions, 21 deletions
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 <kpathsea/paths.h> 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"