From bd6f6d9e958c2dd3d2c7d4e12668ce6f8f0ff9b0 Mon Sep 17 00:00:00 2001
From: "Alan M. Carroll" <amc@apache.org>
Date: Sun, 26 Feb 2023 12:25:17 -0600
Subject: [PATCH] Build: remove configure check for sys/mount.h, use C++17
 builtin.

---
 configure.ac              | 2 +-
 include/tscore/ink_file.h | 2 +-
 src/tscore/ink_file.cc    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index a9c3c93f50b..db8e59e1baf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1962,7 +1962,7 @@ AC_CHECK_HEADERS([sys/types.h \
 
 # On OpenBSD, pthread.h must be included before pthread_np.h
 AC_CHECK_HEADERS([pthread_np.h], [], [], [#include <pthread.h>])
-AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/disk.h sys/disklabel.h sys/mount.h])
+AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/disk.h sys/disklabel.h])
 AC_CHECK_HEADERS([linux/hdreg.h linux/major.h])
 
 AC_CHECK_HEADERS([sys/sysctl.h], [], [],
diff --git a/include/tscore/ink_file.h b/include/tscore/ink_file.h
index 8fd2f75579d..7c0ca9fd81e 100644
--- a/include/tscore/ink_file.h
+++ b/include/tscore/ink_file.h
@@ -47,7 +47,7 @@
 
 // Darwin keeps statfs(2) in <sys/mount.h> ...
 // Its problematic if linux/mount.h is already included so check for that
-#if HAVE_SYS_MOUNT_H && !defined(_LINUX_MOUNT_H)
+#if __has_include(<sys/mount.h>) && ! defined(_LINUX_MOUNT_H)
 #include <sys/mount.h>
 #endif
 
diff --git a/src/tscore/ink_file.cc b/src/tscore/ink_file.cc
index 2139cecdb4c..c8643628ffc 100644
--- a/src/tscore/ink_file.cc
+++ b/src/tscore/ink_file.cc
@@ -52,7 +52,7 @@
 #include <linux/hdreg.h> /* for struct hd_geometry */
 #endif
 
-#if HAVE_SYS_MOUNT_H
+#if __has_include(<sys/mount.h>)
 #include <sys/mount.h> /* for BLKGETSIZE */
 #endif