[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, master, updated. 32665320520f8d5dd0f9de4c7b45d96014f68067

[Javier Fernandez-Sanguino]

The following commit has been merged in the master branch:
commit 32665320520f8d5dd0f9de4c7b45d96014f68067
Merge: e18e9b4849307f7cb778ce0aa14080afa15c8c0b d15bc9fc080f48e2bb59840e6e01d4cd55926eaf
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date:   Thu Oct 4 00:35:21 2012 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ossec/pkg-ossec

diff --combined src/Config.Make
index 34211ff,a0e4e89..460ce6a
--- a/src/Config.Make
+++ b/src/Config.Make
@@@ -8,7 -8,7 +8,7 @@@ include ${PT}LOCATIO
  include ${PT}Config.OS
  
  
 -CFLAGS = -g -Wall -I${PT} -I${PT}headers ${CPATH} ${CEXTRA} ${DEXTRA} ${EEXTRA} ${FEXTRA} ${GEXTRA} ${HEXTRA} -DARGV0=\"${NAME}\" -DXML_VAR=\"var\" -DOSSECHIDS
 +CFLAGS = -g -Wall -I${PT} -I${PT}headers ${CPATH} ${CEXTRA} ${DEXTRA} ${EEXTRA} ${FEXTRA} ${GEXTRA} ${HEXTRA} ${CGEOIP} -DARGV0=\"${NAME}\" -DXML_VAR=\"var\" -DOSSECHIDS
  
  SOURCES = *.c
  OBJECTS = *.o 
@@@ -22,6 -22,6 +22,6 @@@ OS_CRYPTO = ${PT}os_crypto/os_crypto.
  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
- OS_LINK = ${IEXTRA} -I/usr/include -lz
+ OS_ZLIB = ${PT}os_zlib/os_zlib.c ${PT}external/libz.a
+ OS_LINK = ${IEXTRA}
  DBS = cdb/cdb.a

-- 
Git repository for pkg-ossec