From: Ken Hornstein <kenh@pobox.com>
Date: Fri, 1 Feb 2013 18:42:51 +0000 (-0500)
Subject: Move ICONV_ENABLED so it always gets initialized even if the header check
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/31422b15ec8e775718ab1d5e08acfba7e04fb1a9?hp=d5e78944632398a4e31bca0c43cb4df3b30b1640

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 efa6939f..5ae52c87 100644
--- 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
@@ -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
-  ICONV_ENABLED=0
   AS_IF([test "x$nmh_found_iconv" = "xyes"],
     [AC_DEFINE([HAVE_ICONV], [1],
 		   [Define if you have the iconv() function.])