Merge branch 'stable'

cmake/FindReadline.cmake

@@ -5,26 +5,21 @@
 # READLINE_INCLUDE_DIR
 # READLINE_LIBRARIES
 #
-include(FindCurses)
 include(FindTermcap)
 
-FIND_LIBRARY(READLINE_HISTORY_LIBRARY NAMES history)
 FIND_LIBRARY(READLINE_READLINE_LIBRARY NAMES readline)
 FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h)
 SET(READLINE_FOUND FALSE)
 
-IF (READLINE_HISTORY_LIBRARY AND READLINE_READLINE_LIBRARY AND READLINE_INCLUDE_DIR)
+IF (READLINE_READLINE_LIBRARY AND READLINE_INCLUDE_DIR)
 	SET (READLINE_FOUND TRUE)
 	SET (READLINE_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 ${READLINE_LIBRARIES} ${CURSES_LIBRARY})
-	ENDIF(CURSES_FOUND)
+	SET (READLINE_LIBRARIES ${READLINE_READLINE_LIBRARY})
+	MESSAGE(STATUS "Found GNU readline: ${READLINE_READLINE_LIBRARY}")
 	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)
+ENDIF (READLINE_READLINE_LIBRARY AND READLINE_INCLUDE_DIR)
 
 MARK_AS_ADVANCED(
 	READLINE_FOUND