Fix gettext detection and locale building (#9772)

broken since a368e7e

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 710d9e13e1c8c56c3b9062993bb65d45bba5a66d..dd68ceec9d759e07b6832815103de3e56ef79d64 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,7 +62,7 @@ set(USE_GETTEXT FALSE)
 
 if(ENABLE_GETTEXT)
        find_package(GettextLib)
-       if(GETTEXT_FOUND)
+       if(GETTEXTLIB_FOUND)
                if(WIN32)
                        message(STATUS "GetText library: ${GETTEXT_LIBRARY}")
                        message(STATUS "GetText DLL: ${GETTEXT_DLL}")
@@ -70,7 +70,7 @@ if(ENABLE_GETTEXT)
                endif()
                set(USE_GETTEXT TRUE)
                message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
-       endif(GETTEXT_FOUND)
+       endif(GETTEXTLIB_FOUND)
 else()
        mark_as_advanced(GETTEXT_ICONV_DLL GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY GETTEXT_MSGFMT)
        message(STATUS "GetText disabled.")
@@ -680,7 +680,7 @@ set(GETTEXT_BLACKLISTED_LOCALES
 
 option(APPLY_LOCALE_BLACKLIST "Use a blacklist to avoid broken locales" TRUE)
 
-if (GETTEXT_FOUND AND APPLY_LOCALE_BLACKLIST)
+if (GETTEXTLIB_FOUND AND APPLY_LOCALE_BLACKLIST)
        set(GETTEXT_USED_LOCALES "")
        foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
                if (NOT ";${GETTEXT_BLACKLISTED_LOCALES};" MATCHES ";${LOCALE};")