Merge branch 'maint'

diff --git a/Makefile b/Makefile
index 45dbcf6edff9d907836aa2208dd59c12c4b6ec03..ba214589cb35ae517c67ff2c1428efd81032e56e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -385,6 +385,7 @@ endif
 ifeq ($(uname_S),Darwin)
        NEEDS_SSL_WITH_CRYPTO = YesPlease
        NEEDS_LIBICONV = YesPlease
+       OLD_ICONV = UnfortunatelyYes
        NO_STRLCPY = YesPlease
 endif
 ifeq ($(uname_S),SunOS)