[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, debian, updated. e94f964658a8a569fae5f6c9854d3f8c0781de8d

[Javier Fernandez-Sanguino]

The following commit has been merged in the debian branch:
commit e94f964658a8a569fae5f6c9854d3f8c0781de8d
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date:   Thu Jul 28 21:24:15 2011 +0200

    Do not build the included external library, use the system's zlib instead

diff --git a/src/Config.Make b/src/Config.Make
index a0e4e89..90b6ee4 100755
--- a/src/Config.Make
+++ b/src/Config.Make
@@ -22,6 +22,6 @@ OS_CRYPTO = ${PT}os_crypto/os_crypto.a
 OS_SHARED = ${PT}shared/lib_shared.a
 OS_ROOTCHECK = ${PT}rootcheck/rootcheck_lib.a
 OS_CONFIG = ${PT}config/lib_config.a
-OS_ZLIB = ${PT}os_zlib/os_zlib.c ${PT}external/libz.a
-OS_LINK = ${IEXTRA}
+OS_ZLIB = ${PT}os_zlib/os_zlib.c
+OS_LINK = ${IEXTRA} -I/usr/include -lz
 DBS = cdb/cdb.a
diff --git a/src/Makeall b/src/Makeall
index 94c8a95..054305d 100755
--- a/src/Makeall
+++ b/src/Makeall
@@ -129,10 +129,10 @@ fi
 # Getting values for each action
 if [ "X${ARGV}" = "Xall" ]; then
     DIRECTORIES="${LIBS} ${SOURCES} ${BINARIES}" 
-    DOZLIB="x"
+    DOZLIB=""
 elif [ "X${ARGV}" = "Xlibs" ]; then
     DIRECTORIES="${LIBS} ${SOURCES}"
-    DOZLIB="x"
+    DOZLIB=""
 elif [ "X${ARGV}" = "Xrootcheck" ]; then
     DIRECTORIES="os_xml os_regex os_net ${SOURCES} ${ROOTCHECKBIN}"    
 elif [ "X${ARGV}" = "Xbuild" ]; then

-- 
Git repository for pkg-ossec