diff --git a/cmake/SearchLibrary.cmake b/cmake/SearchLibrary.cmake
index 7f462b59..aa3a240e 100644
--- a/cmake/SearchLibrary.cmake
+++ b/cmake/SearchLibrary.cmake
@@ -12,9 +12,8 @@ FUNCTION(SEARCH_LIBRARY library_name function liblist)
   IF(${${library_name}})
     RETURN()
   ENDIF()
-  CHECK_FUNCTION_EXISTS(${function} ${function}_IS_SYS_FUNC)
-  # check if function is part of libc
-  IF(HAVE_${function}_IS_SYS_FUNC)
+  CHECK_FUNCTION_EXISTS(${function} IS_${function}_LIBC_FUNC)
+  IF(IS_${function}_LIBC_FUNC)
     SET(${library_name} "" PARENT_SCOPE)
     RETURN()
   ENDIF()
diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in
index 5df2312f..45d2f4e3 100644
--- a/mariadb_config/mariadb_config.c.in
+++ b/mariadb_config/mariadb_config.c.in
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
   if (argc <= 1)
   {
     usage();
-    exit(1);
+    exit(0);
   }
 
   while(1)
@@ -116,7 +116,7 @@ int main(int argc, char **argv)
       puts(LIBS_SYS);
       break;
     default:
-      exit(0);
+      exit((c != -1));
     }
   }