[BACK]Return to configure.ac CVS log [TXT] [DIR] Up to [local] / rpl

Diff for /rpl/configure.ac between versions 1.273 and 1.291

version 1.273, 2022/09/07 13:40:29 version 1.291, 2024/05/28 16:06:18
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.34])  AC_INIT([rpl],[4.1.36])
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(silent-rules)  AM_INIT_AUTOMAKE(silent-rules)
 AM_SILENT_RULES([yes])  AM_SILENT_RULES([yes])
Line 7  AC_SUBST(target_cpu) Line 7  AC_SUBST(target_cpu)
 AC_CONFIG_HEADERS([rplconfig.h])  AC_CONFIG_HEADERS([rplconfig.h])
   
 dnl Libraries  dnl Libraries
 NCURSES=ncurses-6.3  NCURSES=ncurses-6.4
 READLINE=readline-8.1  READLINE=readline-8.2
 UNITS=units-2.21  UNITS=units-2.22
 GSL=gsl-2.7.1  GSL=gsl-2.7.1
 GPP=gpp-3.0  GPP=gpp-3.0
 GNUPLOT=gnuplot-5.4.2  GNUPLOT=gnuplot-5.4.8
 dnl ftp://ftp.astron.com/pub/file/  dnl ftp://ftp.astron.com/pub/file/
 FILE=file-5.41  FILE=file-5.45
 ICONV=libiconv-1.16  ICONV=libiconv-1.17
 SQLITE=sqlite-3.37.0  SQLITE=sqlite-3.42.0
 OPENSSL=openssl-1.1.1q  OPENSSL=openssl-3.2.1
 OPENMOTIF=motif-2.3.8  OPENMOTIF=motif-2.3.8
 LIBXPM=libXpm-3.5.12  LIBXPM=libXpm-3.5.16
 SIGSEGV=libsigsegv-2.12  SIGSEGV=libsigsegv-2.14
 ZLIB=zlib-1.2.11  ZLIB=zlib-1.2.13
   
 GMP=gmp-6.2.1  GMP=gmp-6.3.0
 MPFR=mpfr-4.1.0  MPFR=mpfr-4.2.0
 MPFI=mpfi-1.5.4  MPFI=mpfi-1.5.4
 NTL=ntl-11.5.1  NTL=ntl-11.5.1
 PARI=pari-2.13.3  PARI=pari-2.15.4
 GIAC=giac-1.9.0  GIAC=giac-1.9.0
   
 dnl 32 bits ABI  dnl 32 bits ABI
Line 797  if test "x$with_mysql" = xcheck -o "x$wi Line 797  if test "x$with_mysql" = xcheck -o "x$wi
     saved_CFLAGS="$CFLAGS"      saved_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -L/$libMySQLinc"      CFLAGS="$CFLAGS -L/$libMySQLinc"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
                     libMySQLinc=$libMySQLinc/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])                      libMySQLinc=$libMySQLinc],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
     CFLAGS=$saved_CFLAGS      CFLAGS=$saved_CFLAGS
   
     if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then      if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then
Line 805  if test "x$with_mysql" = xcheck -o "x$wi Line 805  if test "x$with_mysql" = xcheck -o "x$wi
         saved_CFLAGS="$CFLAGS"          saved_CFLAGS="$CFLAGS"
         CFLAGS="$CFLAGS $libMySQLinc/mysql"          CFLAGS="$CFLAGS $libMySQLinc/mysql"
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
                         libMySQLinc=$libMySQLinc],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])                          libMySQLinc=$libMySQLinc/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
           CFLAGS=$saved_CFLAGS
       fi
   
       if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then
           AC_MSG_CHECKING(for libmysql includes in /usr/include/mariadb)
           saved_CFLAGS="$CFLAGS"
           CFLAGS="$CFLAGS $libMySQLinc/mariadb"
           AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
                           libMySQLinc=$libMySQLinc/mariadb],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
         CFLAGS=$saved_CFLAGS          CFLAGS=$saved_CFLAGS
         libMySQLinc=$libMySQLinc/mysql  
     fi      fi
   
     if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then      if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then
