moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Daniel Stenberg 2004-11-08 07:47:08 +00:00
parent 5dcd2710d4
commit c688166066
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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
;;

9
lib/setup.h
View File

@ -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 */