Move ICONV_ENABLED so it always gets initialized even if the header check

for iconv.h fails.

diff --git a/m4/iconv.m4 b/m4/iconv.m4
index efa6939fcfd6f96e29a721e48c677b0f7e566ce6..5ae52c8726f8ab09e39d1324ef3e4687e275a45c 100644 (file)
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -4,7 +4,8 @@ dnl or libiconv()
 dnl
 
 AC_DEFUN([NMH_CHECK_ICONV],
 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
   [AC_CHECK_FUNC([iconv],
     [dnl This is where iconv is found in the default libraries (LIBS)
     nmh_found_iconv=yes


@@ -21,7 +22,6 @@ AC_DEFUN([NMH_CHECK_ICONV],
     AS_IF([test "x$nmh_found_iconv" = "xyes"], [ICONVLIB="-liconv"])])
   dnl If we came out of that by finding iconv in some form, define
   dnl HAVE_ICONV
     AS_IF([test "x$nmh_found_iconv" = "xyes"], [ICONVLIB="-liconv"])])
   dnl If we came out of that by finding iconv in some form, define
   dnl HAVE_ICONV

-  ICONV_ENABLED=0

   AS_IF([test "x$nmh_found_iconv" = "xyes"],
     [AC_DEFINE([HAVE_ICONV], [1],
                   [Define if you have the iconv() function.])
   AS_IF([test "x$nmh_found_iconv" = "xyes"],
     [AC_DEFINE([HAVE_ICONV], [1],
                   [Define if you have the iconv() function.])