From c688166066d2d34b32ce86b58c03a81fc7e1e190 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 8 Nov 2004 07:47:08 +0000 Subject: 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. --- lib/setup.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/setup.h') diff --git a/lib/setup.h b/lib/setup.h index f121b7320..e535279c8 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -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 */ -- cgit v1.2.3