diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | include/module.h | 2 | ||||
| -rw-r--r-- | include/sysconf.h.cmake | 2 | ||||
| -rw-r--r-- | lang/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/language.cpp | 8 | ||||
| -rw-r--r-- | src/module.cpp | 6 | ||||
| -rw-r--r-- | src/modules.cpp | 2 |
7 files changed, 12 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a92086489..5bc380167 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,6 +207,9 @@ else(CMAKE244_OR_BETTER) include(TestCXXAcceptsFlag) endif(CMAKE244_OR_BETTER) +# Find gettext +find_package(Gettext) + # Add an optional variable for using run-cc.pl for building, Perl will be checked later regardless of this setting option(USE_RUN_CC_PL "Use run-cc.pl for building" OFF) diff --git a/include/module.h b/include/module.h index 7b4db02a2..9ef037c4b 100644 --- a/include/module.h +++ b/include/module.h @@ -5,7 +5,7 @@ #include "commands.h" #include "modules.h" -#if HAVE_GETTEXT +#if GETTEXT_FOUND # include <libintl.h> # define _(x) gettext(x) #else diff --git a/include/sysconf.h.cmake b/include/sysconf.h.cmake index 46a48df7d..e25e22eb4 100644 --- a/include/sysconf.h.cmake +++ b/include/sysconf.h.cmake @@ -18,7 +18,7 @@ #cmakedefine HAVE_SYS_SELECT_H 1 #cmakedefine HAVE_UMASK 1 #cmakedefine HAVE_EVENTFD 1 -#cmakedefine HAVE_GETTEXT 1 +#cmakedefine GETTEXT_FOUND 1 #cmakedefine RUNGROUP "@RUNGROUP@" #cmakedefine SERVICES_BIN "@SERVICES_BIN@" diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index 622888900..19c516b3e 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -1,6 +1,3 @@ -# Find gettext -INCLUDE(FindGettext) - # Only do this if gettext is installed if(GETTEXT_FOUND) # Get all of the .po files diff --git a/src/language.cpp b/src/language.cpp index 3744770a9..8fd15a693 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -1,6 +1,6 @@ #include "services.h" -#if HAVE_GETTEXT +#if GETTEXT_FOUND # include <libintl.h> # define _(x) gettext(x) #else @@ -11,7 +11,7 @@ std::vector<Anope::string> languages; void InitLanguages() { -#if HAVE_GETTEXT +#if GETTEXT_FOUND languages.clear(); spacesepstream sep(Config->Languages); Anope::string language; @@ -40,7 +40,7 @@ void InitLanguages() const Anope::string GetString(Anope::string language, LanguageString string) { -#if HAVE_GETTEXT +#if GETTEXT_FOUND /* For older databases */ if (language == "en") language.clear(); @@ -53,7 +53,7 @@ const Anope::string GetString(Anope::string language, LanguageString string) #endif return language_strings[string]; -#if HAVE_GETTEXT +#if GETTEXT_FOUND setlocale(LC_ALL, language.c_str()); const char *ret = dgettext("anope", language_strings[string].c_str()); setlocale(LC_ALL, ""); diff --git a/src/module.cpp b/src/module.cpp index da6673dbf..2b7676550 100644 --- a/src/module.cpp +++ b/src/module.cpp @@ -8,7 +8,7 @@ #include "modules.h" -#ifdef HAVE_GETTEXT +#ifdef GETTEXT_FOUND # include <libintl.h> #endif @@ -29,11 +29,9 @@ Module::Module(const Anope::string &mname, const Anope::string &creator) Modules.push_back(this); -#if HAVE_GETTEXT +#if GETTEXT_FOUND if (!bindtextdomain(this->name.c_str(), (services_dir + "/languages/").c_str())) - { Log() << "Error calling bindtextdomain, " << Anope::LastError(); - } #endif } diff --git a/src/modules.cpp b/src/modules.cpp index 47158f5e9..127620333 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -308,7 +308,7 @@ void Module::SendMessage(BotInfo *from, User *to, const char *fmt, ...) language = Config->NSDefLanguage; const char *message = fmt; -#if HAVE_GETTEXT +#if GETTEXT_FOUND if (!language.empty()) { setlocale(LC_ALL, language.c_str()); |