From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Wed, 15 Jun 2016 21:27:05 +0000 (-0400)
Subject: Merge pull request #520 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to... 
X-Git-Tag: 3.0.0-233~365^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df81d32;p=thirdparty%2Fsnort3.git

Merge pull request #520 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to master

Squashed commit of the following:

commit b39468d96c0a99284bf313ecef7d8208d5fc0d23
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Jun 15 17:22:22 2016 -0400

    cmake: Fix reentrancy of FindDNET.cmake
---

diff --git a/cmake/FindDNET.cmake b/cmake/FindDNET.cmake
index 18b4c7119..ae117f441 100644
--- a/cmake/FindDNET.cmake
+++ b/cmake/FindDNET.cmake
@@ -21,13 +21,14 @@ set(ERROR_MESSAGE
 
 # Check for libdumbnet first, then libdnet
 
-find_path(DNET_INCLUDE_DIR dumbnet.h
+find_path(DUMBNET_INCLUDE_DIR dumbnet.h
     HINTS ${DNET_INCLUDE_DIR_HINT})
 
-# If we found libdument header, define HAVE_DUMBNET_H for config.h generation
-# and search for libdumnet.
-if (DNET_INCLUDE_DIR)
+# If we found libdumbnet header, define HAVE_DUMBNET_H for config.h generation
+# and search for libdumbnet.
+if (DUMBNET_INCLUDE_DIR)
     set(HAVE_DUMBNET_H "1")
+    set(DNET_INCLUDE_DIR ${DUMBNET_INCLUDE_DIR})
     find_library(DNET_LIBRARIES NAMES dumbnet
         HINTS ${DNET_LIBRARIES_DIR_HINT})
 else ()