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

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

version 1.288, 2024/02/08 15:57:32 version 1.290, 2024/05/28 15:32:22
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
           if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then
               libMySQLinc=$libMySQLinc/mysql
           fi;
       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          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 815  if test "x$with_mysql" = xcheck -o "x$wi Line 829  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              libMySQLinc=$libMySQLinc/../local/include
               libMySQLlib=$libMySQLlib/../local/lib
           fi;
     fi      fi
   
     if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then      if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then
Line 828  if test "x$with_mysql" = xcheck -o "x$wi Line 844  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
         libMySQLinc=$libMySQLinc/../local/include/mysql          if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then
         libMySQLlib=$libMySQLlib/../local/lib              libMySQLinc=$libMySQLinc/../local/include/mysql
               libMySQLlib=$libMySQLlib/../local/lib
           fi;
     fi      fi
 else  else
     if test "x$with_mysql" != xno; then      if test "x$with_mysql" != xno; then
Removed from v.1.288  
changed lines
  Added in v.1.290

CVSweb interface <joel.bertrand@systella.fr>