From 1e991d6fcdc4f23d041b7045217916e540d83b11 Mon Sep 17 00:00:00 2001
From: brectanus <brectanus@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Wed, 27 Feb 2008 23:18:03 +0000
Subject: [PATCH] Add searching for lua in /usr/lib{64|32}. Do not default to
 using -Werror (warnings are errors).

---
 CHANGES                               |  8 ++++++++
 apache2/build/find_lua.m4             | 16 ++++++++++++++++
 apache2/configure.in                  | 17 ++++++++++++++++-
 apache2/modsecurity.h                 |  4 ++--
 doc/modsecurity2-apache-reference.xml |  4 ++--
 5 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 12f1f9d7..ce2c4388 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+27 Feb 2008 - 2.5.1-rc1
+-----------------------
+
+ * Now search /usr/lib64 and /usr/lib32 for lua libs.
+
+ * No longer treat warnings as errors by default (use --enable-strict-compile).
+
+
 19 Feb 2008 - 2.5.0
 -------------------
 
diff --git a/apache2/build/find_lua.m4 b/apache2/build/find_lua.m4
index 5a1842d6..759d8514 100644
--- a/apache2/build/find_lua.m4
+++ b/apache2/build/find_lua.m4
@@ -66,6 +66,14 @@ if test "${lua_path}" != "no"; then
                 with_lua_lib="${x}/lib"
                 lua_lib_name="lua5.1"
                 break
+            elif test -e "${x}/lib64/liblua5.1.a"; then
+                with_lua_lib="${x}/lib64"
+                lua_lib_name="lua5.1"
+                break
+            elif test -e "${x}/lib32/liblua5.1.a"; then
+                with_lua_lib="${x}/lib32"
+                lua_lib_name="lua5.1"
+                break
             elif test -e "${x}/liblua.a"; then
                 with_lua_lib="${x}"
                 lua_lib_name="lua"
@@ -74,6 +82,14 @@ if test "${lua_path}" != "no"; then
                 with_lua_lib="${x}/lib"
                 lua_lib_name="lua"
                 break
+            elif test -e "${x}/lib64/liblua.a"; then
+                with_lua_lib="${x}/lib64"
+                lua_lib_name="lua"
+                break
+            elif test -e "${x}/lib32/liblua.a"; then
+                with_lua_lib="${x}/lib32"
+                lua_lib_name="lua"
+                break
             else
                 with_lua_lib=""
                 lua_lib_name=""
diff --git a/apache2/configure.in b/apache2/configure.in
index bcdf5179..e8cb24e0 100644
--- a/apache2/configure.in
+++ b/apache2/configure.in
@@ -126,6 +126,21 @@ sinclude(build/find_curl.m4)
 
 ### Configure Options
 
+# Strict Compile
+AC_ARG_ENABLE(strict-compile,
+              AS_HELP_STRING([--enable-strict-compile],
+                             [Enable strict compilation (warnings are errors).]),
+[
+  if test "$enableval" != "no"; then
+    strict_compile="-Werror"
+  else
+    strict_compile=
+  fi
+],
+[
+  strict_compile=
+])
+
 # DEBUG_CONF
 AC_ARG_ENABLE(debug-conf,
               AS_HELP_STRING([--enable-debug-conf],
@@ -203,7 +218,7 @@ AC_ARG_ENABLE(modsec-api,
 
 ### Build *EXTRA_CFLAGS vars
 
-EXTRA_CFLAGS="-O2 -g -Wall -Werror"
+EXTRA_CFLAGS="-O2 -g -Wall $strict_compile"
 MODSEC_EXTRA_CFLAGS="$debug_conf $debug_cache $debug_acmp $perf_meas $modsec_api"
 
 APXS_WRAPPER=build/apxs-wrapper
diff --git a/apache2/modsecurity.h b/apache2/modsecurity.h
index 38fcc53c..ceca8c76 100644
--- a/apache2/modsecurity.h
+++ b/apache2/modsecurity.h
@@ -63,8 +63,8 @@ extern DSOLOCAL modsec_build_type_rec modsec_build_type[];
 #define MODSEC_VERSION_MAJOR       "2"
 #define MODSEC_VERSION_MINOR       "5"
 #define MODSEC_VERSION_MAINT       "0"
-#define MODSEC_VERSION_TYPE        ""
-#define MODSEC_VERSION_RELEASE     ""
+#define MODSEC_VERSION_TYPE        "rc"
+#define MODSEC_VERSION_RELEASE     "1"
 
 #define MODULE_NAME "ModSecurity for Apache"
 #define MODULE_RELEASE \
diff --git a/doc/modsecurity2-apache-reference.xml b/doc/modsecurity2-apache-reference.xml
index a59dbe01..52095796 100644
--- a/doc/modsecurity2-apache-reference.xml
+++ b/doc/modsecurity2-apache-reference.xml
@@ -4,7 +4,7 @@
   Manual</title>
 
   <articleinfo>
-    <releaseinfo>Version 2.5.0 (February 19, 2008)</releaseinfo>
+    <releaseinfo>Version 2.5.1-rc1 (February 27, 2008)</releaseinfo>
 
     <copyright>
       <year>2004-2008</year>
@@ -6126,4 +6126,4 @@ Server: Apache/2.x.x
       </section>
     </section>
   </section>
-</article>
\ No newline at end of file
+</article>