From 2e02e4cb81a1b3af063b5093380217ffca10e5a4 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 24 Sep 2022 03:11:43 +0300 Subject: [PATCH 35/35] configure: Search mariadb configuration by name mariadb-config See osdn #45703 Signed-off-by: Marko Lindqvist --- configure.ac | 2 +- m4/mysql.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 868284080a..d15b97ac48 100644 --- a/configure.ac +++ b/configure.ac @@ -1973,7 +1973,7 @@ AC_MSG_NOTICE([ Build freeciv server: $server AI modules support: $enable_aimodules Database support: $enable_fcdb - mysql: $fcdb_mysql + mysql/mariadb: $fcdb_mysql odbc: $fcdb_odbc postgres: $fcdb_postgres sqlite3: $fcdb_sqlite3 diff --git a/m4/mysql.m4 b/m4/mysql.m4 index 9875a1eb82..7507cc8cb8 100644 --- a/m4/mysql.m4 +++ b/m4/mysql.m4 @@ -20,7 +20,7 @@ AC_DEFUN([FC_CHECK_MYSQL], dnl if test -z "$MYSQL_CONFIG" -o test; then - AC_PATH_PROG([MYSQL_CONFIG], [mysql_config], [no]) + AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mariadb-config], [no]) fi if test "$MYSQL_CONFIG" != "no"; then -- 2.35.1