Merge branch 'client_cmake' into stable

cmake/FindReadline.cmake

@@ -15,17 +15,15 @@ SET(READLINE_FOUND FALSE)
 
 IF (READLINE_HISTORY_LIBRARY AND READLINE_READLINE_LIBRARY AND READLINE_INCLUDE_DIR)
 	SET (READLINE_FOUND TRUE)
+	SET (READLINE_INCLUDE_DIR ${CURSES_INCLUDE_DIR} ${READLINE_INCLUDE_DIR})
+	SET (READLINE_LIBRARIES ${READLINE_HISTORY_LIBRARY} ${READLINE_READLINE_LIBRARY})
+	MESSAGE(STATUS "Found GNU readline: ${READLINE_HISTORY_LIBRARY}, ${READLINE_READLINE_LIBRARY}")
 	IF (CURSES_FOUND)
-		SET (READLINE_LIBRARIES ${CURSES_LIBRARIES} ${READLINE_HISTORY_LIBRARY} ${READLINE_READLINE_LIBRARY})
-		SET (READLINE_INCLUDE_DIR ${CURSES_INCLUDE_DIR} ${READLINE_INCLUDE_DIR})
-		MESSAGE(STATUS "Found GNU readline built with Curses: ${READLINE_HISTORY_LIBRARY}, ${READLINE_READLINE_LIBRARY}")
-	ELSE(CURSES_FOUND)
-		IF (TERMCAP_FOUND)
-			SET (READLINE_LIBRARIES ${TERMCAP_LIBRARY} ${READLINE_HISTORY_LIBRARY} ${READLINE_READLINE_LIBRARY})
-			SET (READLINE_INCLUDE_DIR ${TERMCAP_INCLUDE_DIR} ${READLINE_INCLUDE_DIR})
-			MESSAGE(STATUS "Found GNU readline built with Termcap: ${READLINE_HISTORY_LIBRARY}, ${READLINE_READLINE_LIBRARY}")
-		ENDIF (TERMCAP_FOUND)
+		SET (READLINE_LIBRARIES ${READLINE_LIBRARIES} ${CURSES_LIBRARY})
 	ENDIF(CURSES_FOUND)
+	IF (TERMCAP_FOUND)
+		SET (READLINE_LIBRARIES ${READLINE_LIBRARIES} ${TERMCAP_LIBRARY})
+	ENDIF (TERMCAP_FOUND)
 ENDIF (READLINE_HISTORY_LIBRARY AND READLINE_READLINE_LIBRARY AND READLINE_INCLUDE_DIR)
 
 MARK_AS_ADVANCED(