Diff for /rpl/configure.ac between versions 1.91 and 1.123

version 1.91, 2014/05/16 14:49:49 version 1.123, 2015/06/08 14:11:27
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.18])  AC_INIT([rpl],[4.1.22])
 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.3  READLINE=readline-6.3
 UNITS=units-2.02  UNITS=units-2.11
 GSL=gsl-1.16  GSL=gsl-1.16
 GPP=gpp-3.0  GPP=gpp-3.0
 GNUPLOT=gnuplot-4.6.5  GNUPLOT=gnuplot-5.0.0
 FILE=file-5.11  FILE=file-5.11
 ICONV=libiconv-1.14  ICONV=libiconv-1.14
 SQLITE=sqlite-3.8.4.3  SQLITE=sqlite-3.8.10.2
 OPENSSL=openssl-1.0.1g  OPENSSL=openssl-1.0.2a
 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.8
   
 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
 PARI=pari-2.5.4  PARI=pari-2.5.4
 GIAC=giac-1.1.0  GIAC=giac-1.1.4
   
 dnl 32 bits ABI  dnl 32 bits ABI
 AC_ARG_WITH(gcc_version,  AC_ARG_WITH(gcc_version,
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 218  AC_COMPILE_IFELSE( Line 227  AC_COMPILE_IFELSE(
     )      )
 AC_SUBST(SHARED_MEMORY)  AC_SUBST(SHARED_MEMORY)
   
   AC_C_INLINE
   
   if test "$ac_cv_c_inline" != no ; then
       AC_DEFINE(HAVE_INLINE,1,[inline keywork or macro available])
       AC_SUBST(HAVE_INLINE)
   fi
   
 AC_MSG_CHECKING([for pselect])  AC_MSG_CHECKING([for pselect])
 AC_COMPILE_IFELSE(  AC_COMPILE_IFELSE(
     [AC_LANG_PROGRAM([#include <sys/select.h>      [AC_LANG_PROGRAM([#include <sys/select.h>
Line 376  if test "$enableval" = "no"; then Line 392  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 460  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; \
                       elif test $i = "../ncurses-5.9-20150516.patch.gz"; then \
                           rm -f doc/html/man/adacurses-config.1.html;
                       fi && \
                   gunzip -c $i | patch -p1;
             done);              done);
 fi  fi
 if test ! -d "$srcdir"/tools/$READLINE; then  if test ! -d "$srcdir"/tools/$READLINE; then
Line 1287  case $OS in Line 1309  case $OS in
     break ;;      break ;;
 esac  esac
   
   dnl Correction d'un problème de compilation pour GNUplot 5.0.0
   ac_configure_args="$ac_configure_args --disable-wxwidgets"
   
 case $OS in  case $OS in
     OS2)      OS2)
         WHOLE_LIB1=""          WHOLE_LIB1=""

Removed from v.1.91  
changed lines
  Added in v.1.123


CVSweb interface <joel.bertrand@systella.fr>