--- rpl/configure.ac 2023/08/07 08:05:59 1.285 +++ rpl/configure.ac 2024/05/28 15:13:26 1.289 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.34]) +AC_INIT([rpl],[4.1.36]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) AM_SILENT_RULES([yes]) @@ -17,7 +17,7 @@ dnl ftp://ftp.astron.com/pub/file/ FILE=file-5.45 ICONV=libiconv-1.17 SQLITE=sqlite-3.42.0 -OPENSSL=openssl-3.1.2 +OPENSSL=openssl-3.2.1 OPENMOTIF=motif-2.3.8 LIBXPM=libXpm-3.5.16 SIGSEGV=libsigsegv-2.14 @@ -807,6 +807,16 @@ 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],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"]) CFLAGS=$saved_CFLAGS + libMySQLinc=$libMySQLinc/mysql + fi + + if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then + AC_MSG_CHECKING(for libmysql includes in /usr/include/mariadb) + 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"]) + CFLAGS=$saved_CFLAGS libMySQLinc=$libMySQLinc/mysql fi