X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=ac5bee1ef6ae1bc18ea860feaad585f948e73328;hp=0640ea27aaf4c71e8db86d278dcd2ee0dd65f00a;hb=d82950b8ae73d50bffebb88c2b5c10b49f4082f4;hpb=3b0fccf127a6f872841e68825a85470f7d88185c

diff --git a/configure.ac b/configure.ac
index 0640ea27..ac5bee1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.6.2], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.7.0-BETA], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -24,23 +24,23 @@ AC_CONFIG_HEADERS([config.h])
 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])
 
@@ -48,7 +48,8 @@ AC_PROG_CC
 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
@@ -206,25 +207,6 @@ case "$host" in
 		;;
 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])
@@ -259,7 +241,7 @@ if test "x$WITH_NTFS_3G" = "xyes"; then
 	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],