--- rpl/configure.ac 2014/05/16 14:49:49 1.91 +++ rpl/configure.ac 2015/10/29 12:59:37 1.135 @@ -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.23]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -8,27 +8,27 @@ AC_SUBST(target_cpu) AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries -NCURSES=ncurses-5.9 +NCURSES=ncurses-6.0 READLINE=readline-6.3 -UNITS=units-2.02 +UNITS=units-2.12 GSL=gsl-1.16 GPP=gpp-3.0 -GNUPLOT=gnuplot-4.6.5 +GNUPLOT=gnuplot-5.0.1 FILE=file-5.11 ICONV=libiconv-1.14 -SQLITE=sqlite-3.8.4.3 -OPENSSL=openssl-1.0.1g +SQLITE=sqlite-3.9.1 +OPENSSL=openssl-1.0.2d OPENMOTIF=openmotif-2.3.4 LIBXPM=libXpm-3.5.9 SIGSEGV=libsigsegv-2.11 -ZLIB=zlib-1.2.7 +ZLIB=zlib-1.2.8 -GMP=gmp-5.1.2 -MPFR=mpfr-3.1.2 +GMP=gmp-6.0.0 +MPFR=mpfr-3.1.3 NTL=ntl-5.5.2 COCOA=CoCoALib-0.9950 PARI=pari-2.5.4 -GIAC=giac-1.1.0 +GIAC=giac-1.2.0 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) @@ -76,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 @@ -174,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, @@ -201,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 @@ -218,6 +227,13 @@ AC_COMPILE_IFELSE( ) AC_SUBST(SHARED_MEMORY) +AC_C_INLINE + +if test "$ac_cv_c_inline" != no ; then + AC_DEFINE(HAVE_INLINE,1,[inline keywork or macro available]) + AC_SUBST(HAVE_INLINE) +fi + AC_MSG_CHECKING([for pselect]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([#include @@ -376,7 +392,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" @@ -444,7 +460,8 @@ 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 && \ + gunzip -c $i | patch -p1; done); fi if test ! -d "$srcdir"/tools/$READLINE; then @@ -682,8 +699,10 @@ AC_SUBST(libX) AC_SUBST(includeX) dnl Date -DATE=$(LANG=C date +"%A, %e %B %Y %T %z") +DATE=$(env LC_ALL=C date +"%A, %e %B %Y %T %z") +DATE_FR=$(env LC_ALL=fr_FR date +"%A, %e %B %Y %T %z") AC_SUBST(DATE) +AC_SUBST(DATE_FR) dnl Checks for libraries AC_CHECK_LIB(m, main,, AC_MSG_ERROR([Can not find libm !])) @@ -1157,7 +1176,6 @@ esac AC_SUBST(OS) -DATE=$(env LC_ALL=C date +'%A %x, %X %Z') MALLOC= case $OS in @@ -1287,6 +1305,12 @@ 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" +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" + case $OS in OS2) WHOLE_LIB1=""