Diff for /rpl/configure.ac between versions 1.39 and 1.87

version 1.39, 2012/07/31 11:06:34 version 1.87, 2014/03/17 14:34:31
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.9])  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 9  AC_CONFIG_HEADERS([rplconfig.h]) Line 9  AC_CONFIG_HEADERS([rplconfig.h])
   
 dnl Libraries  dnl Libraries
 NCURSES=ncurses-5.9  NCURSES=ncurses-5.9
 READLINE=readline-6.2  READLINE=readline-6.3
 UNITS=units-1.89e  UNITS=units-2.02
 GSL=gsl-1.15  GSL=gsl-1.16
 GPP=gpp-3.0  GPP=gpp-3.0
 GNUPLOT=gnuplot-4.6.0  GNUPLOT=gnuplot-4.6.5
 FILE=file-5.11  FILE=file-5.11
 ICONV=libiconv-1.13.1  ICONV=libiconv-1.14
 SQLITE=sqlite-3.7.13  SQLITE=sqlite-3.8.4.1
 OPENSSL=openssl-1.0.1c  OPENSSL=openssl-1.0.1f
 OPENMOTIF=openmotif-2.3.3  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
   
 GMP=gmp-5.0.5  GMP=gmp-5.1.2
 MPFR=mpfr-3.1.0  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-0.9.6  GIAC=giac-1.1.0
   
 dnl 32 bits ABI  dnl 32 bits ABI
 AC_ARG_WITH(gcc_version,  AC_ARG_WITH(gcc_version,
Line 36  CC=gcc-$with_gcc_version Line 37  CC=gcc-$with_gcc_version
 CXX=g++-$with_gcc_version  CXX=g++-$with_gcc_version
 CF=gfortran-$with_gcc_version  CF=gfortran-$with_gcc_version
 F77=gfortran-$with_gcc_version  F77=gfortran-$with_gcc_version
   AC_SUBST(CC)
   AC_SUBST(CXX)
   AC_SUBST(CF)
   AC_SUBST(F77)
 ],[])  ],[])
   
 dnl Checks for Bash  dnl Checks for Bash
Line 245  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 419  fi], [PROFILAGE=""]) Line 424  fi], [PROFILAGE=""])
   
 AC_SUBST(PROFILAGE)  AC_SUBST(PROFILAGE)
   
   dnl Checks for uuencode
   AC_CHECK_PROG(UUENCODE, uuencode, yes, no)
   if test "$UUENCODE" = no; then
       AC_MSG_ERROR([Can not find uuencode !])
   fi
   
 if test ! -d tools; then  if test ! -d tools; then
     mkdir tools      mkdir tools
 fi  fi
Line 490  if test ! -d tools/$OPENSSL; then Line 501  if test ! -d tools/$OPENSSL; then
     gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \      gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \
             (cd tools && tar -xf -)              (cd tools && tar -xf -)
 fi  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  if test ! -d rplcas; then
     mkdir rplcas      mkdir rplcas
 fi  fi
Line 558  if test "$SED" = no; then Line 573  if test "$SED" = no; then
     AC_MSG_ERROR([Can not find sed !])      AC_MSG_ERROR([Can not find sed !])
 fi  fi
   
   dnl Checks for yacc
   AC_CHECK_PROG(YACC, yacc, yes, no)
   if test "$YACC" = no; then
       AC_MSG_ERROR([Can not find yacc !])
   fi
   
 dnl Checks for TeX, LaTeX, dvips, gs, gv, vim and gnuplot  dnl Checks for TeX, LaTeX, dvips, gs, gv, vim and gnuplot
 if test "$TEX_SUPPORT" = guessed; then  if test "$TEX_SUPPORT" = guessed; then
     POSTSCRIPT_SUPPORT="-DPOSTSCRIPT_SUPPORT"      POSTSCRIPT_SUPPORT="-DPOSTSCRIPT_SUPPORT"
Line 691  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 778  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 1130  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 1187  case $OS in Line 1213  case $OS in
     OS/2)      OS/2)
         if test $FORCED_FINAL_ENCODING -eq 0; then \          if test $FORCED_FINAL_ENCODING -eq 0; then \
             FINAL_ENCODING=CP850; \              FINAL_ENCODING=CP850; \
               FORCED_FINAL_ENCODING=1;\
         fi;          fi;
         OS=OS2          OS=OS2
         NESTED_FUNCTIONS=          NESTED_FUNCTIONS=
Line 1204  case $OS in Line 1231  case $OS in
     OpenBSD)      OpenBSD)
         if test $FORCED_FINAL_ENCODING -eq 0; then \          if test $FORCED_FINAL_ENCODING -eq 0; then \
             FINAL_ENCODING=UTF-8; \              FINAL_ENCODING=UTF-8; \
               FORCED_FINAL_ENCODING=1;\
         fi;          fi;
         EXPORT_DYNAMIC=-Wl,--export-dynamic          EXPORT_DYNAMIC=-Wl,--export-dynamic
         NESTED_FUNCTIONS=          NESTED_FUNCTIONS=
Line 1286  case $HOST in Line 1314  case $HOST in
         ARCH=armel          ARCH=armel
     break;;      break;;
   
       mips*el-unknown-linux-gnu)
           ARCH=mipsel
       break;;
   
     *)      *)
         ARCH=unknown          ARCH=$(echo $HOST | cut -f1 -d-)
     break ;;      break ;;
 esac  esac
   
Line 1321  AC_SUBST(OPENMOTIF) Line 1353  AC_SUBST(OPENMOTIF)
 AC_SUBST(BUILD_OPENMOTIF)  AC_SUBST(BUILD_OPENMOTIF)
 AC_SUBST(SIGSEGV)  AC_SUBST(SIGSEGV)
 AC_SUBST(FINAL_ENCODING)  AC_SUBST(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)
Line 1333  AC_SUBST(PARI) Line 1365  AC_SUBST(PARI)
 AC_SUBST(GIAC)  AC_SUBST(GIAC)
 AC_SUBST(INCMOTIF)  AC_SUBST(INCMOTIF)
 AC_SUBST(LIBMOTIF)  AC_SUBST(LIBMOTIF)
   AC_SUBST(ZLIB)
   
 AC_SUBST(CFLAGS)  AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)  AC_SUBST(CXXFLAGS)
Line 1358  if test $RECURSIVE = yes; then Line 1391  if test $RECURSIVE = yes; then
     AC_CONFIG_SUBDIRS(tools/$SIGSEGV)      AC_CONFIG_SUBDIRS(tools/$SIGSEGV)
 fi  fi
   
 if test $MYSQL_LIB = "yes" -o $POSTGRESQL_LIB = "yes"; then  
     ZLIB=-lz  
 else  
     ZLIB=  
 fi  
   
 AC_SUBST(ZLIB)  
   
 AC_CONFIG_FILES(Makefile)  AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(COPYING)  AC_CONFIG_FILES(HEADER)
 AC_CONFIG_FILES(tools/Makefile)  AC_CONFIG_FILES(tools/Makefile)
 AC_CONFIG_FILES(src/Makefile)  AC_CONFIG_FILES(src/Makefile)
 AC_CONFIG_FILES(man/Makefile)  AC_CONFIG_FILES(man/Makefile)

Removed from v.1.39  
changed lines
  Added in v.1.87


CVSweb interface <joel.bertrand@systella.fr>