--- rpl/configure.ac 2018/05/29 06:04:58 1.215 +++ rpl/configure.ac 2019/10/25 19:55:46 1.241 @@ -1,6 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.28]) -AC_CANONICAL_TARGET +AC_INIT([rpl],[4.1.31]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) AM_SILENT_RULES([yes]) @@ -8,28 +7,28 @@ AC_SUBST(target_cpu) AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries -NCURSES=ncurses-6.0 -READLINE=readline-7.0 +NCURSES=ncurses-6.1 +READLINE=readline-8.0 UNITS=units-2.16 -GSL=gsl-2.4 +GSL=gsl-2.6 GPP=gpp-3.0 -GNUPLOT=gnuplot-5.2.3 -FILE=file-5.33 +GNUPLOT=gnuplot-5.2.7 +FILE=file-5.37 ICONV=libiconv-1.15 -SQLITE=sqlite-3.23.1 -OPENSSL=openssl-1.1.0h +SQLITE=sqlite-3.30.1 +OPENSSL=openssl-1.1.1d OPENMOTIF=motif-2.3.8 LIBXPM=libXpm-3.5.12 SIGSEGV=libsigsegv-2.12 ZLIB=zlib-1.2.11 GMP=gmp-6.1.2 -MPFR=mpfr-3.1.5 -MPFI=mpfi-1.5.1 -NTL=ntl-9.11.0 -COCOA=CoCoALib-0.99542 -PARI=pari-2.7.6 -GIAC=giac-1.2.2 +MPFR=mpfr-4.0.1 +MPFI=mpfi-1.5.3 +NTL=ntl-11.0.0 +COCOA=CoCoALib-0.99600 +PARI=pari-2.9.5 +GIAC=giac-1.4.9 dnl 32 bits ABI AC_ARG_WITH(gcc_version, @@ -95,18 +94,6 @@ dnl X paths AC_PATH_X AC_PATH_XTRA -if test "$ac_x_includes" != "no"; then - if test x"$ac_x_includes" != x; then - X_CFLAGS="$X_CFLAGS -I$ac_x_includes" - includeX="-I$ac_x_includes" - fi -fi -if test "$ac_x_libraries" != "no"; then - if test x"$ac_x_libraries" != x; then - X_LIBS="$X_LIBS -L$ac_x_libraries" - fi -fi - dnl 32 bits ABI AC_ARG_WITH(32bits-abi, [ --with-32bits-abi force 32bits ABI (multilib)],[ @@ -185,6 +172,18 @@ fi],[ AC_SUBST(RPLTOOLS) +dnl libcurl path +AC_ARG_WITH(curl, +[ --with-curl specify libcurl path used for RPL/CAS],[ +if test "$with_curl" = "no" -o "$with_curl" = "yes"; then + AC_MSG_ERROR([You have to specify libcurl path !]) +else + LIBCURL=-L$with_curl +fi],[ + LIBCURL= + ] +) + dnl RPL/CAS support AC_ARG_ENABLE(rplcas, [ --enable-rplcas compile rplcas (default=no)],[ @@ -194,7 +193,9 @@ if test "$enableval" = "no"; then INCRPLCAS= else RPLCAS=-DRPLCAS - LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a + LIBRPLCAS="\$(top_builddir)/rplcas/lib/librplcas.a" +dnl LIBS="$LIBS $LIBCURL -lcurl" + LIBGIAC="$LIBCURL -lcurl" INCRPLCAS="-I\$(top_builddir)/rplcas/include/giac \ -I\$(top_builddir)/rplcas/include" fi],[ @@ -208,6 +209,7 @@ AC_SUBST(ABI) AC_SUBST(RPLCAS) AC_SUBST(LIBRPLCAS) AC_SUBST(INCRPLCAS) +AC_SUBST(LIBGIAC) dnl Options AC_ARG_ENABLE(optimization, @@ -298,7 +300,7 @@ AC_LINK_IFELSE( [SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES; AC_MSG_RESULT(no)] ) LDFLAGS=$LIBS -REG="" +LIBS=$REG else SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES fi @@ -380,6 +382,18 @@ INCMOTIF="" BUILD_OPENMOTIF="" MODULE_MOTIF="" + +if test "$ac_x_includes" != "no"; then + if test x"$ac_x_includes" != x; then + includeX="-I$ac_x_includes" + fi +fi +if test "$ac_x_libraries" != "no"; then + if test x"$ac_x_libraries" != x; then + X_LIBS="-L$ac_x_libraries" + fi +fi + AC_ARG_ENABLE(motif, [ --enable-motif provide the Motif support [[default=guessed]]], [ if test "$enableval" = "no"; then @@ -393,8 +407,20 @@ else MOTIF_SUPPORT="-UMOTIF_SUPPORT" fi) +dnl libXinerama path +AC_ARG_WITH(xinerama, +[ --with-xinerama specify libxinerama path used for Motif],[ +if test "$with_xinerama" = "no" -o "$with_xinerama" = "yes"; then + AC_MSG_ERROR([You have to specify libxinerama path !]) +else + LIBXINERAMA=-L$with_xinerama +fi],[ + LIBXINERAMA= + ] +) + if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then - libX="$X_LIBS -lXt -lX11 -lXext -lXinerama" + libX="$X_LIBS -lXt -lX11 -lXext $LIBXINERAMA -lXinerama" LIBMOTIF="\$(top_builddir)/tools/$OPENMOTIF/install/lib/libXm.a \ \$(top_builddir)/tools/$LIBXPM/src/.libs/libXpm.a" INCMOTIF="-I\$(top_srcdir)/tools/$OPENMOTIF/lib \ @@ -465,6 +491,10 @@ if test ! -d "$srcdir"/tools/$NCURSES; t for i in $(ls ../$NCURSES*.patch.gz); do echo Applying patch $i && \ gunzip -c $i | patch -p1; + done; + for i in $(ls ../ncurses-6.1*.patch.gz); + do echo Applying patch $i && \ + gunzip -c $i | patch -p1; done); fi if test ! -d "$srcdir"/tools/$READLINE; then @@ -717,8 +747,11 @@ AC_CHECK_LIB(c, pthread_mutex_init,, [AC_CHECK_LIB(pthread, main,, AC_MSG_ERROR([Can not find libpthread !]))]) if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then + REG=$LIBS + LIBS="$LIBS $libX" AC_CHECK_LIB(Xinerama, XineramaIsActive,, AC_MSG_ERROR([Can not find libXinerama !])) + LIBS=$REG fi AC_CHECK_LIB(gomp, omp_get_num_procs,, AC_MSG_ERROR([Can not find libgomp !])) OPENMP=-lgomp @@ -1155,11 +1188,11 @@ AC_MSG_CHECKING([whether CC supports -ma AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -malign-double"], [AC_MSG_RESULT([no])]) -CFLAGS=-mieee-fp -AC_MSG_CHECKING([whether CC supports -mieee-fp]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -mieee-fp"], - [AC_MSG_RESULT([no])]) +#CFLAGS=-mieee-fp +#AC_MSG_CHECKING([whether CC supports -mieee-fp]) +#AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], +# [AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -mieee-fp"], +# [AC_MSG_RESULT([no])]) CFLAGS=-mieee AC_MSG_CHECKING([whether CC supports -mieee]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],