Skip to content

Commit 9ed2a74

Browse files
authored
Merge pull request #13 from rylieb/master
Add Lua 5.4 compatibility to configure and configure.ac.
2 parents 73b2cb0 + f187473 commit 9ed2a74

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3914,7 +3914,7 @@ return luaopen_utf8 ();
39143914
return 0;
39153915
}
39163916
_ACEOF
3917-
for ac_lib in '' lua-5.3 lua5.3 lua; do
3917+
for ac_lib in '' lua-5.4 lua5.4 lua-5.3 lua5.3 lua; do
39183918
if test -z "$ac_lib"; then
39193919
ac_res="none required"
39203920
else
@@ -4243,7 +4243,7 @@ fi
42434243
42444244
42454245
# Checks for header files.
4246-
for ac_header in lua5.3/lua.h lua53/lua.h lua.h
4246+
for ac_header in lua5.4/lua.h lua54/lua.h lua5.3/lua.h lua53/lua.h lua.h
42474247
do :
42484248
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
42494249
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ AC_SUBST([LIBUTIL])
7676
AC_SUBST([LIBWS2_32])
7777
AC_SEARCH_LIBS([pow], [m],
7878
[AS_IF([test -n "$ac_lib"], [LIBM=-l$ac_lib])])
79-
AC_SEARCH_LIBS([luaopen_utf8], [lua-5.3 lua5.3 lua],
79+
AC_SEARCH_LIBS([luaopen_utf8], [lua-5.4 lua5.4 lua-5.3 lua5.3 lua],
8080
[AS_IF([test -n "$ac_lib"], [LIBLUA=-l$ac_lib])])
8181
AC_SEARCH_LIBS([libusb_init], [usb-1.0 usb],
8282
[AS_IF([test -n "$ac_lib"], [LIBUSB=-l$ac_lib])],
@@ -92,7 +92,7 @@ AC_SEARCH_LIBS([gai_strerrorA], [Ws2_32],
9292
[AS_IF([test -n "$ac_lib"], [LIBWS2_32=-l$ac_lib])])
9393

9494
# Checks for header files.
95-
AC_CHECK_HEADERS([lua5.3/lua.h lua53/lua.h lua.h])
95+
AC_CHECK_HEADERS([lua5.4/lua.h lua54/lua.h lua5.3/lua.h lua53/lua.h lua.h])
9696
AC_CHECK_HEADERS([libusb-1.0/libusb.h libusb.h])
9797
AC_CHECK_HEADERS([pty.h util.h libutil.h])
9898

0 commit comments

Comments
 (0)