From bc1a25da37f62346844c46b25af5f726c36bb5c3 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Thu, 21 Oct 2010 15:43:22 -0500
Subject: [PATCH] Added forgotten libz and libmagic include dirs to the search
 path.

This allows them to be located in a non-standard location.
---
 CMakeLists.txt     | 13 +++++++++----
 src/CMakeLists.txt |  1 -
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b39467c4a4..c3f7ace7d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,10 +70,6 @@ find_package(BISON REQUIRED)
 find_package(PCAP REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_package(BIND REQUIRED)
-include_directories(BEFORE
-                    ${PCAP_INCLUDE_DIR}
-                    ${OPENSSL_INCLUDE_DIR}
-                    ${BIND_INCLUDE_DIR})
 
 # This test is for when the user would like to use rebuild BinPAC
 # rather than use an existing installation
@@ -107,6 +103,15 @@ endif ()
 # TODO: optional libGeoIP
 # TODO: optional Google perftools
 
+include_directories(BEFORE
+                    ${PCAP_INCLUDE_DIR}
+                    ${OPENSSL_INCLUDE_DIR}
+                    ${BIND_INCLUDE_DIR}
+                    ${BinPAC_INCLUDE_DIR}
+                    ${LibMagic_INCLUDE_DIR}
+                    ${ZLIB_INCLUDE_DIR}
+)
+
 ##
 ## Configuration Checks/Tests
 ##
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 30b5b6bd5b..47930aa451 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,5 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
-                    ${BinPAC_INCLUDE_DIR}
                     )
 
 macro(REPLACE_YY_PREFIX_TARGET inFile outFile yylexPrefix yyPrefix)