X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=configure.ac;h=06a7540080fc3665e23a4a3ddc7983e2d27fa8df;hb=53675ca016f3b49fd12fce880b313964ab30dd7c;hp=ad04b478e3393fb15815f645ebac4bc62445a64b;hpb=2a33c303e30fd740f740e21632fd06b9e414b0c7;p=wimlib

diff --git a/configure.ac b/configure.ac
index ad04b478..06a75400 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,46 +157,46 @@ 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
-		WINDOWS_EXTRA_LDFLAGS="-no-undefined"
-		VISIBILITY_CFLAGS=""
 		WITH_NTFS_3G_DEFAULT="no"
 		WITH_FUSE_DEFAULT="no"
-		WINDOWS_BUILD="yes"
+		WINDOWS_NATIVE_BUILD="yes"
+		VISIBILITY_CFLAGS=""
+		WINDOWS_CPPFLAGS="-D_POSIX"
+		WINDOWS_LDFLAGS="-no-undefined"
 		WINDOWS_LDADD="-lshlwapi"
 		;;
  	*-*-cygwin*)
 		# Cygwin (WARNING: not well supported)
-		WINDOWS_EXTRA_LDFLAGS="-no-undefined"
-		VISIBILITY_CFLAGS=""
 		WITH_NTFS_3G_DEFAULT="no"
 		WITH_FUSE_DEFAULT="no"
-		WINDOWS_BUILD="yes"
-		WINDOWS_LDADD=""
+		VISIBILITY_CFLAGS=""
 		;;
 	*)
 		# UNIX / other
-		WINDOWS_EXTRA_LDFLAGS=""
-		VISIBILITY_CFLAGS="-fvisibility=hidden"
-		WITH_NTFS_3G_DEFAULT="yes"
-		WITH_FUSE_DEFAULT="yes"
-		WINDOWS_BUILD="no"
-		WINDOWS_LDADD=""
 		;;
 esac
 
-AC_SUBST([WINDOWS_EXTRA_LDFLAGS], [$WINDOWS_EXTRA_LDFLAGS])
 AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
+AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS])
 AC_SUBST([WINDOWS_LDADD], [$WINDOWS_LDADD])
-AM_CONDITIONAL([WINDOWS_BUILD], [test "x$WINDOWS_BUILD" = "xyes"])
+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],
@@ -236,22 +236,20 @@ else
 	LIBNTFS_3G_LDADD=
 	LIBNTFS_3G_CFLAGS=
 
-	if test "x$WINDOWS_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"])
 
 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.