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

version 1.86, 2014/03/17 14:31:45 version 1.105, 2015/01/05 14:02:08
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.17])  AC_INIT([rpl],[4.1.19])
 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-2.02  UNITS=units-2.02
 GSL=gsl-1.16  GSL=gsl-1.16
 GPP=gpp-3.0  GPP=gpp-3.0
 GNUPLOT=gnuplot-4.6.5  GNUPLOT=gnuplot-4.6.6
 FILE=file-5.11  FILE=file-5.11
 ICONV=libiconv-1.14  ICONV=libiconv-1.14
 SQLITE=sqlite-3.8.4.1  SQLITE=sqlite-3.8.7.4
 OPENSSL=openssl-1.0.1f  OPENSSL=openssl-1.0.1j
 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.2  GMP=gmp-6.0.0
 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
Line 44  AC_SUBST(F77) Line 44  AC_SUBST(F77)
 ],[])  ],[])
   
 dnl Checks for Bash  dnl Checks for Bash
   BASH_PATH=$(which bash)
 BASH=$(which bash | sed 's/\//\\\//g')  BASH=$(which bash | sed 's/\//\\\//g')
   
 if test x$BASH = x; then  if test x$BASH = x; then
Line 51  if test x$BASH = x; then Line 52  if test x$BASH = x; then
 fi  fi
   
 AC_SUBST(BASH)  AC_SUBST(BASH)
   AC_SUBST(BASH_PATH)
   
 dnl Checks for C compiler  dnl Checks for C compiler
 AC_PROG_CC(gcc)  AC_PROG_CC(gcc)
Line 76  AC_PROG_F77(gfortran) Line 78  AC_PROG_F77(gfortran)
 dnl Check for Fortran 9* compiler  dnl Check for Fortran 9* compiler
 AC_PROG_FC(gfortran)  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.])      AC_MSG_ERROR([Cannot find gfortran! You have to install it.])
 fi  fi
   
 if test x"$FC" == x; then  if test x"$FC" = x; then
     AC_MSG_ERROR([Cannot find gfortran! You have to install it.])      AC_MSG_ERROR([Cannot find gfortran! You have to install it.])
 fi  fi
   
