Check for xlog_assign_lsn in xfs headers

Checking for libxfs.h isn't enough; some debian installs
have libxfs.h but no xlog_assign_lsn, and the loggen build still
fails.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Tested-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/aclocal.m4 b/aclocal.m4
index ac616d10e6b3859376487c89d9a5e79c76cc0bb1..8a61e390974dd9b9ea0f8448e05eb268403003f0 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -421,6 +421,13 @@ AC_DEFUN([AC_PACKAGE_WANT_XFS_LIBXFS_H],
     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

diff --git a/configure.in b/configure.in
index 210a91e21db96ac2862bc60862fade7c1a06be5b..6c2afe7938a97ded77e47bd976f119563de0b57a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -46,6 +46,7 @@ in
                AC_MULTILIB($enable_lib64)
                AC_PACKAGE_NEED_XFS_XFS_H
                AC_PACKAGE_WANT_XFS_LIBXFS_H
+               AC_PACKAGE_WANT_XLOG_ASSIGN_LSN
                AC_PACKAGE_NEED_XFS_XQM_H
                AC_PACKAGE_NEED_XFSCTL_MACRO
                AC_PACKAGE_NEED_XFS_HANDLE_H

diff --git a/include/builddefs.in b/include/builddefs.in
index e8f4b6b5873b07ed26654252795c313587123681..7827ed5acc9e940c44731659f5b651c41ca27d9d 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -15,6 +15,7 @@ CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 
 HAVE_LIBXFS = @have_libxfs@
+HAVE_XLOG_ASSIGN_LSN = @have_xlog_assign_lsn@
 LIBXFS = @libxfs@
 LIBACL = @libacl@
 LIBATTR = @libattr@

diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4
index 903e4a70fed1893dcf4b93fde9b6857c176c7cbd..870882f0a0f01cbd1c15ee338c6572ccca1545db 100644 (file)
--- a/m4/package_xfslibs.m4
+++ b/m4/package_xfslibs.m4
@@ -13,6 +13,14 @@ AC_DEFUN([AC_PACKAGE_WANT_LIBXFS_H],
     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_SUBST(have_have_xlog_assign_lsn)
+  ])
+
 AC_DEFUN([AC_PACKAGE_NEED_XFS_XQM_H],
   [ AC_CHECK_HEADERS([xfs/xqm.h])
     if test "$ac_cv_header_xfs_xqm_h" != "yes"; then

diff --git a/src/Makefile b/src/Makefile
index 515e16efbc7081270db22e99c186f9c3ab568cce..7b01754a12ea8ec4c5bb48f88ccf7ec9e58b197b 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,7 +17,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize \
        fs_perms testx looptest locktest unwritten_mmap \
        bulkstat_unlink_test bulkstat_unlink_test_modified t_dir_offset
 
-ifeq ($(HAVE_LIBXFS), true)
+ifeq ($(HAVE_XLOG_ASSIGN_LSN), true)
 LINUX_TARGETS += loggen
 endif