github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace obsolete macros

Browse Source
This commit is contained in:
Ervin Hegedus 2024-02-25 22:01:07 +01:00
parent 985cb946cc
commit d0f3cf1389
No known key found for this signature in database
GPG Key ID: 5FA5BC3F5EC41F61
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
build/lua.m4
View File

@ -192,29 +192,30 @@ AC_DEFUN([CHECK_FOR_LUA_AT], [
LUA_DISPLAY="${lua_lib_file}, ${lua_inc_path}" LUA_DISPLAY="${lua_lib_file}, ${lua_inc_path}"
# Double checking version from lua.h... # Double checking version from lua.h...
AC_TRY_COMPILE([ #include <lua.h>> ], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <lua.h> ],
[ #if (LUA_VERSION_NUM < 502)
return 0;
#else
#error Lua 5.1 not detected
#endif ],
[ LUA_VERSION=501 ], [ lua_5_1=0 ]
)
AC_TRY_COMPILE([ #include <lua.h> ],
[ #if (LUA_VERSION_NUM == 502) [ #if (LUA_VERSION_NUM == 502)
return 0; return 0;
#else #else
#error Lua 5.2 not detected #error Lua 5.2 not detected
#endif ], #endif ]])],
[ LUA_VERSION=502 ], [ lua_5_2=0 ] [ LUA_VERSION=502 ], [ lua_5_2=0 ]
) )
AC_TRY_COMPILE([ #include <lua.h> ],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <lua.h> ],
[ #if (LUA_VERSION_NUM == 502)
return 0;
#else
#error Lua 5.2 not detected
#endif ]])],
[ LUA_VERSION=502 ], [ lua_5_2=0 ]
)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <lua.h> ],
[ #if (LUA_VERSION_NUM == 504) [ #if (LUA_VERSION_NUM == 504)
return 0; return 0;
#else #else
#error Lua 5.4 not detected #error Lua 5.4 not detected
#endif ], #endif ]])],
[ LUA_VERSION=504 ], [ lua_5_4=0 ] [ LUA_VERSION=504 ], [ lua_5_4=0 ]
) )

8
build/pcre.m4
View File

@ -77,9 +77,11 @@ else
CFLAGS="${PCRE_CFLAGS} ${CFLAGS}" CFLAGS="${PCRE_CFLAGS} ${CFLAGS}"
LDFLAGS="${PCRE_LDADD} ${LDFLAGS}" LDFLAGS="${PCRE_LDADD} ${LDFLAGS}"
LIBS="${PCRE_LDADD} ${LIBS}" LIBS="${PCRE_LDADD} ${LIBS}"
AC_TRY_LINK([ #include <pcre.h> ], AC_LINK_IFELSE(
[ pcre_jit_exec(NULL, NULL, NULL, 0, 0, 0, NULL, 0, NULL); ], [AC_LANG_PROGRAM([[ #include <pcre.h> ]],
[ pcre_jit_available=yes ], [:] [[ pcre_jit_exec(NULL, NULL, NULL, 0, 0, 0, NULL, 0, NULL); ]])],
[ pcre_jit_available=yes ],
[:]
) )
if test "x$pcre_jit_available" = "xyes"; then if test "x$pcre_jit_available" = "xyes"; then

3
configure.ac
View File

@ -137,7 +137,6 @@ AM_CONDITIONAL([PCRE2_CFLAGS], [test "PCRE2_CFLAGS" != ""])
# Checks for header files. # Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([string]) AC_CHECK_HEADERS([string])
AC_CHECK_HEADERS([iostream]) AC_CHECK_HEADERS([iostream])
AC_CHECK_HEADERS([sys/utsname.h]) AC_CHECK_HEADERS([sys/utsname.h])
@ -304,7 +303,7 @@ fi
if test $buildParser = true; then if test $buildParser = true; then
AC_PROG_YACC AC_PROG_YACC
AC_PROG_LEX AC_PROG_LEX(noyywrap)
AC_PATH_PROG([FLEX], [flex]) AC_PATH_PROG([FLEX], [flex])
test "x$FLEX" = "x" && AC_MSG_ERROR([flex is needed to build ModSecurity]) test "x$FLEX" = "x" && AC_MSG_ERROR([flex is needed to build ModSecurity])