From 68f7b2b3abcd17edd03a1c7874192616f65fd908 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Fri, 8 Apr 2005 20:04:59 +0000 Subject: [PATCH] - Simplify check for getnameinfo - Added check for getaddrinfo --- configure.ac | 22 ++++------------------ src/misc/httpd.c | 9 --------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/configure.ac b/configure.ac index b3bad09480..6b30883a9f 100644 --- a/configure.ac +++ b/configure.ac @@ -391,24 +391,10 @@ if test $ac_cv_struct_sockaddr_storage = no; then AC_DEFINE(ss_family, sa_family) fi -dnl getnameinfo, which implies {get,free}addrinfo, but not gai_strerror, -dnl not available on win32 and -lresolv NOT needed on Solaris. -AH_TEMPLATE(HAVE_GETNAMEINFO, - [Define to 1 if you have the `getnameinfo' function.]) -AH_TEMPLATE(HAVE_GAI_STRERROR, - [Define to 1 if you have the `gai_strerror' function.]) -AC_CACHE_CHECK([for getnameinfo], ac_cv_func_getnameinfo, -[AC_LINK_IFELSE([AC_LANG_PROGRAM([ -[#include -# include -# include -#endif] -], [[getnameinfo(0,0,0,0,0,0,0);]])], -ac_cv_func_getnameinfo=yes, -ac_cv_func_getnameinfo=no)]) -AS_IF([test $ac_cv_func_getnameinfo = yes], - [AC_DEFINE(HAVE_GETNAMEINFO) - AC_DEFINE(HAVE_GAI_STRERROR)]) +dnl getaddrinfo, getnameinfo and gai_strerror check +dnl -lresolv is NOT needed on Solaris +dnl we purposedly make the test fail on Windows +AC_CHECK_FUNCS([getaddrinfo getnameinfo gai_strerror]) dnl Check for va_copy AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy, diff --git a/src/misc/httpd.c b/src/misc/httpd.c index 3a45f810a0..fb15d64ad4 100644 --- a/src/misc/httpd.c +++ b/src/misc/httpd.c @@ -879,15 +879,6 @@ void httpd_StreamDelete( httpd_stream_t *stream ) *****************************************************************************/ #define LISTEN_BACKLOG 100 -#if defined(HAVE_GETNAMEINFO) && !defined(HAVE_GETADDRINFO) -/* - * For now, VLC's configure script does not check for getaddrinfo(), - * but it should be present if getnameinfo() is (the opposite is untrue, with - * Debian potato as an example) - */ -# define HAVE_GETADDRINFO 1 -#endif - static void httpd_HostThread( httpd_host_t * ); static int GetAddrPort( const struct sockaddr_storage *p_ss ); -- 2.39.2