Fix up a configure diagnostic when detecting attr/acl headers.

Merge of master-melb:xfs-cmds:25114a by kenmcd.

diff --git a/aclocal.m4 b/aclocal.m4
index 8f8c7dad813e598fb87f134c29cdb83a8773f4bf..bed7836e2f704d47ced91b661090fffbfd76bfa0 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -218,7 +218,7 @@ AC_DEFUN([AC_PACKAGE_NEED_SYS_ACL_H],
         echo
         echo 'FATAL ERROR: sys/acl.h does not exist.'
         echo 'Install the access control lists (acl) development package.'
         echo
         echo 'FATAL ERROR: sys/acl.h does not exist.'
         echo 'Install the access control lists (acl) development package.'

-        echo 'Alternatively, run "make install-lib" from the acl source.'
+        echo 'Alternatively, run "make install-dev" from the acl source.'

         exit 1
     fi
   ])
         exit 1
     fi
   ])


@@ -229,7 +229,7 @@ AC_DEFUN([AC_PACKAGE_NEED_ACL_LIBACL_H],
         echo
         echo 'FATAL ERROR: acl/libacl.h does not exist.'
         echo 'Install the access control lists (acl) development package.'
         echo
         echo 'FATAL ERROR: acl/libacl.h does not exist.'
         echo 'Install the access control lists (acl) development package.'

-        echo 'Alternatively, run "make install-lib" from the acl source.'
+        echo 'Alternatively, run "make install-dev" from the acl source.'

         exit 1
     fi
   ])
         exit 1
     fi
   ])


@@ -256,7 +256,7 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H],
         echo
         echo 'FATAL ERROR: attr/xattr.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'
         echo
         echo 'FATAL ERROR: attr/xattr.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'

-        echo 'Alternatively, run "make install-lib" from the attr source.'
+        echo 'Alternatively, run "make install-dev" from the attr source.'

         exit 1
     fi
   ])
         exit 1
     fi
   ])


@@ -267,7 +267,7 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H],
         echo
         echo 'FATAL ERROR: attr/error_context.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'
         echo
         echo 'FATAL ERROR: attr/error_context.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'

-        echo 'Alternatively, run "make install-lib" from the attr source.'
+        echo 'Alternatively, run "make install-dev" from the attr source.'

         exit 1
     fi
   ])
         exit 1
     fi
   ])


@@ -279,7 +279,7 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRIBUTES_H],
         echo
         echo 'FATAL ERROR: attributes.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'
         echo
         echo 'FATAL ERROR: attributes.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'

-        echo 'Alternatively, run "make install-lib" from the attr source.'
+        echo 'Alternatively, run "make install-dev" from the attr source.'

         exit 1
     fi
   ])
         exit 1
     fi
   ])

diff --git a/m4/package_acldev.m4 b/m4/package_acldev.m4
index 2228543d5d2031aa2aa25b319aa6e73196df3579..2508e2cbde0c806188ab5c3320ae47b07a9c5e09 100644 (file)
--- a/m4/package_acldev.m4
+++ b/m4/package_acldev.m4
@@ -4,7 +4,7 @@ AC_DEFUN([AC_PACKAGE_NEED_SYS_ACL_H],
         echo
         echo 'FATAL ERROR: sys/acl.h does not exist.'
         echo 'Install the access control lists (acl) development package.'
         echo
         echo 'FATAL ERROR: sys/acl.h does not exist.'
         echo 'Install the access control lists (acl) development package.'

-        echo 'Alternatively, run "make install-lib" from the acl source.'
+        echo 'Alternatively, run "make install-dev" from the acl source.'

         exit 1
     fi
   ])
         exit 1
     fi
   ])


@@ -15,7 +15,7 @@ AC_DEFUN([AC_PACKAGE_NEED_ACL_LIBACL_H],
         echo
         echo 'FATAL ERROR: acl/libacl.h does not exist.'
         echo 'Install the access control lists (acl) development package.'
         echo
         echo 'FATAL ERROR: acl/libacl.h does not exist.'
         echo 'Install the access control lists (acl) development package.'

-        echo 'Alternatively, run "make install-lib" from the acl source.'
+        echo 'Alternatively, run "make install-dev" from the acl source.'

         exit 1
     fi
   ])
         exit 1
     fi
   ])

diff --git a/m4/package_attrdev.m4 b/m4/package_attrdev.m4
index 70a3ab62a97d40053e80bef9872d49ff4b37eaa4..038bb049d8f796b04a8ef08773947c733a7393d8 100644 (file)
--- a/m4/package_attrdev.m4
+++ b/m4/package_attrdev.m4
@@ -4,7 +4,7 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H],
         echo
         echo 'FATAL ERROR: attr/xattr.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'
         echo
         echo 'FATAL ERROR: attr/xattr.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'

-        echo 'Alternatively, run "make install-lib" from the attr source.'
+        echo 'Alternatively, run "make install-dev" from the attr source.'

         exit 1
     fi
   ])
         exit 1
     fi
   ])


@@ -15,7 +15,7 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H],
         echo
         echo 'FATAL ERROR: attr/error_context.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'
         echo
         echo 'FATAL ERROR: attr/error_context.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'

-        echo 'Alternatively, run "make install-lib" from the attr source.'
+        echo 'Alternatively, run "make install-dev" from the attr source.'

         exit 1
     fi
   ])
         exit 1
     fi
   ])


@@ -27,16 +27,11 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRIBUTES_H],
         echo
         echo 'FATAL ERROR: attributes.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'
         echo
         echo 'FATAL ERROR: attributes.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'

-        echo 'Alternatively, run "make install-lib" from the attr source.'
+        echo 'Alternatively, run "make install-dev" from the attr source.'

         exit 1
     fi
   ])
 
         exit 1
     fi
   ])
 

-AC_DEFUN([AC_PACKAGE_WANT_ATTRLIST_LIBATTR],
-  [ AC_CHECK_LIB(attr, attr_list, [have_attr_list=true], [have_attr_list=false])
-    AC_SUBST(have_attr_list)
-  ])
-

 AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_LIBATTR],
   [ AC_CHECK_LIB(attr, getxattr,, [
         echo
 AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_LIBATTR],
   [ AC_CHECK_LIB(attr, getxattr,, [
         echo