Merge branch 'es/make-no-iconv'

"make NO_ICONV=NoThanks" did not override NEEDS_LIBICONV
(i.e. linkage of -lintl, -liconv, etc. that are platform-specific
tweaks), which has been corrected.

* es/make-no-iconv:
  Makefile: make NO_ICONV really mean "no iconv"

Makefile

@@ -1351,6 +1351,7 @@ ifdef APPLE_COMMON_CRYPTO
 	LIB_4_CRYPTO += -framework Security -framework CoreFoundation
 endif
 endif
+ifndef NO_ICONV
 	ifdef NEEDS_LIBICONV
 		ifdef ICONVDIR
 			BASIC_CFLAGS += -I$(ICONVDIR)/include
@@ -1363,6 +1364,7 @@ ifdef NEEDS_LIBICONV
 		endif
 		EXTLIBS += $(ICONV_LINK) -liconv
 	endif
+endif
 ifdef NEEDS_LIBGEN
 	EXTLIBS += -lgen
 endif