Removed config.h.

modules/drogon/drogon/config/drogon/config.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#define USE_POSTGRESQL 0
-#define LIBPQ_SUPPORTS_BATCH_MODE 0
-#define USE_MYSQL 0
-#define USE_SQLITE3 0
-#define OpenSSL_FOUND
-/* #undef Boost_FOUND */
-
-#define COMPILATION_FLAGS "-std=c++17"
-#define COMPILER_COMMAND "/usr/bin/c++"
-#define COMPILER_ID "GNU"
-
-#define INCLUDING_DIRS " -I/usr/include -I/usr/local/include"

modules/drogon/drogon/lib/src/ConfigLoader.cc

@@ -14,7 +14,7 @@
 
 #include "ConfigLoader.h"
 #include "HttpAppFrameworkImpl.h"
-#include <drogon/config.h>
+
 #include <trantor/utils/Logger.h>
 #include <fstream>
 #include <iostream>

modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.cc

@@ -31,7 +31,7 @@
 #include <drogon/HttpResponse.h>
 #include <drogon/HttpTypes.h>
 #include <drogon/Session.h>
-#include <drogon/config.h>
+
 #include <drogon/utils/Utilities.h>
 #include <drogon/version.h>
 #include <json/json.h>

modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.h

@@ -16,7 +16,7 @@
 
 #include "impl_forwards.h"
 #include <drogon/HttpAppFramework.h>
-#include <drogon/config.h>
+
 #include <json/json.h>
 #include <functional>
 #include <limits>
