fbsd-build-path-20051111

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 1b6639c..69739b1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -24,7 +24,7 @@ AC_ARG_ENABLE( bos-restricted-mode,
 AC_ARG_ENABLE( bos-new-config,
 [  --enable-bos-new-config             enable bosserver pickup of BosConfig.new on restarts],, enable_bos_new_config="no")
 AC_ARG_ENABLE( largefile-fileserver,
-[  --enable-largefile-fileserver        enable large file support in fileserver],, enable_largefile_fileserver="no")
+[  --disable-largefile-fileserver       disable large file support in fileserver],, enable_largefile_fileserver="yes")
 AC_ARG_ENABLE( namei-fileserver,
 [  --enable-namei-fileserver           force compilation of namei fileserver in preference to inode fileserver],, enable_namei_fileserver="no")
 AC_ARG_ENABLE( supergroups,
@@ -180,6 +180,9 @@ case $system in
         *-hpux*)
                MKAFS_OSTYPE=HPUX
                 AC_MSG_RESULT(hp_ux)
+               if test -f "/usr/old/usr/include/ndir.h"; then
+                AC_DEFINE(HAVE_USR_OLD_USR_INCLUDE_NDIR_H, 1, [define if you have old ndir.h])
+               fi
                 ;;
         *-irix*)
                if test -d /usr/include/sys/SN/SN1; then
@@ -207,10 +210,14 @@ case $system in
                fi
                AC_SUBST([HEADER_RT])
                 ;;
-        *-darwin*)
+        powerpc-*-darwin*)
                MKAFS_OSTYPE=DARWIN
                 AC_MSG_RESULT(ppc_darwin)
                 ;;
+        i386-*-darwin*)
+               MKAFS_OSTYPE=DARWIN
+                AC_MSG_RESULT(x86_darwin)
+                ;;
        *-freebsd*)
                MKAFS_OSTYPE=FBSD
                AC_MSG_RESULT(i386_fbsd)
@@ -233,65 +240,17 @@ if test "x$with_afs_sysname" != "x"; then
 else
        AC_MSG_CHECKING(your AFS sysname)
        case $host in
-               i?86-*-openbsd3.1)
-                       AFS_SYSNAME="i386_obsd31"
-                       ;;
-               i?86-*-openbsd3.2)
-                       AFS_SYSNAME="i386_obsd32"
-                       ;;
-               i?86-*-openbsd3.3)
-                       AFS_SYSNAME="i386_obsd33"
-                       ;;
-               i?86-*-openbsd3.4)
-                       AFS_SYSNAME="i386_obsd34"
-                       ;;
-               i?86-*-openbsd3.5)
-                       AFS_SYSNAME="i386_obsd35"
-                       ;;
-               i?86-*-openbsd3.6)
-                       AFS_SYSNAME="i386_obsd36"
-                       ;;
-               i?86-*-openbsd3.7)
-                       AFS_SYSNAME="i386_obsd37"
-                       ;;
-               i?86-*-openbsd3.8)
-                       AFS_SYSNAME="i386_obsd38"
-                       ;;
-               i?86-*-freebsd4.2*)
-                       AFS_SYSNAME="i386_fbsd_42"
-                       ;;
-               i?86-*-freebsd4.3*)
-                       AFS_SYSNAME="i386_fbsd_43"
-                       ;;
-               i?86-*-freebsd4.4*)
-                       AFS_SYSNAME="i386_fbsd_44"
-                       ;;
-               i?86-*-freebsd4.5*)
-                       AFS_SYSNAME="i386_fbsd_45"
-                       ;;
-               i?86-*-freebsd4.6*)
-                       AFS_SYSNAME="i386_fbsd_46"
-                       ;;
-               i?86-*-freebsd4.7*)
-                       AFS_SYSNAME="i386_fbsd_47"
-                       ;;
-               i?86-*-freebsd5.0*)
-                       AFS_SYSNAME="i386_fbsd_50"
-                       ;;
-               i?86-*-freebsd5.1*)
-                       AFS_SYSNAME="i386_fbsd_51"
-                       ;;
-               i?86-*-freebsd5.2*)
-                       AFS_SYSNAME="i386_fbsd_52"
-                       ;;
-               i?86-*-freebsd5.3*)
-                       AFS_SYSNAME="i386_fbsd_53"
-                       ;;
-               i?86-*-freebsd5.4*)
-                       AFS_SYSNAME="i386_fbsd_54"
-                       ;;
-               i?86-*-freebsd6.0*)
-                       AFS_SYSNAME="i386_fbsd_60"
+               i?86-*-openbsd?.?)
+                       v=${host#*openbsd}
+                       vM=${v%.*}
+                       vm=${v#*.}
+                       AFS_SYSNAME="i386_obsd${vM}${vm}"
+                       ;;
+               i?86-*-freebsd?.*)
+                       v=${host#*freebsd}
+                       vM=${v%.*}
+                       vm=${v#*.}
+                       AFS_SYSNAME="i386_fbsd_${vM}${vm}"
                        ;;
                i?86-*-netbsd*1.5*)
                        AFS_PARAM_COMMON=param.nbsd15.h
@@ -313,6 +272,10 @@ else
                        AFS_PARAM_COMMON=param.nbsd20.h
                        AFS_SYSNAME="i386_nbsd20"
                        ;;
+               amd64-*-netbsd*2.0*)
+                       AFS_PARAM_COMMON=param.nbsd20.h
+                       AFS_SYSNAME="amd64_nbsd20"
+                       ;;
                powerpc-*-netbsd*2.0*)
                        AFS_PARAM_COMMON=param.nbsd20.h
                        AFS_SYSNAME="ppc_nbsd20"
