summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin McCarthy <kevin@8t8.us>2024-11-04 11:15:11 +0800
committerKevin McCarthy <kevin@8t8.us>2024-11-04 11:15:11 +0800
commitf87ab401d0af87b20c224265f0bd7de4cad123c7 (patch)
treebd7efae6189a06c6f8e8a4c74276dc9480397621
parent9dc98409c190084d9aab761935775f163558ff86 (diff)
parenta5bd98212d8dab1e76867b72bac205000393dd14 (diff)
Merge branch 'stable'HEADmaster
-rw-r--r--configure.ac8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 9348b4c3..b557b7ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1272,7 +1272,7 @@ AC_ARG_ENABLE(iconv, AS_HELP_STRING([--disable-iconv],[Disable iconv support]),
AM_GNU_GETTEXT([external])
AM_ICONV
-if test "$am_cv_func_iconv" != "yes"
+if test "$am_func_iconv" != "yes"
then
AC_MSG_WARN([Configuring without iconv support. See INSTALL for details])
else
@@ -1356,7 +1356,7 @@ dnl -- IDN depends on iconv
dnl mutt_idna.c will perform charset transformations (for smtputf8
dnl support) as long as at least iconv is installed. If there is no
dnl iconv, then it doesn't need to be included in the build.
-if test "$am_cv_func_iconv" = yes; then
+if test "$am_func_iconv" = yes; then
MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_idna.o"
fi
@@ -1391,7 +1391,7 @@ AC_ARG_WITH(idn2, AS_HELP_STRING([--with-idn2=@<:@PFX@:>@],[Use GNU libidn2 for
[with_idn2=no])
if test "x$with_idn" != "xno"; then
- if test "$am_cv_func_iconv" != "yes"; then
+ if test "$am_func_iconv" != "yes"; then
if test "$with_idn" != "auto"; then
AC_MSG_ERROR([IDN requested but iconv is disabled or unavailable])
fi
@@ -1431,7 +1431,7 @@ fi
dnl idna2
if test "x$with_idn2" != "xno"; then
- if test "$am_cv_func_iconv" != "yes"; then
+ if test "$am_func_iconv" != "yes"; then
AC_MSG_ERROR([IDN2 requested but iconv is disabled or unavailable])
else
dnl Solaris 11 has /usr/include/idn