--- configure.in.in.orig	2005-02-16 11:23:42.000000000 +0000
+++ configure.in.in	2005-02-16 11:28:28.000000000 +0000
@@ -42,12 +42,18 @@
 dnl Test for libidn (IDNA support)
 dnl -------
 
+AC_ARG_WITH(idn,AC_HELP_STRING([--with-idn],[Enable idn support [default=check]]),[idn_test="$withval"],[idn_test="yes"])
+
 LIB_IDN=
-AC_CHECK_LIB(idn, idna_to_ascii_4i, [
-  AC_DEFINE_UNQUOTED(HAVE_LIBIDN, 1, [Defined if you have libidn in your system])
-  LIB_IDN=-lidn
-])
-AC_CHECK_HEADERS([idna.h punycode.h stringprep.h])
+
+if test "x$idn_test" = "xyes" ; then
+  AC_CHECK_LIB(idn, idna_to_ascii_4i, [
+    AC_DEFINE_UNQUOTED(HAVE_LIBIDN, 1, [Defined if you have libidn in your system])
+    LIB_IDN=-lidn
+  ])
+  AC_CHECK_HEADERS([idna.h punycode.h stringprep.h])
+fi
+
 AC_SUBST(LIB_IDN)
 
 dnl --------