Update xfsprogs to latest kernel headers and functions

[xfstests-dev.git] / m4 / package_xfslibs.m4

diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4
index af718c257b69b525bcaa743bb0293018dcab3bff..cafd9597c2abfdb1f9826eda1390f2d665c9f546 100644 (file)
--- a/m4/package_xfslibs.m4
+++ b/m4/package_xfslibs.m4
@@ -3,8 +3,7 @@ AC_DEFUN([AC_PACKAGE_NEED_XFS_LIBXFS_H],
     if test "$ac_cv_header_xfs_libxfs_h" != "yes"; then
         echo
         echo 'FATAL ERROR: cannot find a valid <xfs/libxfs.h> header file.'
-        echo 'Install or upgrade the XFS development package.'
-        echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
+        echo 'Run "make install-qa" from the xfsprogs source.'
         exit 1
     fi
   ])
@@ -42,7 +41,8 @@ AC_DEFUN([AC_PACKAGE_NEED_LIBXFSINIT_LIBXFS],
     libxfs="-lxfs"
     test -f `pwd`/../xfsprogs/libxfs/libxfs.la && \
         libxfs="`pwd`/../xfsprogs/libxfs/libxfs.la"
-    test -f /usr/lib/libxfs.la && libxfs="/usr/lib/libxfs.la"
+    test -f ${libexecdir}${libdirsuffix}/libxfs.la && \
+       libxfs="${libexecdir}${libdirsuffix}/libxfs.la"
     AC_SUBST(libxfs)
   ])
 
@@ -57,7 +57,8 @@ AC_DEFUN([AC_PACKAGE_NEED_OPEN_BY_FSHANDLE],
     libhdl="-lhandle"
     test -f `pwd`/../xfsprogs/libhandle/libhandle.la && \
         libhdl="`pwd`/../xfsprogs/libhandle/libhandle.la"
-    test -f /usr/lib/libhandle.la && libhdl="/usr/lib/libhandle.la"
+    test -f ${libexecdir}${libdirsuffix}/libhandle.la && \
+       libhdl="${libexecdir}${libdirsuffix}/libhandle.la"
     AC_SUBST(libhdl)
   ])
 
@@ -72,7 +73,8 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE],
     libhdl="-lhandle"
     test -f `pwd`/../xfsprogs/libhandle/libhandle.la && \
         libhdl="`pwd`/../xfsprogs/libhandle/libhandle.la"
-    test -f /usr/lib/libhandle.la && libhdl="/usr/lib/libhandle.la"
+    test -f ${libexecdir}${libdirsuffix}/libhandle.la && \
+       libhdl="${libexecdir}${libdirsuffix}/libhandle.la"
     AC_SUBST(libhdl)
   ])
 
@@ -90,8 +92,8 @@ AC_DEFUN([AC_PACKAGE_NEED_IRIX_LIBHANDLE],
   ])
 
 AC_DEFUN([AC_PACKAGE_NEED_XFSCTL_MACRO],
-  [ AC_MSG_CHECKING([xfsctl from xfs/libxfs.h])
-    AC_TRY_LINK([#include <xfs/libxfs.h>], [ int x = xfsctl(0, 0, 0, 0); ],
+  [ AC_MSG_CHECKING([xfsctl from xfs/xfs.h])
+    AC_TRY_LINK([#include <xfs/xfs.h>], [ int x = xfsctl(0, 0, 0, 0); ],
       [ echo ok ],
       [ echo
         echo 'FATAL ERROR: cannot find required macros in the XFS headers.'