Fix cpio symlink tests on FreeBSD; the link-sensitive ACL routines

weren't being properly configured, which was causing the regular
Posix mode bits to get overwritten.

SVN-Revision: 1357

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d988350ec594b94becc6d6b13971950c8c51de8e..b81f795c4748736c439ca598127341ba24104140 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -621,6 +621,10 @@ IF(ENABLE_ACL)
       "sys/types.h;sys/acl.h" HAVE_ACL_GET_PERM)
   CHECK_SYMBOL_EXISTS(acl_get_perm_np
       "sys/types.h;sys/acl.h" HAVE_ACL_GET_PERM_NP)
+  CHECK_SYMBOL_EXISTS(acl_get_link
+      "sys/types.h;sys/acl.h" HAVE_ACL_GET_LINK)
+  CHECK_SYMBOL_EXISTS(acl_get_link_np
+      "sys/types.h;sys/acl.h" HAVE_ACL_GET_LINK_NP)
 
   # MacOS has an acl.h that isn't POSIX.  It can be detected by
   # checking for ACL_USER

diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index 988d360ee81660c34f3633d492055778c7698a8e..d64c4cf2ffef0afbf0555970122f8052586ca308 100644 (file)
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -9,6 +9,12 @@
 /* Define to 1 if you have the `acl_create_entry' function. */
 #cmakedefine HAVE_ACL_CREATE_ENTRY 1
 
+/* Define to 1 if you have the `acl_get_link' function. */
+#cmakedefine HAVE_ACL_GET_LINK 1
+
+/* Define to 1 if you have the `acl_get_link_np' function. */
+#cmakedefine HAVE_ACL_GET_LINK_NP 1
+
 /* Define to 1 if you have the `acl_get_perm' function. */
 #cmakedefine HAVE_ACL_GET_PERM 1