--- rpl/configure.ac	2019/01/04 10:31:15	1.231
+++ 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.30])
+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.0
-READLINE=readline-7.0
-UNITS=units-2.16
-GSL=gsl-2.5
+NCURSES=ncurses-6.5
+READLINE=readline-8.2
+UNITS=units-2.22
+GSL=gsl-2.8
 GPP=gpp-3.0
-GNUPLOT=gnuplot-5.2.5
-FILE=file-5.33
-ICONV=libiconv-1.15
-SQLITE=sqlite-3.26.0
-OPENSSL=openssl-1.1.1a
+GNUPLOT=gnuplot-6.0.1
+dnl ftp://ftp.astron.com/pub/file/
+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
-
-GMP=gmp-6.1.2
-MPFR=mpfr-4.0.1
-MPFI=mpfi-1.5.3
-NTL=ntl-11.0.0
-COCOA=CoCoALib-0.99600
-PARI=pari-2.9.5
-GIAC=giac-1.4.9
+LIBXPM=libXpm-3.5.16
+SIGSEGV=libsigsegv-2.14
+ZLIB=zlib-1.2.13
+
+GMP=gmp-6.3.0
+MPFR=mpfr-4.2.0
+MPFI=mpfi-1.5.4
+NTL=ntl-11.5.1
+PARI=pari-2.15.4
+GIAC=giac-1.9.0
 
 dnl 32 bits ABI
 AC_ARG_WITH(gcc_version,
@@ -194,7 +194,8 @@ if test "$enableval" = "no"; then
 else
 	RPLCAS=-DRPLCAS
 	LIBRPLCAS="\$(top_builddir)/rplcas/lib/librplcas.a"
-	LIBS="$LIBS $LIBCURL -lcurl"
+dnl	LIBS="$LIBS $LIBCURL -lcurl"
+	LIBGIAC="$LIBCURL -lcurl"
 	INCRPLCAS="-I\$(top_builddir)/rplcas/include/giac \
 			-I\$(top_builddir)/rplcas/include"
 fi],[
@@ -208,6 +209,7 @@ AC_SUBST(ABI)
 AC_SUBST(RPLCAS)
 AC_SUBST(LIBRPLCAS)
 AC_SUBST(INCRPLCAS)
+AC_SUBST(LIBGIAC)
 
 dnl Options
 AC_ARG_ENABLE(optimization,
@@ -316,7 +318,7 @@ AC_ARG_ENABLE(final-encoding,
 [  --enable-final-encoding force final encoding [[default=guessed]]], [
 if test "$enableval" = "no"; then
 	FINAL_ENCODING="\$(shell locale charmap | \
-		\$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')"
+		\$(AWK) '/=/ { print \$\$3;} !/=/ { print \$\$1;}')"
 	FORCED_FINAL_ENCODING=0
 else
 	FINAL_ENCODING="$enable_final_encoding"
@@ -324,7 +326,7 @@ else
 fi], [
 FORCED_FINAL_ENCODING=0
 FINAL_ENCODING="\$(shell locale charmap | \
-	\$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')"])
+	\$(AWK) '/=/ { print \$\$3;} !/=/ { print \$\$1;}')"])
 
 AC_ARG_ENABLE(tex,
 [  --enable-tex            provide the TeX support [[default=guessed]]], [
@@ -489,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
@@ -506,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); \
@@ -516,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 | \
@@ -567,15 +567,12 @@ 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 | \
 			(cd rplcas && tar -xf -)
 fi
-if test ! -d rplcas/$COCOA; then
-	gunzip -c "$srcdir"/rplcas/$COCOA.tar.gz | \
-			(cd rplcas && tar -xf -)
-fi
 if test ! -d rplcas/$PARI; then
 	gunzip -c "$srcdir"/rplcas/$PARI.tar.gz | \
 			(cd rplcas && tar -xf -)
@@ -751,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, [[
@@ -800,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
@@ -808,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
@@ -818,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
@@ -829,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
@@ -851,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"
@@ -867,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
@@ -1354,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)
@@ -1455,7 +1461,6 @@ AC_SUBST(GMP)
 AC_SUBST(MPFR)
 AC_SUBST(MPFI)
 AC_SUBST(NTL)
-AC_SUBST(COCOA)
 AC_SUBST(PARI)
 AC_SUBST(GIAC)
 AC_SUBST(INCMOTIF)