mirror of
https://github.com/isc-projects/bind9.git
synced 2026-04-26 00:30:05 -04:00
Remove check for isc_port_t; Windows never have it, Unix always have it
This commit is contained in:
parent
40f7680efa
commit
29c853f500
6 changed files with 8 additions and 68 deletions
31
configure
vendored
31
configure
vendored
|
|
@ -738,7 +738,6 @@ ISC_PLATFORM_NEEDMEMMOVE
|
|||
ISC_IRS_GETNAMEINFOSOCKLEN
|
||||
ISC_IRS_NEEDADDRINFO
|
||||
ISC_PLATFORM_HAVETFO
|
||||
ISC_PLATFORM_NEEDPORTT
|
||||
ISC_PLATFORM_HAVEIF_LADDRCONF
|
||||
ISC_PLATFORM_HAVEIF_LADDRREQ
|
||||
BIND9_CO_RULE
|
||||
|
|
@ -17916,36 +17915,6 @@ rm -f core conftest.err conftest.$ac_objext \
|
|||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
|
||||
#
|
||||
# Look for in_port_t.
|
||||
#
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for type in_port_t" >&5
|
||||
$as_echo_n "checking for type in_port_t... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
in_port_t port = 25; return (0);
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
ISC_PLATFORM_NEEDPORTT="#undef ISC_PLATFORM_NEEDPORTT"
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
ISC_PLATFORM_NEEDPORTT="#define ISC_PLATFORM_NEEDPORTT 1"
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
|
||||
#
|
||||
# Allow forcibly disabling TCP Fast Open support as autodetection might yield
|
||||
# confusing results on some systems (e.g. FreeBSD; see set_tcp_fastopen()
|
||||
|
|
|
|||
30
configure.in
30
configure.in
|
|
@ -1245,7 +1245,7 @@ case "$use_gssapi" in
|
|||
DNS_GSSAPI_LIBS="-framework Kerberos"
|
||||
AC_MSG_RESULT(framework)
|
||||
;;
|
||||
|
||||
|
||||
*)
|
||||
AC_MSG_RESULT(looking in $use_gssapi/lib)
|
||||
USE_GSSAPI='-DGSSAPI'
|
||||
|
|
@ -1977,20 +1977,6 @@ AC_TRY_LINK([
|
|||
ISC_PLATFORM_HAVEIF_LADDRCONF="#undef ISC_PLATFORM_HAVEIF_LADDRCONF"])
|
||||
AC_SUBST(ISC_PLATFORM_HAVEIF_LADDRCONF)
|
||||
|
||||
#
|
||||
# Look for in_port_t.
|
||||
#
|
||||
AC_MSG_CHECKING(for type in_port_t)
|
||||
AC_TRY_COMPILE([
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>],
|
||||
[in_port_t port = 25; return (0);],
|
||||
[AC_MSG_RESULT(yes)
|
||||
ISC_PLATFORM_NEEDPORTT="#undef ISC_PLATFORM_NEEDPORTT"],
|
||||
[AC_MSG_RESULT(no)
|
||||
ISC_PLATFORM_NEEDPORTT="#define ISC_PLATFORM_NEEDPORTT 1"])
|
||||
AC_SUBST(ISC_PLATFORM_NEEDPORTT)
|
||||
|
||||
#
|
||||
# Allow forcibly disabling TCP Fast Open support as autodetection might yield
|
||||
# confusing results on some systems (e.g. FreeBSD; see set_tcp_fastopen()
|
||||
|
|
@ -2114,7 +2100,7 @@ AC_ARG_ENABLE(getifaddrs,
|
|||
# This interface iteration code for getifaddrs() will fall back to using
|
||||
# /proc/net/if_inet6 if getifaddrs() in glibc doesn't return any IPv6
|
||||
# addresses.
|
||||
#
|
||||
#
|
||||
case $want_getifaddrs in
|
||||
glibc)
|
||||
AC_MSG_WARN("--enable-getifaddrs=glibc is no longer required")
|
||||
|
|
@ -2964,11 +2950,11 @@ AC_SUBST(CURL)
|
|||
# NOM_PATH_FILE(VARIABLE, FILENAME, DIRECTORIES)
|
||||
#
|
||||
# If the file FILENAME is found in one of the DIRECTORIES, the shell
|
||||
# variable VARIABLE is defined to its absolute pathname. Otherwise,
|
||||
# variable VARIABLE is defined to its absolute pathname. Otherwise,
|
||||
# it is set to FILENAME, with no directory prefix (that's not terribly
|
||||
# useful, but looks less confusing in substitutions than leaving it
|
||||
# empty). The variable VARIABLE will be substituted into output files.
|
||||
#
|
||||
#
|
||||
|
||||
AC_DEFUN([NOM_PATH_FILE], [
|
||||
$1=""
|
||||
|
|
@ -3344,7 +3330,7 @@ DLZ_SYSTEM_TEST=""
|
|||
DLZ_DRIVER_MYSQL_INCLUDES=""
|
||||
DLZ_DRIVER_MYSQL_LIBS=""
|
||||
|
||||
#
|
||||
#
|
||||
# Configure support for building a shared library object
|
||||
#
|
||||
# Even when libtool is available it can't always be relied upon
|
||||
|
|
@ -3482,8 +3468,8 @@ if test "yes" = "$cross_compiling"; then
|
|||
BUILD_LDFLAGS="$BUILD_LDFLAGS"
|
||||
BUILD_LIBS="$BUILD_LIBS"
|
||||
else
|
||||
BUILD_CC="$CC"
|
||||
BUILD_CFLAGS="$CFLAGS"
|
||||
BUILD_CC="$CC"
|
||||
BUILD_CFLAGS="$CFLAGS"
|
||||
BUILD_CPPFLAGS="$CPPFLAGS $GEN_NEED_OPTARG"
|
||||
BUILD_LDFLAGS="$LDFLAGS"
|
||||
BUILD_LIBS="$LIBS"
|
||||
|
|
@ -3803,7 +3789,7 @@ report() {
|
|||
echo " Algorithm: $with_cc_alg"
|
||||
fi
|
||||
|
||||
# these lines are only printed if run with --enable-full-report
|
||||
# these lines are only printed if run with --enable-full-report
|
||||
if test "yes" = "$enable_full_report"; then
|
||||
test "no" = "$found_ipv6" || echo " IPv6 support (--enable-ipv6)"
|
||||
test "X$PYTHON" = "X" || echo " Python tools (--with-python)"
|
||||
|
|
|
|||
|
|
@ -30,11 +30,6 @@
|
|||
*** Network.
|
||||
***/
|
||||
|
||||
/*! \brief
|
||||
* If this system needs in_port_t, ISC_PLATFORM_NEEDPORTT will be defined.
|
||||
*/
|
||||
@ISC_PLATFORM_NEEDPORTT@
|
||||
|
||||
/*! \brief
|
||||
* Define if the system has struct lifconf which is a extended struct ifconf
|
||||
* for IPv6.
|
||||
|
|
|
|||
|
|
@ -158,13 +158,6 @@
|
|||
#define INADDR_LOOPBACK 0x7f000001UL
|
||||
#endif
|
||||
|
||||
#ifdef ISC_PLATFORM_NEEDPORTT
|
||||
/*%
|
||||
* Ensure type in_port_t is defined.
|
||||
*/
|
||||
typedef uint16_t in_port_t;
|
||||
#endif
|
||||
|
||||
#ifndef MSG_TRUNC
|
||||
/*%
|
||||
* If this system does not have MSG_TRUNC (as returned from recvmsg())
|
||||
|
|
|
|||
|
|
@ -108,9 +108,7 @@
|
|||
/*
|
||||
* Ensure type in_port_t is defined.
|
||||
*/
|
||||
#ifdef ISC_PLATFORM_NEEDPORTT
|
||||
typedef uint16_t in_port_t;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* If this system does not have MSG_TRUNC (as returned from recvmsg())
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@
|
|||
#define PATH_MAX _MAX_PATH
|
||||
#endif
|
||||
|
||||
#define ISC_PLATFORM_NEEDPORTT
|
||||
#undef MSG_TRUNC
|
||||
|
||||
#define ISC_PLATFORM_NEEDSTRSEP
|
||||
|
|
|
|||
Loading…
Reference in a new issue