X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=06a7540080fc3665e23a4a3ddc7983e2d27fa8df;hp=2ed9d7da89218a2d572b62badc16ed064e255fd0;hb=de12c346dc64404821d52d545e2e1b3d44230f2a;hpb=4a4aa00c378959fedcc4dab39d0933d36e2a1c3e

diff --git a/configure.ac b/configure.ac
index 2ed9d7da..06a75400 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.2.3], [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])
@@ -28,11 +28,12 @@ AC_CONFIG_FILES([Makefile
 		])
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_CANONICAL_HOST
 
 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 sys/file.h])
+		  errno.h attr/xattr.h utime.h sys/file.h glob.h])
 
 AC_CHECK_MEMBER([struct stat.st_mtim],
 		[AC_DEFINE([HAVE_STAT_NANOSECOND_PRECISION], [1],
@@ -41,15 +42,6 @@ AC_CHECK_MEMBER([struct stat.st_mtim],
 		[],
 		[[#include <sys/stat.h>]])
 
-AM_ICONV
-if test "x$am_cv_func_iconv" != "xyes"; then
-	AC_MSG_ERROR([Cannot find the iconv() function.
-	iconv() is used to convert between UTF-8 and UTF-16 encodings of WIM
-	filenames and XML data.  Wimlib cannot be compiled without it.  iconv()
-	is available in the latest version of glibc and sometimes in other
-	libraries.])
-fi
-
 
 AC_ARG_WITH(pkgconfigdir,
             [  --with-pkgconfigdir=DIR      pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@],
@@ -165,12 +157,47 @@ if test "x$ENABLE_MULTITHREADED_COMPRESSION" = "xyes"; then
 	AC_DEFINE([ENABLE_MULTITHREADED_COMPRESSION], [1],
 		  	[Define to 1 if including support for multithreaded
 			 compression])
-	PTHREAD_LDADD="-lpthread"
-else
-	PTHREAD_LDADD=""
 fi
+
+PTHREAD_LDADD="-lpthread"
 AC_SUBST([PTHREAD_LDADD], [$PTHREAD_LDADD])
 
+WITH_NTFS_3G_DEFAULT="yes"
+WITH_FUSE_DEFAULT="yes"
+WINDOWS_NATIVE_BUILD="no"
+VISIBILITY_CFLAGS="-fvisibility=hidden"
+WINDOWS_CPPFLAGS=""
+WINDOWS_LDFLAGS=""
+WINDOWS_LDADD=""
+
+case "$host" in
+	*-*-mingw*)
+		# Native Windows
+		WITH_NTFS_3G_DEFAULT="no"
+		WITH_FUSE_DEFAULT="no"
+		WINDOWS_NATIVE_BUILD="yes"
+		VISIBILITY_CFLAGS=""
+		WINDOWS_CPPFLAGS="-D_POSIX"
+		WINDOWS_LDFLAGS="-no-undefined"
+		WINDOWS_LDADD="-lshlwapi"
+		;;
+ 	*-*-cygwin*)
+		# Cygwin (WARNING: not well supported)
+		WITH_NTFS_3G_DEFAULT="no"
+		WITH_FUSE_DEFAULT="no"
+		VISIBILITY_CFLAGS=""
+		;;
+	*)
+		# UNIX / other
+		;;
+esac
+
+AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
+AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS])
+AC_SUBST([WINDOWS_LDADD], [$WINDOWS_LDADD])
+AC_SUBST([WINDOWS_CPPFLAGS], [$WINDOWS_CPPFLAGS])
+AM_CONDITIONAL([WINDOWS_NATIVE_BUILD], [test "x$WINDOWS_NATIVE_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.
@@ -178,13 +205,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
@@ -195,22 +223,40 @@ 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=
+
 fi
 AM_CONDITIONAL([WITH_NTFS_3G], [test "x$WITH_NTFS_3G" = "xyes"])
 
 AC_SUBST([LIBNTFS_3G_LDADD], [$LIBNTFS_3G_LDADD])
 AC_SUBST([LIBNTFS_3G_CFLAGS], [$LIBNTFS_3G_CFLAGS])
 
+AM_ICONV
+if test "x$am_cv_func_iconv" != "xyes"; then
+	AC_MSG_ERROR([Cannot find the iconv() function.
+	iconv() is used to convert between encodings of WIM filenames and XML data.
+	wimlib cannot be compiled without it.  iconv() is available in the latest
+	version of glibc and sometimes in other libraries.])
+fi
+
 AC_MSG_CHECKING([whether to include support for mounting WIMs])
 AC_ARG_WITH([fuse],
 		AS_HELP_STRING([--without-fuse], [build without libfuse.
 					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