--- rpl/configure.ac 2015/07/15 22:40:58 1.129 +++ rpl/configure.ac 2016/03/01 19:30:31 1.149 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.22]) +AC_INIT([rpl],[4.1.24]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -10,25 +10,26 @@ AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries NCURSES=ncurses-6.0 READLINE=readline-6.3 -UNITS=units-2.11 -GSL=gsl-1.16 +UNITS=units-2.12 +GSL=gsl-2.1 GPP=gpp-3.0 GNUPLOT=gnuplot-5.0.1 -FILE=file-5.11 +FILE=file-5.25 ICONV=libiconv-1.14 -SQLITE=sqlite-3.8.10.2 -OPENSSL=openssl-1.0.2d +SQLITE=sqlite-3.11.0 +OPENSSL=openssl-1.0.2g OPENMOTIF=openmotif-2.3.4 -LIBXPM=libXpm-3.5.9 +LIBXPM=libXpm-3.5.11 SIGSEGV=libsigsegv-2.11 ZLIB=zlib-1.2.8 -GMP=gmp-6.0.0 -MPFR=mpfr-3.1.2 +GMP=gmp-6.1.0 +MPFR=mpfr-3.1.3 +MPFI=mpfi-1.5.1 NTL=ntl-5.5.2 COCOA=CoCoALib-0.9950 PARI=pari-2.5.4 -GIAC=giac-1.2.0 +GIAC=giac-1.2.2 dnl 32 bits ABI AC_ARG_WITH(gcc_version, @@ -157,6 +158,20 @@ fi],[ ] ) +AC_ARG_ENABLE(native, +[ --enable-native enable gcc native compiler option (default=no)],[ +if test "$enableval" = "yes"; then + CFLAGS="$CFLAGS -mtune=native -march=native" + FFLAGS="$FFLAGS -mtune=native -march=native" + CXXFLAGS="$CXXFLAGS -mtune=native -march=native" + FCFLAGS="$FCFLAGS -mtune=native -march=native" +else + NATIVE= +fi],[ + NATIVE= + ] +) + AC_ARG_WITH(rpltools, [ --with-rpltools specify rpltools path used for cross compilation],[ if test "$with_rpltools" = "no" -o "$with_rpltools" = "yes"; then @@ -203,10 +218,10 @@ if test "$enableval" = "no"; then CXXFLAGS=$ABI FCFLAGS=$ABI else - CFLAGS="$CFLAGS $ABI $enable_optimization" - FFLAGS="$FFLAGS $ABI $enable_optimization" - CXXFLAGS="$CXXFLAGS $ABI $enable_optimization" - FCFLAGS="$FCFLAGS $ABI $enable_optimization" + CFLAGS="$CFLAGS $ABI $OPTIMISATION_C" + FFLAGS="$FFLAGS $ABI $OPTIMISATION_F" + CXXFLAGS="$CXXFLAGS $ABI $OPTIMISATION_CXX" + FCFLAGS="$FCFLAGS $ABI $OPTIMISATION_F" fi],[ CFLAGS="$CFLAGS $ABI $OPTIMISATION_C" FFLAGS="$FFLAGS $ABI $OPTIMISATION_F" @@ -533,6 +548,10 @@ if test ! -d "$srcdir"/rplcas/$MPFR; the gunzip -c "$srcdir"/rplcas/$MPFR.tar.gz | \ (cd "$srcdir/rplcas" && tar -xf -) fi +if test ! -d "$srcdir"/rplcas/$MPFI; then + gunzip -c "$srcdir"/rplcas/$MPFI.tar.gz | \ + (cd "$srcdir/rplcas" && tar -xf -) +fi if test ! -d rplcas/$NTL; then gunzip -c "$srcdir"/rplcas/$NTL.tar.gz | \ (cd rplcas && tar -xf -) @@ -1307,6 +1326,9 @@ 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) @@ -1380,6 +1402,7 @@ AC_SUBST(EXT_SQL) AC_SUBST(MALLOC) AC_SUBST(GMP) AC_SUBST(MPFR) +AC_SUBST(MPFI) AC_SUBST(NTL) AC_SUBST(COCOA) AC_SUBST(PARI)