Add C/C as a submodule in libmariadb/

also
* fix includes
* rename cmake macros and targets to avoid name clashes

cmake/mariadb_connector_c.cmake

@@ -1,32 +1,36 @@
-#
-# Configuration options for Connector/C
-#
-IF(WIN32)
-  # todo: libcurl for windows
+SET(OPT CONC_)
+
+IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
+  SET(CONC_WITH_RTC ON)
+ENDIF()
+
+SET(CONC_WITH_SIGNCODE ${SIGNCODE})
+SET(SIGN_OPTIONS ${SIGNTOOL_PARAMETERS})
+
+IF(TARGET zlib)
+  GET_PROPERTY(ZLIB_LIBRARY_LOCATION TARGET zlib PROPERTY LOCATION)
 ELSE()
-  SET(CC_LIBS ${LIBDL} ${LIBM} ${CMAKE_THREAD_LIBS_INIT})
-  FIND_PACKAGE(OpenSSL)
-  #FIND_PACKAGE(GnuTLS)
-  IF(OPENSSL_FOUND)
-    SET(CC_LIBS ${CC_LIBS} ${OPENSSL_LIBRARIES})
-    SET(CC_CMAKE_OPTS "-DWITH_SSL=OPENSSL")
-  ELSEIF (GNUTLS_FOUND)
-    SET(CC_LIBS ${CC_LIBS} ${GNUTLS_LIBRARY})
-    SET(CC_CMAKE_OPTS "-DWITH_SSL=GNUTLS")
+  SET(ZLIB_LIBRARY_LOCATION ${ZLIB_LIBRARY})
+ENDIF()
+
+IF(SSL_DEFINES MATCHES "YASSL")
+  IF(WIN32)
+    SET(CONC_WITH_SSL "SCHANNEL")
   ELSE()
-    SET(CC_CMAKE_OPTS "-DWITH_SSL=OFF") 
-  ENDIF()
-  INCLUDE(${CMAKE_SOURCE_DIR}/cmake/iconv.cmake)
-  IF(ICONV_FOUND)
-    IF(ICONV_EXTERNAL)
-      IF(NOT ICONV_LIBRARIES MATCHES "libc.so")
-        SET(CC_LIBS ${CC_LIBS} ${ICONV_LIBRARIES})
-      ENDIF()
-    ENDIF()
+    SET(CONC_WITH_SSL "GNUTLS") # that's what debian wants, right?
   ENDIF()
+ELSE()
+  SET(CONC_WITH_SSL "OPENSSL")
 ENDIF()
-IF(NOT TARGET zlib)
-  SET(CC_LIBS ${CC_LIBS} ${ZLIB_LIBRARY})
+
+SET(CONC_WITH_CURL OFF)
+SET(CONC_WITH_MYSQLCOMPAT ON)
+
+IF (INSTALL_LAYOUT STREQUAL "RPM")
+  SET(CONC_INSTALL_LAYOUT "RPM")
+ELSE()
+  SET(CONC_INSTALL_LAYOUT "DEFAULT")
 ENDIF()
-SET(mysqlclient_LIB_DEPENDS ${CC_LIBS} CACHE INTERNAL "")
-MARK_AS_ADVANCED(CC_LIBS CC_CMAKE_OPTS)
+
+MESSAGE("== Configuring MariaDB Connector/C")
+ADD_SUBDIRECTORY(libmariadb)