Merge from trunk: Don't use copyfile() when it's not available.

SVN-Revision: 4036

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index cc3915170735ca7a2538c1da11cc870a0194aa00..8ce88b380fca8994b9c734b81c468da08ac15312 100644 (file)
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -246,7 +246,7 @@ archive_read_disk_entry_from_file(struct archive *_a,
        return (r);
 }
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(HAVE_COPYFILE_H)
 /*
  * The Mac OS "copyfile()" API copies the extended metadata for a
  * file into a separate file in AppleDouble format (see RFC 1740).