Revert "Cmake: fix includes with PATH_SUFFIXES"

cmake/find_icu4c.cmake

@@ -11,6 +11,6 @@ else ()
 endif ()
 set (ICU_LIBS ${ICUI18N} ${ICUUC} ${ICUDATA})
 
-find_path (ICU_INCLUDE_DIR NAMES unicode/unistr.h PATHS ${ICU_INCLUDE_PATHS})
+find_path (ICU_INCLUDE_DIR NAMES unistr.h PATH_SUFFIXES unicode PATHS ${ICU_INCLUDE_PATHS})
 message(STATUS "Using icu: ${ICU_INCLUDE_DIR} : ${ICU_LIBS}")
 include_directories (${ICU_INCLUDE_DIR})

cmake/find_readline_edit.cmake

@@ -20,7 +20,7 @@ if (NOT READLINE_PATHS)
 
 	set(READLINE_INCLUDE_PATHS "/usr/local/opt/readline/include")
 	if (READLINE_LIB)
-		find_path (READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS ${READLINE_INCLUDE_PATHS})
+		find_path (READLINE_INCLUDE_DIR NAMES readline.h PATH_SUFFIXES readline PATHS ${READLINE_INCLUDE_PATHS})
 		add_definitions (-D USE_READLINE)
 		set (LINE_EDITING_LIBS ${READLINE_LIB} ${TERMCAP_LIB})
 		message (STATUS "Using line editing libraries (readline): ${READLINE_INCLUDE_DIR} : ${LINE_EDITING_LIBS}")
@@ -31,7 +31,7 @@ if (NOT READLINE_PATHS)
 			find_library (CURSES_LIB NAMES curses)
 		endif ()
 		add_definitions (-D USE_LIBEDIT)
-		find_path (READLINE_INCLUDE_DIR NAMES editline/readline.h PATHS ${READLINE_INCLUDE_PATHS})
+		find_path (READLINE_INCLUDE_DIR NAMES readline.h PATH_SUFFIXES editline PATHS ${READLINE_INCLUDE_PATHS})
 		set (LINE_EDITING_LIBS ${EDIT_LIB} ${CURSES_LIB} ${TERMCAP_LIB})
 		message (STATUS "Using line editing libraries (edit): ${READLINE_INCLUDE_DIR} : ${LINE_EDITING_LIBS}")
 	else ()

libs/libmysqlxx/cmake/find_mysqlclient.cmake

@@ -18,7 +18,7 @@ set (MYSQL_INCLUDE_PATHS
 	"/usr/include/mysql"
 )
 
-find_path (MYSQL_INCLUDE_DIR NAMES mysql/mysql.h PATHS ${MYSQL_INCLUDE_PATHS})
+find_path (MYSQL_INCLUDE_DIR NAMES mysql.h PATH_SUFFIXES mysql PATHS ${MYSQL_INCLUDE_PATHS})
 
 if (USE_STATIC_LIBRARIES)
 	find_library (STATIC_MYSQLCLIENT_LIB libmysqlclient.a PATHS ${MYSQL_LIB_PATHS})

libs/libmysqlxx/src/Connection.cpp

-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/Exception.h>
 

libs/libmysqlxx/src/Exception.cpp

-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <mysqlxx/Exception.h>
 
 

libs/libmysqlxx/src/Pool.cpp

-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <mysqld_error.h>
 #include <mysqlxx/Pool.h>
 

libs/libmysqlxx/src/Query.cpp

-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/Query.h>
 

libs/libmysqlxx/src/ResultBase.cpp

-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/ResultBase.h>
 

libs/libmysqlxx/src/Row.cpp

-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <mysqlxx/Row.h>
 
 

libs/libmysqlxx/src/StoreQueryResult.cpp

-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/StoreQueryResult.h>
 

libs/libmysqlxx/src/UseQueryResult.cpp

-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/UseQueryResult.h>