1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
From 07150f3a27681e034f18ab2ed2b68914c1e10af6 Mon Sep 17 00:00:00 2001
From: Li xin <lixin.fnst@cn.fujitsu.com>
Date: Sat, 18 Jul 2015 05:03:57 +0900
Subject: [PATCH] configure.ac: convert AC_TRY_RUN to AC_TRY_LINK statements
This is not completely safe, but it's the least invasive fix.
Upstream-Status: Pending
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
m4/glibc.m4 | 6 ++----
m4/ioloop.m4 | 9 +++------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/m4/glibc.m4 b/m4/glibc.m4
index 5d722aa..ce088d3 100644
--- a/m4/glibc.m4
+++ b/m4/glibc.m4
@@ -17,7 +17,7 @@ AC_DEFUN([DOVECOT_GLIBC], [
dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it.
dnl * It may also be broken in AIX.
AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[
- AC_TRY_RUN([
+ AC_TRY_LINK([
#define _XOPEN_SOURCE 600
#include <stdio.h>
#include <stdlib.h>
@@ -26,7 +26,7 @@ AC_DEFUN([DOVECOT_GLIBC], [
#if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7)
possibly broken posix_fallocate
#endif
- int main() {
+ ], [
int fd = creat("conftest.temp", 0600);
int ret;
if (fd == -1) {
@@ -35,8 +35,6 @@ AC_DEFUN([DOVECOT_GLIBC], [
}
ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0;
unlink("conftest.temp");
- return ret;
- }
], [
i_cv_posix_fallocate_works=yes
], [
diff --git a/m4/ioloop.m4 b/m4/ioloop.m4
index 0f7dde0..f40fd62 100644
--- a/m4/ioloop.m4
+++ b/m4/ioloop.m4
@@ -4,13 +4,10 @@ AC_DEFUN([DOVECOT_IOLOOP], [
if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then
AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[
- AC_TRY_RUN([
+ AC_TRY_LINK([
#include <sys/epoll.h>
-
- int main()
- {
- return epoll_create(5) < 1;
- }
+ ], [
+ epoll_create(5) < 1;
], [
i_cv_epoll_works=yes
], [
--
2.25.1
|
