minenux
/
minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Sanitize GETTEXT usage macros 

Now the user-level option is called ENABLE_GETTEXT, and USE_GETTEXT is
only set to true if gettext was enabled and found. This simplifies all
check to USE_GETTEXT only rather than the double checks for it being
enabled and found.
mutilcraft-mt53
Giuseppe Bilotta 2011-07-24 13:58:51 +02:00
parent 47381bde3b
commit e034f8a2a3
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/CMakeLists.txt
View File

@ -5,11 +5,15 @@ if(RUN_IN_PLACE)
add_definitions ( -DRUN_IN_PLACE ) add_definitions ( -DRUN_IN_PLACE )
endif(RUN_IN_PLACE) endif(RUN_IN_PLACE)
OPTION(USE_GETTEXT "Use GetText for internationalization" ON) # user-visible option to enable/disable gettext usage
OPTION(ENABLE_GETTEXT "Use GetText for internationalization" ON)
# this is only set to 1 if gettext is enabled _and_ available
set(USE_GETTEXT 0)
find_package(GettextLib) find_package(GettextLib)
if(GETTEXT_FOUND AND USE_GETTEXT) if(GETTEXT_FOUND AND ENABLE_GETTEXT)
message(STATUS "gettext include path: ${GETTEXT_INCLUDE_DIR}") message(STATUS "gettext include path: ${GETTEXT_INCLUDE_DIR}")
message(STATUS "gettext msgfmt path: ${GETTEXT_MSGFMT}") message(STATUS "gettext msgfmt path: ${GETTEXT_MSGFMT}")
if(WIN32) if(WIN32)
@ -17,12 +21,13 @@ if(GETTEXT_FOUND AND USE_GETTEXT)
message(STATUS "gettext dll: ${GETTEXT_DLL}") message(STATUS "gettext dll: ${GETTEXT_DLL}")
message(STATUS "gettext iconv dll: ${GETTEXT_ICONV_DLL}") message(STATUS "gettext iconv dll: ${GETTEXT_ICONV_DLL}")
endif() endif()
set(USE_GETTEXT 1)
message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}") message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
elseif(GETTEXT_FOUND AND NOT USE_GETTEXT) elseif(GETTEXT_FOUND AND NOT ENABLE_GETTEXT)
MESSAGE(STATUS "GetText found but disabled;") MESSAGE(STATUS "GetText found but disabled;")
else(GETTEXT_FOUND AND USE_GETTEXT) else(GETTEXT_FOUND AND ENABLE_GETTEXT)
message(STATUS "GetText disabled") message(STATUS "GetText disabled")
endif(GETTEXT_FOUND AND USE_GETTEXT) endif(GETTEXT_FOUND AND ENABLE_GETTEXT)
if(NOT MSVC) if(NOT MSVC)
set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++") set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++")
@ -265,7 +270,7 @@ if(BUILD_CLIENT)
install(FILES ${images} DESTINATION ${DATADIR}) install(FILES ${images} DESTINATION ${DATADIR})
if(GETTEXT_FOUND AND USE_GETTEXT) if(USE_GETTEXT)
foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES}) foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE}) set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo") set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
@ -280,14 +285,14 @@ if(BUILD_CLIENT)
if(DEFINED ZLIB_DLL) if(DEFINED ZLIB_DLL)
install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR}) install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
endif() endif()
if(GETTEXT_FOUND AND USE_GETTEXT) if(USE_GETTEXT)
if(DEFINED GETTEXT_DLL) if(DEFINED GETTEXT_DLL)
install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR}) install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR})
endif() endif()
if(DEFINED GETTEXT_ICONV_DLL) if(DEFINED GETTEXT_ICONV_DLL)
install(FILES ${GETTEXT_ICONV_DLL} DESTINATION ${BINDIR}) install(FILES ${GETTEXT_ICONV_DLL} DESTINATION ${BINDIR})
endif() endif()
endif(GETTEXT_FOUND AND USE_GETTEXT) endif(USE_GETTEXT)
endif() endif()
endif(BUILD_CLIENT) endif(BUILD_CLIENT)
@ -295,7 +300,7 @@ if(BUILD_SERVER)
install(TARGETS ${PROJECT_NAME}server DESTINATION ${BINDIR}) install(TARGETS ${PROJECT_NAME}server DESTINATION ${BINDIR})
endif(BUILD_SERVER) endif(BUILD_SERVER)
if (GETTEXT_FOUND AND USE_GETTEXT) if (USE_GETTEXT)
set(MO_FILES) set(MO_FILES)
foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES}) foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
@ -319,7 +324,7 @@ if (GETTEXT_FOUND AND USE_GETTEXT)
endforeach(LOCALE ${GETTEXT_AVAILABLE_LOCALES}) endforeach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
add_custom_target(translations ALL COMMENT "mo update" DEPENDS ${MO_FILES}) add_custom_target(translations ALL COMMENT "mo update" DEPENDS ${MO_FILES})
endif(GETTEXT_FOUND AND USE_GETTEXT) endif(USE_GETTEXT)
# Subdirectories # Subdirectories

8
src/config.h
View File

@ -23,13 +23,13 @@
#else #else
#define RUN_IN_PLACE_BOOLSTRING "0" #define RUN_IN_PLACE_BOOLSTRING "0"
#endif #endif
#ifdef USE_GETTEXT #if USE_GETTEXT
#define USE_GETTEXT_BOOLSTRING "ON" #define USE_GETTEXT_BOOLSTRING "1"
#else #else
#define USE_GETTEXT_BOOLSTRING "OFF" #define USE_GETTEXT_BOOLSTRING "0"
#endif #endif
#define BUILD_INFO "NON-CMAKE RUN_IN_PLACE="RUN_IN_PLACE_BOOLSTRING" USE_GETTEXT="USE_GETTEXT_BOOLSTRING" BUILD_TYPE="BUILD_TYPE #define BUILD_INFO "NON-CMAKE RUN_IN_PLACE="RUN_IN_PLACE_BOOLSTRING" USE_GETTEXT="USE_GETTEXT_BOOLSTRING" BUILD_TYPE="BUILD_TYPE
#endif #endif
#endif #endif

2
src/gettext.h
View File

@ -1,4 +1,4 @@
#if defined(GETTEXT_FOUND) && defined(USE_GETTEXT) #if USE_GETTEXT
#include <libintl.h> #include <libintl.h>
#else #else
#define gettext(String) String #define gettext(String) String