@@ -405,7 +405,7 @@ public:
 			const std::function<void(const HttpResponsePtr &)> &callback);
 
 	bool supportSSL() const override {
-#ifdef OpenSSL_FOUND
+#ifdef OPENSSL_FOUND
 		return true;
 #endif
 		return false;

modules/drogon/drogon/lib/src/HttpClientImpl.cc

@@ -17,7 +17,7 @@
 #include "HttpRequestImpl.h"
 #include "HttpResponseImpl.h"
 #include "HttpResponseParser.h"
-#include <drogon/config.h>
+
 #include <stdlib.h>
 #include <algorithm>
 
@@ -32,7 +32,7 @@ void HttpClientImpl::createTcpClient() {
 	tcpClientPtr_ =
 			std::make_shared<trantor::TcpClient>(loop_, serverAddr_, "httpClient");
 
-#ifdef OpenSSL_FOUND
+#ifdef OPENSSL_FOUND
 	if (useSSL_) {
 		LOG_TRACE << "useOldTLS=" << useOldTLS_;
 		LOG_TRACE << "domain=" << domain_;

modules/drogon/drogon/lib/src/ListenerManager.cc

@@ -15,7 +15,7 @@
 #include "ListenerManager.h"
 #include "HttpAppFrameworkImpl.h"
 #include "HttpServer.h"
-#include <drogon/config.h>
+
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -56,7 +56,7 @@ void ListenerManager::addListener(
 		const std::string &keyFile,
 		bool useOldTLS,
 		const std::vector<std::pair<std::string, std::string> > &sslConfCmds) {
-#ifndef OpenSSL_FOUND
+#ifndef OPENSSL_FOUND
 	if (useSSL) {
 		LOG_ERROR << "Can't use SSL without OpenSSL found in your system";
 	}
@@ -70,7 +70,7 @@ std::vector<trantor::EventLoop *> ListenerManager::createListeners(
 		const WebSocketNewAsyncCallback &webSocketCallback,
 		const ConnectionCallback &connectionCallback,
 		size_t connectionTimeout,
-#ifdef OpenSSL_FOUND
+#ifdef OPENSSL_FOUND
 		const std::string &globalCertFile,
 		const std::string &globalKeyFile,
 		const std::vector<std::pair<std::string, std::string> > &sslConfCmds,
@@ -126,7 +126,7 @@ std::vector<trantor::EventLoop *> ListenerManager::createListeners(
 			}
 
 			if (listener.useSSL_) {
-#ifdef OpenSSL_FOUND
+#ifdef OPENSSL_FOUND
 				auto cert = listener.certFile_;
 				auto key = listener.keyFile_;
 				if (cert == "")
@@ -172,7 +172,7 @@ std::vector<trantor::EventLoop *> ListenerManager::createListeners(
 					syncAdvices,
 					preSendingAdvices);
 			if (listener.useSSL_) {
-#ifdef OpenSSL_FOUND
+#ifdef OPENSSL_FOUND
 				auto cert = listener.certFile_;
 				auto key = listener.keyFile_;
 				if (cert.empty())

modules/drogon/drogon/lib/src/MultiPart.cc

@@ -17,7 +17,7 @@
 #include "HttpRequestImpl.h"
 #include "HttpUtils.h"
 #include <drogon/MultiPart.h>
-#include <drogon/config.h>
+
 #include <drogon/utils/Utilities.h>
 #include <fcntl.h>
 #include <sys/stat.h>

modules/drogon/drogon/lib/src/SharedLibManager.cc

@@ -15,7 +15,7 @@
 #include "SharedLibManager.h"
 #include <dirent.h>
 #include <dlfcn.h>
-#include <drogon/config.h>
+
 #include <sys/types.h>
 #include <trantor/utils/Logger.h>
 #include <unistd.h>

modules/drogon/drogon/lib/src/SharedLibManager.h

@@ -20,6 +20,23 @@
 #include <unordered_map>
 #include <vector>
 
+//not sure wheter these are needed or not yet
+#ifndef COMPILER_COMMAND
+#define COMPILER_COMMAND "/usr/bin/c++"
+#endif
+
+#ifndef COMPILATION_FLAGS
+#define COMPILATION_FLAGS "-std=c++17"
+#endif
+
+#ifndef COMPILER_ID
+#define COMPILER_ID "GNU"
+#endif
+
+#ifndef INCLUDING_DIRS
+#define INCLUDING_DIRS " -I/usr/include -I/usr/local/include"
+#endif
+
 namespace drogon {
 class SharedLibManager : public trantor::NonCopyable {
 public:

modules/drogon/drogon/lib/src/Utilities.cc

@@ -12,10 +12,10 @@
  *
  */
 
-#include <drogon/config.h>
+
 #include <drogon/utils/Utilities.h>
 #include <trantor/utils/Logger.h>
-#ifdef OpenSSL_FOUND
+#ifdef OPENSSL_FOUND
 #include <openssl/md5.h>
 #include <openssl/rand.h>
 #else
@@ -1023,7 +1023,7 @@ std::string brotliDecompress(const char * /*data*/, const size_t /*ndata*/) {
 #endif
 
 std::string getMd5(const char *data, const size_t dataLen) {
-#ifdef OpenSSL_FOUND
+#ifdef OPENSSL_FOUND
 	MD5_CTX c;
 	unsigned char md5[16] = { 0 };
 	MD5_Init(&c);
@@ -1074,7 +1074,7 @@ static bool systemRandomBytes(void *ptr, size_t size) {
 }
 
 bool secureRandomBytes(void *ptr, size_t size) {
-#ifdef OpenSSL_FOUND
+#ifdef OPENSSL_FOUND
 	if (RAND_bytes((unsigned char *)ptr, size) == 0)
 		return true;
 #endif

modules/drogon/drogon/lib/src/WebSocketClientImpl.cc

@@ -19,10 +19,10 @@
 #include "HttpResponseParser.h"
 #include "HttpUtils.h"
 #include "WebSocketConnectionImpl.h"
-#include <drogon/config.h>
+
 #include <drogon/utils/Utilities.h>
 #include <trantor/net/InetAddress.h>
-#ifdef OpenSSL_FOUND
+#ifdef OPENSSL_FOUND
 #include <openssl/sha.h>
 #else
 #include "ssl_funcs/Sha1.h"

modules/drogon/drogon/lib/src/WebsocketControllersRouter.cc

@@ -18,8 +18,8 @@
 #include "HttpResponseImpl.h"
 #include "WebSocketConnectionImpl.h"
 #include <drogon/HttpFilter.h>
-#include <drogon/config.h>
+
-#ifdef OpenSSL_FOUND
+#ifdef OPENSSL_FOUND
 #include <openssl/sha.h>
 #else
 #include "ssl_funcs/Sha1.h"