[gitignore]. [cmake] remove gettext

.gitignore

@@ -1,13 +1,13 @@
 *~
-build/*
+build*/
 .*
 !.git*
 .git/
+*.tar.*
 *.kdev4
 *.kate-swp
 *.orig
 tags
 astyle.sh
 cscope.*
-.kdev_include_paths
-.directory
+*.part

CMakeLists.txt

@@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 2.6)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 find_package(Fcitx 4.2.7 REQUIRED)
 find_package(PkgConfig REQUIRED)
-find_package(Gettext REQUIRED)
 find_package(Libintl REQUIRED)
 find_package(Libiconv REQUIRED)
 find_package(Pthread REQUIRED)

cmake/FindLibintl.cmake

@@ -9,38 +9,39 @@
 # present in libc. Must have more robust system for release, where Gettext
 # functionality can also reside in standalone Gettext library, or the one
 # embedded within kdelibs (cf. gettext.m4 from Gettext source).
- 
+
 # Copyright (c) 2006, Chusslove Illich, <caslav.ilic@gmx.net>
 # Copyright (c) 2007, Alexander Neundorf, <neundorf@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
+
 if(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND)
   set(Libintl_FIND_QUIETLY TRUE)
-endif(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND)
- 
+endif()
+
 find_path(LIBINTL_INCLUDE_DIR libintl.h)
- 
+
 set(LIBINTL_LIB_FOUND FALSE)
- 
+
 if(LIBINTL_INCLUDE_DIR)
   include(CheckFunctionExists)
   check_function_exists(dgettext LIBINTL_LIBC_HAS_DGETTEXT)
- 
-  if (LIBINTL_LIBC_HAS_DGETTEXT)
+
+  if(LIBINTL_LIBC_HAS_DGETTEXT)
     set(LIBINTL_LIBRARIES)
     set(LIBINTL_LIB_FOUND TRUE)
-  else (LIBINTL_LIBC_HAS_DGETTEXT)
-    find_library(LIBINTL_LIBRARIES NAMES intl libintl )
+  else()
+    find_library(LIBINTL_LIBRARIES NAMES intl libintl)
     if(LIBINTL_LIBRARIES)
       set(LIBINTL_LIB_FOUND TRUE)
-    endif(LIBINTL_LIBRARIES)
-  endif (LIBINTL_LIBC_HAS_DGETTEXT)
-
+    endif()
+  endif()
 endif(LIBINTL_INCLUDE_DIR)
- 
+
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libintl  DEFAULT_MSG  LIBINTL_INCLUDE_DIR  LIBINTL_LIB_FOUND)
-
-mark_as_advanced(LIBINTL_INCLUDE_DIR  LIBINTL_LIBRARIES  LIBINTL_LIBC_HAS_DGETTEXT  LIBINTL_LIB_FOUND)
+find_package_handle_standard_args(Libintl DEFAULT_MSG LIBINTL_INCLUDE_DIR
+  LIBINTL_LIB_FOUND)
+
+mark_as_advanced(LIBINTL_INCLUDE_DIR LIBINTL_LIBRARIES
+  LIBINTL_LIBC_HAS_DGETTEXT LIBINTL_LIB_FOUND)