X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=bdc6a92032cf569847b3ae618001b5ab8a918a2c;hp=b76a5b0db56d52ccbd7ce646509b208bb5854b5b;hb=87a0d455554a9e06bc47457981e370c06b9bcbac;hpb=302d18acd7ed0423cfd37a9f1a8f5b70a8fe9965 diff --git a/configure.ac b/configure.ac index b76a5b0d..bdc6a920 100644 --- a/configure.ac +++ b/configure.ac @@ -24,16 +24,14 @@ AC_CONFIG_FILES([Makefile doc/imagex-split.1 doc/imagex-unmount.1 doc/mkwinpeimg.1 - rpm/wimlib.spec - archlinux/PKGBUILD ]) AC_PROG_CC AM_PROG_CC_C_O -AC_CHECK_FUNCS([utimensat]) +AC_CHECK_FUNCS([utimensat lutimes utime]) AC_CHECK_HEADERS([endian.h byteswap.h sys/byteorder.h sys/endian.h \ sys/param.h machine/endian.h alloca.h stdlib.h stdarg.h \ - errno.h attr/xattr.h]) + errno.h attr/xattr.h utime.h]) AM_ICONV @@ -151,13 +149,14 @@ if test "x$WITH_NTFS_3G" = "xyes"; then AC_DEFINE([WITH_NTFS_3G], [1], [Define to 1 to enable support for NTFS-specific information]) - AC_CHECK_LIB([ntfs-3g], [ntfs_mount], [], - [AC_MSG_ERROR([Cannot find libntfs-3g. - Without libntfs-3g, wimlib cannot include support for capturing and - applying WIMs on NTFS filesystems while preserving NTFS-specific data - such as security descriptors and alternate data streams. You should - either install libntfs-3g, or configure with --without-ntfs-3g to - disable support for these NTFS-specific features.])]) + AC_CHECK_LIB([ntfs-3g], [ntfs_xattr_system_setxattr], [], + [AC_MSG_ERROR([Cannot find libntfs-3g version 2011-4-12 + or later. Without libntfs-3g, wimlib cannot include support for + capturing and applying WIMs on NTFS filesystems while preserving + NTFS-specific data such as security descriptors and alternate data + streams. You should either install libntfs-3g, or configure with + --without-ntfs-3g to disable support for these NTFS-specific + features.])]) LIBNTFS_3G_LDADD="`pkg-config --libs libntfs-3g`" LIBNTFS_3G_CFLAGS="`pkg-config --cflags libntfs-3g`" else @@ -201,6 +200,7 @@ else 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])