Fix for CONC-90: Incorrect output for mariadb_config

holzboote@googlemail.com · holzboote@googlemail.com · commit 170a7a14b872 · 2014-05-02T16:13:21.000+02:00
- When linking against external zlib the linker options are
      - added missing space for CMAKE_C_FLAGS
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -102,7 +102,7 @@ INCLUDE(cmake/SearchLibrary.cmake)
 IF(WITH_EXTERNAL_ZLIB)
   FIND_PACKAGE(ZLIB QUIET)
   IF(${ZLIB_FOUND})
-    SET(LIBZ "-lz")
+    SET(LIBZ "z")
   ENDIF()
 ENDIF()
 
diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in
@@ -6,7 +6,7 @@
 #define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include/mariadb"
 #define LIBS    "-L@CMAKE_INSTALL_PREFIX@/lib/mariadb -lmariadb" \
                 "@extra_dynamic_LDFLAGS@"
-#define CFLAGS  INCLUDE "@CMAKE_C_FLAGS@"
+#define CFLAGS  INCLUDE " @CMAKE_C_FLAGS@"
 #define VERSION "@MYSQL_CLIENT_VERSION@"
 #define SOCKET  "@MYSQL_UNIX_ADDR@"
 #define PORT "@MYSQL_PORT@"
diff --git a/unittest/libmariadb/ssl.c b/unittest/libmariadb/ssl.c
