-AC_INIT([wimlib], [1.6.0-BETA], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.7.1-BETA], [ebiggers3@gmail.com])
AC_CONFIG_SRCDIR([src/wim.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_FILES([Makefile]
[doc/Doxyfile]
[wimlib.pc]
- [doc/"$IMAGEX_PROGNAME".1:doc/imagex.1.in]
- [doc/"$IMAGEX_PROGNAME"-append.1:doc/imagex-append.1.in]
- [doc/"$IMAGEX_PROGNAME"-apply.1:doc/imagex-apply.1.in]
- [doc/"$IMAGEX_PROGNAME"-capture.1:doc/imagex-capture.1.in]
- [doc/"$IMAGEX_PROGNAME"-delete.1:doc/imagex-delete.1.in]
- [doc/"$IMAGEX_PROGNAME"-dir.1:doc/imagex-dir.1.in]
- [doc/"$IMAGEX_PROGNAME"-export.1:doc/imagex-export.1.in]
- [doc/"$IMAGEX_PROGNAME"-extract.1:doc/imagex-extract.1.in]
- [doc/"$IMAGEX_PROGNAME"-info.1:doc/imagex-info.1.in]
- [doc/"$IMAGEX_PROGNAME"-join.1:doc/imagex-join.1.in]
- [doc/"$IMAGEX_PROGNAME"-mount.1:doc/imagex-mount.1.in]
- [doc/"$IMAGEX_PROGNAME"-mountrw.1:doc/imagex-mountrw.1.in]
- [doc/"$IMAGEX_PROGNAME"-optimize.1:doc/imagex-optimize.1.in]
- [doc/"$IMAGEX_PROGNAME"-split.1:doc/imagex-split.1.in]
- [doc/"$IMAGEX_PROGNAME"-unmount.1:doc/imagex-unmount.1.in]
- [doc/"$IMAGEX_PROGNAME"-update.1:doc/imagex-update.1.in]
- [doc/mkwinpeimg.1])
+ [doc/man1/"$IMAGEX_PROGNAME".1:doc/man1/imagex.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-append.1:doc/man1/imagex-append.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-apply.1:doc/man1/imagex-apply.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-capture.1:doc/man1/imagex-capture.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-delete.1:doc/man1/imagex-delete.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-dir.1:doc/man1/imagex-dir.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-export.1:doc/man1/imagex-export.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-extract.1:doc/man1/imagex-extract.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-info.1:doc/man1/imagex-info.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-join.1:doc/man1/imagex-join.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-mount.1:doc/man1/imagex-mount.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-mountrw.1:doc/man1/imagex-mountrw.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-optimize.1:doc/man1/imagex-optimize.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-split.1:doc/man1/imagex-split.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-unmount.1:doc/man1/imagex-unmount.1.in]
+ [doc/man1/"$IMAGEX_PROGNAME"-update.1:doc/man1/imagex-update.1.in]
+ [doc/man1/mkwinpeimg.1])
AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg])
AM_PROG_CC_C_O
AC_CANONICAL_HOST
-AC_CHECK_FUNCS([utimensat lutimes utime flock mempcpy])
+AC_CHECK_FUNCS([futimens utimensat utime flock mempcpy \
+ openat fstatat readlinkat fdopendir])
# Note: some of the following header checks are only to define the appropriate
# HAVE_*_H macro so that the NTFS-3g headers don't get confused and try to skip
# including certain headers.
AC_CHECK_HEADERS([alloca.h \
- attr/xattr.h \
byteswap.h \
endian.h \
errno.h \
sys/endian.h \
sys/file.h \
sys/param.h \
+ sys/sysctl.h \
sys/times.h \
time.h \
utime.h])
WINDOWS_CPPFLAGS=""
WINDOWS_LDFLAGS=""
WINDOWS_LDADD=""
-ENABLE_XATTR_DEFAULT="autodetect"
-case "$host" in
- *-*-mingw*)
+case "$host_os" in
+ mingw*)
# Native Windows
WITH_NTFS_3G_DEFAULT="no"
WITH_FUSE_DEFAULT="no"
WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS"
WINDOWS_LDFLAGS="-no-undefined"
WINDOWS_LDADD="-lshlwapi"
- ENABLE_XATTR_DEFAULT="no"
- ;;
- *-*-cygwin*)
- # Cygwin (WARNING: not well supported)
- AC_MSG_WARN([wimlib has not been tested with Cygwin! Please do
- a Windows-native build with MinGW-w64 instead])
- WITH_NTFS_3G_DEFAULT="no"
- WITH_FUSE_DEFAULT="no"
- VISIBILITY_CFLAGS=""
;;
*)
# UNIX / other
;;
esac
-AC_ARG_WITH([ntdll],
- AS_HELP_STRING([--without-ntdll], [Windows only: do not try to
- use functions from ntdll. By default, in some parts
- of its code, wimlib uses Windows NT system calls to
- work around flaws in the Win32 API. This support
- can be omitted if needed, but some annoying bugs
- will surface (e.g. permission denied errors even
- when running as the Administrator).]),
- [WITH_NTDLL=$withval],
- [WITH_NTDLL=yes])
-
-if test "x$WINDOWS_NATIVE_BUILD" = "xyes"; then
- if test "x$WITH_NTDLL" = "xyes"; then
- WINDOWS_LDADD="$WINDOWS_LDADD"
- AC_DEFINE([WITH_NTDLL], [1], [Define to 1 to try to use ntdll
- functions])
- fi
-fi
-
AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS])
AC_SUBST([WINDOWS_LDADD], [$WINDOWS_LDADD])
PKG_CHECK_MODULES([LIBNTFS_3G], [libntfs-3g])
PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libntfs-3g"
- dnl This checks for a NTFS-3g interface that was changed in the
+ dnl This checks for an NTFS-3g interface that was changed in the
dnl 2013.1.13 release
AC_CHECK_DECL([NTFS_MNT_RDONLY],
[AC_DEFINE([HAVE_NTFS_MNT_RDONLY],
fi
AM_CONDITIONAL([WITH_FUSE], [test "x$WITH_FUSE" = "xyes"])
-ENABLE_XATTR=no
-AC_ARG_ENABLE([xattr],
- [AS_HELP_STRING([--enable-xattr], [Enable the xattr interface to access WIM
- alternate data streams (default: autodetect)])],
- [ENABLE_XATTR=$enableval],
- [if test "x$ENABLE_XATTR_DEFAULT" = "xautodetect"; then
- AC_CHECK_FUNC([setxattr],
- [AC_CHECK_HEADER([attr/xattr.h],
- [ENABLE_XATTR=yes],
- [AC_MSG_WARN([Cannot find the "attr/xattr.h" header. You will not be
- able to use the xattr interface to access WIM alternate data
- streams.])])],
- [AC_MSG_WARN([Cannot find the setxattr() function. You will not be
- able to use the xattr interface to access WIM alternate data
- streams.])])
- fi])
-
-if test "x$ENABLE_XATTR" = "xyes"; then
- AC_DEFINE([ENABLE_XATTR], [1], [Define to 1 if using the xattr
- interface to WIM alternate data streams])
-fi
-
AC_MSG_CHECKING([whether to use SSSE3-accelerated SHA1 ])
AC_ARG_ENABLE([ssse3-sha1],
AS_HELP_STRING([--enable-ssse3-sha1], [use assembly language implementation
if test "x$ENABLE_SSSE3_SHA1" = "xyes"; then
AC_DEFINE([ENABLE_SSSE3_SHA1], [1],
[Define to 1 if using vectorized implementation of SHA1])
- SSSE3_SHA1_OBJ=sha1-ssse3.lo
- AX_PROG_NASM
- AC_SUBST([NASM], [$nasm])
+ SSSE3_SHA1_OBJ=src/sha1-ssse3.lo
+ AC_PROG_NASM
+ NASM_SYMBOL_PREFIX=""
+ NASM_WINDOWS_FLAGS=
+ if test "x$WINDOWS_NATIVE_BUILD" = "xyes"; then
+ NASM_WINDOWS_FLAGS="-DWIN_ABI"
+ fi
+ case "$host_os" in
+ darwin* | rhapsody* | nextstep* | openstep* | macos*)
+ NASM_SYMBOL_PREFIX="_"
+ ;;
+ esac
+ AC_SUBST([NASM_WINDOWS_FLAGS], $NASM_WINDOWS_FLAGS)
+ AC_SUBST([NASM_SYMBOL_PREFIX], $NASM_SYMBOL_PREFIX)
else
SSSE3_SHA1_OBJ=
fi