@@ -423,6 +386,12 @@ else
                powerpc-apple-darwin8.0*)
                        AFS_SYSNAME="ppc_darwin_80"
                        ;;
+               powerpc-apple-darwin8.*)
+                       AFS_SYSNAME="ppc_darwin_80"
+                       ;;
+               i386-apple-darwin8.*)
+                       AFS_SYSNAME="x86_darwin_80"
+                       ;;
                sparc-sun-solaris2.5*)
                        AFS_SYSNAME="sun4x_55"
                        enable_login="yes"
@@ -777,7 +746,7 @@ case $AFS_SYSNAME in
                DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist
                DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
                 dnl the test below fails on darwin, even if the CPPFLAGS below
-                dnl are added. the headers from Kernel.Framework must be used
+                dnl are added. the headers from Kernel.framework must be used
                 dnl when KERNEL is defined.
 
                 dnl really, such a thing isn't guaranteed to work on any 
@@ -909,6 +878,11 @@ if test "x$PTHREAD_LIBS" = xerror; then
         AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")
 fi
 if test "x$PTHREAD_LIBS" = xerror; then
+        # pthread_attr_init is a macro under HPUX 11.0 and 11.11
+        AC_CHECK_LIB(pthread, pthread_attr_destroy,
+                PTHREAD_LIBS="-lpthread")
+fi
+if test "x$PTHREAD_LIBS" = xerror; then
         AC_MSG_WARN(*** Unable to locate working posix thread library ***)
 fi
 AC_SUBST(PTHREAD_LIBS)
@@ -931,7 +905,7 @@ else
                i386_fbsd_4?)
                        BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/compile/GENERIC"
                        ;;
-               i386_fbsd_5?)
+               i386_fbsd_*)
                        BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/i386/compile/GENERIC"
                        ;;
        esac
@@ -1005,7 +979,7 @@ AC_CHECK_HEADERS(netinet/in.h netdb.h sys/fcntl.h sys/mnttab.h sys/mntent.h)
 AC_CHECK_HEADERS(mntent.h sys/vfs.h sys/param.h sys/fs_types.h sys/fstyp.h)
 AC_CHECK_HEADERS(sys/mount.h strings.h termios.h signal.h)
 AC_CHECK_HEADERS(windows.h malloc.h winsock2.h direct.h io.h sys/user.h)
-AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h regex.h)
+AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h regex.h values.h)
 
 if test "$ac_cv_header_security_pam_modules_h" = yes -a "$enable_pam" = yes; then
        HAVE_PAM="yes"