Diff for /rpl/configure.ac between versions 1.139 and 1.190

version 1.139, 2015/11/16 20:59:55 version 1.190, 2017/06/21 14:18:20
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.23])  AC_INIT([rpl],[4.1.26])
 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-6.0  NCURSES=ncurses-6.0
 READLINE=readline-6.3  READLINE=readline-7.0
 UNITS=units-2.12  UNITS=units-2.13
 GSL=gsl-2.1  GSL=gsl-2.4
 GPP=gpp-3.0  GPP=gpp-3.0
 GNUPLOT=gnuplot-5.0.1  GNUPLOT=gnuplot-5.0.6
 FILE=file-5.11  FILE=file-5.29
 ICONV=libiconv-1.14  ICONV=libiconv-1.14
 SQLITE=sqlite-3.9.2  SQLITE=sqlite-3.19.3
 OPENSSL=openssl-1.0.2d  OPENSSL=openssl-1.1.0f
 OPENMOTIF=openmotif-2.3.4  OPENMOTIF=openmotif-2.3.7
 LIBXPM=libXpm-3.5.9  LIBXPM=libXpm-3.5.11
 SIGSEGV=libsigsegv-2.11  SIGSEGV=libsigsegv-2.11
 ZLIB=zlib-1.2.8  ZLIB=zlib-1.2.8
   
 GMP=gmp-6.0.0  GMP=gmp-6.1.1
 MPFR=mpfr-3.1.3  MPFR=mpfr-3.1.5
 MPFI=mpfi-1.5.1  MPFI=mpfi-1.5.1
 NTL=ntl-5.5.2  NTL=ntl-9.11.0
 COCOA=CoCoALib-0.9950  COCOA=CoCoALib-0.99542
 PARI=pari-2.5.4  PARI=pari-2.7.6
 GIAC=giac-1.2.2  GIAC=giac-1.2.2
   
 dnl 32 bits ABI  dnl 32 bits ABI
