github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-30 19:47:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update configure to better find lua libs.

Browse Source
This commit is contained in:
brectanus
2008-08-18 16:00:29 +00:00
parent ab5cd92618
commit a686b0633a
2 changed files with 153 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
apache2/build/find_lua.m4
View File

@@ -8,6 +8,7 @@ LUA_CONFIG="pkg-config"
LUA_PKGNAMES="lua5.1 lua5 lua" LUA_PKGNAMES="lua5.1 lua5 lua"
LUA_CFLAGS="" LUA_CFLAGS=""
LUA_LIBS="" LUA_LIBS=""
LUA_SONAMES="so la sl dll dylib"
AC_DEFUN([CHECK_LUA], AC_DEFUN([CHECK_LUA],
[dnl [dnl
@@ -21,7 +22,7 @@ AC_ARG_WITH(
if test "${lua_path}" != "no"; then if test "${lua_path}" != "no"; then
dnl # Determine lua lib directory dnl # Determine lua lib directory
if test -z "${lua_path}"; then if test -z "${lua_path}"; then
test_paths="/usr/local /usr" test_paths="/usr /usr/local /opt"
else else
test_paths="${lua_path}" test_paths="${lua_path}"
fi fi
@@ -58,35 +59,52 @@ if test "${lua_path}" != "no"; then
dnl Hack to just try to find the lib and include dnl Hack to just try to find the lib and include
AC_MSG_CHECKING([for lua install]) AC_MSG_CHECKING([for lua install])
for x in ${test_paths}; do for x in ${test_paths}; do
if test -e "${x}/liblua5.1.a"; then for y in ${LUA_SONAMES}; do
if test -e "${x}/liblua5.1.${y}"; then
with_lua_lib="${x}" with_lua_lib="${x}"
lua_lib_name="lua5.1" lua_lib_name="lua5.1"
break break
elif test -e "${x}/lib/liblua5.1.a"; then elif test -e "${x}/lib/liblua5.1.${y}"; then
with_lua_lib="${x}/lib" with_lua_lib="${x}/lib"
lua_lib_name="lua5.1" lua_lib_name="lua5.1"
break break
elif test -e "${x}/lib64/liblua5.1.a"; then elif test -e "${x}/lib64/liblua5.1.${y}"; then
with_lua_lib="${x}/lib64" with_lua_lib="${x}/lib64"
lua_lib_name="lua5.1" lua_lib_name="lua5.1"
break break
elif test -e "${x}/lib32/liblua5.1.a"; then elif test -e "${x}/lib32/liblua5.1.${y}"; then
with_lua_lib="${x}/lib32" with_lua_lib="${x}/lib32"
lua_lib_name="lua5.1" lua_lib_name="lua5.1"
break break
elif test -e "${x}/liblua.a"; then 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}" with_lua_lib="${x}"
lua_lib_name="lua" lua_lib_name="lua"
break break
elif test -e "${x}/lib/liblua.a"; then elif test -e "${x}/lib/liblua.${y}"; then
with_lua_lib="${x}/lib" with_lua_lib="${x}/lib"
lua_lib_name="lua" lua_lib_name="lua"
break break
elif test -e "${x}/lib64/liblua.a"; then elif test -e "${x}/lib64/liblua.${y}"; then
with_lua_lib="${x}/lib64" with_lua_lib="${x}/lib64"
lua_lib_name="lua" lua_lib_name="lua"
break break
elif test -e "${x}/lib32/liblua.a"; then elif test -e "${x}/lib32/liblua.${y}"; then
with_lua_lib="${x}/lib32" with_lua_lib="${x}/lib32"
lua_lib_name="lua" lua_lib_name="lua"
break break
@@ -95,17 +113,35 @@ if test "${lua_path}" != "no"; then
lua_lib_name="" lua_lib_name=""
fi fi
done done
if test -n "$with_lua_lib"; then
break
fi
done
for x in ${test_paths}; do for x in ${test_paths}; do
if test -e "${x}/lua.h"; then 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}" with_lua_inc="${x}"
break break
elif test -e "${x}/include/lua.h"; then 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" with_lua_inc="${x}/include"
break break
elif test -e "${x}/${lua_pkg_name}/lua.h"; then
with_lua_inc="${x}"
break
else else
with_lua_inc="" with_lua_inc=""
fi fi
done done
if test -n "$with_lua_inc"; then
break
fi
done
if test -n "${with_lua_lib}" -a -n "${with_lua_inc}"; then if test -n "${with_lua_lib}" -a -n "${with_lua_inc}"; then
LUA_CONFIG="" LUA_CONFIG=""
AC_MSG_RESULT([${with_lua_lib} ${with_lua_inc}]) AC_MSG_RESULT([${with_lua_lib} ${with_lua_inc}])

57
apache2/configure vendored
View File

@@ -5178,6 +5178,7 @@ LUA_CONFIG="pkg-config"
LUA_PKGNAMES="lua5.1 lua5 lua" LUA_PKGNAMES="lua5.1 lua5 lua"
LUA_CFLAGS="" LUA_CFLAGS=""
LUA_LIBS="" LUA_LIBS=""
LUA_SONAMES="so la sl dll dylib"
@@ -5612,7 +5613,7 @@ fi
if test "${lua_path}" != "no"; then if test "${lua_path}" != "no"; then
if test -z "${lua_path}"; then if test -z "${lua_path}"; then
test_paths="/usr/local /usr" test_paths="/usr /usr/local /opt"
else else
test_paths="${lua_path}" test_paths="${lua_path}"
fi fi
@@ -5653,35 +5654,52 @@ echo "${ECHO_T}no" >&6; }
{ echo "$as_me:$LINENO: checking for lua install" >&5 { echo "$as_me:$LINENO: checking for lua install" >&5
echo $ECHO_N "checking for lua install... $ECHO_C" >&6; } echo $ECHO_N "checking for lua install... $ECHO_C" >&6; }
for x in ${test_paths}; do for x in ${test_paths}; do
if test -e "${x}/liblua5.1.a"; then for y in ${LUA_SONAMES}; do
if test -e "${x}/liblua5.1.${y}"; then
with_lua_lib="${x}" with_lua_lib="${x}"
lua_lib_name="lua5.1" lua_lib_name="lua5.1"
break break
elif test -e "${x}/lib/liblua5.1.a"; then elif test -e "${x}/lib/liblua5.1.${y}"; then
with_lua_lib="${x}/lib" with_lua_lib="${x}/lib"
lua_lib_name="lua5.1" lua_lib_name="lua5.1"
break break
elif test -e "${x}/lib64/liblua5.1.a"; then elif test -e "${x}/lib64/liblua5.1.${y}"; then
with_lua_lib="${x}/lib64" with_lua_lib="${x}/lib64"
lua_lib_name="lua5.1" lua_lib_name="lua5.1"
break break
elif test -e "${x}/lib32/liblua5.1.a"; then elif test -e "${x}/lib32/liblua5.1.${y}"; then
with_lua_lib="${x}/lib32" with_lua_lib="${x}/lib32"
lua_lib_name="lua5.1" lua_lib_name="lua5.1"
break break
elif test -e "${x}/liblua.a"; then 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}" with_lua_lib="${x}"
lua_lib_name="lua" lua_lib_name="lua"
break break
elif test -e "${x}/lib/liblua.a"; then elif test -e "${x}/lib/liblua.${y}"; then
with_lua_lib="${x}/lib" with_lua_lib="${x}/lib"
lua_lib_name="lua" lua_lib_name="lua"
break break
elif test -e "${x}/lib64/liblua.a"; then elif test -e "${x}/lib64/liblua.${y}"; then
with_lua_lib="${x}/lib64" with_lua_lib="${x}/lib64"
lua_lib_name="lua" lua_lib_name="lua"
break break
elif test -e "${x}/lib32/liblua.a"; then elif test -e "${x}/lib32/liblua.${y}"; then
with_lua_lib="${x}/lib32" with_lua_lib="${x}/lib32"
lua_lib_name="lua" lua_lib_name="lua"
break break
@@ -5690,17 +5708,34 @@ echo $ECHO_N "checking for lua install... $ECHO_C" >&6; }
lua_lib_name="" lua_lib_name=""
fi fi
done done
if test -n "$with_lua_lib"; then
break
fi
done
for x in ${test_paths}; do for x in ${test_paths}; do
if test -e "${x}/lua.h"; then 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}" with_lua_inc="${x}"
break break
elif test -e "${x}/include/lua.h"; then fi
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" with_lua_inc="${x}/include"
break break
elif test -e "${x}/${lua_pkg_name}/lua.h"; then
with_lua_inc="${x}"
break
else else
with_lua_inc="" with_lua_inc=""
fi fi
done done
if test -n "$with_lua_inc"; then
break
fi
done
if test -n "${with_lua_lib}" -a -n "${with_lua_inc}"; then if test -n "${with_lua_lib}" -a -n "${with_lua_inc}"; then
LUA_CONFIG="" LUA_CONFIG=""
{ echo "$as_me:$LINENO: result: ${with_lua_lib} ${with_lua_inc}" >&5 { echo "$as_me:$LINENO: result: ${with_lua_lib} ${with_lua_inc}" >&5