Skip mount tests when --without-fuse

diff --git a/Makefile.am b/Makefile.am
index d2d04ea791b0d2fdfe57886a5b7c24ea16fd26dc..cec197d39fe8eb85141caedefbef719ed3588a5e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,10 +123,13 @@ $(man1_MANS): config.status
 check_PROGRAMS = tests/tree-cmp
 tests_tree_cmp_SOURCES = tests/tree-cmp.c
 
 check_PROGRAMS = tests/tree-cmp
 tests_tree_cmp_SOURCES = tests/tree-cmp.c
 

-dist_check_SCRIPTS = tests/test-imagex                         \
-                    tests/test-imagex-mount                    \
+dist_check_SCRIPTS = tests/test-imagex \

                     tests/test-imagex-capture_and_apply
 
                     tests/test-imagex-capture_and_apply
 

+if WITH_FUSE
+dist_check_SCRIPTS += tests/test-imagex-mount
+endif
+

 if WITH_NTFS_3G
 dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif
 if WITH_NTFS_3G
 dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif

diff --git a/configure.ac b/configure.ac
index b76a5b0db56d52ccbd7ce646509b208bb5854b5b..9a07a7c32e2beaea0f7949c9a04e674ce252d510 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -201,6 +201,7 @@ else
        LIBFUSE_LDADD=
        LIBFUSE_CFLAGS=
 fi
        LIBFUSE_LDADD=
        LIBFUSE_CFLAGS=
 fi

+AM_CONDITIONAL([WITH_FUSE], [test "x$WITH_FUSE" = "xyes"])

 AC_SUBST([LIBFUSE_LDADD], [$LIBFUSE_LDADD])
 AC_SUBST([LIBFUSE_CFLAGS], [$LIBFUSE_CFLAGS])
 
 AC_SUBST([LIBFUSE_LDADD], [$LIBFUSE_LDADD])
 AC_SUBST([LIBFUSE_CFLAGS], [$LIBFUSE_CFLAGS])