Line 158  fi],[ Line 158  fi],[
     ]      ]
 )  )
   
   AC_ARG_ENABLE(native,
   [  --enable-native         enable gcc native compiler option (default=no)],[
   if test "$enableval" = "yes"; then
       CFLAGS="$CFLAGS -mtune=native -march=native"
       FFLAGS="$FFLAGS -mtune=native -march=native"
       CXXFLAGS="$CXXFLAGS -mtune=native -march=native"
       FCFLAGS="$FCFLAGS -mtune=native -march=native"
   else
       NATIVE=
   fi],[
       NATIVE=
       ]
   )
   
 AC_ARG_WITH(rpltools,  AC_ARG_WITH(rpltools,
 [  --with-rpltools         specify rpltools path used for cross compilation],[  [  --with-rpltools         specify rpltools path used for cross compilation],[
 if test "$with_rpltools" = "no" -o "$with_rpltools" = "yes"; then  if test "$with_rpltools" = "no" -o "$with_rpltools" = "yes"; then
Line 197  AC_SUBST(INCRPLCAS) Line 211  AC_SUBST(INCRPLCAS)
   
 dnl Options  dnl Options
 AC_ARG_ENABLE(optimization,  AC_ARG_ENABLE(optimization,
 [  --enable-optimization   set compiler flags [[default=environment variables -O3]]], [  [  --enable-optimization   set compiler flags [[default=environment variables -O2, enable=environment variables -O3]]], [
 if test "$enableval" = "no"; then  if test "$enableval" = "no"; then
     CFLAGS=$ABI      CFLAGS=$ABI
     FFLAGS=$ABI      FFLAGS=$ABI
     CXXFLAGS=$ABI      CXXFLAGS=$ABI
     FCFLAGS=$ABI      FCFLAGS=$ABI
 else  else
     CFLAGS="$CFLAGS $ABI $enable_optimization"  
     FFLAGS="$FFLAGS $ABI $enable_optimization"  
     CXXFLAGS="$CXXFLAGS $ABI $enable_optimization"  
     FCFLAGS="$FCFLAGS $ABI $enable_optimization"  
 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"
   fi],[
       CFLAGS="$CFLAGS $ABI -O2" 
       FFLAGS="$FFLAGS $ABI -O2"
       CXXFLAGS="$CXXFLAGS $ABI -O2"
       FCFLAGS="$FCFLAGS $ABI -O2"
     ]      ]
 )  )
   
Line 235  if test "$ac_cv_c_inline" != no ; then Line 249  if test "$ac_cv_c_inline" != no ; then
     AC_SUBST(HAVE_INLINE)      AC_SUBST(HAVE_INLINE)
 fi  fi
   
 AC_MSG_CHECKING([for pselect])  
 AC_COMPILE_IFELSE(  
     [AC_LANG_PROGRAM([#include <sys/select.h>  
      #include <unistd.h>  
      #include <sys/time.h>  
      #include <sys/types.h>  
      ],  
     [  
      struct timespec tv;  
      fd_set s1, s2, s3;  
      tv.tv_sec=1;  
      tv.tv_nsec=0;  
      FD_SET(1, &s1); FD_SET(2, &s2); FD_SET(3, &s3);  
      pselect(5, &s1, &s2, &s3, &tv, NULL);  
      return(0);  
     ])],  
 [PSELECT=-DPSELECT; AC_MSG_RESULT(yes)],  
 [PSELECT=-UPSELECT; AC_MSG_RESULT(no)]  
     )  
 AC_SUBST(PSELECT)  
   
 AC_ARG_ENABLE(sysv-ipcs,  AC_ARG_ENABLE(sysv-ipcs,
 [  --enable-sysv-ipcs      use SystemV IPC functions [[default=guessed]]], [  [  --enable-sysv-ipcs      use SystemV IPC functions [[default=guessed]]], [
 if test "$enableval" = "no"; then  if test "$enableval" = "no"; then
Line 752  AC_ARG_WITH(mysql, Line 745  AC_ARG_WITH(mysql,
 [  --with-mysql=PATH         specify directory for installed mysql],  [  --with-mysql=PATH         specify directory for installed mysql],
 [], [with_mysql=check])  [], [with_mysql=check])
   
 if test "x$with_mysql" = xcheck -o "x$with_mysql" = yes; then  if test "x$with_mysql" = xcheck -o "x$with_mysql" = xyes; then
     libMySQLinc="-I/usr/include"      libMySQLinc="-I/usr/include"
     libMySQLlib="/usr/lib"      libMySQLlib="/usr/lib"
   
Line 1182  esac Line 1175  esac
 AC_SUBST(OS)  AC_SUBST(OS)
   
 MALLOC=  MALLOC=
   NO_EXPORT_DYNAMIC=-Wl,--no-export-dynamic
   
 case $OS in  case $OS in
     Darwin)      Darwin)
Line 1330  case $OS in Line 1324  case $OS in
     break ;;      break ;;
 esac  esac
   
   BROKEN_SIGSEGV=-UBROKEN_SIGSEGV
   BUILD_SIGSEGV=$SIGSEGV
   if test x"$LIB_PREFIX" = x"lib"; then
       LIBSIGSEGV=\$\(top_builddir\)/tools/$SIGSEGV/src/.libs/libsigsegv.a
   else
       LIBSIGSEGV=\$\(top_builddir\)/tools/$SIGSEGV/src/.libs/sigsegv.a
   fi
   INCSIGSEGV="-I\$(top_builddir)/tools/$SIGSEGV/src"
   CYGWIN_LDFLAGS=
   
 case $HOST in  case $HOST in
     x86_64-*-linux-gnu)      x86_64-*-linux-gnu)
         ARCH=amd64          ARCH=amd64
Line 1347  case $HOST in Line 1351  case $HOST in
         ARCH=mipsel          ARCH=mipsel
     break;;      break;;
   
       x86_64-*-cygwin)
           BROKEN_SIGSEGV=-DBROKEN_SIGSEGV
           BUILD_SIGSEGV=
           INCSIGSEGV=
           LIBSIGSEGV=
           ARCH=$(echo $HOST | cut -f1 -d-)
           CYGWIN_LDFLAGS=-Wl,--allow-multiple-definition \
                   -Wl,--out-implib,rpl.exe.a
       break;;
   
     *)      *)
         ARCH=$(echo $HOST | cut -f1 -d-)          ARCH=$(echo $HOST | cut -f1 -d-)
     break ;;      break ;;
 esac  esac
   
   AC_SUBST(INCSIGSEGV)
   AC_SUBST(LIBSIGSEGV)
 AC_SUBST(WHOLE_LIB1)  AC_SUBST(WHOLE_LIB1)
 AC_SUBST(WHOLE_LIB2)  AC_SUBST(WHOLE_LIB2)
 AC_SUBST(LIB_PREFIX)  AC_SUBST(LIB_PREFIX)
   AC_SUBST(CYGWIN_LDFLAGS)
   
 AC_SUBST(C_STANDARD)  AC_SUBST(C_STANDARD)
 AC_SUBST(EXPORT_DYNAMIC)  AC_SUBST(EXPORT_DYNAMIC)
   AC_SUBST(NO_EXPORT_DYNAMIC)
 AC_SUBST(NESTED_FUNCTIONS)  AC_SUBST(NESTED_FUNCTIONS)
 AC_SUBST(SEMAPHORES_NOMMES)  AC_SUBST(SEMAPHORES_NOMMES)
 AC_SUBST(IPCS_SYSV)  AC_SUBST(IPCS_SYSV)
Line 1396  AC_SUBST(GIAC) Line 1414  AC_SUBST(GIAC)
 AC_SUBST(INCMOTIF)  AC_SUBST(INCMOTIF)
 AC_SUBST(LIBMOTIF)  AC_SUBST(LIBMOTIF)
 AC_SUBST(ZLIB)  AC_SUBST(ZLIB)
   AC_SUBST(BUILD_SIGSEGV)
   AC_SUBST(BROKEN_SIGSEGV)
   
 AC_SUBST(CFLAGS)  AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)  AC_SUBST(CXXFLAGS)
Line 1418  if test $RECURSIVE = yes; then Line 1438  if test $RECURSIVE = yes; then
     AC_CONFIG_SUBDIRS(tools/$ICONV)      AC_CONFIG_SUBDIRS(tools/$ICONV)
     AC_CONFIG_SUBDIRS(tools/$SQLITE)      AC_CONFIG_SUBDIRS(tools/$SQLITE)
     AC_CONFIG_SUBDIRS(tools/$UNITS)      AC_CONFIG_SUBDIRS(tools/$UNITS)
     AC_CONFIG_SUBDIRS(tools/$SIGSEGV)      if test x$BUILD_SIGSEGV = x$SIGSEGV; then
           AC_CONFIG_SUBDIRS(tools/$SIGSEGV)
       fi
 fi  fi
   
 AC_CONFIG_FILES(Makefile)  AC_CONFIG_FILES(Makefile)

Removed from v.1.139  
changed lines
  Added in v.1.190


CVSweb interface <joel.bertrand@systella.fr>