Merge branch 'bc/maint-daemon-sans-ss-family' into maint

diff --git a/Makefile b/Makefile
index 98372ebbfcabc0b96d33bdcde045ff73de971e28..b07cd8a68146047ed3e7a5a17a420ad0ff5576f8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -886,6 +886,7 @@ ifeq ($(uname_S),IRIX)
        SNPRINTF_RETURNS_BOGUS = YesPlease
        SHELL_PATH = /usr/gnu/bin/bash
        NEEDS_LIBGEN = YesPlease
+       NEEDS_LIBICONV = YesPlease
 endif
 ifeq ($(uname_S),IRIX64)
        NO_SETENV=YesPlease
@@ -904,6 +905,7 @@ ifeq ($(uname_S),IRIX64)
        SNPRINTF_RETURNS_BOGUS = YesPlease
        SHELL_PATH=/usr/gnu/bin/bash
        NEEDS_LIBGEN = YesPlease
+       NEEDS_LIBICONV = YesPlease
 endif
 ifeq ($(uname_S),HP-UX)
        NO_IPV6=YesPlease