From f19193316d05e15b78429cdaa7da3319e0b83e7e Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Thu, 9 May 2024 17:12:24 +0000 Subject: [PATCH] ITS#10214 - regenerate configure --- aclocal.m4 | 90 ++++++++++++++++++++++++++++++++++++------ configure | 114 ++++++++++++++++------------------------------------- 2 files changed, 114 insertions(+), 90 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 8ccd66a86c..0de59be5c8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -12,7 +12,7 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*- # serial 12 (pkg-config-0.29.2) dnl Copyright © 2004 Scott James Remnant . @@ -100,7 +100,7 @@ dnl Check to see whether a particular set of modules exists. Similar to dnl PKG_CHECK_MODULES(), but does not set variables or print errors. dnl dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place +dnl only at the first occurrence in configure.ac, so if the first place dnl it's called might be skipped (such as if it is within an "if", you dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], @@ -169,14 +169,14 @@ if test $pkg_failed = yes; then AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -188,7 +188,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -198,10 +198,10 @@ _PKG_TEXT To get pkg-config, see .])[]dnl ]) else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + $3 fi[]dnl ])dnl PKG_CHECK_MODULES @@ -288,6 +288,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES + m4_include([build/libtool.m4]) m4_include([build/ltoptions.m4]) m4_include([build/ltsugar.m4]) diff --git a/configure b/configure index d938880ced..d79ff31317 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: a4836a8a0218326643db20d8131fc717d1fc3edf . +# From configure.ac Id: a5548437ea246ecc6b6aacbf1da365276e287201 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # @@ -641,7 +641,6 @@ SLAPD_SQL_LIBS SLAPD_SQL_LDFLAGS SLAPD_GMP_LIBS SLAPD_SLP_LIBS -SYSTEMD_LIBS ARGON2_LIBS AUTH_LIBS LIBSLAPI @@ -720,7 +719,6 @@ DO_VERSIONED_SYMBOLS OL_VERSIONED_SYMBOLS BUILD_LIBS_DYNAMIC BUILD_THREAD -WITH_SYSTEMD WITH_ACI_ENABLED WITH_MODULES_ENABLED WITH_TLS @@ -4767,7 +4765,6 @@ MODULES_LIBS= SLAPI_LIBS= LIBSLAPI= AUTH_LIBS= -SYSTEMD_LIBS= SLAPD_SLP_LIBS= SLAPD_GMP_LIBS= @@ -14151,8 +14148,22 @@ fi fi else - PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`" - PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e 's/ -lc / /' -e 's/ -lc$//'`" + PERL_CPPFLAGS="" + for opt in `$PERLBIN -MExtUtils::Embed -e ccopts`; do + case "$opt" in + "-flto=auto" | "-Wall" ) + continue;; + esac + PERL_CPPFLAGS="$PERL_CPPFLAGS $opt" + done + PERL_LDFLAGS="" + for opt in `$PERLBIN" -MExtUtils::Embed -e ldopts`; do + case "$opt" in + "-lc" ) + continue;; + esac + PERL_LDFLAGS="$PERL_LDFLAGS $opt" + done if test x"$ol_enable_perl" = "xyes" ; then SLAPD_PERL_LDFLAGS="$PERL_LDFLAGS" @@ -22818,14 +22829,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wiredtiger" 2>&1` + WT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wiredtiger" 2>&1` else - WT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wiredtiger" 2>&1` + WT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wiredtiger" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$WT_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$WT_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (wiredtiger) were not met: + as_fn_error $? "Package requirements (wiredtiger) were not met: $WT_PKG_ERRORS @@ -22838,7 +22849,7 @@ See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -22851,8 +22862,8 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - WT_CFLAGS=$pkg_cv_WT_CFLAGS - WT_LIBS=$pkg_cv_WT_LIBS + WT_CFLAGS=$pkg_cv_WT_CFLAGS + WT_LIBS=$pkg_cv_WT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -23052,9 +23063,7 @@ $as_echo "$as_me: WARNING: Strong authentication not supported!" >&2;} fi fi -WITH_SYSTEMD=no systemdsystemunitdir= -ol_link_systemd=no if test $ol_enable_slapd = no && test $ol_enable_balancer != yes ; then if test $ol_with_systemd != no ; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: servers disabled, ignoring --with-systemd=$ol_with_systemd argument" >&5 @@ -23062,7 +23071,8 @@ $as_echo "$as_me: WARNING: servers disabled, ignoring --with-systemd=$ol_with_sy ol_with_systemd=no fi fi -if test $ol_with_systemd != no ; then + +if test $ol_with_systemd = auto; then for ac_header in systemd/sd-daemon.h do : ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default" @@ -23075,66 +23085,15 @@ fi done - if test $ac_cv_header_systemd_sd_daemon_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_notify in -lsystemd" >&5 -$as_echo_n "checking for sd_notify in -lsystemd... " >&6; } -if ${ac_cv_lib_systemd_sd_notify+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsystemd $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sd_notify (); -int -main () -{ -return sd_notify (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_systemd_sd_notify=yes -else - ac_cv_lib_systemd_sd_notify=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_sd_notify" >&5 -$as_echo "$ac_cv_lib_systemd_sd_notify" >&6; } -if test "x$ac_cv_lib_systemd_sd_notify" = xyes; then : - ol_link_systemd="-lsystemd" -fi - + ol_with_systemd=yes fi +fi - if test $ol_link_systemd = no ; then - if test $ol_with_systemd != auto ; then - as_fn_error $? "Could not locate systemd" "$LINENO" 5 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not locate systemd" >&5 -$as_echo "$as_me: WARNING: Could not locate systemd" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: systemd service notification not supported!" >&5 -$as_echo "$as_me: WARNING: systemd service notification not supported!" >&2;} - fi - else +if test $ol_with_systemd = yes ; then $as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h - SYSTEMD_LIBS="$ol_link_systemd" - WITH_SYSTEMD=yes - if test -n "$systemdsystemunitdir"; then pkg_cv_systemdsystemunitdir="$systemdsystemunitdir" @@ -23158,12 +23117,11 @@ systemdsystemunitdir=$pkg_cv_systemdsystemunitdir if test "x$systemdsystemunitdir" = x""; then : fi - if test -z "$systemdsystemunitdir"; then - if test -d /usr/lib/systemd/system; then - systemdsystemunitdir=/usr/lib/systemd/system - else - systemdsystemunitdir=/lib/systemd/system - fi + if test -z "$systemdsystemunitdir"; then + if test -d /usr/lib/systemd/system; then + systemdsystemunitdir=/usr/lib/systemd/system + else + systemdsystemunitdir=/lib/systemd/system fi fi fi @@ -26146,8 +26104,6 @@ fi - - -- 2.47.2