--- rpl/configure.ac 2013/02/27 17:11:39 1.57 +++ rpl/configure.ac 2013/10/15 13:19:38 1.80 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.13]) +AC_INIT([rpl],[4.1.16]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -11,22 +11,23 @@ dnl Libraries NCURSES=ncurses-5.9 READLINE=readline-6.2 UNITS=units-2.01 -GSL=gsl-1.15 +GSL=gsl-1.16 GPP=gpp-3.0 -GNUPLOT=gnuplot-4.6.1 +GNUPLOT=gnuplot-4.6.3 FILE=file-5.11 -ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.15.2 +ICONV=libiconv-1.14 +SQLITE=sqlite-3.8.0.2 OPENSSL=openssl-1.0.1e OPENMOTIF=openmotif-2.3.4 LIBXPM=libXpm-3.5.9 SIGSEGV=libsigsegv-2.11 +ZLIB=zlib-1.2.7 -GMP=gmp-5.1.1 -MPFR=mpfr-3.1.1 +GMP=gmp-5.1.2 +MPFR=mpfr-3.1.2 NTL=ntl-5.5.2 COCOA=CoCoALib-0.9950 -PARI=pari-2.5.1 +PARI=pari-2.5.4 GIAC=giac-1.1.0 dnl 32 bits ABI @@ -249,7 +250,7 @@ else fi], REG=$LDFLAGS POSIX_IPCS=guessed -LDFLAGS=-lrt +LDFLAGS="-lrt -lpthread" [AC_MSG_CHECKING([for POSIX semaphores and shared objects]) AC_LINK_IFELSE( [AC_LANG_PROGRAM([#include @@ -500,6 +501,10 @@ if test ! -d tools/$OPENSSL; then gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \ (cd tools && tar -xf -) fi +if test ! -d tools/$ZLIB; then + gunzip -c "$srcdir"/tools/$ZLIB.tar.gz | \ + (cd tools && tar -xf - && cd $ZLIB && ./configure --static) +fi if test ! -d rplcas; then mkdir rplcas fi @@ -707,6 +712,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.])) @@ -1146,7 +1157,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= @@ -1304,12 +1314,12 @@ case $HOST in ARCH=armel break;; - mips*el-*-linux-gnu) + mips*el-unknown-linux-gnu) ARCH=mipsel break;; *) - ARCH=unknown + ARCH=$(echo $HOST | cut -f1 -d-) break ;; esac @@ -1345,7 +1355,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) @@ -1356,6 +1365,7 @@ AC_SUBST(PARI) AC_SUBST(GIAC) AC_SUBST(INCMOTIF) AC_SUBST(LIBMOTIF) +AC_SUBST(ZLIB) AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) @@ -1381,16 +1391,8 @@ if test $RECURSIVE = yes; then AC_CONFIG_SUBDIRS(tools/$SIGSEGV) fi -if test x$MYSQL_LIB = x"yes" -o x$POSTGRESQL_LIB = x"yes"; then - ZLIB=-lz -else - ZLIB= -fi - -AC_SUBST(ZLIB) - AC_CONFIG_FILES(Makefile) -AC_CONFIG_FILES(COPYING) +AC_CONFIG_FILES(HEADER) AC_CONFIG_FILES(tools/Makefile) AC_CONFIG_FILES(src/Makefile) AC_CONFIG_FILES(man/Makefile)