X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=cb41ba188f8061243763e41ab5da6f119fb77f96;hp=5dfcd0eabb970875710b7b2e69cf54ec120782aa;hb=a381a9e10a60c7790fe33255c949bf55b5872a8d;hpb=d00a238151ae7c8e091d938234a14572ef43b5f3

diff --git a/configure.ac b/configure.ac
index 5dfcd0ea..cb41ba18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.2.4], [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])
@@ -171,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.
@@ -178,7 +204,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
@@ -220,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