From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat, 23 Jul 2011 13:47:09 +0000 (+0200)
Subject: Place project name and gettext use in config
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=4ffba76bb39363a01647acb19667cd33bbbd700b;p=zefram%2Fminetest%2Fminetest_engine.git

Place project name and gettext use in config
---

diff --git a/src/cmake_config.h.in b/src/cmake_config.h.in
index 5e375191..6a8f93ba 100644
--- a/src/cmake_config.h.in
+++ b/src/cmake_config.h.in
@@ -3,6 +3,7 @@
 #ifndef CMAKE_CONFIG_H
 #define CMAKE_CONFIG_H
 
+#define PROJECT_NAME "@PROJECT_NAME@"
 #define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
 #define VERSION_STRING "@VERSION_STRING@"
 #ifdef NDEBUG
@@ -10,7 +11,7 @@
 #else
 	#define BUILD_TYPE "Debug"
 #endif
-#define BUILD_INFO "VER="VERSION_STRING" RUN_IN_PLACE=@RUN_IN_PLACE@ INSTALL_PREFIX=@CMAKE_INSTALL_PREFIX@ BUILD_TYPE="BUILD_TYPE
+#define BUILD_INFO "VER="VERSION_STRING" RUN_IN_PLACE=@RUN_IN_PLACE@ USE_GETTEXT=@USE_GETTEXT@ INSTALL_PREFIX=@CMAKE_INSTALL_PREFIX@ BUILD_TYPE="BUILD_TYPE
 
 #endif
 
diff --git a/src/config.h b/src/config.h
index b24cf6a6..eb1d1a9a 100644
--- a/src/config.h
+++ b/src/config.h
@@ -9,6 +9,8 @@
 #ifdef USE_CMAKE_CONFIG_H
 	#include "cmake_config.h"
 #else
+	#define PROJECT_NAME "minetest"
+
 	//#define INSTALL_PREFIX ""
 	#define VERSION_STRING "unknown"
 	#ifdef NDEBUG
@@ -21,7 +23,12 @@
 	#else
 		#define RUN_IN_PLACE_BOOLSTRING "0"
 	#endif
-	#define BUILD_INFO "NON-CMAKE RUN_IN_PLACE="RUN_IN_PLACE_BOOLSTRING" BUILD_TYPE="BUILD_TYPE
+	#ifdef USE_GETTEXT
+		#define USE_GETTEXT_BOOLSTRING "ON"
+	#else
+		#define USE_GETTEXT_BOOLSTRING "OFF"
+	#endif
+	#define BUILD_INFO "NON-CMAKE RUN_IN_PLACE="RUN_IN_PLACE_BOOLSTRING" USE_GETTEXT="USE_GETTEXT_BOOLSTRING" BUILD_TYPE="BUILD_TYPE
 #endif
 
 #endif