updated cmakerules to autodetect if gettext can be used

fixed error if gettext is disabled

cmake/Modules/FindGettextLib.cmake

@@ -77,4 +77,7 @@ IF(GETTEXT_FOUND)
  STRING(REPLACE "<locale>" ${_locale} ${_buildvar} ${GETTEXT_MO_BUILD_PATH})
  STRING(REPLACE "<locale>" ${_locale} ${_destvar} ${GETTEXT_MO_DEST_PATH})
  ENDMACRO(SET_MO_PATHS)
+ELSE()
+ SET(GETTEXT_INCLUDE_DIR "")
+ SET(GETTEXT_LIBRARY "")
 ENDIF()

src/CMakeLists.txt

@@ -5,27 +5,24 @@ if(RUN_IN_PLACE)
  add_definitions ( -DRUN_IN_PLACE )
 endif(RUN_IN_PLACE)
 
-OPTION(USE_GETTEXT "Use GetText for internationalization" OFF)
+OPTION(USE_GETTEXT "Use GetText for internationalization" ON)
 
-if(USE_GETTEXT)
- find_package(GettextLib REQUIRED)
+find_package(GettextLib)
+
+if(GETTEXT_FOUND AND USE_GETTEXT)
  message(STATUS "gettext include path: ${GETTEXT_INCLUDE_DIR}")
  message(STATUS "gettext msgfmt path: ${GETTEXT_MSGFMT}")
  if(WIN32)
  message(STATUS "gettext library: ${GETTEXT_LIBRARY}")
  message(STATUS "gettext dll: ${GETTEXT_DLL}")
  message(STATUS "gettext iconv dll: ${GETTEXT_ICONV_DLL}")
  endif()
- if (GETTEXT_FOUND)
- add_definitions( -DUSE_GETTEXT )
- message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
- else()
- message(STATUS "ERROR: GetText enabled but not found, disabling")
- set(USE_GETTEXT FALSE)
- endif(GETTEXT_FOUND)
-else(USE_GETTEXT)
+ message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
+elseif(GETTEXT_FOUND AND NOT USE_GETTEXT)
+ MESSAGE(STATUS "GetText found but disabled;")
+else(GETTEXT_FOUND AND USE_GETTEXT)
  message(STATUS "GetText disabled")
-endif(USE_GETTEXT)
+endif(GETTEXT_FOUND AND USE_GETTEXT)
 
 if(NOT MSVC)
  set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++")
@@ -268,7 +265,7 @@ if(BUILD_CLIENT)
 
  install(FILES ${images} DESTINATION ${DATADIR})
 
- if (USE_GETTEXT)
+ if(GETTEXT_FOUND AND USE_GETTEXT)
  foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
  set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
  set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
@@ -283,22 +280,22 @@ if(BUILD_CLIENT)
  if(DEFINED ZLIB_DLL)
  install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
  endif()
- if(USE_GETTEXT)
+ if(GETTEXT_FOUND AND USE_GETTEXT)
  if(DEFINED GETTEXT_DLL)
  install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR})
  endif()
  if(DEFINED GETTEXT_ICONV_DLL)
  install(FILES ${GETTEXT_ICONV_DLL} DESTINATION ${BINDIR})
  endif()
- endif(USE_GETTEXT)
+ endif(GETTEXT_FOUND AND USE_GETTEXT)
  endif()
 endif(BUILD_CLIENT)
 
 if(BUILD_SERVER)
  install(TARGETS ${PROJECT_NAME}server DESTINATION ${BINDIR})
 endif(BUILD_SERVER)
 
-if (USE_GETTEXT)
+if (GETTEXT_FOUND AND USE_GETTEXT)
  add_custom_command(OUTPUT "${GETTEXT_PO_PATH}/en"
  COMMAND ${CMAKE_COMMAND} -E make_directory "${GETTEXT_PO_PATH}/en"
  COMMENT "po-update [en]: creating translation template base directory")
@@ -347,7 +344,7 @@ if (USE_GETTEXT)
 
  add_custom_target(translations ALL COMMENT "mo update" DEPENDS ${MO_FILES})
  add_custom_target(updatepo COMMENT "po update" DEPENDS ${PO_FILES})
-endif(USE_GETTEXT)
+endif(GETTEXT_FOUND AND USE_GETTEXT)
 
 # Subdirectories
 

src/gettext.h

@@ -1,10 +1,16 @@
+#ifdef GETTEXT_FOUND
 #ifdef USE_GETTEXT
 #include <libintl.h>
 #else
 #define gettext(String) String
 #define bindtextdomain(domain, dir) /* */
 #define textdomain(domain) /* */
 #endif
+#else
+#define gettext(String) String
+#define bindtextdomain(domain, dir) /* */
+#define textdomain(domain) /* */
+#endif
 
 #define _(String) gettext(String)
 #define gettext_noop(String) String

src/main.cpp

@@ -1132,10 +1132,12 @@ int main(int argc, char *argv[])
  // Create user data directory
  fs::CreateDir(porting::path_userdata);
 
+#ifdef LC_MESSAGES
  setlocale(LC_MESSAGES, "");
  bindtextdomain("minetest", (porting::path_userdata+"/locale").c_str());
  textdomain("minetest");
-
+#endif
+
  // Initialize debug streams
 #ifdef RUN_IN_PLACE
  std::string debugfile = DEBUGFILE;