summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/configure4
-rwxr-xr-xBuild/source/libs/configure4
-rw-r--r--Build/source/m4/ChangeLog11
-rw-r--r--Build/source/m4/kpse-setup.m44
-rwxr-xr-xBuild/source/texk/configure4
-rwxr-xr-xBuild/source/utils/configure4
6 files changed, 21 insertions, 10 deletions
diff --git a/Build/source/configure b/Build/source/configure
index badeb53ecf7..fe0dc8f28e3 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -4140,7 +4140,7 @@ case $with_x:$kpse_cv_have_win32 in #(
yes:no | no:*) :
: ;; #(
yes:*) :
- as_fn_error $? "you can not use \`--with-x' for WIN32" "$LINENO" 5 ;; #(
+ as_fn_error $? "you can not use \`--with-x' for Windows" "$LINENO" 5 ;; #(
*:no) :
with_x=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-x'" >&5
@@ -4191,7 +4191,7 @@ $as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
;;
esac ;;
esac
-case $enable_mfluajit-nowin in #(
+case $enable_mfluajit_nowin in #(
yes | no) :
: ;; #(
*) :
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 6aab084e099..afd31205c5d 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -3320,7 +3320,7 @@ case $with_x:$kpse_cv_have_win32 in #(
yes:no | no:*) :
: ;; #(
yes:*) :
- as_fn_error $? "you can not use \`--with-x' for WIN32" "$LINENO" 5 ;; #(
+ as_fn_error $? "you can not use \`--with-x' for Windows" "$LINENO" 5 ;; #(
*:no) :
with_x=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-x'" >&5
@@ -3371,7 +3371,7 @@ $as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
;;
esac ;;
esac
-case $enable_mfluajit-nowin in #(
+case $enable_mfluajit_nowin in #(
yes | no) :
: ;; #(
*) :
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* ],
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 1d767f9d66d..d8038a7b06e 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -3320,7 +3320,7 @@ case $with_x:$kpse_cv_have_win32 in #(
yes:no | no:*) :
: ;; #(
yes:*) :
- as_fn_error $? "you can not use \`--with-x' for WIN32" "$LINENO" 5 ;; #(
+ as_fn_error $? "you can not use \`--with-x' for Windows" "$LINENO" 5 ;; #(
*:no) :
with_x=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-x'" >&5
@@ -3371,7 +3371,7 @@ $as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
;;
esac ;;
esac
-case $enable_mfluajit-nowin in #(
+case $enable_mfluajit_nowin in #(
yes | no) :
: ;; #(
*) :
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index ca6074f689c..2d83c357cc7 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -3320,7 +3320,7 @@ case $with_x:$kpse_cv_have_win32 in #(
yes:no | no:*) :
: ;; #(
yes:*) :
- as_fn_error $? "you can not use \`--with-x' for WIN32" "$LINENO" 5 ;; #(
+ as_fn_error $? "you can not use \`--with-x' for Windows" "$LINENO" 5 ;; #(
*:no) :
with_x=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-x'" >&5
@@ -3371,7 +3371,7 @@ $as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
;;
esac ;;
esac
-case $enable_mfluajit-nowin in #(
+case $enable_mfluajit_nowin in #(
yes | no) :
: ;; #(
*) :