Backport commit 7e36703d from 17.02 to allow the use of mariadb_config

auxdir/x_ac_databases.m4

@@ -22,9 +22,9 @@ AC_DEFUN([X_AC_DATABASES],
 		[_x_ac_mysql_bin="$withval"])
 
 	if test x$_x_ac_mysql_bin = xno; then
-    		AC_PATH_PROG(HAVEMYSQLCONFIG, mysql_config, no)
+		AC_PATH_PROGS(HAVEMYSQLCONFIG, [mysql_config mariadb_config], no)
 	else
-   		AC_PATH_PROG(HAVEMYSQLCONFIG, mysql_config, no, $_x_ac_mysql_bin)
+		AC_PATH_PROGS(HAVEMYSQLCONFIG, [mysql_config mariadb_config], no, $_x_ac_mysql_bin)
 	fi
 
 	if test x$HAVEMYSQLCONFIG = xno; then

configure

@@ -23243,8 +23243,10 @@ fi
 	if test x$_x_ac_mysql_bin = xno; then
-    		# Extract the first word of "mysql_config", so it can be a program name with args.
-set dummy mysql_config; ac_word=$2
+		for ac_prog in mysql_config mariadb_config
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_HAVEMYSQLCONFIG+:} false; then :
@@ -23270,7 +23272,6 @@ done
   done
 IFS=$as_save_IFS
-  test -z "$ac_cv_path_HAVEMYSQLCONFIG" && ac_cv_path_HAVEMYSQLCONFIG="no"
   ;;
 esac
 fi
@@ -23284,9 +23285,15 @@ $as_echo "no" >&6; }
 fi
+  test -n "$HAVEMYSQLCONFIG" && break
+done
+test -n "$HAVEMYSQLCONFIG" || HAVEMYSQLCONFIG="no"
+
 	else
-   		# Extract the first word of "mysql_config", so it can be a program name with args.
-set dummy mysql_config; ac_word=$2
+		for ac_prog in mysql_config mariadb_config
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_HAVEMYSQLCONFIG+:} false; then :
@@ -23312,7 +23319,6 @@ done
   done
 IFS=$as_save_IFS
-  test -z "$ac_cv_path_HAVEMYSQLCONFIG" && ac_cv_path_HAVEMYSQLCONFIG="no"
   ;;
 esac
 fi
@@ -23326,6 +23332,10 @@ $as_echo "no" >&6; }
 fi
+  test -n "$HAVEMYSQLCONFIG" && break
+done
+test -n "$HAVEMYSQLCONFIG" || HAVEMYSQLCONFIG="no"
+
 	fi
 	if test x$HAVEMYSQLCONFIG = xno; then