Skip to content
Snippets Groups Projects
Commit c6881660 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

check for and require tld.h to be present before libidn usage is activated

in the build, since libidn 0.3.X didn't have the header and we don't support
that old libidn versions anyway.

This was mentioned on the list by Jean-Philippe Barrette-LaPierre and in bug
report #1062264.
parent 5dcd2710
No related branches found
No related tags found
No related merge requests found
......@@ -984,7 +984,7 @@ case "$LIBIDN" in
curl_idn_msg="enabled"
dnl different versions of libidn have different setups of these:
AC_CHECK_FUNCS( idn_free idna_strerror tld_strerror)
AC_CHECK_HEADERS( idn-free.h )
AC_CHECK_HEADERS( idn-free.h tld.h )
fi
;;
......
......@@ -281,11 +281,12 @@ typedef int curl_socket_t;
#undef HAVE_ALARM
#endif
#ifdef HAVE_LIBIDN
/* This could benefit from additional checks that some of the used/important
header files are present as well before we define the USE_* define. */
#if defined(HAVE_LIBIDN) && defined(HAVE_TLD_H)
/* The lib was present and the tld.h header (which is missing in libidn 0.3.X
but we only work with libidn 0.4.1 or later) */
#define USE_LIBIDN
#define LIBIDN_REQUIRED_VERSION "0.4.1"
#endif
#define LIBIDN_REQUIRED_VERSION "0.4.1"
#endif /* __CONFIG_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment