From e47e784c53705463696916f5c8dae1c014732f77 Mon Sep 17 00:00:00 2001
From: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date: Wed, 3 Oct 2018 12:13:23 -0500
Subject: [PATCH] Moved the SKIP_OAM_INIT check for cleanliness, added
 'config.h' to other places that need it.

---
 configureEngine.cmake                                     | 7 +++----
 writeengine/redistribute/we_redistributecontrolthread.cpp | 1 +
 writeengine/splitter/we_sdhandler.cpp                     | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configureEngine.cmake b/configureEngine.cmake
index b06746792..a3ac9d3c1 100644
--- a/configureEngine.cmake
+++ b/configureEngine.cmake
@@ -17,9 +17,6 @@ INCLUDE (CheckSymbolExists)
 INCLUDE (CheckCXXSymbolExists)
 INCLUDE (CheckTypeSize)
 
-IF($ENV{SKIP_OAM_INIT})
-    SET(SKIP_OAM_INIT 1)
-ENDIF()    
 CHECK_INCLUDE_FILE_CXX (alloca.h HAVE_ALLOCA_H)
 CHECK_INCLUDE_FILE_CXX (arpa/inet.h HAVE_ARPA_INET_H)
 CHECK_INCLUDE_FILE_CXX (dlfcn.h HAVE_DLFCN_H)
@@ -719,7 +716,9 @@ IF (NOT INLINE)
 SET (inline "")
 ENDIF()
 
-
+IF($ENV{SKIP_OAM_INIT})
+    SET(SKIP_OAM_INIT 1)
+ENDIF()
 
 EXECUTE_PROCESS(
     COMMAND rm -f conftest.data conftest.file conftest.sym
diff --git a/writeengine/redistribute/we_redistributecontrolthread.cpp b/writeengine/redistribute/we_redistributecontrolthread.cpp
index ab2897834..70b5d1e2d 100644
--- a/writeengine/redistribute/we_redistributecontrolthread.cpp
+++ b/writeengine/redistribute/we_redistributecontrolthread.cpp
@@ -37,6 +37,7 @@ using namespace std;
 #include "boost/filesystem/operations.hpp"
 using namespace boost;
 
+#include "config.h"
 #include "installdir.h"
 
 #include "configcpp.h"
diff --git a/writeengine/splitter/we_sdhandler.cpp b/writeengine/splitter/we_sdhandler.cpp
index 61fe45239..647a90e89 100644
--- a/writeengine/splitter/we_sdhandler.cpp
+++ b/writeengine/splitter/we_sdhandler.cpp
@@ -43,6 +43,7 @@ using namespace std;
 #include <boost/thread.hpp>
 using namespace boost;
 
+#include "config.h"
 #include "configcpp.h"
 using namespace config;