DEVEL15-netbsd-30-20061006

FIXES 40782

add support for netbsd 3.0, netbsd 4.0(ish)

(cherry picked from commit 04b51cc8df7a3210ea18228743cb156c0e2c7115)

diff --git a/acinclude.m4 b/acinclude.m4
index cdc2086eb86131eb3c8455be256ec6fd40775792..09da9fdab3255e9327c570c3fa172024ab94cfa9 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -323,7 +323,7 @@ else
                        AFS_PARAM_COMMON=param.nbsd30.h
                        AFS_SYSNAME="i386_nbsd30"
                        ;;
-               i?86-*-netbsd*3.0*)
+               i?86-*-netbsd*3.[[0-8]]*)
                        AFS_PARAM_COMMON=param.nbsd30.h
                        AFS_SYSNAME="i386_nbsd30"
                        ;;
@@ -331,6 +331,14 @@ else
                        AFS_PARAM_COMMON=param.nbsd30.h
                        AFS_SYSNAME="i386_nbsd30"
                        ;;
+               i?86-*-netbsd*4.[[0-8]]*)
+                       AFS_PARAM_COMMON=param.nbsd40.h
+                       AFS_SYSNAME="i386_nbsd40"
+                       ;;
+               i?86-*-netbsd*4.99*)
+                       AFS_PARAM_COMMON=param.nbsd40.h
+                       AFS_SYSNAME="i386_nbsd40"
+                       ;;
                hppa*-hp-hpux11.0*)
                        AFS_SYSNAME="hp_ux110"
                        ;;

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 70516a389d09edd945d3fdc99a4a06168cef9b08..d1a0790884696d1a961cc822a2cb9d5922133d80 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -221,7 +221,7 @@ case $AFS_SYSNAME in
                YACC="byacc"
                ;;
 
-       *nbsd2*|*nbsd3*)
+       *nbsd2*|*nbsd3*|*nbsd4*)
                LEX="flex -l"
                MT_CFLAGS='${XCFLAGS} -DAFS_PTHREAD_ENV -D_REENTRANT '
                MT_LIBS="-lpthread" # XXX -pthread soon

diff --git a/src/config/param.i386_nbsd30.h b/src/config/param.i386_nbsd30.h
index 3281d5a6af00aa41727f0380976af3fda0b4c73a..1f935eca2163f296bbb6f79e406f023cfc70594f 100644 (file)
--- a/src/config/param.i386_nbsd30.h
+++ b/src/config/param.i386_nbsd30.h
@@ -5,8 +5,8 @@
 #define AFS_X86_ENV 1
 #define AFSLITTLE_ENDIAN 1
 
-#define SYS_NAME       "i386_nbsd30"
-#define SYS_NAME_ID    SYS_NAME_ID_i386_nbsd30
+#define SYS_NAME       "i386_nbsd40"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_nbsd40
 
 #ifndef UKERNEL
 /* This section for kernel libafs compiles only */