diff options
| author | Rainer Jung <rjung@apache.org> | 2017-07-04 22:49:53 +0200 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2017-07-04 22:49:53 +0200 |
| commit | 4b3557a8e97498358a0c0b7b54ddaeb06e6f491b (patch) | |
| tree | 91138ff90898734983367e6393703212239cd941 | |
| parent | Fix last compat issue with Lua 5.2 and 5.3. (diff) | |
| download | apache2-4b3557a8e97498358a0c0b7b54ddaeb06e6f491b.tar.xz apache2-4b3557a8e97498358a0c0b7b54ddaeb06e6f491b.zip | |
Mostly revert the configure compat check for
lua from r1785753. This should now no longer
be needed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800819 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | modules/lua/config.m4 | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/modules/lua/config.m4 b/modules/lua/config.m4 index 1c20bee63f..73d4f8aabe 100644 --- a/modules/lua/config.m4 +++ b/modules/lua/config.m4 @@ -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 |