X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=cb41ba188f8061243763e41ab5da6f119fb77f96;hp=dc6019346cfae1ba692a21b2651e2ffcb05a944d;hb=f389abff995f590fd762777e302f99a413521765;hpb=12f851cd2fbd19c6b9d5358756d4b7c0a9944b92

diff --git a/configure.ac b/configure.ac
index dc601934..cb41ba18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.1.0], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.3.0], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -29,11 +29,17 @@ AC_CONFIG_FILES([Makefile
 AC_PROG_CC
 AM_PROG_CC_C_O
 
-AC_CHECK_FUNCS([utimensat lutimes utime])
+AC_CHECK_FUNCS([utimensat lutimes utime flock])
 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 utime.h])
+		  errno.h attr/xattr.h utime.h sys/file.h])
 
+AC_CHECK_MEMBER([struct stat.st_mtim],
+		[AC_DEFINE([HAVE_STAT_NANOSECOND_PRECISION], [1],
+			  [Define to 1 if nanosecond precision timestamps are
+			   supported])],
+		[],
+		[[#include <sys/stat.h>]])
 
 AM_ICONV
 if test "x$am_cv_func_iconv" != "xyes"; then
@@ -121,6 +127,17 @@ if test "x$ENABLE_ASSERTIONS" = "xyes"; then
 	AC_DEFINE([ENABLE_ASSERTIONS], [1], [Define to 1 if including assertions.])
 fi
 
+AC_MSG_CHECKING([whether to include more assertions])
+AC_ARG_ENABLE([more-assertions],
+	AS_HELP_STRING([--enable-more-assertions], [include even more assertions]),
+	[ENABLE_MORE_ASSERTIONS=$enableval],
+	[ENABLE_MORE_ASSERTIONS=no]
+	)
+AC_MSG_RESULT([$ENABLE_MORE_ASSERTIONS])
+if test "x$ENABLE_MORE_ASSERTIONS" = "xyes"; then
+	AC_DEFINE([ENABLE_MORE_ASSERTIONS], [1], [Define to 1 if including more assertions.])
+fi
+
 
 AC_MSG_CHECKING([whether to include compression verification])
 AC_ARG_ENABLE([verify_compression],
@@ -154,6 +171,32 @@ else
 fi
 AC_SUBST([PTHREAD_LDADD], [$PTHREAD_LDADD])
 
+case "$host" in
+	*-*-cygwin*)
+		dnl -no-undefined is needed to build a DLL in a Cygwin environment.
+		CYGWIN_EXTRA_LDFLAGS="-no-undefined"
+
+		dnl -fvisibility=hidden should not be used in a Cygwin
+		dnl  environment
+		VISIBILITY_CFLAGS=""
+
+		WITH_NTFS_3G_DEFAULT="no"
+		WITH_FUSE_DEFAULT="no"
+		WINDOWS_BUILD="yes"
+		;;
+	*)
+		CYGWIN_EXTRA_LDFLAGS=""
+		VISIBILITY_CFLAGS="-fvisibility=hidden"
+		WITH_NTFS_3G_DEFAULT="yes"
+		WITH_FUSE_DEFAULT="yes"
+		WINDOWS_BUILD="no"
+		;;
+esac
+
+AC_SUBST([CYGWIN_EXTRA_LDFLAGS], [$CYGWIN_EXTRA_LDFLAGS])
+AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
+AM_CONDITIONAL([WINDOWS_BUILD], [test "x$WINDOWS_BUILD" = "xyes"])
+
 AC_MSG_CHECKING([whether to include support for ntfs-3g])
 AC_ARG_WITH([ntfs-3g],
 	      AS_HELP_STRING([--without-ntfs-3g], [build without NTFS-3g.
@@ -161,13 +204,14 @@ AC_ARG_WITH([ntfs-3g],
 			      information when capturing or applying WIMs to a
 			      NTFS filesystem.]),
 	[WITH_NTFS_3G=$withval],
-	[WITH_NTFS_3G=yes]
+	[WITH_NTFS_3G=$WITH_NTFS_3G_DEFAULT]
 	)
 AC_MSG_RESULT([$WITH_NTFS_3G])
 if test "x$WITH_NTFS_3G" = "xyes"; then
 	AC_DEFINE([WITH_NTFS_3G], [1], [Define to 1 to enable support for
 		   NTFS-specific information])
 
+	dnl This effectively checks for NTFS-3g 2011.4.12 or later
 	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
@@ -178,6 +222,15 @@ if test "x$WITH_NTFS_3G" = "xyes"; then
 	features.])])
 	LIBNTFS_3G_LDADD="`pkg-config --libs libntfs-3g`"
 	LIBNTFS_3G_CFLAGS="`pkg-config --cflags libntfs-3g`"
+
+	dnl This checks for a 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],
+				 [1],
+				 [Define to 1 if ntfs_mount() takes the flag NTFS_MNT_RDONLY])],
+		      ,
+		      [#include <ntfs-3g/volume.h>])
 else
 	LIBNTFS_3G_LDADD=
 	LIBNTFS_3G_CFLAGS=
@@ -193,7 +246,7 @@ AC_ARG_WITH([fuse],
 					This will disable the ability to mount
 					WIM files.]),
 	[WITH_FUSE=$withval],
-	[WITH_FUSE=yes]
+	[WITH_FUSE=$WITH_FUSE_DEFAULT]
 	)
 AC_MSG_RESULT([$WITH_FUSE])
 if test "x$WITH_FUSE" = "xyes"; then