Diff for /rpl/configure.ac between versions 1.68 and 1.86

version 1.68, 2013/05/22 14:06:52 version 1.86, 2014/03/17 14:31:45
Line 1 Line 1
 dnl Process this file with autoconf to produce a configure script.  dnl Process this file with autoconf to produce a configure script.
 AC_INIT([rpl],[4.1.14])  AC_INIT([rpl],[4.1.17])
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(silent-rules)  AM_INIT_AUTOMAKE(silent-rules)
Line 10  AC_CONFIG_HEADERS([rplconfig.h]) Line 10  AC_CONFIG_HEADERS([rplconfig.h])
 dnl Libraries  dnl Libraries
 NCURSES=ncurses-5.9  NCURSES=ncurses-5.9
 READLINE=readline-6.2  READLINE=readline-6.2
 UNITS=units-2.01  UNITS=units-2.02
 GSL=gsl-1.15  GSL=gsl-1.16
 GPP=gpp-3.0  GPP=gpp-3.0
 GNUPLOT=gnuplot-4.6.2  GNUPLOT=gnuplot-4.6.5
 FILE=file-5.11  FILE=file-5.11
 ICONV=libiconv-1.14  ICONV=libiconv-1.14
 SQLITE=sqlite-3.7.17  SQLITE=sqlite-3.8.4.1
 OPENSSL=openssl-1.0.1e  OPENSSL=openssl-1.0.1f
 OPENMOTIF=openmotif-2.3.4  OPENMOTIF=openmotif-2.3.4
 LIBXPM=libXpm-3.5.9  LIBXPM=libXpm-3.5.9
 SIGSEGV=libsigsegv-2.11  SIGSEGV=libsigsegv-2.11
 ZLIB=zlib-1.2.7  ZLIB=zlib-1.2.7
   
 GMP=gmp-5.1.1  GMP=gmp-5.1.2
 MPFR=mpfr-3.1.2  MPFR=mpfr-3.1.2
 NTL=ntl-5.5.2  NTL=ntl-5.5.2
 COCOA=CoCoALib-0.9950  COCOA=CoCoALib-0.9950
 PARI=pari-2.5.1  PARI=pari-2.5.4
 GIAC=giac-1.1.0  GIAC=giac-1.1.0
   
 dnl 32 bits ABI  dnl 32 bits ABI
Line 250  else Line 250  else
 fi],  fi],
 REG=$LDFLAGS  REG=$LDFLAGS
 POSIX_IPCS=guessed  POSIX_IPCS=guessed
 LDFLAGS=-lrt  LDFLAGS="-lrt -lpthread"
 [AC_MSG_CHECKING([for POSIX semaphores and shared objects])  [AC_MSG_CHECKING([for POSIX semaphores and shared objects])
 AC_LINK_IFELSE(  AC_LINK_IFELSE(
 [AC_LANG_PROGRAM([#include <sys/mman.h>  [AC_LANG_PROGRAM([#include <sys/mman.h>
Line 712  dnl Do we need to use -lrt? Line 712  dnl Do we need to use -lrt?
 AC_CHECK_LIB(rt, nanosleep, LIBS="$LIBS -lrt",  AC_CHECK_LIB(rt, nanosleep, LIBS="$LIBS -lrt",
         AC_MSG_WARN([librt doesn't seem to be needed on this system.]))          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?  dnl Do we need to use -lsocket?
 AC_CHECK_LIB(socket, bind, LIBS="$LIBS -lsocket",  AC_CHECK_LIB(socket, bind, LIBS="$LIBS -lsocket",
         AC_MSG_WARN([libsocket doesn't seem to be needed on this system.]))          AC_MSG_WARN([libsocket doesn't seem to be needed on this system.]))
Line 799  if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP Line 805  if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP
         if test $STATIC = no; then          if test $STATIC = no; then
             LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc"              LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc"
         else          else
             LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a -lz $libMySQLinc"              LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a $libMySQLinc"
         fi          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"])          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;          LIBS=$saved_LIBS;
Line 1151  esac Line 1157  esac
   
 AC_SUBST(OS)  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')  DATE=$(env LC_ALL=C date +'%A %x, %X %Z')
 MALLOC=  MALLOC=
   
Line 1314  case $HOST in Line 1319  case $HOST in
     break;;      break;;
   
     *)      *)
         ARCH=unknown          ARCH=$(echo $HOST | cut -f1 -d-)
     break ;;      break ;;
 esac  esac
   
Line 1350  AC_SUBST(SIGSEGV) Line 1355  AC_SUBST(SIGSEGV)
 AC_SUBST(FINAL_ENCODING)  AC_SUBST(FINAL_ENCODING)
 AC_SUBST(FORCED_FINAL_ENCODING)  AC_SUBST(FORCED_FINAL_ENCODING)
 AC_SUBST(DATE)  AC_SUBST(DATE)
 AC_SUBST(DATE_FR)  
 AC_SUBST(EXT_SQL)  AC_SUBST(EXT_SQL)
 AC_SUBST(MALLOC)  AC_SUBST(MALLOC)
 AC_SUBST(GMP)  AC_SUBST(GMP)

Removed from v.1.68  
changed lines
  Added in v.1.86


CVSweb interface <joel.bertrand@systella.fr>