From a55b3742cb36731ddea5eb2de32ebce0cd6f9002 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 5 Feb 2011 18:35:20 -0500 Subject: [PATCH] Removed the LIBINTL include hack --- cmake/FindGettext.cmake | 2 +- include/services.h | 2 +- include/sysconf.h.cmake | 1 - src/module.cpp | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake index 78be1c634..cdae5bfb3 100644 --- a/cmake/FindGettext.cmake +++ b/cmake/FindGettext.cmake @@ -20,7 +20,7 @@ endif(NOT WIN32) # If we found everything we need set variables correctly for lang/CMakeLists.txt to use if(GETTEXT_FOUND) - set(LIBINTL_INCLUDE "${GETTEXT_INCLUDE}/libintl.h") + include_directories("${GETTEXT_INCLUDE}") set(GETTEXT_MSGFMT_EXECUTABLE ${GETTEXT_MSGFMT}) if(WIN32) diff --git a/include/services.h b/include/services.h index 0ea6cb562..82d491cc4 100644 --- a/include/services.h +++ b/include/services.h @@ -141,7 +141,7 @@ extern "C" void __pfnBkCheck() {} #endif #if GETTEXT_FOUND -# include LIBINTL +# include # define _(x) anope_gettext(x) #else # define _(x) x diff --git a/include/sysconf.h.cmake b/include/sysconf.h.cmake index cf0b5d466..1509ab5d7 100644 --- a/include/sysconf.h.cmake +++ b/include/sysconf.h.cmake @@ -20,7 +20,6 @@ #cmakedefine HAVE_EVENTFD 1 #cmakedefine GETTEXT_FOUND 1 #cmakedefine RUNGROUP "@RUNGROUP@" -#define LIBINTL "@LIBINTL_INCLUDE@" #cmakedefine HAVE_UINT8_T 1 #cmakedefine HAVE_U_INT8_T 1 diff --git a/src/module.cpp b/src/module.cpp index f5c3a9194..2b7676550 100644 --- a/src/module.cpp +++ b/src/module.cpp @@ -9,7 +9,7 @@ #include "modules.h" #ifdef GETTEXT_FOUND -# include LIBINTL +# include #endif Module::Module(const Anope::string &mname, const Anope::string &creator)