From 82ba727a2d655ed9b7b2043020567df8ef047cce Mon Sep 17 00:00:00 2001
From: Rogier <rogier777@gmail.com>
Date: Tue, 17 May 2016 08:54:43 +0200
Subject: [PATCH] Rename cmake_config.h to build_config.h, and don't make it
 optional

In preparation for MSVC compilation support
---
 .gitignore                             |  2 +-
 CMakeLists.txt                         |  6 +++---
 CharEncodingConverter.cpp              |  2 +-
 cmake_config.h.in => build_config.h.in |  6 +++---
 config.h                               | 10 ++--------
 5 files changed, 10 insertions(+), 16 deletions(-)
 rename cmake_config.h.in => build_config.h.in (78%)

diff --git a/.gitignore b/.gitignore
index 4dd499a..b272b11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ CPack*
 _CPack_Packages/
 Makefile
 cmake_install.cmake
-cmake_config.h
+build_config.h
 *.deb
 *.rpm
 *.tar.gz
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61057e1..206c974 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -520,9 +520,9 @@ include(CPack)
 
 # DO this near the end - to make sure all variables have been computed
 # and are final.
+set(INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 configure_file(
-	"${PROJECT_SOURCE_DIR}/cmake_config.h.in"
-	"${PROJECT_BINARY_DIR}/cmake_config.h"
+	"${PROJECT_SOURCE_DIR}/build_config.h.in"
+	"${PROJECT_BINARY_DIR}/build_config.h"
 )
-add_definitions ( -DUSE_CMAKE_CONFIG_H )
 
diff --git a/CharEncodingConverter.cpp b/CharEncodingConverter.cpp
index dfc632a..1f88360 100644
--- a/CharEncodingConverter.cpp
+++ b/CharEncodingConverter.cpp
@@ -1,6 +1,6 @@
 
 #include <iostream>
-#include "cmake_config.h"
+#include "build_config.h"
 
 #include "CharEncodingConverter.h"
 #ifdef _WIN32
diff --git a/cmake_config.h.in b/build_config.h.in
similarity index 78%
rename from cmake_config.h.in
rename to build_config.h.in
index f8f64c9..e742c84 100644
--- a/cmake_config.h.in
+++ b/build_config.h.in
@@ -1,7 +1,7 @@
 // Filled in by the build system
 
-#ifndef CMAKE_CONFIG_H
-#define CMAKE_CONFIG_H
+#ifndef BUILD_CONFIG_H
+#define BUILD_CONFIG_H
 
 #define USE_SQLITE3 @USE_SQLITE3@
 #define USE_POSTGRESQL @USE_POSTGRESQL@
@@ -14,7 +14,7 @@
 #define VERSION_MINOR "@VERSION_MINOR@"
 
 #define PACKAGING_FLAT @PACKAGING_FLAT@
-#define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
+#define INSTALL_PREFIX "@INSTALL_PREFIX@"
 
 #endif
 
diff --git a/config.h b/config.h
index 8167961..2ea8d18 100644
--- a/config.h
+++ b/config.h
@@ -7,6 +7,8 @@
  * =====================================================================
  */
 
+#include "build_config.h"
+
 #if MSDOS || __OS2__ || __NT__ || _WIN32
 #define PATH_SEPARATOR '\\'
 #else
@@ -21,14 +23,6 @@
 // Max number of node name -> color mappings stored in a mapblock
 #define MAPBLOCK_MAXCOLORS	65536
 
-#ifdef USE_CMAKE_CONFIG_H
-#include "cmake_config.h"
-#else
-#define USE_SQLITE3 1
-#define USE_LEVELDB 0
-#define USE_REDIS 0
-#endif
-
 // List of possible database names (for usage message)
 #if USE_SQLITE3
 #define USAGE_NAME_SQLITE "/sqlite3"