X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=3e076173dec796c0154b16a5bea78bbc322cb57f;hp=bfff95bb1beb0965f4cc5bc11f70fe333ecc1b7f;hb=c9b74a8ec3c3243432cbcbdefe6a00007930988a;hpb=1a8b4a9f6e24d3ebbd75a86f73955e0f3f5e1785 diff --git a/configure.ac b/configure.ac index bfff95bb..3e076173 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([wimlib], [1.4.2], [ebiggers3@gmail.com]) +AC_INIT([wimlib], [1.5.0], [ebiggers3@gmail.com]) AC_CONFIG_SRCDIR([src/wim.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -48,7 +48,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_CANONICAL_HOST -AC_CHECK_FUNCS([utimensat lutimes utime flock]) +AC_CHECK_FUNCS([utimensat lutimes utime flock mempcpy]) # 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 @@ -231,6 +231,24 @@ case "$host" in ;; esac +AC_ARG_WITH([ntdll], + AS_HELP_STRING([--without-ntdll], [Windows only: do not link with + 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 -lntdll" + AC_DEFINE([WITH_NTDLL], [1], [Define to 1 if linking with ntdll]) + fi +fi + AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS]) AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS]) AC_SUBST([WINDOWS_LDADD], [$WINDOWS_LDADD]) @@ -272,7 +290,7 @@ if test "x$WITH_NTFS_3G" = "xyes"; then [1], [Define to 1 if ntfs_mount() takes the flag NTFS_MNT_RDONLY])], [], - ,[#include ]) + [#include ]) fi AM_CONDITIONAL([WITH_NTFS_3G], [test "x$WITH_NTFS_3G" = "xyes"])