From fe9d8dbd8a29be41a8f3d322850dcb7963ebe149 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Tue, 2 Nov 2010 13:36:12 +0100
Subject: [PATCH] Changed: #1152 FindLibwww does not make all needed libs link
 to ryzom_client

---
 code/CMakeModules/CheckDepends.cmake | 2 +-
 code/CMakeModules/FindLibwww.cmake   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/CMakeModules/CheckDepends.cmake b/code/CMakeModules/CheckDepends.cmake
index e9a186354..9ebf977c8 100644
--- a/code/CMakeModules/CheckDepends.cmake
+++ b/code/CMakeModules/CheckDepends.cmake
@@ -124,4 +124,4 @@ MACRO(LINK_DEPENDS LIBRARIES MYLIBRARY OTHERLIBRARY SYMBOL)
     SET(${LIBRARIES} ${${LIBRARIES}} ${${OTHERLIBRARY}})
     SET(${OTHERLIBRARY}_LINKED TRUE)
   ENDIF(MUST_LINK)
- NDMACRO(LINK_DEPENDS)
+ENDMACRO(LINK_DEPENDS)
diff --git a/code/CMakeModules/FindLibwww.cmake b/code/CMakeModules/FindLibwww.cmake
index aa76955e1..b739e6c2f 100644
--- a/code/CMakeModules/FindLibwww.cmake
+++ b/code/CMakeModules/FindLibwww.cmake
@@ -136,9 +136,11 @@ LINK_WWW_LIBRARY(LIBWWWAPP_LIBRARY LIBWWWZIP_LIBRARY HTZLib_inflate)
 # libwwwxml can be linked to xmlparse or expat
 LINK_WWW_LIBRARY(LIBWWWXML_LIBRARY LIBXMLPARSE_LIBRARY XML_ParserCreate)
 
-IF(NOT LIBXMLPARSE_LIBRARY_LINKED)
+IF(LIBXMLPARSE_LIBRARY_LINKED)
+  LINK_WWW_LIBRARY(LIBXMLPARSE_LIBRARY EXPAT_LIBRARY XmlInitEncoding)
+ELSE(LIBXMLPARSE_LIBRARY_LINKED)
   LINK_WWW_LIBRARY(LIBWWWXML_LIBRARY EXPAT_LIBRARY XML_ParserCreate)
-ENDIF(NOT LIBXMLPARSE_LIBRARY_LINKED)
+ENDIF(LIBXMLPARSE_LIBRARY_LINKED)
 
 LINK_WWW_LIBRARY(LIBWWWHTTP_LIBRARY LIBMD5_LIBRARY MD5Init)
 LINK_WWW_LIBRARY(LIBWWWAPP_LIBRARY LIBREGEX_LIBRARY regexec)