diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-08 21:01:03 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-18 22:15:26 +0200 |
| commit | a75884e70135dc3699a16fd2745750e990e5851c (patch) | |
| tree | d74299c4953b293f37e93ccdb2869871582f5c47 /scripts/mysql_config.sh | |
| parent | 98cc7a8eeff32eddb37a81635138c76551600e34 (diff) | |
| download | mariadb-git-a75884e70135dc3699a16fd2745750e990e5851c.tar.gz | |
MDEV-13836 mariadb_config & mysql_config output differ
Use mariadb_config, for C/C config variables
Diffstat (limited to 'scripts/mysql_config.sh')
| -rw-r--r-- | scripts/mysql_config.sh | 11 |
1 files changed, 11 insertions, 0 deletions
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] |