cmake: gettext patch from Kornel

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27931 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index f7550eeccd9266ae10bd04e864036a339dec3515..96a8b2083471e066414a49466eb2b42f871f36d2 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -28,8 +28,8 @@ set(PACKAGE_VERSION 2.0svn)
 set(LYX_DATE "2008/2009")
 #TODO
 set(VERSION_INFO "CMake Build")
-set(LYX_DIR_VER "LYX_DIR_16x")
-set(LYX_USERDIR_VER "LYX_USERDIR_16x")
+set(LYX_DIR_VER "LYX_DIR_20x")
+set(LYX_USERDIR_VER "LYX_USERDIR_20x")
 
 set(PROGRAM_SUFFIX "")
 set(LYX_ABS_INSTALLED_DATADIR "/usr/local/share/lyx${PACKAGE_VERSION}")
@@ -58,6 +58,7 @@ include(LyXPaths)
 include(LyXMacros)
 include(ProjectSourceGroup)
 
+
 if(merge OR merge_rebuild)
        set(merge 1 CACHE TYPE STRING FORCE)
        set(MERGE_FILES 1 CACHE TYPE STRING FORCE)
@@ -317,6 +318,7 @@ configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 
 find_package(ICONV REQUIRED)
 add_definitions(-DHAVE_ICONV=1)
+find_package(Gettext)
 
 
 #TODO: insource is not the best place

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 8dfe8039fd0a72b77178ad477d3fc4555f594443..492a167e1ea12472a895682da98194e03b7576a6 100644 (file)
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -46,6 +46,7 @@ check_include_files(argz.h HAVE_ARGZ_H)
 check_function_exists(open HAVE_OPEN)
 check_function_exists(chmod HAVE_CHMOD)
 check_function_exists(close HAVE_CLOSE)
+check_function_exists(dcgettext HAVE_DCGETTEXT)
 check_function_exists(popen HAVE_POPEN)
 check_function_exists(pclose HAVE_PCLOSE)
 check_function_exists(_open HAVE__OPEN)
@@ -53,6 +54,7 @@ check_function_exists(_close HAVE__CLOSE)
 check_function_exists(_popen HAVE__POPEN)
 check_function_exists(_pclose HAVE__PCLOSE)
 check_function_exists(getpid HAVE_GETPID)
+check_function_exists(gettext HAVE_GETTEXT)
 check_function_exists(_getpid HAVE__GETPID)
 check_function_exists(mkdir  HAVE_MKDIR)
 check_function_exists(_mkdir HAVE__MKDIR)

diff --git a/development/cmake/configCompiler.h.cmake b/development/cmake/configCompiler.h.cmake
index 3b45cb7d16d07c2a81bbcd10bcb2167ce9d84bad..929b1bd28af3923c4c8f04c12ba751472d2a9437 100644 (file)
--- a/development/cmake/configCompiler.h.cmake
+++ b/development/cmake/configCompiler.h.cmake
@@ -35,6 +35,7 @@
 #cmakedefine HAVE_OPEN 1
 #cmakedefine HAVE_CHMOD 1
 #cmakedefine HAVE_CLOSE 1
+#cmakedefine HAVE_DCGETTEXT 1
 #cmakedefine HAVE_POPEN 1
 #cmakedefine HAVE_PCLOSE 1
 #cmakedefine HAVE__OPEN 1
@@ -43,6 +44,7 @@
 #cmakedefine HAVE__PCLOSE 1
 #cmakedefine HAVE_GETPID 1
 #cmakedefine HAVE__GETPID 1
+#cmakedefine HAVE_GETTEXT 1
 #cmakedefine HAVE_MKDIR 1
 #cmakedefine HAVE__MKDIR 1
 #cmakedefine HAVE_PUTENV 1
@@ -96,13 +98,18 @@
 #  endif
 #endif
 
+#cmakedefine GETTEXT_FOUND 1
+#if GETTEXT_FOUND
+#define ENABLE_NLS 1
+#define HAVE_LC_MESSAGES 1
+#endif
+
 #cmakedefine HAVE_ALLOCA 1
 #cmakedefine HAVE_SYMBOL_ALLOCA 1
 #if defined(HAVE_SYMBOL_ALLOCA) && !defined(HAVE_ALLOCA)
 #define HAVE_ALLOCA
 #endif
 
-
 #cmakedefine HAVE_ICONV_CONST 1
 #ifdef HAVE_ICONV_CONST
 #define ICONV_CONST const