Line 815  if test "x$with_mysql" = xcheck -o "x$wi Line 823  if test "x$with_mysql" = xcheck -o "x$wi
         saved_CFLAGS="$CFLAGS"          saved_CFLAGS="$CFLAGS"
         CFLAGS="$CFLAGS $libMySQLinc/../local/include"          CFLAGS="$CFLAGS $libMySQLinc/../local/include"
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
                         libMySQLinc=$libMySQLinc/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])                          libMySQLinc=$libMySQLinc/../local/include],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
         CFLAGS=$saved_CFLAGS          CFLAGS=$saved_CFLAGS
         libMySQLinc=$libMySQLinc/../local/include          if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then
         libMySQLlib=$libMySQLlib/../local/lib              libMySQLlib=$libMySQLlib/../local/lib
           fi;
     fi      fi
   
     if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then      if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then
Line 826  if test "x$with_mysql" = xcheck -o "x$wi Line 835  if test "x$with_mysql" = xcheck -o "x$wi
         saved_CFLAGS="$CFLAGS"          saved_CFLAGS="$CFLAGS"
         CFLAGS="$CFLAGS $libMySQLinc/../local/include/mysql"          CFLAGS="$CFLAGS $libMySQLinc/../local/include/mysql"
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
                         libMySQLinc=$libMySQLinc/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])                          libMySQLinc=$libMySQLinc/../local/include/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
         CFLAGS=$saved_CFLAGS          CFLAGS=$saved_CFLAGS
         libMySQLinc=$libMySQLinc/../local/include/mysql          if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then
         libMySQLlib=$libMySQLlib/../local/lib              libMySQLlib=$libMySQLlib/../local/lib
           fi;
     fi      fi
 else  else
     if test "x$with_mysql" != xno; then      if test "x$with_mysql" != xno; then
Line 848  else Line 858  else
             saved_CFLAGS="$CFLAGS"              saved_CFLAGS="$CFLAGS"
             CFLAGS="$CFLAGS $libMySQLinc/mysql"              CFLAGS="$CFLAGS $libMySQLinc/mysql"
             AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";              AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
                             libMySQLinc=$libMySQLinc],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])                              libMySQLinc=$libMySQLinc/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
             CFLAGS=$saved_CFLAGS              CFLAGS=$saved_CFLAGS
             libMySQLinc=$libMySQLinc/mysql  
         fi          fi
     else      else
         MYSQL_SUPPORT="-UMYSQL_SUPPORT"          MYSQL_SUPPORT="-UMYSQL_SUPPORT"
Line 864  if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP Line 873  if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP
         AC_MSG_CHECKING(for libmysql libraries in $libMySQLlib)          AC_MSG_CHECKING(for libmysql libraries in $libMySQLlib)
         saved_LIBS="$LIBS"          saved_LIBS="$LIBS"
         if test $STATIC = no; then          if test $STATIC = no; then
             LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc"              LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r -lz -ldl -lm -lssl -lcrypto $libMySQLinc"
         else          else
             LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a $libMySQLinc"              LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a -lz -ldl -lm -lssl -lcrypto $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 1351  esac Line 1360  esac
 dnl Correction d'un problème de compilation pour GNUplot 5.0.0  dnl Correction d'un problème de compilation pour GNUplot 5.0.0
 ac_configure_args="$ac_configure_args --disable-wxwidgets"  ac_configure_args="$ac_configure_args --disable-wxwidgets"
 dnl Correction d'un problème d'ABI avec readline  dnl Correction d'un problème d'ABI avec readline
 ac_configure_args="$ac_configure_args \  dnl ac_configure_args="$ac_configure_args \
         --with-abi-version=5.9 --with-rel-version=5.9"  dnl     --with-abi-version=5.9 --with-rel-version=5.9"
   
 case $OS in  case $OS in
     OS2)      OS2)
Removed from v.1.273  
changed lines
  Added in v.1.291

CVSweb interface <joel.bertrand@systella.fr>