From 131ce4ced20ac6f5b2a171677aae33ebfdcb2a1e Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sat, 4 Sep 2010 20:18:44 +0200
Subject: [PATCH] Changed: FindLibwww search also for libexpat

---
 code/CMakeModules/FindLibwww.cmake | 4 ++++
 code/ryzom/CMakeLists.txt          | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/code/CMakeModules/FindLibwww.cmake b/code/CMakeModules/FindLibwww.cmake
index dd2e9621a..3aabcf65d 100644
--- a/code/CMakeModules/FindLibwww.cmake
+++ b/code/CMakeModules/FindLibwww.cmake
@@ -109,6 +109,10 @@ IF(WIN32)
     FIND_WWW_LIBRARY(LIBREGEX_LIBRARY gnu_regex)
     SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${LIBREGEX_LIBRARY})
   ENDIF(LIBWWW_REGEX_INCLUDE_DIR)
+ELSE(WIN32)
+  FIND_PACKAGE(EXPAT)
+  SET(LIBWWW_INCLUDE_DIR ${LIBWWW_INCLUDE_DIR} ${EXPAT_INCLUDE_DIRS})
+  SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${EXPAT_LIBRARIES})
 ENDIF(WIN32)
 
 IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR)
diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt
index adca6a42d..56e9e40ca 100644
--- a/code/ryzom/CMakeLists.txt
+++ b/code/ryzom/CMakeLists.txt
@@ -23,13 +23,8 @@ NL_CONFIGURE_CHECKS()
 IF(WITH_STATIC)
   SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
   SET(CURL_DEFINITIONS -DCURL_STATICLIB)
-  SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} -DLIBXML_STATIC)
 ENDIF(WITH_STATIC)
 
-IF(NOT WIN32)
-  SET(EXPAT_LIBRARY expat)
-ENDIF(NOT WIN32)
-
 ADD_SUBDIRECTORY(common)
 
 IF(WITH_RYZOM_CLIENT)