--- rpl/configure.ac 2024/05/28 15:32:22 1.290 +++ rpl/configure.ac 2024/05/28 16:06:18 1.291 @@ -807,9 +807,6 @@ 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"; 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 @@ -819,9 +816,6 @@ 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"; libMySQLinc=$libMySQLinc/mariadb],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"]) CFLAGS=$saved_CFLAGS - if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then - libMySQLinc=$libMySQLinc/mariadb - fi; fi if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then @@ -832,7 +826,6 @@ if test "x$with_mysql" = xcheck -o "x$wi libMySQLinc=$libMySQLinc/../local/include],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"]) CFLAGS=$saved_CFLAGS if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then - libMySQLinc=$libMySQLinc/../local/include libMySQLlib=$libMySQLlib/../local/lib fi; fi @@ -842,10 +835,9 @@ if test "x$with_mysql" = xcheck -o "x$wi saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $libMySQLinc/../local/include/mysql" 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 if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then - libMySQLinc=$libMySQLinc/../local/include/mysql libMySQLlib=$libMySQLlib/../local/lib fi; fi @@ -866,9 +858,8 @@ else saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $libMySQLinc/mysql" 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 - libMySQLinc=$libMySQLinc/mysql fi else MYSQL_SUPPORT="-UMYSQL_SUPPORT" @@ -882,9 +873,9 @@ if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP AC_MSG_CHECKING(for libmysql libraries in $libMySQLlib) saved_LIBS="$LIBS" 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 - LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a $libMySQLinc" + LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a -lz -ldl -lm -lssl -lcrypto $libMySQLinc" 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"]) LIBS=$saved_LIBS;