From 5e9f6125246cec57771bcdeefed03153d41c23fd Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 30 Jul 2003 01:43:28 +0000
Subject: [PATCH] 1498.   [port]          bsdos: 5.x support.

---
 CHANGES                      |  2 ++
 bin/tests/system/ifconfig.sh |  6 +++---
 configure                    | 18 ++++++++++--------
 configure.in                 |  8 +++++---
 lib/bind/configure           |  8 +++-----
 lib/bind/configure.in        |  6 ++----
 lib/bind/libtool.m4          |  2 +-
 libtool.m4                   |  2 +-
 8 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2bd2b6c45b..de32cc2503 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1498.	[port]		bsdos: 5.x support.
+
 1497.	[placeholder]
 
 1496.	[port]		test for pthread_attr_setstacksize().
diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh
index ab656fd929..b405e6dea1 100644
--- a/bin/tests/system/ifconfig.sh
+++ b/bin/tests/system/ifconfig.sh
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: ifconfig.sh,v 1.41 2002/11/12 23:42:37 explorer Exp $
+# $Id: ifconfig.sh,v 1.42 2003/07/30 01:38:47 marka Exp $
 
 #
 # Set up interface aliases for bind9 system tests.
@@ -85,7 +85,7 @@ case "$1" in
 		    *-unknown-netbsd*)
 			ifconfig lo0 10.53.0.$ns alias netmask 255.255.255.0
 			;;
-		    *-pc-bsdi[3-4].*)
+		    *-*-bsdi[3-5].*)
 			ifconfig lo0 add 10.53.0.$ns netmask 255.255.255.0
 			;;
 		    *-dec-osf[4-5].*)
@@ -145,7 +145,7 @@ case "$1" in
 		    *-unknown-netbsd*)
 			ifconfig lo0 10.53.0.$ns delete
 			;;
-		    *-pc-bsdi[3-4].*)
+		    *-*-bsdi[3-5].*)
 			ifconfig lo0 remove 10.53.0.$ns
 			;;
 		    *-dec-osf[4-5].*)
diff --git a/configure b/configure
index 7dcc8d16b3..8aa05be10e 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.346 .
+# From configure.in Revision: 1.347 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -4845,9 +4845,11 @@ case $host in
 	use_threads=false ;;
 *-freebsd*)
 	use_threads=false ;;
-*-bsdi*)
-	# Thread signals do not appear to work reliably on BSDI.
+*-bsdi234*)
+	# Thread signals do not work reliably on some versions of BSD/OS.
 	use_threads=false ;;
+*-bsdi5*)
+	use_threads=true ;;
 *-linux*)
    	# Threads are disabled on Linux by default because most
 	# Linux kernels produce unusable core dumps from multithreaded
@@ -7697,7 +7699,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7700 "configure"' > conftest.$ac_ext
+  echo '#line 7702 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8247,7 +8249,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:8250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:8252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -9262,7 +9264,7 @@ beos*)
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi45*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
@@ -10114,7 +10116,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10117 "configure"
+#line 10119 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10212,7 +10214,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10215 "configure"
+#line 10217 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/configure.in b/configure.in
index 32d083b35c..37ccb76f25 100644
--- a/configure.in
+++ b/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.346 $)
+AC_REVISION($Revision: 1.347 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -582,9 +582,11 @@ case $host in
 	use_threads=false ;;
 *-freebsd*)
 	use_threads=false ;;
-*-bsdi*)
-	# Thread signals do not appear to work reliably on BSDI.
+*-bsdi[234]*)
+	# Thread signals do not work reliably on some versions of BSD/OS.
 	use_threads=false ;;
+*-bsdi5*)
+	use_threads=true ;;
 *-linux*)
    	# Threads are disabled on Linux by default because most
 	# Linux kernels produce unusable core dumps from multithreaded
diff --git a/lib/bind/configure b/lib/bind/configure
index d73f0923fb..38781a8142 100644
--- a/lib/bind/configure
+++ b/lib/bind/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.87 .
+# From configure.in Revision: 1.88 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -8572,7 +8572,7 @@ beos*)
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi45*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
@@ -10837,9 +10837,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 # HAVE_MINIMUM_IFREQ
 
 case "$host" in
-	*-bsdi4*)	have_minimum_ifreq=yes;;
-	*-bsdi3*)	have_minimum_ifreq=yes;;
-	*-bsdi2*)	have_minimum_ifreq=yes;;
+	*-bsdi2345*)	have_minimum_ifreq=yes;;
 	*-darwin*)	have_minimum_ifreq=yes;;
 	*-freebsd*)	have_minimum_ifreq=yes;;
 	*-lynxos*)	have_minimum_ifreq=yes;;
diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index 7f471425e3..ec4bc4867f 100644
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-AC_REVISION($Revision: 1.87 $)
+AC_REVISION($Revision: 1.88 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -1033,9 +1033,7 @@ AC_SUBST(HAVE_SA_LEN)
 # HAVE_MINIMUM_IFREQ
 
 case "$host" in
-	*-bsdi4*)	have_minimum_ifreq=yes;;
-	*-bsdi3*)	have_minimum_ifreq=yes;;
-	*-bsdi2*)	have_minimum_ifreq=yes;;
+	*-bsdi[2345]*)	have_minimum_ifreq=yes;;
 	*-darwin*)	have_minimum_ifreq=yes;;
 	*-freebsd*)	have_minimum_ifreq=yes;;
 	*-lynxos*)	have_minimum_ifreq=yes;;
diff --git a/lib/bind/libtool.m4 b/lib/bind/libtool.m4
index 2d9d1436c7..6f43c7729d 100644
--- a/lib/bind/libtool.m4
+++ b/lib/bind/libtool.m4
@@ -1884,7 +1884,7 @@ beos*)
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
diff --git a/libtool.m4 b/libtool.m4
index 4daa8bf42d..4e04e3e12f 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -1999,7 +1999,7 @@ beos*)
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'