From c3e6d5d38699812e047270a711be1926b7f6f396 Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Wed, 7 Nov 2018 16:41:42 -0500
Subject: Fix inadequate autoconfiscation of copyfile() usage.

Per buildfarm, HAVE_COPYFILE is not the same thing as HAVE_COPYFILE_H.
Add the extra configure test.
---
 src/bin/pg_upgrade/file.c  | 2 +-
 src/include/pg_config.h.in | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/bin/pg_upgrade/file.c b/src/bin/pg_upgrade/file.c
index 244dd4d88b5..69bb683421b 100644
--- a/src/bin/pg_upgrade/file.c
+++ b/src/bin/pg_upgrade/file.c
@@ -18,7 +18,7 @@
 
 #include <sys/stat.h>
 #include <fcntl.h>
-#ifdef HAVE_COPYFILE
+#ifdef HAVE_COPYFILE_H
 #include <copyfile.h>
 #endif
 #ifdef __linux__
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index b1f709358e4..6ac75cd02cc 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -117,6 +117,9 @@
 /* Define to 1 if you have the `copyfile' function. */
 #undef HAVE_COPYFILE
 
+/* Define to 1 if you have the <copyfile.h> header file. */
+#undef HAVE_COPYFILE_H
+
 /* Define to 1 if you have the <crtdefs.h> header file. */
 #undef HAVE_CRTDEFS_H
 
-- 
cgit v1.2.3