1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge branch '10.1' into 10.2

This commit is contained in:
Oleksandr Byelkin
2019-07-26 07:03:39 +02:00
65 changed files with 3227 additions and 117 deletions

View File

@ -274,9 +274,16 @@ then
fi
if test -n "$srcdir"
then
# In an out-of-source build, builddir is not srcdir. Try to guess where
# builddir is by looking for my_print_defaults.
if test -z "$builddir"
then
builddir="$srcdir"
if test -x "$dirname0/extra/my_print_defaults"
then
builddir="$dirname0"
else
builddir="$srcdir"
fi
fi
print_defaults="$builddir/extra/my_print_defaults"
elif test -n "$basedir"