checkpoint

diff --git a/lib/bind/configure b/lib/bind/configure
index 33058b623ce9cf45b21426639914f2f2f13b0642..1890e4ee46cf0b462bb06db8cbf0b24f93c5bc13 100644 (file)
--- a/lib/bind/configure
+++ b/lib/bind/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 
-# From configure.in Revision: 1.12 
+# From configure.in Revision: 1.13 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -3676,8 +3676,8 @@ esac
 
 # PORT_INCLUDE
 PORT_INCLUDE=
-SOLARIS_BITTYPES=
-BSD_COMP=
+SOLARIS_BITTYPES="#undef NEED_SOLARIS_BITTYPES"
+BSD_COMP="#undef BSD_COMP"
 case "$host" in
        *-bsdi2*)       PORT_INCLUDE="-I\${top_builddir}/port/bsdos2/include";;
        *-bsdi*)        PORT_INCLUDE="-I\${top_builddir}/port/bsdos/include";;
@@ -3685,7 +3685,7 @@ case "$host" in
                        BSD_COMP="#define BSD_COMP 1"
                        SOLARIS_BITTYPES="#define NEED_SOLARIS_BITTYPES 1";
                        PORT_INCLUDE="-I\${top_builddir}/port/solaris/include";;
-       *-solaris2*)    BSD_COMP="#undef BSD_COMP"
+       *-solaris2*)    BSD_COMP="#define BSD_COMP 1"
                        PORT_INCLUDE="-I\${top_builddir}/port/solaris/include";;
        *-freebsd*)     PORT_INCLUDE="-I\${top_builddir}/port/freebsd/include";;
 esac

diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index 220bfce3773122d9c7c2d631204a23e7c3f7583f..9428f56f4c64d071c19fd9b48f6747524fc3858c 100644 (file)
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.13 $)
+AC_REVISION($Revision: 1.14 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -1039,8 +1039,8 @@ AC_SUBST(HAVE_MINIMUM_IFREQ)
 
 # PORT_INCLUDE
 PORT_INCLUDE=
-SOLARIS_BITTYPES=
-BSD_COMP=
+SOLARIS_BITTYPES="#undef NEED_SOLARIS_BITTYPES"
+BSD_COMP="#undef BSD_COMP"
 case "$host" in
        *-bsdi2*)       PORT_INCLUDE="-I\${top_builddir}/port/bsdos2/include";;
        *-bsdi*)        PORT_INCLUDE="-I\${top_builddir}/port/bsdos/include";;
@@ -1048,7 +1048,7 @@ case "$host" in
                        BSD_COMP="#define BSD_COMP 1"
                        SOLARIS_BITTYPES="#define NEED_SOLARIS_BITTYPES 1";
                        PORT_INCLUDE="-I\${top_builddir}/port/solaris/include";;
-       *-solaris2*)    BSD_COMP="#undef BSD_COMP"
+       *-solaris2*)    BSD_COMP="#define BSD_COMP 1"
                        PORT_INCLUDE="-I\${top_builddir}/port/solaris/include";;
        *-freebsd*)     PORT_INCLUDE="-I\${top_builddir}/port/freebsd/include";;
 esac

diff --git a/lib/bind/port_before.h.in b/lib/bind/port_before.h.in
index dde0ec935b174f4d48d0f4e27b212912bb43c124..ec018aacf7b47fcff9ae56fa3a082d6842d10f92 100644 (file)
--- a/lib/bind/port_before.h.in
+++ b/lib/bind/port_before.h.in
@@ -6,6 +6,7 @@
 @WANT_IRS_PW@
 
 #define gettimeofday isc__gettimeofday
+@BSD_COMP@
 
 @DO_PTHREADS@
 @GETGROUPLIST_ARGS@