diff options
| author | Eric Sandeen <sandeen@sandeen.net> | 2009-06-02 15:36:13 -0500 |
|---|---|---|
| committer | Eric Sandeen <sandeen@sandeen.net> | 2009-06-02 15:36:13 -0500 |
| commit | 1e814bd4f3bfa7d7c7da4cfa6e18fe7ae297a59b (patch) | |
| tree | a330902996e2a1228d9223374e1d6ee2973315c6 | |
| parent | 288f540b00fa5d4a4bec24f3ff3f2683b44dd777 (diff) | |
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>
| -rwxr-xr-x | 044 | 2 | ||||
| -rw-r--r-- | aclocal.m4 | 12 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | include/builddefs.in | 1 | ||||
| -rw-r--r-- | m4/package_xfslibs.m4 | 11 | ||||
| -rw-r--r-- | src/Makefile | 6 |
6 files changed, 15 insertions, 19 deletions
@@ -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 @@ -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 f0874543..210a91e2 100644 --- 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 636f6321..e8f4b6b5 100644 --- 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 2c8d6947..903e4a70 100644 --- 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 634e1b34..2a094888 100644 --- 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) |