From 31422b15ec8e775718ab1d5e08acfba7e04fb1a9 Mon Sep 17 00:00:00 2001 From: Ken Hornstein Date: Fri, 1 Feb 2013 13:42:51 -0500 Subject: [PATCH] Move ICONV_ENABLED so it always gets initialized even if the header check for iconv.h fails. --- m4/iconv.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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.]) -- 2.56.0