From: Russ Combs <rucombs@cisco.com>
Date: Tue, 22 Sep 2015 13:40:45 +0000 (-0400)
Subject: fix xcode builds
X-Git-Tag: 3.0.0-233~824^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa2a89f44ac2c7b53e2d32dfe73ca3d6c0f3b5fd;p=thirdparty%2Fsnort3.git

fix xcode builds
fix unused warning
---

diff --git a/cmake/platforms.cmake b/cmake/platforms.cmake
index f4ed63a68..c4e2099b9 100644
--- a/cmake/platforms.cmake
+++ b/cmake/platforms.cmake
@@ -85,31 +85,31 @@ include(CheckCXXCompilerFlag)
 
 # More MacOS X fun
 set(CMAKE_REQUIRED_FLAGS "-Wl,-undefined,dynamic_lookup")
-check_cxx_compiler_flag("" HAVE_DYNAMIC_LOOKUP)
+check_cxx_compiler_flag(${CMAKE_REQUIRED_FLAGS} HAVE_DYNAMIC_LOOKUP)
 if(HAVE_DYNAMIC_LOOKUP)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined,dynamic_lookup")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
 endif()
 unset (CMAKE_REQUIRED_FLAGS)
 
 
 set (CMAKE_REQUIRED_FLAGS "-Wl,-export-dynamic")
-check_cxx_compiler_flag ("" HAVE_EXPORT_DYNAMIC)
+check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_EXPORT_DYNAMIC)
 if (HAVE_EXPORT_DYNAMIC)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-export-dynamic")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
 endif ()
 unset(CMAKE_REQUIRED_FLAGS)
 
 
 set (CMAKE_REQUIRED_FLAGS "-Wl,-shared")
-check_cxx_compiler_flag ("" HAVE_SHARED)
+check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_SHARED)
 if (HAVE_SHARED)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-shared")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
 endif ()
 unset(CMAKE_REQUIRED_FLAGS)
 
 set (CMAKE_REQUIRED_FLAGS "-fvisibility=hidden")
-check_cxx_compiler_flag ("" HAVE_VISIBILITY)
+check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_VISIBILITY)
 if (HAVE_VISIBILITY)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
 endif ()
 unset(CMAKE_REQUIRED_FLAGS)
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 50be64aad..54f646365 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -46,33 +46,33 @@ else (BUILD_EXTRA_PLUGINS)
 
     include(CheckCXXCompilerFlag)
     set (CMAKE_REQUIRED_FLAGS "-fvisibility=hidden")
-    check_cxx_compiler_flag ("" HAVE_VISIBILITY)
+    check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_VISIBILITY)
     if (HAVE_VISIBILITY)
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_VISIBILITY")
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
     endif ()
     unset(CMAKE_REQUIRED_FLAGS)
 
     # Some shared library flags for the two platforms which I am using
     set(CMAKE_REQUIRED_FLAGS "-Wl,-undefined,dynamic_lookup")
-    check_cxx_compiler_flag("" HAVE_DYNAMIC_LOOKUP)
+    check_cxx_compiler_flag(${CMAKE_REQUIRED_FLAGS} HAVE_DYNAMIC_LOOKUP)
     if(HAVE_DYNAMIC_LOOKUP)
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined,dynamic_lookup")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
     endif()
     unset (CMAKE_REQUIRED_FLAGS)
 
 
     set (CMAKE_REQUIRED_FLAGS "-Wl,-export-dynamic")
-    check_cxx_compiler_flag ("" HAVE_EXPORT_DYNAMIC)
+    check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_EXPORT_DYNAMIC)
     if (HAVE_EXPORT_DYNAMIC)
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-export-dynamic")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
     endif ()
     unset(CMAKE_REQUIRED_FLAGS)
 
 
     set (CMAKE_REQUIRED_FLAGS "-Wl,-shared")
-    check_cxx_compiler_flag ("" HAVE_SHARED)
+    check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_SHARED)
     if (HAVE_SHARED)
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-shared")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
     endif ()
     unset(CMAKE_REQUIRED_FLAGS)
 
diff --git a/src/lua/lua.cc b/src/lua/lua.cc
index 0e034abb1..fbcc2259c 100644
--- a/src/lua/lua.cc
+++ b/src/lua/lua.cc
@@ -48,11 +48,9 @@ ManageStack::ManageStack(lua_State* L, int extra) :
     state ( L )
 {
     top = lua_gettop(state);
+
     if ( extra > 0 )
-    {
-        bool result = lua_checkstack(state, extra);
-        assert(result);
-    }
+        assert(lua_checkstack(state, extra));
 }
 
 ManageStack::~ManageStack()