Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / m4 / iconv.m4

diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 949c746da827e6417ef5976b752109f4f451b087..5ae52c8726f8ab09e39d1324ef3e4687e275a45c 100644 (file)
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -4,7 +4,8 @@ dnl or libiconv()
 dnl
 
 AC_DEFUN([NMH_CHECK_ICONV],
-[AC_CHECK_HEADER([iconv.h],
+[ICONV_ENABLED=0
+AC_CHECK_HEADER([iconv.h],
   [AC_CHECK_FUNC([iconv],
     [dnl This is where iconv is found in the default libraries (LIBS)
     nmh_found_iconv=yes
@@ -24,6 +25,7 @@ AC_DEFUN([NMH_CHECK_ICONV],
   AS_IF([test "x$nmh_found_iconv" = "xyes"],
     [AC_DEFINE([HAVE_ICONV], [1],
                   [Define if you have the iconv() function.])
+    ICONV_ENABLED=1
     AC_CACHE_CHECK([for iconv declaration], [nmh_cv_iconv_const],
       [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
           #include <iconv.h>]],
@@ -40,3 +42,4 @@ AC_DEFUN([NMH_CHECK_ICONV],
     AC_DEFINE_UNQUOTED([ICONV_CONST], [$nmh_cv_iconv_const],
       [Define as const if the declaration of iconv() needs const.])])])
 AC_SUBST([ICONVLIB])])
+AC_SUBST([ICONV_ENABLED])