summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-01-13 00:02:12 +0000
committerKarl Berry <karl@freefriends.org>2020-01-13 00:02:12 +0000
commit770f8eaf63a917126dd149f433ba96fe83c90a78 (patch)
tree81873c5f952c4229c35ff9e83002dca76267d7e8 /Build/source/m4
parentffb5c8ed6577f66b04ea615504b41c5939825722 (diff)
AS_TR_SH to get mfluajit_nowin in shell contexts
git-svn-id: svn://tug.org/texlive/trunk@53385 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog11
-rw-r--r--Build/source/m4/kpse-setup.m44
2 files changed, 13 insertions, 2 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index f2b05276630..6ac07da167f 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,14 @@
+2020-01-13 Karl Berry <karl@tug.org>
+
+ * kpse-setup.m4 (KPSE_SETUP): use AS_TR_SH on the argument when
+ disabling the jit packages, for the sake of making mfluajit-nowin
+ into mfluajit_nowin for shell usage.
+ Also change one "WIN32" to "Windows" in an error message.
+
+2020-01-12 Mojca Miklavec <mojca.miklavec.lists@gmail.com>
+
+ * kpse-setup.m4 (KPSE_SETUP): also disable mfluajit and mfluajit-nowin.
+
2019-06-26 Karl Berry <karl@freefriends.org>
* kpse-harfbuzz-flags.m4 (KPSE_HARFBUZZ_FLAGS): omit KPSE_ICU_FLAGS.
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index 32eecd0b3b5..85302003609 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -77,7 +77,7 @@ KPSE_WEB2C_PREPARE
KPSE_CHECK_WIN32
AS_CASE([$with_x:$kpse_cv_have_win32],
[yes:no | no:*], [:],
- [yes:*], [AC_MSG_ERROR([you can not use `--with-x' for WIN32])],
+ [yes:*], [AC_MSG_ERROR([you can not use `--with-x' for Windows])],
[*:no], [with_x=yes
AC_MSG_NOTICE([Assuming `--with-x'])
ac_configure_args="$ac_configure_args '--with-x'"],
@@ -85,7 +85,7 @@ AS_CASE([$with_x:$kpse_cv_have_win32],
AC_MSG_NOTICE([WIN32 -> `--without-x'])
ac_configure_args="$ac_configure_args '--without-x'"])
AC_FOREACH([Kpse_Pkg], [luajittex luajithbtex mfluajit mfluajit-nowin], [dnl
-AS_CASE([$enable_]Kpse_Pkg,
+AS_CASE([$enable_[]AS_TR_SH([Kpse_Pkg])],
[yes | no], [:],
[AS_CASE([$host],
[alpha* | sparc* | x86_64-*-solaris* | powerpc-*-darwin* ],