--- rpl/configure.ac 2023/08/05 21:37:00 1.283 +++ rpl/configure.ac 2024/05/28 15:32:22 1.290 @@ -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,17 +17,17 @@ 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 -ZLIB=zlib-1.2.11 // à mettre à jour +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 @@ -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,23 @@ 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 + 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/mariadb],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"]) + CFLAGS=$saved_CFLAGS + if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then + libMySQLinc=$libMySQLinc/mariadb + fi; fi if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then @@ -815,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 @@ -828,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 @@ -1351,8 +1369,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)