X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=1326258c792831a8fd54d511e26fc7707824b48e;hp=c0c0f132274a4bf44243782420990e4f897614ee;hb=7acdc3aecd7ce546727ae8239e0d942c2a00db43;hpb=c8b34bffb7884de559d6ac208e0bd982ea318a36

diff --git a/configure.ac b/configure.ac
index c0c0f132..1326258c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.2.7], [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@:>@],
@@ -171,6 +163,42 @@ else
 fi
 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,7 +206,7 @@ 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
@@ -208,6 +236,17 @@ if test "x$WITH_NTFS_3G" = "xyes"; then
 else
 	LIBNTFS_3G_LDADD=
 	LIBNTFS_3G_CFLAGS=
+
+	if test "x$WINDOWS_NATIVE_BUILD" != "xyes"; then
+		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
+	fi
 fi
 AM_CONDITIONAL([WITH_NTFS_3G], [test "x$WITH_NTFS_3G" = "xyes"])
 
@@ -220,7 +259,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
@@ -323,22 +362,4 @@ AC_SUBST([LIBCRYPTO_LDADD], [$LIBCRYPTO_LDADD])
 AC_SUBST([LIBCRYPTO_CFLAGS], [$LIBCRYPTO_CFLAGS])
 AC_SUBST([SHA1_SOURCES], [$SHA1_SOURCES])
 
-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=""
-		;;
-	*)
-		CYGWIN_EXTRA_LDFLAGS=""
-		VISIBILITY_CFLAGS="-fvisibility=hidden"
-		;;
-esac
-
-AC_SUBST([CYGWIN_EXTRA_LDFLAGS], [$CYGWIN_EXTRA_LDFLAGS])
-AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
-
 AC_OUTPUT