| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From e8b0ffc7ea04cc71dba97a38e1a134aaf2285c2d Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 30 Dec 2015 07:14:50 +0000 |
| 4 | Subject: [PATCH] configure: Use HAVE_SYS_RESOURCE_H to guard sys/resource.h |
| 5 | inclusion |
| 6 | |
| 7 | HAVE_RLIM_T check will not let sys/resource.h to be checked and |
| 8 | rlim_t is defined in sys/resource.h so the check would fail. |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | Upstream-Status: Pending |
| 13 | |
| 14 | aclocal.m4 | 2 +- |
| 15 | configure | 14 +++++++------- |
| 16 | 2 files changed, 8 insertions(+), 8 deletions(-) |
| 17 | |
| 18 | diff --git a/aclocal.m4 b/aclocal.m4 |
| 19 | index 6e6f32c..70e7076 100644 |
| 20 | --- a/aclocal.m4 |
| 21 | +++ b/aclocal.m4 |
| 22 | @@ -11,7 +11,7 @@ AC_CACHE_VAL(xinetd_cv_type_$1, |
| 23 | #if HAVE_NETDB_H |
| 24 | #include <netdb.h> |
| 25 | #endif |
| 26 | -#if HAVE_RLIM_T |
| 27 | +#if HAVE_SYS_RESOURCE_H |
| 28 | #include <sys/resource.h> |
| 29 | #endif |
| 30 | #if HAVE_STDINT_H |
| 31 | diff --git a/configure b/configure |
| 32 | index b507d38..bec56ea 100755 |
| 33 | --- a/configure |
| 34 | +++ b/configure |
| 35 | @@ -7640,7 +7640,7 @@ cat >>conftest.$ac_ext <<_ACEOF |
| 36 | #if HAVE_NETDB_H |
| 37 | #include <netdb.h> |
| 38 | #endif |
| 39 | -#if HAVE_RLIM_T |
| 40 | +#if HAVE_SYS_RESOURCE_H |
| 41 | #include <sys/resource.h> |
| 42 | #endif |
| 43 | #if HAVE_STDINT_H |
| 44 | @@ -7686,7 +7686,7 @@ cat >>conftest.$ac_ext <<_ACEOF |
| 45 | #if HAVE_NETDB_H |
| 46 | #include <netdb.h> |
| 47 | #endif |
| 48 | -#if HAVE_RLIM_T |
| 49 | +#if HAVE_SYS_RESOURCE_H |
| 50 | #include <sys/resource.h> |
| 51 | #endif |
| 52 | #if HAVE_STDINT_H |
| 53 | @@ -7732,7 +7732,7 @@ cat >>conftest.$ac_ext <<_ACEOF |
| 54 | #if HAVE_NETDB_H |
| 55 | #include <netdb.h> |
| 56 | #endif |
| 57 | -#if HAVE_RLIM_T |
| 58 | +#if HAVE_SYS_RESOURCE_H |
| 59 | #include <sys/resource.h> |
| 60 | #endif |
| 61 | #if HAVE_STDINT_H |
| 62 | @@ -7778,7 +7778,7 @@ cat >>conftest.$ac_ext <<_ACEOF |
| 63 | #if HAVE_NETDB_H |
| 64 | #include <netdb.h> |
| 65 | #endif |
| 66 | -#if HAVE_RLIM_T |
| 67 | +#if HAVE_SYS_RESOURCE_H |
| 68 | #include <sys/resource.h> |
| 69 | #endif |
| 70 | #if HAVE_STDINT_H |
| 71 | @@ -7824,7 +7824,7 @@ cat >>conftest.$ac_ext <<_ACEOF |
| 72 | #if HAVE_NETDB_H |
| 73 | #include <netdb.h> |
| 74 | #endif |
| 75 | -#if HAVE_RLIM_T |
| 76 | +#if HAVE_SYS_RESOURCE_H |
| 77 | #include <sys/resource.h> |
| 78 | #endif |
| 79 | #if HAVE_STDINT_H |
| 80 | @@ -7870,7 +7870,7 @@ cat >>conftest.$ac_ext <<_ACEOF |
| 81 | #if HAVE_NETDB_H |
| 82 | #include <netdb.h> |
| 83 | #endif |
| 84 | -#if HAVE_RLIM_T |
| 85 | +#if HAVE_SYS_RESOURCE_H |
| 86 | #include <sys/resource.h> |
| 87 | #endif |
| 88 | #if HAVE_STDINT_H |
| 89 | @@ -7916,7 +7916,7 @@ cat >>conftest.$ac_ext <<_ACEOF |
| 90 | #if HAVE_NETDB_H |
| 91 | #include <netdb.h> |
| 92 | #endif |
| 93 | -#if HAVE_RLIM_T |
| 94 | +#if HAVE_SYS_RESOURCE_H |
| 95 | #include <sys/resource.h> |
| 96 | #endif |
| 97 | #if HAVE_STDINT_H |
| 98 | -- |
| 99 | 2.6.4 |
| 100 | |