--- rpl/configure.ac	2013/02/10 16:29:01	1.54
+++ rpl/configure.ac	2015/01/27 15:23:59	1.112
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([rpl],[4.1.12])
+AC_INIT([rpl],[4.1.20])
 AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(silent-rules)
@@ -9,25 +9,26 @@ AC_CONFIG_HEADERS([rplconfig.h])
 
 dnl Libraries
 NCURSES=ncurses-5.9
-READLINE=readline-6.2
-UNITS=units-2.01
-GSL=gsl-1.15
+READLINE=readline-6.3
+UNITS=units-2.02
+GSL=gsl-1.16
 GPP=gpp-3.0
-GNUPLOT=gnuplot-4.6.1
+GNUPLOT=gnuplot-5.0.0
 FILE=file-5.11
-ICONV=libiconv-1.13.1
-SQLITE=sqlite-3.7.15.2
-OPENSSL=openssl-1.0.1c
+ICONV=libiconv-1.14
+SQLITE=sqlite-3.8.8.1
+OPENSSL=openssl-1.0.2
 OPENMOTIF=openmotif-2.3.4
 LIBXPM=libXpm-3.5.9
 SIGSEGV=libsigsegv-2.11
+ZLIB=zlib-1.2.7
 
-GMP=gmp-5.0.5
-MPFR=mpfr-3.1.1
+GMP=gmp-6.0.0
+MPFR=mpfr-3.1.2
 NTL=ntl-5.5.2
 COCOA=CoCoALib-0.9950
-PARI=pari-2.5.1
-GIAC=giac-1.1.0
+PARI=pari-2.5.4
+GIAC=giac-1.1.4
 
 dnl 32 bits ABI
 AC_ARG_WITH(gcc_version,
@@ -43,6 +44,7 @@ AC_SUBST(F77)
 ],[])
 
 dnl Checks for Bash
+BASH_PATH=$(which bash)
 BASH=$(which bash | sed 's/\//\\\//g')
 
 if test x$BASH = x; then
@@ -50,6 +52,7 @@ if test x$BASH = x; then
 fi
 
 AC_SUBST(BASH)
+AC_SUBST(BASH_PATH)
 
 dnl Checks for C compiler
 AC_PROG_CC(gcc)
@@ -75,11 +78,11 @@ AC_PROG_F77(gfortran)
 dnl Check for Fortran 9* compiler
 AC_PROG_FC(gfortran)
 
-if test x"$F77" == x; then
+if test x"$F77" = x; then
 	AC_MSG_ERROR([Cannot find gfortran! You have to install it.])
 fi
 
-if test x"$FC" == x; then
+if test x"$FC" = x; then
 	AC_MSG_ERROR([Cannot find gfortran! You have to install it.])
 fi
 
@@ -173,18 +176,23 @@ AC_ARG_ENABLE(rplcas,
 if test "$enableval" = "no"; then
 	RPLCAS=-URPLCAS
 	LIBRPLCAS=
+	INCRPLCAS=
 else
 	RPLCAS=-DRPLCAS
 	LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a
+	INCRPLCAS="-I\$(top_builddir)/rplcas/include/giac \
+			-I\$(top_builddir)/rplcas/include"
 fi],[
 	RPLCAS=-URPLCAS
 	LIBRPLCAS=
+	INCRPLCAS=
 	]
 )
 
 AC_SUBST(ABI)
 AC_SUBST(RPLCAS)
 AC_SUBST(LIBRPLCAS)
+AC_SUBST(INCRPLCAS)
 
 dnl Options
 AC_ARG_ENABLE(optimization,
@@ -200,13 +208,15 @@ else
 	CXXFLAGS="$CXXFLAGS $ABI $enable_optimization"
 	FCFLAGS="$FCFLAGS $ABI $enable_optimization"
 fi],[
-	CFLAGS="$CFLAGS $ABI $OPTIMISATION_C"
+	CFLAGS="$CFLAGS $ABI $OPTIMISATION_C" 
 	FFLAGS="$FFLAGS $ABI $OPTIMISATION_F"
 	CXXFLAGS="$CXXFLAGS $ABI $OPTIMISATION_CXX"
 	FCFLAGS="$FCFLAGS $ABI $OPTIMISATION_F"
 	]
 )
 
