make it config-time optional.
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@infradead.org>
[ $lversion -ne 1 ] && \
_notrun "Cannot run this test yet using MKFS_OPTIONS specified"
[ $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
_check_mount
_check_require_logdev
-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],
])
AC_DEFUN([AC_PACKAGE_NEED_XFS_XQM_H],
*)
AC_MULTILIB($enable_lib64)
AC_PACKAGE_NEED_XFS_XFS_H
*)
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
AC_PACKAGE_NEED_XFS_XQM_H
AC_PACKAGE_NEED_XFSCTL_MACRO
AC_PACKAGE_NEED_XFS_HANDLE_H
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
+HAVE_LIBXFS = @have_libxfs@
LIBXFS = @libxfs@
LIBACL = @libacl@
LIBATTR = @libattr@
LIBXFS = @libxfs@
LIBACL = @libacl@
LIBATTR = @libattr@
-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],
])
AC_DEFUN([AC_PACKAGE_NEED_XFS_XQM_H],
godown resvtest writemod makeextents itrash rename \
multi_open_unlink dmiperf unwritten_sync genhashnames
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
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)
IRIX_TARGETS = open_unlink
ifeq ($(PKG_PLATFORM),linux)