--- rpl/configure.ac 2023/08/05 21:24:40 1.279 +++ 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]) @@ -16,18 +16,18 @@ GNUPLOT=gnuplot-5.4.8 dnl ftp://ftp.astron.com/pub/file/ FILE=file-5.45 ICONV=libiconv-1.17 -SQLITE=sqlite-3.37.0 -OPENSSL=openssl-1.1.1s +SQLITE=sqlite-3.42.0 +OPENSSL=openssl-3.2.1 OPENMOTIF=motif-2.3.8 -LIBXPM=libXpm-3.5.12 -SIGSEGV=libsigsegv-2.12 -ZLIB=zlib-1.2.11 +LIBXPM=libXpm-3.5.16 +SIGSEGV=libsigsegv-2.14 +ZLIB=zlib-1.2.13 -GMP=gmp-6.2.1 -MPFR=mpfr-4.1.0 +GMP=gmp-6.3.0 +MPFR=mpfr-4.2.0 MPFI=mpfi-1.5.4 NTL=ntl-11.5.1 -PARI=pari-2.13.3 +PARI=pari-2.15.4 GIAC=giac-1.9.0 dnl 32 bits ABI @@ -811,6 +811,16 @@ if test "x$with_mysql" = xcheck -o "x$wi 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 + + if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then AC_MSG_CHECKING(for libmysql includes in /usr/local/include) saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $libMySQLinc/../local/include" @@ -1351,8 +1361,8 @@ esac dnl Correction d'un problème de compilation pour GNUplot 5.0.0 ac_configure_args="$ac_configure_args --disable-wxwidgets" dnl Correction d'un problème d'ABI avec readline -ac_configure_args="$ac_configure_args \ - --with-abi-version=5.9 --with-rel-version=5.9" +dnl ac_configure_args="$ac_configure_args \ +dnl --with-abi-version=5.9 --with-rel-version=5.9" case $OS in OS2)