Rebase against 99114803b80f6e687f1d4ed11e0808b821cdbf22

This commit is contained in:
Alistair Leslie-Hughes
2019-05-15 08:00:59 +10:00
parent f3e2363b52
commit 6ce73c283d
5 changed files with 36 additions and 27 deletions

View File

@@ -1,4 +1,4 @@
From b314f9b084341f4d6f9cec5d8b92736b4f9a9ae7 Mon Sep 17 00:00:00 2001
From 3c98dd79ccad72249122925b6b748c6ec84db003 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().
@@ -11,10 +11,10 @@ Although perhaps we shouldn't since the server doesn't do this.
1 file changed, 12 insertions(+)
diff --git a/configure.ac b/configure.ac
index 11947e5..957d4e1 100644
index 4f1c925bf95..662d510317a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -498,6 +498,7 @@ AC_CHECK_HEADERS(\
@@ -511,6 +511,7 @@ AC_CHECK_HEADERS(\
sys/elf32.h \
sys/epoll.h \
sys/event.h \
@@ -22,7 +22,7 @@ index 11947e5..957d4e1 100644
sys/exec_elf.h \
sys/filio.h \
sys/ioctl.h \
@@ -2206,6 +2207,7 @@ AC_CHECK_FUNCS(\
@@ -2130,6 +2131,7 @@ AC_CHECK_FUNCS(\
pipe2 \
poll \
port_create \
@@ -30,9 +30,9 @@ index 11947e5..957d4e1 100644
prctl \
pread \
proc_pidinfo \
@@ -2274,6 +2276,16 @@ AC_SEARCH_LIBS(clock_gettime, rt,
test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")])
LIBS=$ac_save_LIBS
@@ -2204,6 +2206,16 @@ case $host_os in
;;
esac
+dnl Check for shm_open which may be in -lrt
+if test "$ac_cv_header_sys_mman_h" = "yes" -a "x$RT_LIBS" = "x"
@@ -48,5 +48,5 @@ index 11947e5..957d4e1 100644
if test "x$with_ldap" != "xno"
then
--
1.9.1
2.20.1