pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-26 21:06:38 +02:00
Code Activity

Fix libintl.h issue on FreeBSD

Browse Source
This commit is contained in:
Julien Louis
2007-05-26 19:15:46 +00:00
parent 34e220df56
commit dde12565e7
6 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/FindGettext.cmake
+8 -1
View File
@@ -32,6 +32,13 @@ INCLUDE(CheckIncludeFiles)
INCLUDE(CheckLibraryExists)
INCLUDE(CheckFunctionExists)
FIND_PATH(LIBINTL_INCLUDE
NAMES libintl.h
PATH /usr/local/include /usr/pkg/include /usr/include
)
SET(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE})
CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)
IF(HAVE_LIBINTL_H)
@@ -41,8 +48,8 @@ IF(HAVE_LIBINTL_H)
ELSE(LIBC_HAS_DGETTEXT)
FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl libintl
PATHS
/usr/lib
/usr/local/lib
/usr/lib
)
IF(LIBINTL_LIBRARY)
CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
cmake/FindIconv.cmake
+6
View File
@@ -54,6 +54,12 @@ IF(ICONV_INCLUDE_PATH)
ENDIF(ICONV_INCLUDE_PATH)
include(CheckCSourceCompiles)
IF(ICONV_LIBRARY)
SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
ENDIF(ICONV_LIBRARY)
SET(CMAKE_REQUIRED_FLAGS -Werror)
check_c_source_compiles("
#include <iconv.h>
src/CMakeLists.txt
+1 -1
View File
@@ -21,7 +21,7 @@ INCLUDE(CheckIncludeFiles)
INCLUDE(CheckFunctionExists)
CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
CHECK_INCLUDE_FILES("libintl.h" HAVE_LIBINTL_H)
#CHECK_INCLUDE_FILES("libintl.h" HAVE_LIBINTL_H)
CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
CHECK_INCLUDE_FILES("locale.h" HAVE_LOCALE_H)
CHECK_INCLUDE_FILES("netdb.h" HAVE_NETDB_H)
weechat/cmake/FindGettext.cmake
+8 -1
View File
@@ -32,6 +32,13 @@ INCLUDE(CheckIncludeFiles)
INCLUDE(CheckLibraryExists)
INCLUDE(CheckFunctionExists)
FIND_PATH(LIBINTL_INCLUDE
NAMES libintl.h
PATH /usr/local/include /usr/pkg/include /usr/include
)
SET(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE})
CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)
IF(HAVE_LIBINTL_H)
@@ -41,8 +48,8 @@ IF(HAVE_LIBINTL_H)
ELSE(LIBC_HAS_DGETTEXT)
FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl libintl
PATHS
/usr/lib
/usr/local/lib
/usr/lib
)
IF(LIBINTL_LIBRARY)
CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
weechat/cmake/FindIconv.cmake
+6
View File
@@ -54,6 +54,12 @@ IF(ICONV_INCLUDE_PATH)
ENDIF(ICONV_INCLUDE_PATH)
include(CheckCSourceCompiles)
IF(ICONV_LIBRARY)
SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
ENDIF(ICONV_LIBRARY)
SET(CMAKE_REQUIRED_FLAGS -Werror)
check_c_source_compiles("
#include <iconv.h>
weechat/src/CMakeLists.txt
+1 -1
View File
@@ -21,7 +21,7 @@ INCLUDE(CheckIncludeFiles)
INCLUDE(CheckFunctionExists)
CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
CHECK_INCLUDE_FILES("libintl.h" HAVE_LIBINTL_H)
#CHECK_INCLUDE_FILES("libintl.h" HAVE_LIBINTL_H)
CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
CHECK_INCLUDE_FILES("locale.h" HAVE_LOCALE_H)
CHECK_INCLUDE_FILES("netdb.h" HAVE_NETDB_H)