Line 174  AC_ARG_ENABLE(rplcas, Line 176  AC_ARG_ENABLE(rplcas,
 if test "$enableval" = "no"; then  if test "$enableval" = "no"; then
     RPLCAS=-URPLCAS      RPLCAS=-URPLCAS
     LIBRPLCAS=      LIBRPLCAS=
       INCRPLCAS=
 else  else
     RPLCAS=-DRPLCAS      RPLCAS=-DRPLCAS
     LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a      LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a
       INCRPLCAS="-I\$(top_builddir)/rplcas/include/giac \
               -I\$(top_builddir)/rplcas/include"
 fi],[  fi],[
     RPLCAS=-URPLCAS      RPLCAS=-URPLCAS
     LIBRPLCAS=      LIBRPLCAS=
       INCRPLCAS=
     ]      ]
 )  )
   
 AC_SUBST(ABI)  AC_SUBST(ABI)
 AC_SUBST(RPLCAS)  AC_SUBST(RPLCAS)
 AC_SUBST(LIBRPLCAS)  AC_SUBST(LIBRPLCAS)
   AC_SUBST(INCRPLCAS)
   
 dnl Options  dnl Options
 AC_ARG_ENABLE(optimization,  AC_ARG_ENABLE(optimization,
Line 201  else Line 208  else
     CXXFLAGS="$CXXFLAGS $ABI $enable_optimization"      CXXFLAGS="$CXXFLAGS $ABI $enable_optimization"
     FCFLAGS="$FCFLAGS $ABI $enable_optimization"      FCFLAGS="$FCFLAGS $ABI $enable_optimization"
 fi],[  fi],[
     CFLAGS="$CFLAGS $ABI $OPTIMISATION_C"      CFLAGS="$CFLAGS $ABI $OPTIMISATION_C" 
     FFLAGS="$FFLAGS $ABI $OPTIMISATION_F"      FFLAGS="$FFLAGS $ABI $OPTIMISATION_F"
     CXXFLAGS="$CXXFLAGS $ABI $OPTIMISATION_CXX"      CXXFLAGS="$CXXFLAGS $ABI $OPTIMISATION_CXX"
     FCFLAGS="$FCFLAGS $ABI $OPTIMISATION_F"      FCFLAGS="$FCFLAGS $ABI $OPTIMISATION_F"
     ]      ]
 )  )
   
   CFLAGS="$CFLAGS -fno-strict-overflow"
   
 AC_MSG_CHECKING([for usable shared memory])  AC_MSG_CHECKING([for usable shared memory])
 AC_COMPILE_IFELSE(  AC_COMPILE_IFELSE(
     [AC_LANG_PROGRAM([#include <sys/shm.h>      [AC_LANG_PROGRAM([#include <sys/shm.h>
Line 248  else Line 257  else
     IPCS_SYSV=-DIPCS_SYSV      IPCS_SYSV=-DIPCS_SYSV
     POSIX_IPCS=yes      POSIX_IPCS=yes
 fi],  fi],
 REG=$LDFLAGS  REG=$LIBS
 POSIX_IPCS=guessed  POSIX_IPCS=guessed
 LDFLAGS="-lrt -lpthread"  LIBS="-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 269  fd = shm_open(sem , O_CREAT | O_RDWR, S_ Line 278  fd = shm_open(sem , O_CREAT | O_RDWR, S_
 [IPCS_SYSV=-UIPCS_SYSV; AC_MSG_RESULT(yes)],  [IPCS_SYSV=-UIPCS_SYSV; AC_MSG_RESULT(yes)],
 [IPCS_SYSV=-DIPCS_SYSV; AC_MSG_RESULT(no)]  [IPCS_SYSV=-DIPCS_SYSV; AC_MSG_RESULT(no)]
     )]      )]
 LDFLAGS=$REG  LIBS=$REG
 )  )
   
 if test "$IPCS_SYSV" = "-UIPCS_SYSV" -a "$POSIX_IPCS" = "guessed"; then  if test "$IPCS_SYSV" = "-UIPCS_SYSV" -a "$POSIX_IPCS" = "guessed"; then
 REG=$LDFLAGS  REG=$LIBS
 LDFLAGS=-pthread  LIBS=-pthread
 AC_MSG_CHECKING([for POSIX anonymous semaphores])  AC_MSG_CHECKING([for POSIX anonymous semaphores])
 AC_LINK_IFELSE(  AC_LINK_IFELSE(
 [AC_LANG_PROGRAM([#include <semaphore.h>  [AC_LANG_PROGRAM([#include <semaphore.h>
Line 287  AC_LINK_IFELSE( Line 296  AC_LINK_IFELSE(
 [SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES; AC_MSG_RESULT(yes)],  [SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES; AC_MSG_RESULT(yes)],
 [SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES; AC_MSG_RESULT(no)]  [SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES; AC_MSG_RESULT(no)]
     )      )
 LDFLAGS=$REG  LDFLAGS=$LIBS
 REG=""  REG=""
 else  else
     SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES      SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
Line 376  if test "$enableval" = "no"; then Line 385  if test "$enableval" = "no"; then
 else  else
     MOTIF_SUPPORT="-DMOTIF_SUPPORT"      MOTIF_SUPPORT="-DMOTIF_SUPPORT"
 fi],  fi],
 if test "$have_x" == "yes"; then  if test "$have_x" = "yes"; then
     MOTIF_SUPPORT="-DMOTIF_SUPPORT"      MOTIF_SUPPORT="-DMOTIF_SUPPORT"
 else  else
     MOTIF_SUPPORT="-UMOTIF_SUPPORT"      MOTIF_SUPPORT="-UMOTIF_SUPPORT"
Line 444  if test ! -d "$srcdir"/tools/$NCURSES; t Line 453  if test ! -d "$srcdir"/tools/$NCURSES; t
             do echo Applying script $i && chmod 775 $i && ./$i;              do echo Applying script $i && chmod 775 $i && ./$i;
             done;              done;
             for i in ../$NCURSES*.patch.gz;              for i in ../$NCURSES*.patch.gz;
             do echo Applying patch $i && gunzip -c $i | patch -p1;              do echo Applying patch $i && \
                       if test $i = "../ncurses-5.9-20140607.patch.gz" ; then \
                           rm -f Ada95/src/library.gpr; \
                       fi && \
                   gunzip -c $i | patch -p1;
             done);              done);
 fi  fi
 if test ! -d "$srcdir"/tools/$READLINE; then  if test ! -d "$srcdir"/tools/$READLINE; then

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


CVSweb interface <joel.bertrand@systella.fr>