You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2017/07/04 20:49:53 UTC
svn commit: r1800819 - /httpd/httpd/trunk/modules/lua/config.m4
Author: rjung
Date: Tue Jul 4 20:49:53 2017
New Revision: 1800819
URL: http://svn.apache.org/viewvc?rev=1800819&view=rev
Log:
Mostly revert the configure compat check for
lua from r1785753. This should now no longer
be needed.
Modified:
httpd/httpd/trunk/modules/lua/config.m4
Modified: httpd/httpd/trunk/modules/lua/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/config.m4?rev=1800819&r1=1800818&r2=1800819&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/config.m4 (original)
+++ httpd/httpd/trunk/modules/lua/config.m4 Tue Jul 4 20:49:53 2017
@@ -12,47 +12,19 @@ AC_DEFUN([CHECK_LUA_PATH], [dnl
AC_MSG_CHECKING([for lua.h in $1/$2])
if test -f $1/$2/lua.h; then
AC_MSG_RESULT([yes])
-
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
- save_LIBS=$LIBS
-
CFLAGS="$CFLAGS"
LDFLAGS="-L$1/$3 $LDFLAGS $lib_m"
-
AC_CHECK_LIB($4, luaL_newstate, [
- dnl mod_lua relies on some compatibility APIs to function.
- AC_MSG_CHECKING([for luaL_register in -l$4])
- CFLAGS="$CFLAGS -I$1/$2"
- LIBS="-l$4"
- AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[
- #define LUA_COMPAT_ALL
- #define LUA_COMPAT_5_2
- #define LUA_COMPAT_5_1
- #define LUA_COMPAT_MODULE
-
- #include <lua.h>
- #include <lauxlib.h>
- ]], [[
- /* This isn't a valid call, but we're testing linkability */
- luaL_register(NULL, NULL, NULL);
- ]])
- ], [
- AC_MSG_RESULT([yes])
- LUA_LIBS="-L$1/$3 -l$4 $lib_m"
- if test "x$ap_platform_runtime_link_flag" != "x"; then
- APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$1/$3])
- fi
- LUA_CFLAGS="-I$1/$2"
- ], [
- AC_MSG_RESULT([no])
- ])
+ LUA_LIBS="-L$1/$3 -l$4 $lib_m"
+ if test "x$ap_platform_runtime_link_flag" != "x"; then
+ APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$1/$3])
+ fi
+ LUA_CFLAGS="-I$1/$2"
])
-
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
- LIBS=$save_LIBS
if test -n "${LUA_LIBS}"; then
break