From dcb3106e20618efcf95bf76a7dbfc446df9f69d9 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 3 Jun 2009 15:15:15 -0500 Subject: [PATCH] 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 Tested-by: Aneesh Kumar K.V Reviewed-by: Christoph Hellwig --- aclocal.m4 | 7 +++++++ configure.in | 1 + include/builddefs.in | 1 + m4/package_xfslibs.m4 | 8 ++++++++ src/Makefile | 2 +- 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index ac616d10..8a61e390 100644 --- 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 ]]) + ]) + 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 210a91e2..6c2afe79 100644 --- 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 e8f4b6b5..7827ed5a 100644 --- 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 903e4a70..870882f0 100644 --- 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 ]]) + 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 515e16ef..7b01754a 100644 --- 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 -- 2.30.2