From a75884e70135dc3699a16fd2745750e990e5851c Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sun, 8 Oct 2017 21:01:03 +0200
Subject: [PATCH] MDEV-13836 mariadb_config & mysql_config output differ

Use mariadb_config, for C/C config variables
---
 scripts/mysql_config.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index 52f6d563fe5..cc6db192de2 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -114,6 +114,17 @@ if [ "$basedir" != "/usr" ]; then
 fi
 cflags="$include @CFLAGS_FOR_CLIENTS@"
 
+mariadb_config="$basedir/bin/mariadb_config"
+if test -x "$basedir/bin/mariadb_config"; then
+  cflags=`"$mariadb_config" --cflags`
+  include=`"$mariadb_config" --include`
+  libs=`"$mariadb_config" --libs`
+  plugindir=`"$mariadb_config" --plugindir`
+  socket=`"$mariadb_config" --socket`
+  port=`"$mariadb_config" --port`
+  version=`"$mariadb_config" --version`
+fi
+
 usage () {
         cat <<EOF
 Usage: $0 [OPTIONS]