From 35fd75d859e4a8873b8843da1db13e04a1b08140 Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <fcosta@trustwave.com>
Date: Wed, 11 Dec 2013 05:16:05 -0800
Subject: [PATCH] nginx: Trying apxs and apxs2 while compiling nginx module

---
 nginx/modsecurity/config | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/nginx/modsecurity/config b/nginx/modsecurity/config
index f0bf507a..e7869b37 100644
--- a/nginx/modsecurity/config
+++ b/nginx/modsecurity/config
@@ -9,7 +9,7 @@ then
   exit 1
 fi
 
-echo -n "Checking for Apache headers using apx2... "
+echo -n "Checking for Apache headers using apxs2... "
 apache_include_dir=`apxs2 -q INCLUDEDIR 2> /dev/null`
 RETVAL=$?
 if [ $RETVAL -eq 0 ]
@@ -17,10 +17,17 @@ then
   CORE_INCS="$CORE_INCS $apache_include_dir"
   echo "Ok"
 else
-  echo "FAIL"
-  echo "Aborting. Apache apx2 is not installed or fails to point\
+  echo -n "Checking for Apache headers using apxs... "
+  apache_include_dir=`apxs -q INCLUDEDIR 2> /dev/null`
+  RETVAL=$?
+  if [ $RETVAL -eq 0 ]
+  then
+    CORE_INCS="$CORE_INCS $apache_include_dir"
+    echo "Ok"
+  else
+    echo "Aborting. Apache apxs2/apxs is not installed or fails to point\
 Apache headers."
-  exit 1;
+    exit 1;
 fi
 
 missing=""