--- rpl/configure.ac 2014/06/09 08:26:28 1.95 +++ rpl/configure.ac 2015/01/27 15:15:37 1.111 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.18]) +AC_INIT([rpl],[4.1.20]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -13,11 +13,11 @@ READLINE=readline-6.3 UNITS=units-2.02 GSL=gsl-1.16 GPP=gpp-3.0 -GNUPLOT=gnuplot-4.6.5 +GNUPLOT=gnuplot-5.0.0 FILE=file-5.11 ICONV=libiconv-1.14 -SQLITE=sqlite-3.8.4.3 -OPENSSL=openssl-1.0.1g +SQLITE=sqlite-3.8.8.1 +OPENSSL=openssl-1.0.1k OPENMOTIF=openmotif-2.3.4 LIBXPM=libXpm-3.5.9 SIGSEGV=libsigsegv-2.11 @@ -28,7 +28,7 @@ MPFR=mpfr-3.1.2 NTL=ntl-5.5.2 COCOA=CoCoALib-0.9950 PARI=pari-2.5.4 -GIAC=giac-1.1.0 +GIAC=giac-1.1.4 dnl 32 bits ABI AC_ARG_WITH(gcc_version, @@ -44,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 @@ -51,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) @@ -451,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 @@ -1294,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=""