cvsignore-updates-kolya-20011005

[openafs.git] / configure-libafs.in

diff --git a/configure-libafs.in b/configure-libafs.in
index 80e15cb..83bc926 100644 (file)
--- a/configure-libafs.in
+++ b/configure-libafs.in
@@ -1,7 +1,7 @@
 AC_INIT(Makefile.common)
 AM_INIT_AUTOMAKE(openafs-libafs,devel)
 AC_CANONICAL_HOST
-AC_CONFIG_HEADER(src/config/afsconfig.h)
+AC_CONFIG_HEADER(config/afsconfig.h)
 
 #BOZO_SAVE_CORES BOS_RESTRICTED_MODE BOS_NEW_CONFIG pam sia
 AC_ARG_WITH(afs-sysname,
@@ -112,37 +112,14 @@ case $system in
                fi
                AC_MSG_RESULT(linux)
                if test "x$enable_kernel_module" = "xyes"; then
-                LINUX_FS_STRUCT_INODE_HAS_I_BYTES
+                LINUX_BUILD_VNODE_FROM_INODE(config,afs)
                 LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK
-                LINUX_FS_STRUCT_INODE_HAS_I_CDEV
-                LINUX_FS_STRUCT_INODE_HAS_I_TRUNCATE_SEM
-                LINUX_FS_STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS
-                LINUX_FS_STRUCT_INODE_HAS_I_MAPPING_OVERLOAD
-                LINUX_FS_STRUCT_INODE_HAS_I_MMAP_SHARED
                 LINUX_INODE_SETATTR_RETURN_TYPE
                 LINUX_NEED_RHCONFIG
                 LINUX_WHICH_MODULES
                 if test "x$ac_cv_linux_func_inode_setattr_returns_int" = "xyes" ; then
                  AC_DEFINE(INODE_SETATTR_NOT_VOID)
                 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
-                if test "x$ac_cv_linux_fs_struct_inode_has_i_mmap_shared" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_I_MMAP_SHARED)
-                fi
-                if test "x$ac_cv_linux_fs_struct_inode_has_i_mapping_overload" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_I_MAPPING_OVERLOAD)
-                fi
-                if test "x$ac_cv_linux_fs_struct_inode_has_i_cdev" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_I_CDEV)
-                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_bytes" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_I_BYTES)
-                fi
                 if test "x$ac_cv_linux_fs_struct_address_space_has_page_lock" = "xyes"; then 
                  AC_DEFINE(STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK)
                 fi
@@ -189,6 +166,10 @@ case $system in
                MKAFS_OSTYPE=FBSD
                AC_MSG_RESULT(i386_fbsd)
                ;;
+       *-openbsd*)
+               MKAFS_OSTYPE=OBSD
+               AC_MSG_RESULT(i386_obsd)
+               ;;
         *)
                 AC_MSG_RESULT($system)
                 ;;
@@ -210,15 +191,18 @@ else
                        ;;
                powerpc-apple-darwin1.2*)
                        AFS_SYSNAME="ppc_darwin_12"
-                       DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist
+                       DARWIN_PLIST=afs.${AFS_SYSNAME}.plist
+                       DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
                        ;;
                powerpc-apple-darwin1.3*)
                        AFS_SYSNAME="ppc_darwin_13"
-                       DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist
+                       DARWIN_PLIST=afs.${AFS_SYSNAME}.plist
+                       DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
                        ;;
                powerpc-apple-darwin1.4*)
                        AFS_SYSNAME="ppc_darwin_14"
-                       DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist
+                       DARWIN_PLIST=afs.${AFS_SYSNAME}.plist
+                       DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
                        ;;
                sparc-sun-solaris2.5*)
                        AFS_SYSNAME="sun4x_55"
@@ -461,6 +445,7 @@ AC_SUBST(TOP_LIBDIR)
 AC_SUBST(DEST)
 AC_SUBST(WITH_OBSOLETE)
 AC_SUBST(WITH_INSECURE)
+AC_SUBST(DARWIN_INFOFILE)
 
 AC_OUTPUT(             \
 Makefile               \