From: sapier <Sapier at GMX dot net>
Date: Sun, 6 Apr 2014 08:48:04 +0000 (+0200)
Subject: Make config honor build system specified config defines
X-Git-Tag: 0.4.10~198
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F1205%2Fhead;p=oweals%2Fminetest.git

Make config honor build system specified config defines
---

diff --git a/src/config.h b/src/config.h
index 55bbb5bee..1558ebe09 100644
--- a/src/config.h
+++ b/src/config.h
@@ -9,12 +9,24 @@
 #define PROJECT_NAME "Minetest"
 #define RUN_IN_PLACE 0
 #define USE_GETTEXT 0
-#define USE_SOUND 0
-#define USE_CURL 0
+#ifndef USE_SOUND
+	#define USE_SOUND 0
+#endif
+
+#ifndef USE_CURL
+	#define USE_CURL 0
+#endif
+
 #define USE_FREETYPE 0
 #define STATIC_SHAREDIR ""
-#define USE_LEVELDB 0
-#define USE_LUAJIT 0
+
+#ifndef USE_LEVELDB
+	#define USE_LEVELDB 0
+#endif
+
+#ifndef USE_LUAJIT
+	#define USE_LUAJIT 0
+#endif
 
 #ifdef USE_CMAKE_CONFIG_H
 	#include "cmake_config.h"