diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c index 1a0d4db..d6c82a7 100644 --- a/bin/named/unix/os.c +++ b/bin/named/unix/os.c @@ -117,12 +117,12 @@ static int dfd[2] = { -1, -1 }; static isc_boolean_t non_root = ISC_FALSE; static isc_boolean_t non_root_caps = ISC_FALSE; -#ifdef HAVE_LINUX_TYPES_H -#include -#endif #ifdef HAVE_SYS_CAPABILITY_H #include #else +#ifdef HAVE_LINUX_TYPES_H +#include +#endif /*% * We define _LINUX_FS_H to prevent it from being included. We don't need * anything from it, and the files it includes cause warnings with 2.2 diff --git a/configure b/configure index 8ec2946..a77b2f8 100755 --- a/configure +++ b/configure @@ -18066,17 +18066,28 @@ fi done - for ac_header in linux/capability.h sys/capability.h + for ac_header in sys/capability.h do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_LINUX_TYPES_H + ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_capability_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_CAPABILITY_H 1 +_ACEOF + +fi + +done + + for ac_header in linux/capability.h +do : + ac_fn_c_check_header_compile "$LINENO" "linux/capability.h" "ac_cv_header_linux_capability_h" "#ifdef HAVE_LINUX_TYPES_H #include #endif " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +if test "x$ac_cv_header_linux_capability_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_LINUX_CAPABILITY_H 1 _ACEOF fi diff --git a/configure.in b/configure.in index be0e40e..f577dc8 100644 --- a/configure.in +++ b/configure.in @@ -2637,7 +2637,8 @@ AC_ARG_ENABLE(linux-caps, case "$enable_linux_caps" in yes|'') AC_CHECK_HEADERS(linux/types.h) - AC_CHECK_HEADERS([linux/capability.h sys/capability.h], [], [], + AC_CHECK_HEADERS([sys/capability.h]) + AC_CHECK_HEADERS([linux/capability.h], [], [], [#ifdef HAVE_LINUX_TYPES_H #include #endif