summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-07-31 20:52:36 +0000
committerKarl Berry <karl@freefriends.org>2018-07-31 20:52:36 +0000
commit348f3caedde56c0630f297b4ec1781ab18cd234d (patch)
treeebdbe966dc29046c7be4f26c1b382681099ae507 /Build/source/texk/web2c
parentffa86c021abf4e35896a4c28390c527e21e824db (diff)
doc,sync
git-svn-id: svn://tug.org/texlive/trunk@48318 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rwxr-xr-xBuild/source/texk/web2c/configure7
-rw-r--r--Build/source/texk/web2c/configure.ac7
2 files changed, 9 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 65955e9412c..681a176fceb 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -18592,6 +18592,7 @@ fi
+# Include additional code for web2c.
## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
## configure options for TeX and MF
@@ -19003,12 +19004,14 @@ fi
+# LuaTeX and XeTeX now require C++11 because poppler does :(.
+# XeTeX also requires C+11 because of ICU.
if test "x$enable_xetex" = xyes \
|| test "x$enable_luatex" = xyes \
|| test "x$enable_luajittex" = xyes \
|| test "x$enable_luatex53" = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LuaTeX enabled, requiring C++11 support" >&5
-$as_echo "$as_me: LuaTeX enabled, requiring C++11 support" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++11, since LuaTeX and/or XeTeX enabled" >&5
+$as_echo "$as_me: checking for C++11, since LuaTeX and/or XeTeX enabled" >&6;}
ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=true
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 902902ca58e..6c083929715 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -42,16 +42,17 @@ AC_PROG_OBJCXX
KPSE_CXX_HACK
KPSE_LT_HACK
-dnl Include additional code for web2c.
+# Include additional code for web2c.
KPSE_WEB2C_PREPARE
m4_include([ac/web2c.ac])
-dnl LuaTeX requires C++11 because poppler does :(.
+# LuaTeX and XeTeX now require C++11 because poppler does :(.
+# XeTeX also requires C+11 because of ICU.
if test "x$enable_xetex" = xyes \
|| test "x$enable_luatex" = xyes \
|| test "x$enable_luajittex" = xyes \
|| test "x$enable_luatex53" = xyes; then
- AC_MSG_NOTICE([LuaTeX enabled, requiring C++11 support])
+ AC_MSG_NOTICE([checking for C++11, since LuaTeX and/or XeTeX enabled])
AX_CXX_COMPILE_STDCXX([11])
fi