--- rpl/configure.ac 2023/08/07 08:05:59 1.285 +++ rpl/configure.ac 2024/10/28 14:56:58 1.297 @@ -1,5 +1,5 @@ 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 AM_INIT_AUTOMAKE(silent-rules) AM_SILENT_RULES([yes]) @@ -7,17 +7,17 @@ AC_SUBST(target_cpu) AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries -NCURSES=ncurses-6.4 +NCURSES=ncurses-6.5 READLINE=readline-8.2 UNITS=units-2.22 -GSL=gsl-2.7.1 +GSL=gsl-2.8 GPP=gpp-3.0 -GNUPLOT=gnuplot-5.4.8 +GNUPLOT=gnuplot-5.4.10 dnl ftp://ftp.astron.com/pub/file/ FILE=file-5.45 ICONV=libiconv-1.17 SQLITE=sqlite-3.42.0 -OPENSSL=openssl-3.1.2 +OPENSSL=openssl-3.3.2 OPENMOTIF=motif-2.3.8 LIBXPM=libXpm-3.5.16 SIGSEGV=libsigsegv-2.14 @@ -748,9 +748,9 @@ if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPP AC_MSG_ERROR([Can not find libXinerama !])) LIBS=$REG fi -AC_CHECK_LIB(gomp, omp_get_num_procs,, AC_MSG_ERROR([Can not find libgomp !])) -OPENMP=-lgomp -AC_SUBST(OPENMP) +dnl AC_CHECK_LIB(gomp, omp_get_num_procs,, AC_MSG_ERROR([Can not find libgomp !])) +dnl OPENMP=-lgomp +dnl AC_SUBST(OPENMP) dnl Check for union semun AC_CHECK_TYPE([union semun], SEMUN=-DUNION_SEMUN, SEMUN=-UUNION_SEMUN, [[ @@ -797,7 +797,7 @@ if test "x$with_mysql" = xcheck -o "x$wi saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -L/$libMySQLinc" 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 if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then @@ -805,9 +805,17 @@ if test "x$with_mysql" = xcheck -o "x$wi 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 + 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 - libMySQLinc=$libMySQLinc/mysql fi if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then @@ -815,10 +823,11 @@ if test "x$with_mysql" = xcheck -o "x$wi saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $libMySQLinc/../local/include" 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 - libMySQLinc=$libMySQLinc/../local/include - libMySQLlib=$libMySQLlib/../local/lib + if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then + libMySQLlib=$libMySQLlib/../local/lib + fi; fi if test "$MYSQL_SUPPORT" = "-UMYSQL_SUPPORT"; then @@ -826,10 +835,11 @@ 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 - libMySQLinc=$libMySQLinc/../local/include/mysql - libMySQLlib=$libMySQLlib/../local/lib + if test "$MYSQL_SUPPORT" != "-UMYSQL_SUPPORT"; then + libMySQLlib=$libMySQLlib/../local/lib + fi; fi else if test "x$with_mysql" != xno; then @@ -848,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" @@ -864,16 +873,16 @@ 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; if test $STATIC = no; then - libMySQLlib="-L/$libMySQLlib -lmysqlclient_r" + libMySQLlib="-L/$libMySQLlib -lmysqlclient_r -lssl -lcrypto" else - libMySQLlib="$libMySQLlib/libmysqlclient_r.a" + libMySQLlib="$libMySQLlib/libmysqlclient_r.a -lssl -lcrypto" EXT_SQL="$EXT_SQL $libMySQLlib" fi fi