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

diff --git a/configure.ac b/configure.ac
index 1326258c..06a75400 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,10 +157,9 @@ 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"
@@ -237,22 +236,20 @@ 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"])
 
 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.