Make IDN depend on iconv support

diff --git a/ChangeLog b/ChangeLog
index 357673b71bc8e127abddbfb6a291d27cd70ffb86..dc46845024fb25adee3495bac93b6f4153126017 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-04-29 19:10 -0700  Alain Bench  <veronatif@free.fr>  (0e32bd00f341)
+
+       * contrib/smime.rc, smime.c: contrib/smime.rc:
+       $smime_verify_opaque_command fallback to -noverify to get signed
+       text despite a failed -verify (but send only this first failure
+       notice to stderr). smime.c: fflush() before rewind(). Closes #2428.
+       Helps Debian Bug 420014
+
+2007-04-24 17:51 -0700  Vincent Lefevre  <vincent@vinc17.org>  (a58527ead950)
+
+       * po/fr.po: Updated French translation.
+
 2007-04-24 14:08 -0700  Michael Elkins  <me@mutt.org>  (21c7e172030f)
 
        * remailer.c: fixup for mutt_FormatString() changes

diff --git a/configure.ac b/configure.ac
index 9edbd01868aafa9bf700dcf01811fd880314f54e..dd2bc7488968efcbeaec634cf0e8539edf573df9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -717,24 +717,6 @@ AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL 2 network
         ])
 AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes)
 
-AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn=[PFX]], [Use GNU libidn for domain names]),
-                [
-                 if test "$with_idn" != "no" ; then
-                       if test "$with_idn" != "yes" ; then
-                          CPPFLAGS="$CPPFLAGS -I$with_idn/include"
-                          LDFLAGS="$LDFLAGS -L$with_idn/lib"
-                       fi
-                 fi
-                ]
-)
-
-if test "x$with_idn" != "xno"; then
-   AC_CHECK_LIB(idn, stringprep_check_version)
-   AC_CHECK_FUNCS(idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z)
-   AC_CHECK_FUNCS(idna_to_ascii_from_utf8 idna_to_ascii_8z)
-   AC_CHECK_FUNCS(idna_to_ascii_lz idna_to_ascii_from_locale)
-fi
-
 dnl -- end socket --
 
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging support]),
@@ -1049,6 +1031,34 @@ fi
 
 fi # libiconv
 
+dnl -- IDN depends on iconv
+
+AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn=[PFX]], [Use GNU libidn for domain names]),
+                [
+                 if test "$with_idn" != "no" ; then
+                       if test "$with_idn" != "yes" ; then
+                          CPPFLAGS="$CPPFLAGS -I$with_idn/include"
+                          LDFLAGS="$LDFLAGS -L$with_idn/lib"
+                       fi
+                 fi
+                ]
+)
+
+if test "x$with_idn" != "xno"; then
+  if test "$am_cv_func_iconv" != "yes"
+  then
+    if test "x$with_idn" != "x"
+    then
+      AC_MSG_ERROR([IDN requested but iconv is disabled or unavailable])
+    fi
+  else
+    AC_CHECK_LIB(idn, stringprep_check_version)
+    AC_CHECK_FUNCS(idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z)
+    AC_CHECK_FUNCS(idna_to_ascii_from_utf8 idna_to_ascii_8z)
+    AC_CHECK_FUNCS(idna_to_ascii_lz idna_to_ascii_from_locale)
+  fi
+fi
+
 dnl -- locales --
 
 AC_CHECK_HEADERS(wchar.h)