X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=blobdiff_plain;f=m4%2Fpackage_attrdev.m4;h=12251ceb63c3e489338c1686be28c84fc2552662;hp=fbb0db74683636bbf7cb5479b9e2ff406bef5daa;hb=681a33182ce024eaa967e195d7b8bae6922399f5;hpb=5868405dce1df6cbf4f3e656e342092b9119a70c

diff --git a/m4/package_attrdev.m4 b/m4/package_attrdev.m4
index fbb0db74..12251ceb 100644
--- 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 'Alternatively, run "make install-lib" from the attr source.'
+        echo 'Alternatively, run "make install-dev" from the attr source.'
         exit 1
     fi
   ])
@@ -15,22 +15,28 @@ 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 'Alternatively, run "make install-lib" from the attr source.'
+        echo 'Alternatively, run "make install-dev" from the attr source.'
         exit 1
     fi
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_ATTR_ATTRIBUTES_H],
-  [ AC_CHECK_HEADERS([attr/attributes.h])
-    if test "$ac_cv_header_attr_attributes_h" != "yes"; then
+AC_DEFUN([AC_PACKAGE_NEED_ATTRIBUTES_H],
+  [ have_attributes_h=false
+    AC_CHECK_HEADERS([attr/attributes.h sys/attributes.h], [have_attributes_h=true], )
+    if test "$have_attributes_h" = "false"; then
         echo
-        echo 'FATAL ERROR: attr/attributes.h does not exist.'
+        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
   ])
 
+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
@@ -40,9 +46,8 @@ AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_LIBATTR],
         exit 1
     ])
     libattr="-lattr"
-    test -f `pwd`/../attr/libattr/libattr.la && \
-        libattr="`pwd`/../attr/libattr/libattr.la"
-    test -f /usr/lib/libattr.la && libattr="/usr/lib/libattr.la"
+    test -f ${libexecdir}${libdirsuffix}/libattr.la && \
+	libattr="${libexecdir}${libdirsuffix}/libattr.la"
     AC_SUBST(libattr)
   ])
 
@@ -55,9 +60,8 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRGET_LIBATTR],
         exit 1
     ])
     libattr="-lattr"
-    test -f `pwd`/../attr/libattr/libattr.la && \
-        libattr="`pwd`/../attr/libattr/libattr.la"
-    test -f /usr/lib/libattr.la && libattr="/usr/lib/libattr.la"
+    test -f ${libexecdir}${libdirsuffix}/libattr.la && \
+	libattr="${libexecdir}${libdirsuffix}/libattr.la"
     AC_SUBST(libattr)
   ])