X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=25c905871588f56aceb8e91bbb1a38ef4d5e5798;hb=5d33eca131cac10205d88f097f3a86c4429a8271;hp=8be5513adce089829731a928695ebebaebbdf6aa;hpb=fe79b8de83c5cc6e657d4310d934ceb1208a1fd3;p=mono.git

diff --git a/configure.ac b/configure.ac
index 8be5513adce..25c90587158 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1031,20 +1031,20 @@ AC_SUBST(DEFAULT_PROFILE)
 
 if test x$USE_NLS = xprofile_default; then
 
-if test x$host_darwin = xyes; then
-# We make the default value for USE_NLS
-# "no" on OSX because it isn't available on most
-# default OSX installs. The most common configurations will
-# all disable it, so this saves us typing.
-  USE_NLS=no
-  AC_SUBST([USE_NLS])
-  AC_MSG_RESULT([$USE_NLS])
-else
-  USE_NLS=yes
-  AC_SUBST([USE_NLS])
-  AC_MSG_RESULT([$USE_NLS])
-fi
+	AC_MSG_CHECKING([NLS used])
+
+	# We make the default value for USE_NLS
+	# "no" on OSX because it isn't available on most
+	# default OSX installs. The most common configurations will
+	# all disable it, so this saves us typing.
+	if test x$host_darwin = xyes; then
+		USE_NLS=no;
+	else
+		USE_NLS=yes;
+	fi
 
+	AC_SUBST([USE_NLS])
+	AC_MSG_RESULT([$USE_NLS])
 fi
 
 AC_ARG_ENABLE(minimal, [  --enable-minimal=LIST      drop support for LIST subsystems.
@@ -1171,7 +1171,7 @@ if test "x$mono_feature_disable_normalization" = "xyes"; then
 fi
 
 #TODO: remove assembly_remapping feature name once everyone is using desktop_loader
-if test "x$mono_feature_disable_assembly_remapping" = "xyes" || "x$mono_feature_disable_desktop_loader" = "xyes"; then
+if test "x$mono_feature_disable_assembly_remapping" = "xyes" || test "x$mono_feature_disable_desktop_loader" = "xyes"; then
 	AC_DEFINE(DISABLE_DESKTOP_LOADER, 1, [Disable desktop assembly loader semantics.])
 	AC_MSG_NOTICE([Disabled desktop assembly loader semantics.])
 fi