--- rpl/configure.ac 2021/03/13 12:50:36 1.254 +++ rpl/configure.ac 2024/10/29 16:41:02 1.299 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.33]) +AC_INIT([rpl],[4.1.36]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) AM_SILENT_RULES([yes]) @@ -7,28 +7,28 @@ AC_SUBST(target_cpu) AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries -NCURSES=ncurses-6.1 -READLINE=readline-8.0 -UNITS=units-2.19 -GSL=gsl-2.6 +NCURSES=ncurses-6.5 +READLINE=readline-8.2 +UNITS=units-2.22 +GSL=gsl-2.8 GPP=gpp-3.0 -GNUPLOT=gnuplot-5.2.8 +GNUPLOT=gnuplot-6.0.1 dnl ftp://ftp.astron.com/pub/file/ -FILE=file-5.37 -ICONV=libiconv-1.16 -SQLITE=sqlite-3.31.1 -OPENSSL=openssl-1.1.1g +FILE=file-5.45 +ICONV=libiconv-1.17 +SQLITE=sqlite-3.47.0 +OPENSSL=openssl-3.3.2 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.0 -MPFR=mpfr-4.0.2 +GMP=gmp-6.3.0 +MPFR=mpfr-4.2.0 MPFI=mpfi-1.5.4 -NTL=ntl-11.4.3 -PARI=pari-2.11.4 -GIAC=giac-1.5.0 +NTL=ntl-11.5.1 +PARI=pari-2.15.4 +GIAC=giac-1.9.0 dnl 32 bits ABI AC_ARG_WITH(gcc_version, @@ -491,10 +491,6 @@ if test ! -d "$srcdir"/tools/$NCURSES; t for i in $(ls ../$NCURSES*.patch.gz); do echo Applying patch $i && \ gunzip -c $i | patch -p1; - done; - for i in $(ls ../ncurses-6.1*.patch.gz); - do echo Applying patch $i && \ - gunzip -c $i | patch -p1; done); fi if test ! -d "$srcdir"/tools/$READLINE; then @@ -508,6 +504,7 @@ fi if test ! -d "$srcdir"/tools/$GSL; then gunzip -c "$srcdir"/tools/$GSL.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) + (cd "$srcdir"/tools/$GSL && ./autogen.sh) if test $(uname) = "OS/2"; then (cd "$srcdir"/tools/$GSL; \ TMP=$(mktemp tmp.XXXXXXXXXX); \ @@ -518,6 +515,7 @@ fi if test ! -d "$srcdir"/tools/$GPP; then gunzip -c "$srcdir"/tools/$GPP.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) + (cd "$srcdir"/tools/$GPP && autoreconf -i) fi if test ! -d "$srcdir"/tools/$FILE; then gunzip -c "$srcdir"/tools/$FILE.tar.gz | \ @@ -569,6 +567,7 @@ fi if test ! -d "$srcdir"/rplcas/$MPFI; then gunzip -c "$srcdir"/rplcas/$MPFI.tar.gz | \ (cd "$srcdir/rplcas" && tar -xf -) + (cd "$srcdir"/rplcas/$MPFI && ./autogen.sh) fi if test ! -d rplcas/$NTL; then gunzip -c "$srcdir"/rplcas/$NTL.tar.gz | \ @@ -749,9 +748,9 @@ if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPP AC_MSG_ERROR([Can not find libXinerama !])) LIBS=$REG fi -AC_CHECK_LIB(gomp, omp_get_num_procs,, AC_MSG_ERROR([Can not find libgomp !])) -OPENMP=-lgomp -AC_SUBST(OPENMP) +dnl AC_CHECK_LIB(gomp, omp_get_num_procs,, AC_MSG_ERROR([Can not find libgomp !])) +dnl OPENMP=-lgomp +dnl AC_SUBST(OPENMP) dnl Check for union semun AC_CHECK_TYPE([union semun], SEMUN=-DUNION_SEMUN, SEMUN=-UUNION_SEMUN, [[ @@ -798,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 @@ -806,9 +805,17 @@ 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 + 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 - libMySQLinc=$libMySQLinc/mysql fi if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then @@ -816,10 +823,11 @@ 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 + libMySQLlib=$libMySQLlib/../local/lib + fi; fi if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then @@ -827,10 +835,11 @@ if test "x$with_mysql" = xcheck -o "x$wi saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $libMySQLinc/../local/include/mysql" 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/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 + libMySQLlib=$libMySQLlib/../local/lib + fi; fi else if test "x$with_mysql" != xno; then @@ -849,9 +858,8 @@ else 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 fi else MYSQL_SUPPORT="-UMYSQL_SUPPORT" @@ -865,16 +873,16 @@ if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP AC_MSG_CHECKING(for libmysql libraries in $libMySQLlib) saved_LIBS="$LIBS" if test $STATIC = no; then - LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc" + LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r -lz -ldl -lm -lssl -lcrypto $libMySQLinc" else - LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a $libMySQLinc" + LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a -lz -ldl -lm -lssl -lcrypto $libMySQLinc" fi AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[MYSQL mysql; mysql_init(&mysql);]])],[AC_MSG_RESULT([yes]); MYSQL_LIB="yes"],[AC_MSG_RESULT([no]); MYSQL_LIB="no"]) LIBS=$saved_LIBS; if test $STATIC = no; then - libMySQLlib="-L/$libMySQLlib -lmysqlclient_r" + libMySQLlib="-L/$libMySQLlib -lmysqlclient_r -lssl -lcrypto" else - libMySQLlib="$libMySQLlib/libmysqlclient_r.a" + libMySQLlib="$libMySQLlib/libmysqlclient_r.a -lssl -lcrypto" EXT_SQL="$EXT_SQL $libMySQLlib" fi fi @@ -1352,8 +1360,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)