--- rpl/configure.ac 2014/06/09 08:26:28 1.95 +++ rpl/configure.ac 2016/02/04 15:15:26 1.145 @@ -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.24]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -8,27 +8,28 @@ 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 -GSL=gsl-1.16 +UNITS=units-2.12 +GSL=gsl-2.1 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.10.2 +OPENSSL=openssl-1.0.2f 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-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.1.0 +GIAC=giac-1.2.2 dnl 32 bits ABI AC_ARG_WITH(gcc_version, @@ -44,6 +45,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 +53,7 @@ if test x$BASH = x; then fi AC_SUBST(BASH) +AC_SUBST(BASH_PATH) dnl Checks for C compiler AC_PROG_CC(gcc) @@ -155,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 @@ -201,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" @@ -225,6 +242,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 @@ -451,7 +475,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 @@ -523,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 -) @@ -689,8 +718,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 !])) @@ -1164,7 +1195,6 @@ esac AC_SUBST(OS) -DATE=$(env LC_ALL=C date +'%A %x, %X %Z') MALLOC= case $OS in @@ -1294,6 +1324,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="" @@ -1366,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)