--- rpl/configure.ac 2017/07/11 16:04:53 1.197 +++ rpl/configure.ac 2018/05/29 14:12:37 1.220 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.27]) +AC_INIT([rpl],[4.1.28]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -10,26 +10,26 @@ AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries NCURSES=ncurses-6.0 READLINE=readline-7.0 -UNITS=units-2.14 +UNITS=units-2.16 GSL=gsl-2.4 GPP=gpp-3.0 -GNUPLOT=gnuplot-5.0.6 -FILE=file-5.31 +GNUPLOT=gnuplot-5.2.3 +FILE=file-5.33 ICONV=libiconv-1.15 -SQLITE=sqlite-3.19.3 -OPENSSL=openssl-1.1.0f -OPENMOTIF=openmotif-2.3.7 -LIBXPM=libXpm-3.5.11 -SIGSEGV=libsigsegv-2.11 -ZLIB=zlib-1.2.8 +SQLITE=sqlite-3.23.1 +OPENSSL=openssl-1.1.0h +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.99563 +PARI=pari-2.9.5 +GIAC=giac-1.4.9 dnl 32 bits ABI AC_ARG_WITH(gcc_version, @@ -191,15 +191,18 @@ AC_ARG_ENABLE(rplcas, if test "$enableval" = "no"; then RPLCAS=-URPLCAS LIBRPLCAS= + LIBRPLCAS_EXT= INCRPLCAS= else RPLCAS=-DRPLCAS - LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a + LIBRPLCAS="\$\(top_builddir\)/rplcas/lib/librplcas.a" + LIBRPLCAS_EXT=-lcurl INCRPLCAS="-I\$(top_builddir)/rplcas/include/giac \ -I\$(top_builddir)/rplcas/include" fi],[ RPLCAS=-URPLCAS LIBRPLCAS= + LIBRPLCAS_EXT= INCRPLCAS= ] ) @@ -207,6 +210,7 @@ fi],[ AC_SUBST(ABI) AC_SUBST(RPLCAS) AC_SUBST(LIBRPLCAS) +AC_SUBST(LIBRPLCAS_EXT) AC_SUBST(INCRPLCAS) dnl Options @@ -394,8 +398,8 @@ else fi) if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then - libX="$X_LIBS -lXt -lX11 -lXext" - LIBMOTIF="\$(top_builddir)/tools/$OPENMOTIF/lib/Xm/.libs/libXm.a \ + libX="$X_LIBS -lXt -lX11 -lXext -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 \ -I\$(top_builddir)/tools/$OPENMOTIF/lib \ @@ -443,6 +447,12 @@ if test "$UUENCODE" = no; then AC_MSG_ERROR([Can not find uuencode !]) fi +dnl Checks for patch +AC_CHECK_PROG(PATCH, patch, yes, no) +if test "$PATCH" = no; then + AC_MSG_ERROR([Can not find patch !]) +fi + if test ! -d tools; then mkdir tools fi @@ -710,6 +720,13 @@ AC_CHECK_LIB(m, main,, AC_MSG_ERROR([Can 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 + AC_CHECK_LIB(Xinerama, XineramaIsActive,, + AC_MSG_ERROR([Can not find libXinerama !])) +fi +AC_CHECK_LIB(gomp, omp_get_num_procs,, AC_MSG_ERROR([Can not find libgomp !])) +OPENMP=-lgomp +AC_SUBST(OPENMP) dnl Check for union semun AC_CHECK_TYPE([union semun], SEMUN=-DUNION_SEMUN, SEMUN=-UUNION_SEMUN, [[ @@ -1142,11 +1159,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([])],