summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/m4/ChangeLog6
-rw-r--r--Build/source/m4/kpse-luajit-flags.m42
-rwxr-xr-xBuild/source/texk/web2c/configure2
3 files changed, 8 insertions, 2 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 7bd4039e99f..e5f5d9f0d50 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-11 Karl Berry <karl@freefriends.org>
+
+ * kpse-luajit-flags.m4 (KPSE_LUAJIT_FLAGS): try LIBLUAJIT_LDEXTRA,
+ following (sort of):
+ https://github.com/TeX-Live/luatex/commit/273de1c6308ab9378905a5e1929b19207e2765af
+
2019-01-10 Karl Berry <karl@freefriends.org>
* kpse-luajit-flags.m4 (KPSE_LUAJIT_FLAGS): check for
diff --git a/Build/source/m4/kpse-luajit-flags.m4 b/Build/source/m4/kpse-luajit-flags.m4
index bb8cd04e499..1677a72742a 100644
--- a/Build/source/m4/kpse-luajit-flags.m4
+++ b/Build/source/m4/kpse-luajit-flags.m4
@@ -49,7 +49,7 @@ AC_LINK_IFELSE(
)],
[
AC_MSG_RESULT(["$jitlibs"])
- LUAJIT_LIBS="$LUAJIT_LIBS $jitlibs"
+ LIBLUAJIT_LDEXTRA="$LIBLUAJIT_LDEXTRA $jitlibs"
],
[AC_MSG_FAILURE([luajit could not be linked])]
)
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 96b210e0cbb..aa495fa4d8b 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -25069,7 +25069,7 @@ if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$jitlibs\"" >&5
$as_echo "\"$jitlibs\"" >&6; }
- LUAJIT_LIBS="$LUAJIT_LIBS $jitlibs"
+ LIBLUAJIT_LDEXTRA="$LIBLUAJIT_LDEXTRA $jitlibs"
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5