--- FindGettext.cmake.orig	2010-05-26 23:29:11.000000000 +0200
+++ FindGettext.cmake	2010-05-26 23:39:08.000000000 +0200
@@ -65,14 +65,70 @@
 
 ENDMACRO(GETTEXT_CREATE_TRANSLATIONS )
 
-IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
+
+#
+# The following part is taken from KDE's FindGettext.cmake
+#
+#  GETTEXT_INCLUDE_DIR - Gettext include directory
+#  GETTEXT_LIBRARIES - Libraries needed to use Gettext
+
+# TODO: This will enable translations only if Gettext functionality is
+# 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>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if (LIBC_HAS_DGETTEXT OR LIBINTL_HAS_DGETTEXT)
+    
+    # in cache already
+    set(GETTEXT_LIBINC_FOUND TRUE)
+    
+else (LIBC_HAS_DGETTEXT OR LIBINTL_HAS_DGETTEXT)
+    include(CheckLibraryExists)
+    include(CheckFunctionExists)
+
+    find_path(GETTEXT_INCLUDE_DIR libintl.h)
+    if(GETTEXT_INCLUDE_DIR)
+        set(HAVE_LIBINTL_H 1)
+    else(GETTEXT_INCLUDE_DIR)
+        set(HAVE_LIBINTL_H 0)
+    endif(GETTEXT_INCLUDE_DIR)
+                
+    set(GETTEXT_LIBRARIES)
+
+    if (HAVE_LIBINTL_H)
+        check_function_exists(dgettext LIBC_HAS_DGETTEXT)
+        if (LIBC_HAS_DGETTEXT)
+            set(GETTEXT_SOURCE "built in libc")
+            set(GETTEXT_LIBINC_FOUND TRUE)
+        else (LIBC_HAS_DGETTEXT)
+            find_library(LIBINTL_LIBRARY NAMES intl libintl )
+
+            check_library_exists(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
+            if (LIBINTL_HAS_DGETTEXT)
+                set(GETTEXT_SOURCE "in ${LIBINTL_LIBRARY}")
+                set(GETTEXT_LIBRARIES ${LIBINTL_LIBRARY})
+                set(GETTEXT_LIBINC_FOUND TRUE)
+            endif (LIBINTL_HAS_DGETTEXT)
+        endif (LIBC_HAS_DGETTEXT)
+    endif (HAVE_LIBINTL_H)
+endif (LIBC_HAS_DGETTEXT OR LIBINTL_HAS_DGETTEXT)
+
+
+IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND GETTEXT_LIBINC_FOUND )
    SET(GETTEXT_FOUND TRUE)
-ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
+   if (NOT Gettext_FIND_QUIETLY)
+      message(STATUS "Found Gettext: ${GETTEXT_SOURCE}")
+   endif (NOT Gettext_FIND_QUIETLY)
+ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND GETTEXT_LIBINC_FOUND )
    SET(GETTEXT_FOUND FALSE)
    IF (GetText_REQUIRED)
       MESSAGE(FATAL_ERROR "GetText not found")
    ENDIF (GetText_REQUIRED)
-ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
-
-
+ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND GETTEXT_LIBINC_FOUND )