mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-09-29 19:24:29 +03:00
Merge 2.5.x build changes back to trunk.
This commit is contained in:
b1v1r
@@ -4,10 +4,11 @@ dnl Sets:
|
||||
dnl LUA_CFLAGS
|
||||
dnl LUA_LIBS
|
||||
|
||||
LUA_CONFIG="pkg-config"
|
||||
LUA_PKGNAMES="lua5.1 lua5 lua"
|
||||
LUA_CONFIG=""
|
||||
LUA_CFLAGS=""
|
||||
LUA_LIBS=""
|
||||
LUA_CONFIG=pkg-config
|
||||
LUA_PKGNAMES="lua5.1 lua-5.1 lua_5.1 lua-51 lua_51 lua51 lua5 lua"
|
||||
LUA_SONAMES="so la sl dll dylib"
|
||||
|
||||
AC_DEFUN([CHECK_LUA],
|
||||
@@ -15,146 +16,154 @@ AC_DEFUN([CHECK_LUA],
|
||||
|
||||
AC_ARG_WITH(
|
||||
lua,
|
||||
[AC_HELP_STRING([--with-lua=PATH],[Path to the lua prefix])],
|
||||
lua_path="$withval",
|
||||
:)
|
||||
[AC_HELP_STRING([--with-lua=PATH],[Path to lua prefix or config script])],
|
||||
[test_paths="${with_lua}"],
|
||||
[test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr"; ])
|
||||
|
||||
if test "${lua_path}" != "no"; then
|
||||
dnl # Determine lua lib directory
|
||||
if test -z "${lua_path}"; then
|
||||
test_paths="/usr /usr/local /opt"
|
||||
else
|
||||
test_paths="${lua_path}"
|
||||
AC_MSG_CHECKING([for liblua config script])
|
||||
|
||||
for x in ${test_paths}; do
|
||||
dnl # Determine if the script was specified and use it directly
|
||||
if test ! -d "$x" -a -e "$x"; then
|
||||
LUA_CONFIG="$x"
|
||||
break
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for pkg-config script for lua library])
|
||||
for x in ${test_paths}; do
|
||||
if test -e "${x}/bin/${LUA_CONFIG}"; then
|
||||
with_lua="${x}/bin"
|
||||
dnl # Try known config script names/locations
|
||||
for y in $LUA_CONFIG; do
|
||||
if test -e "${x}/bin/${y}"; then
|
||||
LUA_CONFIG="${x}/bin/${y}"
|
||||
lua_config="${LUA_CONFIG}"
|
||||
break
|
||||
elif test -e "${x}/${y}"; then
|
||||
LUA_CONFIG="${x}/${y}"
|
||||
lua_config="${LUA_CONFIG}"
|
||||
break
|
||||
else
|
||||
with_lua=""
|
||||
fi
|
||||
done
|
||||
if test -n "${with_lua}"; then
|
||||
LUA_CONFIG="${with_lua}/${LUA_CONFIG}"
|
||||
for LUA_PKGNAME in ${LUA_PKGNAMES}; do
|
||||
if ${LUA_CONFIG} --exists ${LUA_PKGNAME}; then
|
||||
break
|
||||
fi
|
||||
LUA_PKGNAME=""
|
||||
done
|
||||
if test -n "$LUA_PKGNAME"; then
|
||||
AC_MSG_RESULT([${LUA_CONFIG} ${LUA_PKGNAME}])
|
||||
LUA_CFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --cflags`"
|
||||
LUA_LIBS="`${LUA_CONFIG} ${LUA_PKGNAME} --libs`"
|
||||
CFLAGS=$save_CFLAGS
|
||||
LDFLAGS=$save_LDFLAGS
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
if test -n "${lua_config}"; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
dnl # Try known package names
|
||||
if test -n "${LUA_CONFIG}"; then
|
||||
LUA_PKGNAME=""
|
||||
for x in ${LUA_PKGNAMES}; do
|
||||
if ${LUA_CONFIG} --exists ${x}; then
|
||||
LUA_PKGNAME="$x"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
if test -n "${LUA_PKGNAME}"; then
|
||||
AC_MSG_RESULT([${LUA_CONFIG}])
|
||||
LUA_CFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --cflags`"
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(lua CFLAGS: $LUA_CFLAGS); fi
|
||||
LUA_LIBS="`${LUA_CONFIG} ${LUA_PKGNAME} --libs`"
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(lua LIBS: $LUA_LIBS); fi
|
||||
CFLAGS=$save_CFLAGS
|
||||
LDFLAGS=$save_LDFLAGS
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
|
||||
dnl Hack to just try to find the lib and include
|
||||
AC_MSG_CHECKING([for lua install])
|
||||
for x in ${test_paths}; do
|
||||
for y in ${LUA_SONAMES}; do
|
||||
if test -e "${x}/liblua5.1.${y}"; then
|
||||
lua_lib_path="${x}"
|
||||
lua_lib_name="lua5.1"
|
||||
break
|
||||
elif test -e "${x}/lib/liblua5.1.${y}"; then
|
||||
lua_lib_path="${x}/lib"
|
||||
lua_lib_name="lua5.1"
|
||||
break
|
||||
elif test -e "${x}/lib64/liblua5.1.${y}"; then
|
||||
lua_lib_path="${x}/lib64"
|
||||
lua_lib_name="lua5.1"
|
||||
break
|
||||
elif test -e "${x}/lib32/liblua5.1.${y}"; then
|
||||
lua_lib_path="${x}/lib32"
|
||||
lua_lib_name="lua5.1"
|
||||
break
|
||||
elif test -e "${x}/liblua51.${y}"; then
|
||||
lua_lib_path="${x}"
|
||||
lua_lib_name="lua51"
|
||||
break
|
||||
elif test -e "${x}/lib/liblua51.${y}"; then
|
||||
lua_lib_path="${x}/lib"
|
||||
lua_lib_name="lua51"
|
||||
break
|
||||
elif test -e "${x}/lib64/liblua51.${y}"; then
|
||||
lua_lib_path="${x}/lib64"
|
||||
lua_lib_name="lua51"
|
||||
break
|
||||
elif test -e "${x}/lib32/liblua51.${y}"; then
|
||||
lua_lib_path="${x}/lib32"
|
||||
lua_lib_name="lua51"
|
||||
break
|
||||
elif test -e "${x}/liblua.${y}"; then
|
||||
lua_lib_path="${x}"
|
||||
lua_lib_name="lua"
|
||||
break
|
||||
elif test -e "${x}/lib/liblua.${y}"; then
|
||||
lua_lib_path="${x}/lib"
|
||||
lua_lib_name="lua"
|
||||
break
|
||||
elif test -e "${x}/lib64/liblua.${y}"; then
|
||||
lua_lib_path="${x}/lib64"
|
||||
lua_lib_name="lua"
|
||||
break
|
||||
elif test -e "${x}/lib32/liblua.${y}"; then
|
||||
lua_lib_path="${x}/lib32"
|
||||
lua_lib_name="lua"
|
||||
break
|
||||
else
|
||||
lua_lib_path=""
|
||||
lua_lib_name=""
|
||||
fi
|
||||
done
|
||||
if test -n "$lua_lib_path"; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
for x in ${test_paths}; do
|
||||
if test -e "${x}/include/lua.h"; then
|
||||
lua_inc_path="${x}/include"
|
||||
break
|
||||
elif test -e "${x}/lua.h"; then
|
||||
lua_inc_path="${x}"
|
||||
break
|
||||
fi
|
||||
|
||||
dnl # Check some sub-paths as well
|
||||
for lua_pkg_name in ${lua_lib_name} ${LUA_PKGNAMES}; do
|
||||
if test -e "${x}/include/${lua_pkg_name}/lua.h"; then
|
||||
lua_inc_path="${x}/include"
|
||||
break
|
||||
elif test -e "${x}/${lua_pkg_name}/lua.h"; then
|
||||
lua_inc_path="${x}"
|
||||
break
|
||||
else
|
||||
lua_inc_path=""
|
||||
fi
|
||||
done
|
||||
if test -n "$lua_inc_path"; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -n "${lua_lib_path}" -a -n "${lua_inc_path}"; then
|
||||
LUA_CONFIG=""
|
||||
AC_MSG_RESULT([${lua_lib_path} ${lua_inc_path}])
|
||||
LUA_CFLAGS="-I${lua_inc_path}"
|
||||
LUA_LIBS="-L${lua_lib_path} -l${lua_lib_name}"
|
||||
CFLAGS=$save_CFLAGS
|
||||
LDFLAGS=$save_LDFLAGS
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
|
||||
dnl Hack to just try to find the lib and include
|
||||
AC_MSG_CHECKING([for lua install])
|
||||
for x in ${test_paths}; do
|
||||
for y in ${LUA_SONAMES}; do
|
||||
if test -e "${x}/liblua5.1.${y}"; then
|
||||
with_lua_lib="${x}"
|
||||
lua_lib_name="lua5.1"
|
||||
break
|
||||
elif test -e "${x}/lib/liblua5.1.${y}"; then
|
||||
with_lua_lib="${x}/lib"
|
||||
lua_lib_name="lua5.1"
|
||||
break
|
||||
elif test -e "${x}/lib64/liblua5.1.${y}"; then
|
||||
with_lua_lib="${x}/lib64"
|
||||
lua_lib_name="lua5.1"
|
||||
break
|
||||
elif test -e "${x}/lib32/liblua5.1.${y}"; then
|
||||
with_lua_lib="${x}/lib32"
|
||||
lua_lib_name="lua5.1"
|
||||
break
|
||||
elif test -e "${x}/liblua51.${y}"; then
|
||||
with_lua_lib="${x}"
|
||||
lua_lib_name="lua51"
|
||||
break
|
||||
elif test -e "${x}/lib/liblua51.${y}"; then
|
||||
with_lua_lib="${x}/lib"
|
||||
lua_lib_name="lua51"
|
||||
break
|
||||
elif test -e "${x}/lib64/liblua51.${y}"; then
|
||||
with_lua_lib="${x}/lib64"
|
||||
lua_lib_name="lua51"
|
||||
break
|
||||
elif test -e "${x}/lib32/liblua51.${y}"; then
|
||||
with_lua_lib="${x}/lib32"
|
||||
lua_lib_name="lua51"
|
||||
break
|
||||
elif test -e "${x}/liblua.${y}"; then
|
||||
with_lua_lib="${x}"
|
||||
lua_lib_name="lua"
|
||||
break
|
||||
elif test -e "${x}/lib/liblua.${y}"; then
|
||||
with_lua_lib="${x}/lib"
|
||||
lua_lib_name="lua"
|
||||
break
|
||||
elif test -e "${x}/lib64/liblua.${y}"; then
|
||||
with_lua_lib="${x}/lib64"
|
||||
lua_lib_name="lua"
|
||||
break
|
||||
elif test -e "${x}/lib32/liblua.${y}"; then
|
||||
with_lua_lib="${x}/lib32"
|
||||
lua_lib_name="lua"
|
||||
break
|
||||
else
|
||||
with_lua_lib=""
|
||||
lua_lib_name=""
|
||||
fi
|
||||
done
|
||||
if test -n "$with_lua_lib"; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
for x in ${test_paths}; do
|
||||
if test -e "${x}/include/lua.h"; then
|
||||
with_lua_inc="${x}/include"
|
||||
break
|
||||
elif test -e "${x}/lua.h"; then
|
||||
with_lua_inc="${x}"
|
||||
break
|
||||
fi
|
||||
|
||||
dnl # Check some sub-paths as well
|
||||
for lua_pkg_name in ${lua_lib_name} ${LUA_PKGNAMES}; do
|
||||
if test -e "${x}/include/${lua_pkg_name}/lua.h"; then
|
||||
with_lua_inc="${x}/include"
|
||||
break
|
||||
elif test -e "${x}/${lua_pkg_name}/lua.h"; then
|
||||
with_lua_inc="${x}"
|
||||
break
|
||||
else
|
||||
with_lua_inc=""
|
||||
fi
|
||||
done
|
||||
if test -n "$with_lua_inc"; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -n "${with_lua_lib}" -a -n "${with_lua_inc}"; then
|
||||
LUA_CONFIG=""
|
||||
AC_MSG_RESULT([${with_lua_lib} ${with_lua_inc}])
|
||||
LUA_CFLAGS="-I${with_lua_inc}"
|
||||
LUA_LIBS="-L${with_lua_lib} -l${lua_lib_name}"
|
||||
CFLAGS=$save_CFLAGS
|
||||
LDFLAGS=$save_LDFLAGS
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
fi
|
||||
else
|
||||
AC_MSG_NOTICE([not using optional lua library])
|
||||
fi
|
||||
|
||||
if test -n "${LUA_LIBS}"; then
|
||||
@@ -164,7 +173,7 @@ fi
|
||||
AC_SUBST(LUA_LIBS)
|
||||
AC_SUBST(LUA_CFLAGS)
|
||||
|
||||
if test "${lua_path}" != "no"; then
|
||||
if test "${with_path}" != "no"; then
|
||||
if test -z "${LUA_LIBS}"; then
|
||||
ifelse([$2], , AC_MSG_NOTICE([optional lua library not found]), $2)
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user