diff options
| author | Karl Berry <karl@freefriends.org> | 2017-11-02 18:12:59 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-11-02 18:12:59 +0000 |
| commit | 32f9975945b9776d533b3711831278049b7fb840 (patch) | |
| tree | c8d1cbdd2534bc1d407c15db77678a388ddb284c /Build/source/configure | |
| parent | 95bae373420bccabefcfeb31bad94b69df4e4360 (diff) | |
revert to requiring configure to succeed in all subdirs, since we cannot avoid C++11 for TL 2018
git-svn-id: svn://tug.org/texlive/trunk@45671 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/configure')
| -rwxr-xr-x | Build/source/configure | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Build/source/configure b/Build/source/configure index df762e3a83c..abe0027297b 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -643,8 +643,8 @@ cross_TRUE ICU_CONFIG FT2_CONFIG PKG_CONFIG -MAKE_SUBDIRS CONF_SUBDIRS +MAKE_SUBDIRS CXXCPP WARNING_CXXFLAGS am__fastdepCXX_FALSE @@ -21076,15 +21076,16 @@ 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; } -CONF_SUBDIRS= +echo 'dbg:_KPSE_RECURSE called: list=texlibs, text=TeX specific libraries, cond=test "x$with_system_Kpse_pkg" != xyes && test "x$need_Kpse_pkg" = xyes, prefix=texk/.' >&5 MAKE_SUBDIRS= -if test -x $srcdir/texk/ptexenc/configure && test "x$with_system_ptexenc" != xyes && test "x$need_ptexenc" = xyes; then +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" CONF_SUBDIRS="texk/ptexenc $CONF_SUBDIRS" - MAKE_SUBDIRS="texk/ptexenc $MAKE_SUBDIRS" fi -if test -x $srcdir/texk/kpathsea/configure && test "x$with_system_kpathsea" != xyes && test "x$need_kpathsea" = xyes; then +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" CONF_SUBDIRS="texk/kpathsea $CONF_SUBDIRS" - MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5 |