From 1da17c2f22a5e5da4008f6398166c34fa2193784 Mon Sep 17 00:00:00 2001 From: Daria Phoebe Brashear Date: Tue, 17 Apr 2018 15:15:40 -0400 Subject: [PATCH] roken: test for auxv_t in whichever of auxv.h or sys/auxv.h we find on solaris it's in sys/auxv.h; so a test for it only in auxv.h isn't enough --- cf/roken-frag.m4 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cf/roken-frag.m4 b/cf/roken-frag.m4 index fca48c608..f4cb2e2a8 100644 --- a/cf/roken-frag.m4 +++ b/cf/roken-frag.m4 @@ -42,7 +42,6 @@ AC_HAVE_TYPE([ssize_t],[#include ]) AC_REQUIRE([AC_TYPE_PID_T]) AC_REQUIRE([AC_TYPE_UID_T]) AC_HAVE_TYPE([long long]) -AC_HAVE_TYPE([auxv_t],[#include ]) AC_REQUIRE([rk_RETSIGTYPE]) @@ -51,6 +50,7 @@ AC_REQUIRE([AC_HEADER_STDC]) AC_REQUIRE([AC_HEADER_TIME]) AC_CHECK_HEADERS([\ + auxv.h \ arpa/inet.h \ config.h \ crypt.h \ @@ -97,6 +97,14 @@ AC_CHECK_HEADERS([\ util.h \ ]) +AC_HAVE_TYPE([auxv_t],[#ifdef HAVE_AUXV_H +#include +#endif +#ifdef HAVE_SYS_AUXV_H +#include +#endif +]) + AC_HAVE_TYPE([uintptr_t],[#ifdef HAVE_STDINT_H #include #endif])