libxfs.h is really only needed for the loggen test;

make it config-time optional.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@infradead.org>

diff --git a/044 b/044
index 17d080cd630003a30aff2f9cc8102ddca62de44c..80631ba4e27c43c2983e7c487e1c00f37f54abfe 100755 (executable)
--- a/044
+++ b/044
@@ -126,6 +126,8 @@ _filter_mkfs <$tmp.mkfs0 2>$tmp.mkfs1
 [ $lversion -ne 1 ] && \
     _notrun "Cannot run this test yet using MKFS_OPTIONS specified"
 
+[ $here/src/loggen ] || _notrun "loggen not built, skipping test"
+
 _check_mount
 _check_require_logdev
 

diff --git a/aclocal.m4 b/aclocal.m4
index 6cc5dceb320ebc2c908512aaab9e5337baf78b1d..ac616d10e6b3859376487c89d9a5e79c76cc0bb1 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -416,15 +416,9 @@ AC_DEFUN([AC_PACKAGE_NEED_XFS_XFS_H],
     fi
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_XFS_LIBXFS_H],
-  [ AC_CHECK_HEADERS([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.'
-        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_NEED_XFS_XQM_H],

diff --git a/configure.in b/configure.in
index f087454336241748ccb248e1c199e958459b0a9e..210a91e21db96ac2862bc60862fade7c1a06be5b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -45,7 +45,7 @@ in
        *)
                AC_MULTILIB($enable_lib64)
                AC_PACKAGE_NEED_XFS_XFS_H
-               AC_PACKAGE_NEED_XFS_LIBXFS_H
+               AC_PACKAGE_WANT_XFS_LIBXFS_H
                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 636f63212a5134026d54346dab7ffb574a76e506..e8f4b6b5873b07ed26654252795c313587123681 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -14,6 +14,7 @@ LOADERFLAGS = @LDFLAGS@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 
+HAVE_LIBXFS = @have_libxfs@
 LIBXFS = @libxfs@
 LIBACL = @libacl@
 LIBATTR = @libattr@

diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4
index 2c8d694703133ec57da1e82bf690ceb2f776f03d..903e4a70fed1893dcf4b93fde9b6857c176c7cbd 100644 (file)
--- a/m4/package_xfslibs.m4
+++ b/m4/package_xfslibs.m4
@@ -8,14 +8,9 @@ AC_DEFUN([AC_PACKAGE_NEED_XFS_XFS_H],
     fi
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_XFS_LIBXFS_H],
-  [ AC_CHECK_HEADERS([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 'Run "make install-qa" from the xfsprogs source.'
-        exit 1
-    fi
+AC_DEFUN([AC_PACKAGE_WANT_LIBXFS_H],
+  [ AC_CHECK_HEADERS([xfs/libxfs.h], [ have_libxfs=true ], [ have_libxfs=false ])
+    AC_SUBST(have_libxfs)
   ])
 
 AC_DEFUN([AC_PACKAGE_NEED_XFS_XQM_H],

diff --git a/src/Makefile b/src/Makefile
index 634e1b34972e6b808a3ef4e3c3928ce123f59c25..2a094888cf02e7b6ad77de00ee9876b861d90baf 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,11 +12,15 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
        godown resvtest writemod makeextents itrash rename \
        multi_open_unlink dmiperf unwritten_sync genhashnames
 
-LINUX_TARGETS = loggen xfsctl bstat t_mtab getdevicesize \
+LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize \
        preallo_rw_pattern_reader preallo_rw_pattern_writer ftrunc trunc \
        fs_perms testx looptest locktest unwritten_mmap \
        bulkstat_unlink_test bulkstat_unlink_test_modified t_dir_offset
 
+ifeq ($(HAVE_LIBXFS), true)
+LINUX_TARGETS += loggen
+endif
+
 IRIX_TARGETS = open_unlink
 
 ifeq ($(PKG_PLATFORM),linux)