From 3ac2055a7d1cd5c78cb778abff1557e365bf08d9 Mon Sep 17 00:00:00 2001
From: Scott MacVicar <macvicar@facebook.com>
Date: Thu, 28 Oct 2010 16:34:42 -0700
Subject: [PATCH] Add imap support, requires cclient

---
 CMake/FindCClient.cmake  | 23 +++++++++++++++++++++++
 CMake/HPHPFindLibs.cmake |  6 ++++--
 CMake/HPHPSetup.cmake    |  6 +++---
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 CMake/FindCClient.cmake

diff --git a/CMake/FindCClient.cmake b/CMake/FindCClient.cmake
new file mode 100644
index 00000000000..3cc88a1b737
--- /dev/null
+++ b/CMake/FindCClient.cmake
@@ -0,0 +1,23 @@
+IF(CCLIENT_FOUND)
+  SET(CCLIENT_FIND_QUIETLY TRUE)
+ENDIF(CCLIENT_FOUND)
+
+FIND_PATH(CCLIENT_INCLUDE_PATH
+  NAMES c-client.h
+  PATH_SUFFIXES c-client
+  PATHS /usr/include /usr/local/include /usr/pkg/include
+)
+
+FIND_LIBRARY(CCLIENT_LIBRARY
+  NAMES c-client
+  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
+)
+
+IF (CCLIENT_INCLUDE_PATH AND CCLIENT_LIBRARY)
+  SET(CCLIENT_FOUND TRUE)
+ENDIF()
+
+MARK_AS_ADVANCED(
+  CCLIENT_INCLUDE_PATH
+  CCLIENT_LIBRARY
+)
diff --git a/CMake/HPHPFindLibs.cmake b/CMake/HPHPFindLibs.cmake
index 21b7405f66c..8b424dbb9b8 100644
--- a/CMake/HPHPFindLibs.cmake
+++ b/CMake/HPHPFindLibs.cmake
@@ -180,7 +180,7 @@ include_directories(${ONIGURUMA_INCLUDE_DIRS})
 find_package(Ldap REQUIRED)
 include_directories(${LDAP_INCLUDE_DIR})
 
-# ncuses, readline and history
+# ncurses, readline and history
 #set(CURSES_NEED_NCURSES true)
 find_package(Ncurses REQUIRED)
 include_directories(${NCURSES_INCLUDE_PATH})
@@ -188,6 +188,8 @@ include_directories(${NCURSES_INCLUDE_PATH})
 find_package(Readline REQUIRED)
 include_directories(${READLINE_INCLUDE_DIR})
 
+find_package(CClient REQUIRED)
+include_directories(${CCLIENT_INCLUDE_PATH})
 
 if (LINUX OR FREEBSD)
 	FIND_LIBRARY (CRYPT_LIB crypt)
@@ -301,5 +303,5 @@ endif()
 
 	target_link_libraries(${target} ${READLINE_LIBRARY})
 	target_link_libraries(${target} ${NCURSES_LIBRARY})
-
+	target_link_libraries(${target} ${CCLIENT_LIBRARY})
 endmacro()
diff --git a/CMake/HPHPSetup.cmake b/CMake/HPHPSetup.cmake
index e36f298327a..1f7c869d19c 100644
--- a/CMake/HPHPSetup.cmake
+++ b/CMake/HPHPSetup.cmake
@@ -24,9 +24,9 @@ set(FREEBSD FALSE)
 set(LINUX FALSE)
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
-	set(FREEBSD TRUE)	
+	set(FREEBSD TRUE)
 endif()
-	
+
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 	set(LINUX TRUE)
 endif()
@@ -57,7 +57,7 @@ endif()
 add_definitions(-DHPHP_OSS=1)
 
 set(CMAKE_C_FLAGS "-w -fPIC")
-set(CMAKE_CXX_FLAGS "-fPIC -fno-omit-frame-pointer -ftemplate-depth-60 -Wall -Woverloaded-virtual -Wno-deprecated -Wno-parentheses -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof")
+set(CMAKE_CXX_FLAGS "-fPIC -fno-omit-frame-pointer -ftemplate-depth-60 -Wall -Woverloaded-virtual -Wno-deprecated -Wno-parentheses -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names")
 
 include_directories(${HPHP_HOME}/src)
 include_directories(${HPHP_HOME}/src/lib/system/gen)
-- 
2.11.4.GIT