linux-use-results-of-all-inode-configure-tests-20020122

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 5051481..4f70d87 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -48,8 +48,6 @@ AC_ARG_ENABLE(tivoli-tsm,
 [  --enable-tivoli-tsm                 Enable use of the Tivoli TSM API libraries for butc support],, enable_tivoli_tsm="no"
 )
 
-AC_PROG_CC
-
 dnl weird ass systems
 AC_AIX
 AC_ISC_POSIX
@@ -58,6 +56,7 @@ AC_MINIX
 dnl Various compiler setup.
 AC_C_INLINE
 AC_C_CONST
+AC_PROG_CC
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_SIGNAL
@@ -122,10 +121,13 @@ case $system in
                AC_MSG_RESULT(linux)
                if test "x$enable_kernel_module" = "xyes"; then
                 ifdef([OPENAFS_CONFIGURE_LIBAFS],
-                  [LINUX_BUILD_VNODE_FROM_INODE(config,afs)],
-                  [LINUX_BUILD_VNODE_FROM_INODE(src/config,src/afs/LINUX)]
+                  [LINUX_BUILD_VNODE_FROM_INODE(src/config,afs)],
+                  [LINUX_BUILD_VNODE_FROM_INODE(${srcdir}/src/config,src/afs/LINUX,${srcdir}/src/afs/LINUX)]
                 )
                 LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK
+                LINUX_FS_STRUCT_INODE_HAS_I_TRUNCATE_SEM
+                LINUX_FS_STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS
+                LINUX_FS_STRUCT_INODE_HAS_I_DEVICES
                 LINUX_INODE_SETATTR_RETURN_TYPE
                 LINUX_NEED_RHCONFIG
                 LINUX_WHICH_MODULES
@@ -135,6 +137,15 @@ case $system in
                 if test "x$ac_cv_linux_fs_struct_address_space_has_page_lock" = "xyes"; then 
                  AC_DEFINE(STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK)
                 fi
+                if test "x$ac_cv_linux_fs_struct_inode_has_i_truncate_sem" = "xyes"; then 
+                 AC_DEFINE(STRUCT_INODE_HAS_I_TRUNCATE_SEM)
+                fi
+                if test "x$ac_cv_linux_fs_struct_inode_has_i_devices" = "xyes"; then 
+                 AC_DEFINE(STRUCT_INODE_HAS_I_DEVICES)
+                fi
+                if test "x$ac_cv_linux_fs_struct_inode_has_i_dirty_data_buffers" = "xyes"; then 
+                 AC_DEFINE(STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS)
+                fi
                 :
                fi
                 ;;
@@ -148,6 +159,9 @@ case $system in
                 AC_MSG_RESULT(hp_ux)
                 ;;
         *-irix*)
+               if test -d /usr/include/sys/SN/SN1; then
+                IRIX_BUILD_IP35="IP35"
+               fi
                MKAFS_OSTYPE=IRIX
                 AC_MSG_RESULT(sgi)
                 ;;
@@ -178,6 +192,10 @@ case $system in
                MKAFS_OSTYPE=FBSD
                AC_MSG_RESULT(i386_fbsd)
                ;;
+       *-netbsd*)
+               MKAFS_OSTYPE=NBSD
+               AC_MSG_RESULT(nbsd)
+               ;;
        *-openbsd*)
                MKAFS_OSTYPE=OBSD
                AC_MSG_RESULT(i386_obsd)
@@ -195,6 +213,14 @@ else
                i?86-*-freebsd4.2*)
                        AFS_SYSNAME="i386_fbsd_42"
                        ;;
+               i?86-*-netbsd*1.5*)
+                       AFS_PARAM_COMMON=param.nbsd15.h
+                       AFS_SYSNAME="i386_nbsd15"
+                       ;;
+               alpha-*-netbsd*1.5*)
+                       AFS_PARAM_COMMON=param.nbsd15.h
+                       AFS_SYSNAME="alpha_nbsd15"
+                       ;;
                hppa*-hp-hpux11*)
                        AFS_SYSNAME="hp_ux110"
                        ;;
@@ -203,18 +229,15 @@ else
                        ;;
                powerpc-apple-darwin1.2*)
                        AFS_SYSNAME="ppc_darwin_12"
-                       DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist
-                       DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
                        ;;
                powerpc-apple-darwin1.3*)
                        AFS_SYSNAME="ppc_darwin_13"
-                       DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist
-                       DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
                        ;;
                powerpc-apple-darwin1.4*)
                        AFS_SYSNAME="ppc_darwin_14"
-                       DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist
-                       DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
+                       ;;
+               powerpc-apple-darwin5.1*)
+                       AFS_SYSNAME="ppc_darwin_51"
                        ;;
                sparc-sun-solaris2.5*)
                        AFS_SYSNAME="sun4x_55"
@@ -288,6 +311,12 @@ else
         AC_MSG_RESULT($AFS_SYSNAME)
 fi
 
+case $AFS_SYSNAME in
+       *_darwin*)
+               DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist
+               DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
+               ;;
+esac
 
 if test "x${MKAFS_OSTYPE}" = "xIRIX"; then
         echo Skipping library tests because they confuse Irix.
@@ -466,11 +495,13 @@ ENABLE_KERNEL_MODULE=libafs
 fi
 
 AC_SUBST(AFS_SYSNAME)
+AC_SUBST(AFS_PARAM_COMMON)
 AC_SUBST(ENABLE_KERNEL_MODULE)
 AC_SUBST(LIB_AFSDB)
 AC_SUBST(LINUX_KERNEL_PATH)
 AC_SUBST(LINUX_VERSION)
 AC_SUBST(MKAFS_OSTYPE)
+AC_SUBST(TOP_OBJDIR)
 AC_SUBST(TOP_SRCDIR)
 AC_SUBST(TOP_INCDIR)
 AC_SUBST(TOP_LIBDIR)
@@ -478,5 +509,8 @@ AC_SUBST(DEST)
 AC_SUBST(WITH_OBSOLETE)
 AC_SUBST(WITH_INSECURE)
 AC_SUBST(DARWIN_INFOFILE)
+AC_SUBST(IRIX_BUILD_IP35)
+
+OPENAFS_OSCONF
 
 ])