From 4d9745d46259dfdfaeaf54a48d740ce6e874a526 Mon Sep 17 00:00:00 2001
From: OmniStudent <theostenman@yahoo.com>
Date: Sun, 4 May 2014 10:56:18 +0200
Subject: [PATCH] applied patch mt3

---
 .DS_Store                                   | Bin 6148 -> 6148 bytes
 minetest/.DS_Store                          | Bin 6148 -> 6148 bytes
 minetest/cmake/Modules/FindGettextLib.cmake |  16 +++++++++++++---
 minetest/src/CMakeLists.txt                 |   1 +
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 242a620c70f53fc8e42f2492e1b84ecd4219dc4f..5b2f7dd8db868a692e5b875a46a364c2b72352be 100644
GIT binary patch
delta 89
zcmZoMXffEJ%4C_mBZYy1frUYjA)O(Up(Hoo#U-V*B$<KXeD_8LpbUy!3X<I9I3{W4
Ywhs)G7chxTp1{P%v~}+01xzWT05jwnrvLx|

delta 89
zcmZoMXffEJ%4C`J#hHPDfrUYjA)O(Up(Hoo#U-V*B$<KXeD}HlpbUy!3X<I9I3{W4
YRtJX33z$SEPhjF>+Tyo)0aJ=706Tyg8UO$Q

diff --git a/minetest/.DS_Store b/minetest/.DS_Store
index 77fd01c684303c5544cc5a50748685ea1f2ef281..04f11042c92039eb21908b857906f9e9e6057c13 100644
GIT binary patch
delta 115
zcmZoMXfc@J&nUMsU^g?P++-e>&E~8O$qcy+i455csX6I}!O8i#1q@(dt^}lzWOMUf
vTvAF)k{KAzcdsnnyo*JeQE~@R2{S`6LlHwVvh+sD&F@(6GHzz)_{$Ffsh=PG

delta 62
zcmV-E0Kxx+FoZCWPXQdUP`d*G9Fq(Lv$OjI76BQh000030CNCx0Ap=$L_}nDbYlPj
U&x^3CvnmGN0g-S#vj+(M4^xj5{Qv*}

diff --git a/minetest/cmake/Modules/FindGettextLib.cmake b/minetest/cmake/Modules/FindGettextLib.cmake
index bc7ea36..78bc94b 100644
--- a/minetest/cmake/Modules/FindGettextLib.cmake
+++ b/minetest/cmake/Modules/FindGettextLib.cmake
@@ -1,21 +1,31 @@
 # Package finder for gettext libs and include files
 
 SET(CUSTOM_GETTEXT_PATH "${PROJECT_SOURCE_DIR}/../../gettext"
-	CACHE FILEPATH "path to custom gettext")
+	CACHE FILEPATH "/usr/local/opt/gettext")
 
 # by default
 SET(GETTEXT_FOUND FALSE)
 
 FIND_PATH(GETTEXT_INCLUDE_DIR
 	NAMES libintl.h
-	PATHS "${CUSTOM_GETTEXT_PATH}/include"
+	PATHS "${CUSTOM_GETTEXT_PATH}/include" "/usr/local/opt/gettext/include"
 	DOC "gettext include directory")
 
 FIND_PROGRAM(GETTEXT_MSGFMT
 	NAMES msgfmt
-	PATHS "${CUSTOM_GETTEXT_PATH}/bin"
+	PATHS "${CUSTOM_GETTEXT_PATH}/bin" "/usr/local/opt/gettext/bin"
 	DOC "path to msgfmt")
 
+FIND_LIBRARY(GETTEXT_LIBRARY
+	NAMES libintl.a
+	PATHS "${CUSTOM_GETTEXT_PATH}/lib" "/usr/local/opt/gettext/lib"
+	DOC "gettext *intl*.lib")
+
+FIND_LIBRARY(ICONV_LIBRARY
+	NAMES libiconv.dylib
+	PATHS "${CUSTOM_GETTEXT_PATH}/lib" "/usr/lib"
+	DOC "iconv lib")
+
 # modern Linux, as well as Mac, seem to not need require special linking
 # they do not because gettext is part of glibc
 # TODO check the requirements on other BSDs and older Linux
diff --git a/minetest/src/CMakeLists.txt b/minetest/src/CMakeLists.txt
index 0ede2d6..28ac5ca 100644
--- a/minetest/src/CMakeLists.txt
+++ b/minetest/src/CMakeLists.txt
@@ -522,6 +522,7 @@ if(BUILD_CLIENT)
 		${PNG_LIBRARIES}
 		${X11_LIBRARIES}
 		${GETTEXT_LIBRARY}
+		${ICONV_LIBRARY}
 		${SOUND_LIBRARIES}
 		${SQLITE3_LIBRARY}
 		${LUA_LIBRARY}