[GNUnet-SVN] r32493 - gnunet

[gnunet]

Author: LRN
Date: 2014-03-01 23:57:57 +0100 (Sat, 01 Mar 2014)
New Revision: 32493

Modified:
   gnunet/configure.ac
Log:
libidn is needed unconditionally for libgnunetdnsparser

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2014-02-28 21:11:28 UTC (rev 32492)
+++ gnunet/configure.ac 2014-03-01 22:57:57 UTC (rev 32493)
@@ -473,12 +473,15 @@
      LDFLAGS="${LDFLAGS} -L$libidn/lib"
      CPPFLAGS="${CPPFLAGS} -I$libidn/include"
   fi
-  AC_CHECK_HEADER(idna.h,
-    AC_CHECK_LIB(idn, stringprep_check_version,
-      [libidn=yes LIBS="${LIBS} -lidn"],
-      AC_MSG_FAILURE([GNUnet requires libidn])),
-    AC_MSG_FAILURE([GNUnet requires libidn]))
 fi
+libidn=no
+AC_CHECK_HEADER(idna.h,
+  AC_CHECK_LIB(idn, stringprep_check_version,
+    [libidn=yes LIBS="${LIBS} -lidn"], []), [])
+if test "$libidn" != "yes"; then
+  AC_MSG_FAILURE([GNUnet requires libidn.
+libidn-1.13 should be sufficient, newer versions work too.])
+fi
 AC_MSG_RESULT($libidn)
 
 # restore LIBS