From 54b1709d145b1bf2c1f83c448c79eeedc03efbed Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sun, 6 May 2012 21:50:44 +0200
Subject: [PATCH] Fixed: Compilation using WITH_STATIC_EXTERNAL under Mac OS X

---
 code/ryzom/CMakeLists.txt | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt
index eb3d1c642..62323501e 100644
--- a/code/ryzom/CMakeLists.txt
+++ b/code/ryzom/CMakeLists.txt
@@ -7,15 +7,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src )
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common )
 SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server/src)
 
-IF(WITH_STATIC)
-  FIND_PACKAGE(OpenSSL QUIET)
-  IF(OPENSSL_FOUND)
-    SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
-    SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
-  ENDIF(OPENSSL_FOUND)
-  SET(CURL_DEFINITIONS -DCURL_STATICLIB)
-ENDIF(WITH_STATIC)
-
 ADD_SUBDIRECTORY(common)
 
 IF(WITH_RYZOM_CLIENT)
@@ -26,6 +17,30 @@ IF(WITH_RYZOM_CLIENT)
   ENDIF(WITH_LUA51)
   FIND_PACKAGE(Luabind REQUIRED)
   FIND_PACKAGE(CURL REQUIRED)
+
+  IF(WIN32 OR CURL_LIBRARIES MATCHES "\\.a")
+    SET(CURL_STATIC ON)
+  ENDIF(WIN32 OR CURL_LIBRARIES MATCHES "\\.a")
+
+  IF(CURL_STATIC)
+    SET(CURL_DEFINITIONS -DCURL_STATICLIB)
+
+    FIND_PACKAGE(OpenSSL QUIET)
+
+    IF(OPENSSL_FOUND)
+      SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
+      SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
+    ENDIF(OPENSSL_FOUND)
+
+    # CURL Macports version depends on libidn and libintl too
+    IF(APPLE)
+      FIND_LIBRARY(IDN_LIBRARY idn)
+      FIND_LIBRARY(INTL_LIBRARY intl)
+
+      SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${IDN_LIBRARY} ${INTL_LIBRARY})
+    ENDIF(APPLE)
+  ENDIF(CURL_STATIC)
+
   FIND_PACKAGE(Libwww REQUIRED)
 
   ADD_SUBDIRECTORY(client)