1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
|
https://github.com/autoconf-archive/autoconf-archive/pull/318
From 51056b0e139322d0377b0ecd30efd80ec1290dfe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 Nov 2024 09:22:08 +0100
Subject: [PATCH] Revert "Add LuaJIT support to AX_PROG_LUA macro"
---
m4/ax_lua.m4 | 109 ++++++++++++++-------------------------------------
1 file changed, 29 insertions(+), 80 deletions(-)
diff --git a/m4/ax_lua.m4 b/m4/ax_lua.m4
index 5f63cace..a2f2a2ce 100644
--- a/m4/ax_lua.m4
+++ b/m4/ax_lua.m4
@@ -49,14 +49,6 @@
# interpreter. If LUA is blank, the user's path is searched for an
# suitable interpreter.
#
-# Optionally a LUAJIT option may be set ahead of time to look for and
-# validate a LuaJIT install instead of PUC Lua. Usage might look like:
-#
-# AC_ARG_WITH(luajit, [AS_HELP_STRING([--with-luajit],
-# [Prefer LuaJIT over PUC Lua, even if the latter is newer. Default: no])
-# ])
-# AM_CONDITIONAL([LUAJIT], [test "x$with_luajit" != 'xno'])
-#
# If MINIMUM-VERSION is supplied, then only Lua interpreters with a
# version number greater or equal to MINIMUM-VERSION will be accepted. If
# TOO-BIG-VERSION is also supplied, then only Lua interpreters with a
@@ -160,7 +152,6 @@
#
# LICENSE
#
-# Copyright (c) 2023 Caleb Maclennan <caleb@alerque.com>
# Copyright (c) 2015 Reuben Thomas <rrt@sc3d.org>
# Copyright (c) 2014 Tim Perkins <tprk77@gmail.com>
#
@@ -190,7 +181,7 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
-#serial 47
+#serial 48
dnl =========================================================================
dnl AX_PROG_LUA([MINIMUM-VERSION], [TOO-BIG-VERSION],
@@ -206,14 +197,13 @@ AC_DEFUN([AX_PROG_LUA],
AC_ARG_VAR([LUA], [The Lua interpreter, e.g. /usr/bin/lua5.1])
dnl Find a Lua interpreter.
- AM_COND_IF([LUAJIT],
- [_ax_lua_interpreter_list='luajit luajit-2.1.0-beta3 luajit-2.0.5 luajit-2.0.4 luajit-2.0.3'],
- [_ax_lua_interpreter_list='lua lua5.4 lua54 lua5.3 lua53 lua5.2 lua52 lua5.1 lua51 lua5.0 lua50'])
+ m4_define_default([_AX_LUA_INTERPRETER_LIST],
+ [lua lua5.4 lua54 lua5.3 lua53 lua5.2 lua52 lua5.1 lua51 lua50])
m4_if([$1], [],
[ dnl No version check is needed. Find any Lua interpreter.
AS_IF([test "x$LUA" = 'x'],
- [AC_PATH_PROGS([LUA], [$_ax_lua_interpreter_list], [:])])
+ [AC_PATH_PROGS([LUA], [_AX_LUA_INTERPRETER_LIST], [:])])
ax_display_LUA='lua'
AS_IF([test "x$LUA" != 'x:'],
@@ -252,7 +242,7 @@ AC_DEFUN([AX_PROG_LUA],
[_ax_check_text="for a Lua interpreter with version >= $1, < $2"])
AC_CACHE_CHECK([$_ax_check_text],
[ax_cv_pathless_LUA],
- [ for ax_cv_pathless_LUA in $_ax_lua_interpreter_list none; do
+ [ for ax_cv_pathless_LUA in _AX_LUA_INTERPRETER_LIST none; do
test "x$ax_cv_pathless_LUA" = 'xnone' && break
_AX_LUA_CHK_IS_INTRP([$ax_cv_pathless_LUA], [], [continue])
_AX_LUA_CHK_VER([$ax_cv_pathless_LUA], [$1], [$2], [break])
@@ -285,18 +275,6 @@ AC_DEFUN([AX_PROG_LUA],
AC_SUBST([LUA_VERSION], [$ax_cv_lua_version])
AC_SUBST([LUA_SHORT_VERSION], [`echo "$LUA_VERSION" | $SED 's|\.||'`])
- AM_COND_IF([LUAJIT], [
- AC_CACHE_CHECK([for $ax_display_LUA jit version], [ax_cv_luajit_version],
- [ ax_cv_luajit_version=[`$LUA -e '
- local _, _, ver = string.find(jit and jit.version, "(%d+%..+)")
- print(ver or "")'`]
- ])
- AS_IF([test "x$ax_cv_luajit_version" = 'x'],
- [AC_MSG_ERROR([invalid Lua jit version number])])
- AC_SUBST([LUAJIT_VERSION], [$ax_cv_luajit_version])
- AC_SUBST([LUAJIT_SHORT_VERSION], [$(echo "$LUAJIT_VERSION" | $SED 's|\.|§|;s|\..*||;s|§|.|')])
- ])
-
dnl The following check is not supported:
dnl At times (like when building shared libraries) you may want to know
dnl which OS platform Lua thinks this is.
@@ -486,50 +464,33 @@ AC_DEFUN([AX_LUA_HEADERS],
AC_MSG_ERROR([cannot check Lua headers without knowing LUA_VERSION])
])
- AM_COND_IF([LUAJIT],[
- dnl Check for LUAJIT_VERSION.
- AC_MSG_CHECKING([if LUAJIT_VERSION is defined])
- AS_IF([test "x$LUAJIT_VERSION" != 'x'],
- [AC_MSG_RESULT([yes])],
- [ AC_MSG_RESULT([no])
- AC_MSG_ERROR([cannot check Lua jit headers without knowing LUAJIT_VERSION])
- ])
- ])
-
dnl Make LUA_INCLUDE a precious variable.
AC_ARG_VAR([LUA_INCLUDE], [The Lua includes, e.g. -I/usr/include/lua5.1])
- dnl Some default directories to search.
- AM_COND_IF([LUAJIT],
- [_ax_lua_include_list="
- /usr/include/luajit-$LUAJIT_VERSION
- /usr/include/luajit-$LUAJIT_SHORT_VERSION
- /usr/local/include/luajit-$LUAJIT_VERSION
- /usr/local/include/luajit-$LUAJIT_SHORT_VERSION"],
- [_ax_lua_include_list="
- /usr/include/lua$LUA_VERSION
- /usr/include/lua-$LUA_VERSION
- /usr/include/lua/$LUA_VERSION
- /usr/include/lua$LUA_SHORT_VERSION
- /usr/local/include/lua$LUA_VERSION
- /usr/local/include/lua-$LUA_VERSION
- /usr/local/include/lua/$LUA_VERSION
- /usr/local/include/lua$LUA_SHORT_VERSION"])
+ dnl Some default directories to search.
+ LUA_SHORT_VERSION=`echo "$LUA_VERSION" | $SED 's|\.||'`
+ m4_define_default([_AX_LUA_INCLUDE_LIST],
+ [ /usr/include/lua$LUA_VERSION \
+ /usr/include/lua-$LUA_VERSION \
+ /usr/include/lua/$LUA_VERSION \
+ /usr/include/lua$LUA_SHORT_VERSION \
+ /usr/local/include/lua$LUA_VERSION \
+ /usr/local/include/lua-$LUA_VERSION \
+ /usr/local/include/lua/$LUA_VERSION \
+ /usr/local/include/lua$LUA_SHORT_VERSION \
+ ])
dnl Try to find the headers.
_ax_lua_saved_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $LUA_INCLUDE"
AC_CHECK_HEADERS([lua.h lualib.h lauxlib.h luaconf.h])
- AM_COND_IF([LUAJIT], [AC_CHECK_HEADERS([luajit.h])])
CPPFLAGS=$_ax_lua_saved_cppflags
dnl Try some other directories if LUA_INCLUDE was not set.
AS_IF([test "x$LUA_INCLUDE" = 'x' &&
- test "x$ac_cv_header_lua_h" != 'xyes' ||
- test "x$with_luajit" != 'xno' &&
- test "x$ac_cv_header_luajit_h" != 'xyes'],
+ test "x$ac_cv_header_lua_h" != 'xyes'],
[ dnl Try some common include paths.
- for _ax_include_path in $_ax_lua_include_list; do
+ for _ax_include_path in _AX_LUA_INCLUDE_LIST; do
test ! -d "$_ax_include_path" && continue
AC_MSG_CHECKING([for Lua headers in])
@@ -539,12 +500,10 @@ AC_DEFUN([AX_LUA_HEADERS],
AS_UNSET([ac_cv_header_lualib_h])
AS_UNSET([ac_cv_header_lauxlib_h])
AS_UNSET([ac_cv_header_luaconf_h])
- AS_UNSET([ac_cv_header_luajit_h])
_ax_lua_saved_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$_ax_include_path"
AC_CHECK_HEADERS([lua.h lualib.h lauxlib.h luaconf.h])
- AM_COND_IF([LUAJIT], [AC_CHECK_HEADERS([luajit.h])])
CPPFLAGS=$_ax_lua_saved_cppflags
AS_IF([test "x$ac_cv_header_lua_h" = 'xyes'],
@@ -662,26 +621,16 @@ AC_DEFUN([AX_LUA_LIBS],
dnl Try to find the Lua libs.
_ax_lua_saved_libs=$LIBS
LIBS="$LIBS $LUA_LIB"
- AM_COND_IF([LUAJIT],
- [AC_SEARCH_LIBS([lua_load],
- [ luajit$LUA_VERSION \
- luajit$LUA_SHORT_VERSION \
- luajit-$LUA_VERSION \
- luajit-$LUA_SHORT_VERSION \
- luajit],
- [_ax_found_lua_libs='yes'],
- [_ax_found_lua_libs='no'],
- [$_ax_lua_extra_libs])],
- [AC_SEARCH_LIBS([lua_load],
- [ lua$LUA_VERSION \
- lua$LUA_SHORT_VERSION \
- lua-$LUA_VERSION \
- lua-$LUA_SHORT_VERSION \
- lua \
- ],
- [_ax_found_lua_libs='yes'],
- [_ax_found_lua_libs='no'],
- [$_ax_lua_extra_libs])])
+ AC_SEARCH_LIBS([lua_load],
+ [ lua$LUA_VERSION \
+ lua$LUA_SHORT_VERSION \
+ lua-$LUA_VERSION \
+ lua-$LUA_SHORT_VERSION \
+ lua \
+ ],
+ [_ax_found_lua_libs='yes'],
+ [_ax_found_lua_libs='no'],
+ [$_ax_lua_extra_libs])
LIBS=$_ax_lua_saved_libs
AS_IF([test "x$ac_cv_search_lua_load" != 'xno' &&
|
