mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-14 05:45:59 +03:00
Merge 9acd950415de64793ae61c1a04f5710a82050276 into 31507404e6a6c0da46a85b478301fc73b8c202d4
This commit is contained in:
commit
d6dd9f0386
22
build/lua.m4
22
build/lua.m4
@ -6,7 +6,7 @@ AC_DEFUN([CHECK_LUA],
|
|||||||
[dnl
|
[dnl
|
||||||
|
|
||||||
# Possible names for the lua library/package (pkg-config)
|
# Possible names for the lua library/package (pkg-config)
|
||||||
LUA_POSSIBLE_LIB_NAMES="lua54 lua5.4 lua-5.4 lua53 lua5.3 lua-5.3 lua52 lua5.2 lua-5.2 lua51 lua5.1 lua-5.1 lua"
|
LUA_POSSIBLE_LIB_NAMES="lua54 lua5.4 lua-5.4 lua53 lua5.3 lua-5.3 lua52 lua5.2 lua-5.2 lua51 lua5.1 lua-5.1 luajit-5.1 luajit lua"
|
||||||
|
|
||||||
# Possible extensions for the library
|
# Possible extensions for the library
|
||||||
LUA_POSSIBLE_EXTENSIONS="so la sl dll dylib"
|
LUA_POSSIBLE_EXTENSIONS="so la sl dll dylib"
|
||||||
@ -37,13 +37,6 @@ else
|
|||||||
else
|
else
|
||||||
LUA_MANDATORY=no
|
LUA_MANDATORY=no
|
||||||
fi
|
fi
|
||||||
for x in ${LUA_POSSIBLE_PATHS}; do
|
|
||||||
CHECK_FOR_LUA_AT(${x})
|
|
||||||
if test -n "${LUA_CFLAGS}"; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "${LUA_CFLAGS}"; then
|
|
||||||
# Trying to figure out the version using pkg-config...
|
# Trying to figure out the version using pkg-config...
|
||||||
if test -n "${PKG_CONFIG}"; then
|
if test -n "${PKG_CONFIG}"; then
|
||||||
LUA_PKG_NAME=""
|
LUA_PKG_NAME=""
|
||||||
@ -63,15 +56,22 @@ else
|
|||||||
LUA_LDFLAGS="`${PKG_CONFIG} ${LUA_PKG_NAME} --libs-only-L --libs-only-other`"
|
LUA_LDFLAGS="`${PKG_CONFIG} ${LUA_PKG_NAME} --libs-only-L --libs-only-other`"
|
||||||
LUA_DISPLAY="${LUA_LDADD}, ${LUA_CFLAGS}"
|
LUA_DISPLAY="${LUA_LDADD}, ${LUA_CFLAGS}"
|
||||||
case $LUA_PKG_VERSION in
|
case $LUA_PKG_VERSION in
|
||||||
(5.1*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;;
|
|
||||||
(5.2*) LUA_CFLAGS="-DWITH_LUA_5_2 ${LUA_CFLAGS}" ; lua_5_2=1 ;;
|
|
||||||
(5.3*) LUA_CFLAGS="-DWITH_LUA_5_3 ${LUA_CFLAGS}" ; lua_5_3=1 ;;
|
|
||||||
(5.4*) LUA_CFLAGS="-DWITH_LUA_5_4 ${LUA_CFLAGS}" ; lua_5_4=1 ;;
|
(5.4*) LUA_CFLAGS="-DWITH_LUA_5_4 ${LUA_CFLAGS}" ; lua_5_4=1 ;;
|
||||||
|
(5.3*) LUA_CFLAGS="-DWITH_LUA_5_3 ${LUA_CFLAGS}" ; lua_5_3=1 ;;
|
||||||
|
(5.2*) LUA_CFLAGS="-DWITH_LUA_5_2 ${LUA_CFLAGS}" ; lua_5_2=1 ;;
|
||||||
|
(5.1*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;;
|
||||||
(2.0*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;;
|
(2.0*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;;
|
||||||
(2.1*) LUA_CFLAGS="-DWITH_LUA_5_1 -DWITH_LUA_JIT_2_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;;
|
(2.1*) LUA_CFLAGS="-DWITH_LUA_5_1 -DWITH_LUA_JIT_2_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;;
|
||||||
esac
|
esac
|
||||||
AC_MSG_NOTICE([LUA pkg-config version: ${LUA_PKG_VERSION}])
|
AC_MSG_NOTICE([LUA pkg-config version: ${LUA_PKG_VERSION}])
|
||||||
fi
|
fi
|
||||||
|
if test -z "${LUA_CFLAGS}"; then
|
||||||
|
for x in ${LUA_POSSIBLE_PATHS}; do
|
||||||
|
CHECK_FOR_LUA_AT(${x})
|
||||||
|
if test -n "${LUA_CFLAGS}"; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user