From 6375797935d555fc10ffd02d3cecd3d175079b7e Mon Sep 17 00:00:00 2001 From: ste7677 Date: Wed, 1 Aug 2018 09:06:40 +0200 Subject: [PATCH 1/3] Update find_libmodsec.m4 Previous version can never find libmodsecurity, even if correct patch is specified. Fixed it now. Note that line 5 "defaults to /usr/local/modsecurity/" also has been changed to "defaults to /usr/local/modsecurity" (without trailing slash. --- build/find_libmodsec.m4 | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/build/find_libmodsec.m4 b/build/find_libmodsec.m4 index 2a6c82d..71adf96 100644 --- a/build/find_libmodsec.m4 +++ b/build/find_libmodsec.m4 @@ -4,7 +4,7 @@ AC_MSG_NOTICE(looking for libmodsecurity) # Check if the user provided --with-libmodsecurity AC_ARG_WITH(libmodsecurity, [AS_HELP_STRING([[--with-libmodsecurity=FILE]], - [FILE is the path to libmodsecurity install dir; defaults to "/usr/local/modsecurity/".])], + [FILE is the path to libmodsecurity install dir; defaults to "/usr/local/modsecurity".])], [ if test "$withval" = "yes"; then V3PATH=/usr/local/modsecurity/ @@ -13,27 +13,39 @@ AC_ARG_WITH(libmodsecurity, fi ]) +# --with-libmodsecurity=/my/absolute/path is provided, +# do some checks +if test -n "$V3PATH"; then + if test -f "$V3PATH/lib/libmodsecurity.so"; then + V3LIB="$V3PATH/lib/" + fi + if test -f "$V3PATH/include/modsecurity/modsecurity.h"; then + V3INCLUDE="$V3PATH/include/" + fi +fi + +# --with-libmodsecurity= is set to empty, +# do some blind guessing if test -z "$V3PATH"; then for i in /usr/local/modsecurity/ \ /usr/local/sbin \ /usr/local/bin \ /usr/sbin \ - /usr/bin; + /usr/bin \ + /usr do if test -f "$i/lib/libmodsecurity.so"; then V3LIB="$i/lib/" fi if test -f "$i/include/modsecurity/modsecurity.h"; then V3INCLUDE="$i/include/" - # TODO: test if V3LIB is set - break fi done fi + if test -n "$V3LIB" -a "$V3LIB" != "no" -a -x "$V3LIB" ; then AC_MSG_NOTICE(found libmodsecurity at $V3LIB) else AC_MSG_ERROR(couldn't find libmodsecurity) fi ]) - From 513fbc622bbd23ce9263653f3994a6672c972b16 Mon Sep 17 00:00:00 2001 From: ste7677 Date: Wed, 1 Aug 2018 09:16:57 +0200 Subject: [PATCH 2/3] remove trailing slash in line 10 --- build/find_libmodsec.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/find_libmodsec.m4 b/build/find_libmodsec.m4 index 71adf96..4d34549 100644 --- a/build/find_libmodsec.m4 +++ b/build/find_libmodsec.m4 @@ -7,7 +7,7 @@ AC_ARG_WITH(libmodsecurity, [FILE is the path to libmodsecurity install dir; defaults to "/usr/local/modsecurity".])], [ if test "$withval" = "yes"; then - V3PATH=/usr/local/modsecurity/ + V3PATH=/usr/local/modsecurity else V3PATH="$withval" fi From a1346799ccfab6ffac5b3413a571cdad5d2b247d Mon Sep 17 00:00:00 2001 From: ste7677 Date: Wed, 1 Aug 2018 10:04:29 +0200 Subject: [PATCH 3/3] Fix trailing slash in line 30 --- build/find_libmodsec.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/find_libmodsec.m4 b/build/find_libmodsec.m4 index 4d34549..54d84f9 100644 --- a/build/find_libmodsec.m4 +++ b/build/find_libmodsec.m4 @@ -7,7 +7,7 @@ AC_ARG_WITH(libmodsecurity, [FILE is the path to libmodsecurity install dir; defaults to "/usr/local/modsecurity".])], [ if test "$withval" = "yes"; then - V3PATH=/usr/local/modsecurity + V3PATH=/usr/local/modsecurity/ else V3PATH="$withval" fi @@ -27,7 +27,7 @@ fi # --with-libmodsecurity= is set to empty, # do some blind guessing if test -z "$V3PATH"; then - for i in /usr/local/modsecurity/ \ + for i in /usr/local/modsecurity \ /usr/local/sbin \ /usr/local/bin \ /usr/sbin \