Rebase against f232252951fec637758f6b2c4eeda1c0e0650310.

This commit is contained in:
Alistair Leslie-Hughes
2021-09-16 09:35:15 +10:00
parent ad56d6b3d3
commit d918a0ca3f
8 changed files with 41 additions and 260 deletions

View File

@@ -1,4 +1,4 @@
From 33486bf9924ffb152e008ec662e2f9905d67c449 Mon Sep 17 00:00:00 2001
From 4d8244be2c89fe601d75bd17631d87f504dcd63a Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Wed, 13 Jun 2018 10:44:49 -0500
Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open().
@@ -13,7 +13,7 @@ Although perhaps we shouldn't since the server doesn't do this.
3 files changed, 89 insertions(+)
diff --git a/configure b/configure
index f2319159834..a3916efab32 100755
index 97b5dcfb38b..367008886d7 100755
--- a/configure
+++ b/configure
@@ -7543,6 +7543,7 @@ for ac_header in \
@@ -25,9 +25,9 @@ index f2319159834..a3916efab32 100755
sys/ioctl.h \
sys/ipc.h \
@@ -18009,6 +18010,7 @@ for ac_func in \
poll \
port_create \
posix_fadvise \
posix_fallocate \
+ ppoll \
prctl \
proc_pidinfo \
@@ -106,7 +106,7 @@ index f2319159834..a3916efab32 100755
then
if ${LDAP_CFLAGS:+false} :; then :
diff --git a/configure.ac b/configure.ac
index 73869723bd3..6cab92efd74 100644
index 0e65c78a81d..a3c9a627117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -510,6 +510,7 @@ AC_CHECK_HEADERS(\
@@ -118,9 +118,9 @@ index 73869723bd3..6cab92efd74 100644
sys/ioctl.h \
sys/ipc.h \
@@ -2212,6 +2213,7 @@ AC_CHECK_FUNCS(\
poll \
port_create \
posix_fadvise \
posix_fallocate \
+ ppoll \
prctl \
proc_pidinfo \
@@ -143,12 +143,12 @@ index 73869723bd3..6cab92efd74 100644
if test "x$with_ldap" != "xno"
then
diff --git a/include/config.h.in b/include/config.h.in
index 9f8e7f34ada..5ecf57cde58 100644
index f66444fd715..bf8fc85e6c5 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -507,6 +507,9 @@
/* Define to 1 if you have the `posix_fadvise' function. */
#undef HAVE_POSIX_FADVISE
/* Define to 1 if you have the `posix_fallocate' function. */
#undef HAVE_POSIX_FALLOCATE
+/* Define to 1 if you have the `ppoll' function. */
+#undef HAVE_PPOLL