From: Quanah Gibson-Mount Date: Mon, 24 Apr 2023 18:45:40 +0000 (+0000) Subject: ITS#10011 - Regenerate configure X-Git-Tag: OPENLDAP_REL_ENG_2_5_15~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=076063c24ae8d0515101ccea18374d9577acabf7;p=thirdparty%2Fopenldap.git ITS#10011 - Regenerate configure --- diff --git a/aclocal.m4 b/aclocal.m4 index daf32af07e..8ccd66a86c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -12,9 +12,9 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -55,7 +55,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -156,7 +156,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -166,11 +166,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + 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` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -187,7 +187,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) 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 diff --git a/configure b/configure index b718883cb5..cc5ee53716 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: 3943f6265060065483db582e5c7bef14fe934d80 . +# From configure.ac Id: 83ef5280475a7529b44a783ec58790269a6214e2 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # @@ -812,7 +812,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -973,7 +972,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1226,15 +1224,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1372,7 +1361,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1525,7 +1514,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -15303,6 +15291,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include +#include #ifndef HAVE_EBCDIC # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -16271,6 +16260,10 @@ $as_echo "no" >&6; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include +#ifdef HAVE_SYS_POLL_H +#include +#endif int main(int argc, char **argv) { int epfd = epoll_create(256); @@ -16451,7 +16444,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - main() { + int main(void) { char buf[100]; buf[0] = 0; strerror_r( 1, buf, sizeof buf ); @@ -16651,7 +16644,7 @@ else #include #include static char *pattern, *string; -main() +int main(void) { int rc; regex_t re; @@ -17865,8 +17858,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -17945,16 +17942,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -18050,8 +18055,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -18130,16 +18139,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -18240,8 +18257,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -18320,16 +18341,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -18430,8 +18459,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -18510,16 +18543,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -18620,8 +18661,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -18700,16 +18745,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -18810,8 +18863,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -18890,16 +18947,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -19001,8 +19066,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -19081,16 +19150,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -19191,8 +19268,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -19271,16 +19352,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -19382,8 +19471,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -19462,16 +19555,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -19573,8 +19674,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -19653,16 +19758,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -19763,8 +19876,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -19843,16 +19960,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -19954,8 +20079,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -20034,16 +20163,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -20145,8 +20282,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -20225,16 +20366,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -20335,8 +20484,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -20415,16 +20568,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -20525,8 +20686,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -20605,16 +20770,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -20716,8 +20889,12 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } @@ -20796,16 +20973,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -21017,14 +21202,12 @@ else /* end confdefs.h. */ #include -#ifndef NULL -#define NULL (void*)0 -#endif +pthread_t thread; int main () { -pthread_detach(NULL); +pthread_detach(thread); ; return 0; } @@ -21138,16 +21321,24 @@ else #define NULL (void*)0 #endif +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { return (void *) (p == NULL); } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { /* pthread test function */ @@ -21237,6 +21428,9 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#define _XOPEN_SOURCE 500 /* For pthread_setconcurrency() on glibc */ +#include +#include #include #include #include @@ -21247,8 +21441,12 @@ else static int fildes[2]; +#ifdef __STDC__ +static void *task(void *p) +#else static void *task(p) void *p; +#endif { int i; struct timeval tv; @@ -21272,9 +21470,13 @@ static void *task(p) exit(0); /* if we exit here, the select blocked the whole process */ } +#ifdef __STDC__ +int main(int argc, char **argv) +#else int main(argc, argv) int argc; char **argv; +#endif { pthread_t t; @@ -22566,8 +22768,8 @@ $as_echo "no" >&6; } fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WT" >&5 -$as_echo_n "checking for WT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wiredtiger" >&5 +$as_echo_n "checking for wiredtiger... " >&6; } if test -n "$WT_CFLAGS"; then pkg_cv_WT_CFLAGS="$WT_CFLAGS" @@ -22607,7 +22809,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -22634,7 +22836,7 @@ Alternatively, you may set the environment variables WT_CFLAGS and WT_LIBS to avoid the need to call pkg-config. 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 "$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: error: in \`$ac_pwd':" >&2;} @@ -23734,7 +23936,8 @@ else /* end confdefs.h. */ #include -main() +#include +int main(void) { if ('C' == toupper('C')) exit(0);