--- rpl/configure.ac 2013/09/25 14:36:45 1.76 +++ rpl/configure.ac 2014/06/09 08:26:28 1.95 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.16]) +AC_INIT([rpl],[4.1.18]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -9,21 +9,21 @@ AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries NCURSES=ncurses-5.9 -READLINE=readline-6.2 -UNITS=units-2.01 +READLINE=readline-6.3 +UNITS=units-2.02 GSL=gsl-1.16 GPP=gpp-3.0 -GNUPLOT=gnuplot-4.6.3 +GNUPLOT=gnuplot-4.6.5 FILE=file-5.11 ICONV=libiconv-1.14 -SQLITE=sqlite-3.8.0 -OPENSSL=openssl-1.0.1e +SQLITE=sqlite-3.8.4.3 +OPENSSL=openssl-1.0.1g OPENMOTIF=openmotif-2.3.4 LIBXPM=libXpm-3.5.9 SIGSEGV=libsigsegv-2.11 ZLIB=zlib-1.2.7 -GMP=gmp-5.1.2 +GMP=gmp-6.0.0 MPFR=mpfr-3.1.2 NTL=ntl-5.5.2 COCOA=CoCoALib-0.9950 @@ -76,11 +76,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 +174,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 +206,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 @@ -248,9 +255,9 @@ else IPCS_SYSV=-DIPCS_SYSV POSIX_IPCS=yes fi], -REG=$LDFLAGS +REG=$LIBS POSIX_IPCS=guessed -LDFLAGS=-lrt +LIBS="-lrt -lpthread" [AC_MSG_CHECKING([for POSIX semaphores and shared objects]) AC_LINK_IFELSE( [AC_LANG_PROGRAM([#include @@ -269,12 +276,12 @@ fd = shm_open(sem , O_CREAT | O_RDWR, S_ [IPCS_SYSV=-UIPCS_SYSV; AC_MSG_RESULT(yes)], [IPCS_SYSV=-DIPCS_SYSV; AC_MSG_RESULT(no)] )] -LDFLAGS=$REG +LIBS=$REG ) if test "$IPCS_SYSV" = "-UIPCS_SYSV" -a "$POSIX_IPCS" = "guessed"; then -REG=$LDFLAGS -LDFLAGS=-pthread +REG=$LIBS +LIBS=-pthread AC_MSG_CHECKING([for POSIX anonymous semaphores]) AC_LINK_IFELSE( [AC_LANG_PROGRAM([#include @@ -287,7 +294,7 @@ AC_LINK_IFELSE( [SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES; AC_MSG_RESULT(yes)], [SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES; AC_MSG_RESULT(no)] ) -LDFLAGS=$REG +LDFLAGS=$LIBS REG="" else SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES @@ -376,7 +383,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" @@ -712,6 +719,12 @@ dnl Do we need to use -lrt? AC_CHECK_LIB(rt, nanosleep, LIBS="$LIBS -lrt", AC_MSG_WARN([librt doesn't seem to be needed on this system.])) +AC_CHECK_LIB(rt, shm_open, LIBS="$LIBS -lrt", + AC_MSG_WARN([librt doesn't seem to be needed on this system.])) + +AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread", + AC_MSG_WARN([libpthread doesn't seem to be needed on this system.])) + dnl Do we need to use -lsocket? AC_CHECK_LIB(socket, bind, LIBS="$LIBS -lsocket", AC_MSG_WARN([libsocket doesn't seem to be needed on this system.])) @@ -799,7 +812,7 @@ if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP if test $STATIC = no; then LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc" else - LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a -lz $libMySQLinc" + LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a $libMySQLinc" fi AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[MYSQL mysql; mysql_init(&mysql);]])],[AC_MSG_RESULT([yes]); MYSQL_LIB="yes"],[AC_MSG_RESULT([no]); MYSQL_LIB="no"]) LIBS=$saved_LIBS; @@ -1151,7 +1164,6 @@ esac AC_SUBST(OS) -DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z') DATE=$(env LC_ALL=C date +'%A %x, %X %Z') MALLOC= @@ -1350,7 +1362,6 @@ AC_SUBST(SIGSEGV) AC_SUBST(FINAL_ENCODING) AC_SUBST(FORCED_FINAL_ENCODING) AC_SUBST(DATE) -AC_SUBST(DATE_FR) AC_SUBST(EXT_SQL) AC_SUBST(MALLOC) AC_SUBST(GMP)