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

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

version 1.290, 2024/05/28 15:32:22 version 1.291, 2024/05/28 16:06:18
Line 807  if test "x$with_mysql" = xcheck -o "x$wi Line 807  if test "x$with_mysql" = xcheck -o "x$wi
         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/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
         CFLAGS=$saved_CFLAGS          CFLAGS=$saved_CFLAGS
         if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then  
             libMySQLinc=$libMySQLinc/mysql  
         fi;  
     fi      fi
   
     if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then      if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then
Line 819  if test "x$with_mysql" = xcheck -o "x$wi Line 816  if test "x$with_mysql" = xcheck -o "x$wi
         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/mariadb],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])                          libMySQLinc=$libMySQLinc/mariadb],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
         CFLAGS=$saved_CFLAGS          CFLAGS=$saved_CFLAGS
         if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then  
             libMySQLinc=$libMySQLinc/mariadb  
         fi;  
     fi      fi
   
     if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then      if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then
Line 832  if test "x$with_mysql" = xcheck -o "x$wi Line 826  if test "x$with_mysql" = xcheck -o "x$wi
                         libMySQLinc=$libMySQLinc/../local/include],[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
         if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then          if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then
             libMySQLinc=$libMySQLinc/../local/include  
             libMySQLlib=$libMySQLlib/../local/lib              libMySQLlib=$libMySQLlib/../local/lib
         fi;          fi;
     fi      fi
Line 842  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
         if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then          if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then
             libMySQLinc=$libMySQLinc/../local/include/mysql  
             libMySQLlib=$libMySQLlib/../local/lib              libMySQLlib=$libMySQLlib/../local/lib
         fi;          fi;
     fi      fi
Line 866  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 882  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;
Removed from v.1.290  
changed lines
  Added in v.1.291

CVSweb interface <joel.bertrand@systella.fr>