+CFLAGS="$CFLAGS -fno-strict-overflow"
+
 AC_MSG_CHECKING([for usable shared memory])
 AC_COMPILE_IFELSE(
 	[AC_LANG_PROGRAM([#include <sys/shm.h>
@@ -247,9 +257,9 @@ else
 	IPCS_SYSV=-DIPCS_SYSV
 	POSIX_IPCS=yes
 fi],
-REG=$LDFLAGS
+REG=$LIBS
 POSIX_IPCS=guessed
-LDFLAGS=-lrt
+LIBS="-lrt -lpthread"
 [AC_MSG_CHECKING([for POSIX semaphores and shared objects])
 AC_LINK_IFELSE(
 [AC_LANG_PROGRAM([#include <sys/mman.h>
@@ -268,12 +278,12 @@ fd = shm_open(sem , O_CREAT | O_RDWR, S_
 [IPCS_SYSV=-UIPCS_SYSV; AC_MSG_RESULT(yes)],
 [IPCS_SYSV=-DIPCS_SYSV; AC_MSG_RESULT(no)]
 	)]
-LDFLAGS=$REG
+LIBS=$REG
 )
 
 if test "$IPCS_SYSV" = "-UIPCS_SYSV" -a "$POSIX_IPCS" = "guessed"; then
-REG=$LDFLAGS
-LDFLAGS=-pthread
+REG=$LIBS
+LIBS=-pthread
 AC_MSG_CHECKING([for POSIX anonymous semaphores])
 AC_LINK_IFELSE(
 [AC_LANG_PROGRAM([#include <semaphore.h>
@@ -286,7 +296,7 @@ AC_LINK_IFELSE(
 [SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES; AC_MSG_RESULT(yes)],
 [SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES; AC_MSG_RESULT(no)]
 	)
-LDFLAGS=$REG
+LDFLAGS=$LIBS
 REG=""
 else
 	SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
@@ -375,7 +385,7 @@ if test "$enableval" = "no"; then
 else
 	MOTIF_SUPPORT="-DMOTIF_SUPPORT"
 fi],
-if test "$have_x" == "yes"; then
+if test "$have_x" = "yes"; then
 	MOTIF_SUPPORT="-DMOTIF_SUPPORT"
 else
 	MOTIF_SUPPORT="-UMOTIF_SUPPORT"
@@ -443,7 +453,11 @@ if test ! -d "$srcdir"/tools/$NCURSES; t
 			do echo Applying script $i && chmod 775 $i && ./$i;
 			done;
 			for i in ../$NCURSES*.patch.gz;
-			do echo Applying patch $i && gunzip -c $i | patch -p1;
+			do echo Applying patch $i && \
+					if test $i = "../ncurses-5.9-20140607.patch.gz" ; then \
+						rm -f Ada95/src/library.gpr; \
+					fi && \
+				gunzip -c $i | patch -p1;
 			done);
 fi
 if test ! -d "$srcdir"/tools/$READLINE; then
@@ -500,6 +514,10 @@ if test ! -d tools/$OPENSSL; then
 	gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \
 			(cd tools && tar -xf -)
 fi
+if test ! -d tools/$ZLIB; then
+	gunzip -c "$srcdir"/tools/$ZLIB.tar.gz | \
+			(cd tools && tar -xf - && cd $ZLIB && ./configure --static)
+fi
 if test ! -d rplcas; then
 	mkdir rplcas
 fi
@@ -707,6 +725,12 @@ dnl Do we need to use -lrt?
 AC_CHECK_LIB(rt, nanosleep, LIBS="$LIBS -lrt",
 		AC_MSG_WARN([librt doesn't seem to be needed on this system.]))
 
+AC_CHECK_LIB(rt, shm_open, LIBS="$LIBS -lrt",
+		AC_MSG_WARN([librt doesn't seem to be needed on this system.]))
+
+AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread",
+		AC_MSG_WARN([libpthread doesn't seem to be needed on this system.]))
+
 dnl Do we need to use -lsocket?
 AC_CHECK_LIB(socket, bind, LIBS="$LIBS -lsocket",
 		AC_MSG_WARN([libsocket doesn't seem to be needed on this system.]))
@@ -794,7 +818,7 @@ if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP
 		if test $STATIC = no; then
 			LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc"
 		else
-			LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a -lz $libMySQLinc"
+			LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a $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;
@@ -1146,7 +1170,6 @@ esac
 
 AC_SUBST(OS)
 
-DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z')
 DATE=$(env LC_ALL=C date +'%A %x, %X %Z')
 MALLOC=
 
@@ -1277,6 +1300,9 @@ case $OS in
 	break ;;
 esac
 
+dnl Correction d'un problème de compilation pour GNUplot 5.0.0
+ac_configure_args="$ac_configure_args --disable-wxwidgets"
+
 case $OS in
     OS2)
 		WHOLE_LIB1=""
@@ -1304,12 +1330,12 @@ case $HOST in
 		ARCH=armel
 	break;;
 
-	mips*el-*-linux-gnu)
+	mips*el-unknown-linux-gnu)
 		ARCH=mipsel
 	break;;
 
 	*)
-		ARCH=unknown
+		ARCH=$(echo $HOST | cut -f1 -d-)
 	break ;;
 esac
 
@@ -1345,7 +1371,6 @@ AC_SUBST(SIGSEGV)
 AC_SUBST(FINAL_ENCODING)
 AC_SUBST(FORCED_FINAL_ENCODING)
 AC_SUBST(DATE)
-AC_SUBST(DATE_FR)
 AC_SUBST(EXT_SQL)
 AC_SUBST(MALLOC)
 AC_SUBST(GMP)
@@ -1356,6 +1381,7 @@ AC_SUBST(PARI)
 AC_SUBST(GIAC)
 AC_SUBST(INCMOTIF)
 AC_SUBST(LIBMOTIF)
+AC_SUBST(ZLIB)
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
@@ -1381,16 +1407,8 @@ if test $RECURSIVE = yes; then
 	AC_CONFIG_SUBDIRS(tools/$SIGSEGV)
 fi
 
-if test x$MYSQL_LIB = x"yes" -o x$POSTGRESQL_LIB = x"yes"; then
-	ZLIB=-lz
-else
-	ZLIB=
-fi
-
-AC_SUBST(ZLIB)
-
 AC_CONFIG_FILES(Makefile)
-AC_CONFIG_FILES(COPYING)
+AC_CONFIG_FILES(HEADER)
 AC_CONFIG_FILES(tools/Makefile)
 AC_CONFIG_FILES(src/Makefile)
 AC_CONFIG_FILES(man/Makefile)