--- rpl/configure.ac	2024/05/28 15:13:26	1.289
+++ rpl/configure.ac	2024/05/28 15:32:22	1.290
@@ -797,7 +797,7 @@ if test "x$with_mysql" = xcheck -o "x$wi
 	saved_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -L/$libMySQLinc"
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
-					libMySQLinc=$libMySQLinc/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
+					libMySQLinc=$libMySQLinc],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
 	CFLAGS=$saved_CFLAGS
 
 	if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then
@@ -805,9 +805,11 @@ if test "x$with_mysql" = xcheck -o "x$wi
 		saved_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $libMySQLinc/mysql"
 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
-						libMySQLinc=$libMySQLinc],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
+						libMySQLinc=$libMySQLinc/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
 		CFLAGS=$saved_CFLAGS
-		libMySQLinc=$libMySQLinc/mysql
+		if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then
+			libMySQLinc=$libMySQLinc/mysql
+		fi;
 	fi
 
 	if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then
@@ -815,9 +817,11 @@ if test "x$with_mysql" = xcheck -o "x$wi
 		saved_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $libMySQLinc/mariadb"
 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
-						libMySQLinc=$libMySQLinc],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
+						libMySQLinc=$libMySQLinc/mariadb],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
 		CFLAGS=$saved_CFLAGS
-		libMySQLinc=$libMySQLinc/mysql
+		if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then
+			libMySQLinc=$libMySQLinc/mariadb
+		fi;
 	fi
 
 	if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then
@@ -825,10 +829,12 @@ if test "x$with_mysql" = xcheck -o "x$wi
 		saved_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $libMySQLinc/../local/include"
 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
-						libMySQLinc=$libMySQLinc/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
+						libMySQLinc=$libMySQLinc/../local/include],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
 		CFLAGS=$saved_CFLAGS
-		libMySQLinc=$libMySQLinc/../local/include
-		libMySQLlib=$libMySQLlib/../local/lib
+		if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then
+			libMySQLinc=$libMySQLinc/../local/include
+			libMySQLlib=$libMySQLlib/../local/lib
+		fi;
 	fi
 
 	if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then
@@ -838,8 +844,10 @@ if test "x$with_mysql" = xcheck -o "x$wi
 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
 						libMySQLinc=$libMySQLinc/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
 		CFLAGS=$saved_CFLAGS
-		libMySQLinc=$libMySQLinc/../local/include/mysql
-		libMySQLlib=$libMySQLlib/../local/lib
+		if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then
+			libMySQLinc=$libMySQLinc/../local/include/mysql
+			libMySQLlib=$libMySQLlib/../local/lib
+		fi;
 	fi
 else
 	if test "x$with_mysql" != xno; then