Check for xlog_assign_lsn in xfs headers

[xfstests-dev.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 52f1c7da0fbfe52a67fb96ca46adb1acad952d48..8a61e390974dd9b9ea0f8448e05eb268403003f0 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -405,17 +405,29 @@ AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE],
     AC_SUBST(libuuid)
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_XFS_LIBXFS_H],
-  [ AC_CHECK_HEADERS([xfs/libxfs.h])
-    if test "$ac_cv_header_xfs_libxfs_h" != "yes"; then
+AC_DEFUN([AC_PACKAGE_NEED_XFS_XFS_H],
+  [ AC_CHECK_HEADERS([xfs/xfs.h])
+    if test "$ac_cv_header_xfs_xfs_h" != "yes"; then
         echo
-        echo 'FATAL ERROR: cannot find a valid <xfs/libxfs.h> header file.'
+        echo 'FATAL ERROR: cannot find a valid <xfs/xfs.h> header file.'
         echo 'Install or upgrade the XFS development package.'
         echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
         exit 1
     fi
   ])
 
+AC_DEFUN([AC_PACKAGE_WANT_XFS_LIBXFS_H],
+  [ AC_CHECK_HEADERS([xfs/libxfs.h], [ have_libxfs=true ], [ have_libxfs=false ])
+    AC_SUBST(have_libxfs)
+  ])
+
+AC_DEFUN([AC_PACKAGE_WANT_XLOG_ASSIGN_LSN],
+  [
+    AC_CHECK_DECL(xlog_assign_lsn,
+      [ have_xlog_assign_lsn=true ], [ have_xlog_assign_lsn=false ],
+      [[#include <xfs/libxfs.h>]])
+  ])
+
 AC_DEFUN([AC_PACKAGE_NEED_XFS_XQM_H],
   [ AC_CHECK_HEADERS([xfs/xqm.h])
     if test "$ac_cv_header_xfs_xqm_h" != "yes"; then
@@ -500,8 +512,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.'