VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-06 11:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Turn 5.1/5.2 order upside down, simplify. This should also (AFAIK) work with Ubuntu/Debian, which has previously been known to fail to compile mod_lua.so

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706533 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daniel Gruno
2015-10-03 09:45:20 +00:00
parent 79f5d5cfd8
commit cfabdeb78e
1 changed files with 66 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
modules/lua/config.m4
View File

@ -1,7 +1,7 @@
APACHE_MODPATH_INIT(lua)
dnl Check for Lua 5.1/5.2 Libraries
dnl Check for Lua 5.2/5.1 Libraries
dnl CHECK_LUA(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
dnl Sets:
dnl LUA_CFLAGS
@ -11,7 +11,7 @@ AC_DEFUN([CHECK_LUA],
AC_ARG_WITH(
lua,
[AC_HELP_STRING([--with-lua=PATH],[Path to the Lua 5.1/5.2 prefix])],
[AC_HELP_STRING([--with-lua=PATH],[Path to the Lua 5.2/5.1 prefix])],
lua_path="$withval",
:)
@ -25,92 +25,6 @@ fi
AC_CHECK_LIB(m, pow, lib_m="-lm")
AC_CHECK_LIB(m, sqrt, lib_m="-lm")
for x in $test_paths ; do
if test "x$x" = "x."; then
AC_CHECK_HEADER(lua.h,[
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS"
LDFLAGS="$LDFLAGS $lib_m"
AC_CHECK_LIB(lua5.1, luaL_newstate, [
LUA_LIBS="-llua5.1 $lib_m"
],[
AC_CHECK_LIB(lua-5.1, luaL_newstate, [
LUA_LIBS="-llua-5.1 $lib_m"
],[
AC_CHECK_LIB(lua, luaL_newstate, [
LUA_LIBS="-llua $lib_m"
])
])
])
LUA_CFLAGS=
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
break
])
else
AC_MSG_CHECKING([for lua.h in ${x}/include/lua-5.1])
if test -f ${x}/include/lua-5.1/lua.h; then
AC_MSG_RESULT([yes])
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS"
LDFLAGS="-L$x/lib/lua-5.1 $LDFLAGS $lib_m"
AC_CHECK_LIB(lua-5.1, luaL_newstate, [
LUA_LIBS="-L$x/lib/lua-5.1 -llua-5.1 $lib_m"
if test "x$ap_platform_runtime_link_flag" != "x"; then
APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib/lua-5.1])
fi
LUA_CFLAGS="-I$x/include/lua-5.1"
])
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
break
else
AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([for lua.h in ${x}/include/lua5.1])
if test -f ${x}/include/lua5.1/lua.h; then
AC_MSG_RESULT([yes])
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS"
LDFLAGS="-L$x/lib $LDFLAGS $lib_m"
AC_CHECK_LIB(lua5.1, luaL_newstate, [
LUA_LIBS="-L$x/lib -llua5.1 $lib_m"
if test "x$ap_platform_runtime_link_flag" != "x"; then
APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib])
fi
LUA_CFLAGS="-I$x/include/lua5.1"
])
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
break
else
AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([for lua.h in ${x}/include/lua51])
if test -f ${x}/include/lua51/lua.h; then
AC_MSG_RESULT([yes])
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS"
LDFLAGS="-L$x/lib/lua51 $LDFLAGS $lib_m"
AC_CHECK_LIB(lua, luaL_newstate, [
LUA_LIBS="-L$x/lib/lua51 -llua $lib_m"
if test "x$ap_platform_runtime_link_flag" != "x"; then
APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib/lua51])
fi
LUA_CFLAGS="-I$x/include/lua51"
])
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
break
else
AC_MSG_RESULT([no])
fi
#
# Shouldn't we look for 5.2 first??
#
AC_MSG_CHECKING([for lua.h in ${x}/include/lua-5.2])
if test -f ${x}/include/lua-5.2/lua.h; then
AC_MSG_RESULT([yes])
@ -191,20 +105,80 @@ for x in $test_paths ; do
else
AC_MSG_RESULT([no])
fi
fi
AC_MSG_CHECKING([for lua.h in ${x}/include/lua-5.1])
if test -f ${x}/include/lua-5.1/lua.h; then
AC_MSG_RESULT([yes])
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS"
LDFLAGS="-L$x/lib/lua-5.1 $LDFLAGS $lib_m"
AC_CHECK_LIB(lua-5.1, luaL_newstate, [
LUA_LIBS="-L$x/lib/lua-5.1 -llua-5.1 $lib_m"
if test "x$ap_platform_runtime_link_flag" != "x"; then
APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib/lua-5.1])
fi
LUA_CFLAGS="-I$x/include/lua-5.1"
])
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
break
else
AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([for lua.h in ${x}/include/lua5.1])
if test -f ${x}/include/lua5.1/lua.h; then
AC_MSG_RESULT([yes])
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS"
LDFLAGS="-L$x/lib $LDFLAGS $lib_m"
AC_CHECK_LIB(lua5.1, luaL_newstate, [
LUA_LIBS="-L$x/lib -llua5.1 $lib_m"
if test "x$ap_platform_runtime_link_flag" != "x"; then
APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib])
fi
LUA_CFLAGS="-I$x/include/lua5.1"
])
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
break
else
AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([for lua.h in ${x}/include/lua51])
if test -f ${x}/include/lua51/lua.h; then
AC_MSG_RESULT([yes])
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS"
LDFLAGS="-L$x/lib/lua51 $LDFLAGS $lib_m"
AC_CHECK_LIB(lua, luaL_newstate, [
LUA_LIBS="-L$x/lib/lua51 -llua $lib_m"
if test "x$ap_platform_runtime_link_flag" != "x"; then
APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib/lua51])
fi
LUA_CFLAGS="-I$x/include/lua51"
])
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
break
else
AC_MSG_RESULT([no])
fi
done
AC_SUBST(LUA_LIBS)
AC_SUBST(LUA_CFLAGS)
if test -z "${LUA_LIBS}"; then
AC_MSG_WARN([*** Lua 5.1 or 5.2 library not found.])
AC_MSG_WARN([*** Lua 5.2 or 5.1 library not found.])
ifelse([$2], ,
enable_lua="no"
if test -z "${lua_path}"; then
AC_MSG_WARN([Lua 5.1 or 5.2 library is required])
AC_MSG_WARN([Lua 5.2 or 5.1 library is required])
else
AC_MSG_ERROR([Lua 5.1 or 5.2 library is required])
AC_MSG_ERROR([Lua 5.2 or 5.1 library is required])
fi,
$2)
else