bozo-make-logging-more-readable-20011120
[openafs.git] / acinclude.m4
index f95f431..07ad5f1 100644 (file)
@@ -122,10 +122,11 @@ 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_INODE_SETATTR_RETURN_TYPE
                 LINUX_NEED_RHCONFIG
                 LINUX_WHICH_MODULES
@@ -135,6 +136,9 @@ 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
                 :
                fi
                 ;;
@@ -148,6 +152,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)
                 ;;
@@ -228,6 +235,9 @@ else
                sparc-sun-solaris2.8)
                        AFS_SYSNAME="sun4x_58"
                        ;;
+               sparc-sun-solaris2.9)
+                       AFS_SYSNAME="sun4x_59"
+                       ;;
                alpha*-dec-osf4.0*)
                        AFS_SYSNAME="alpha_dux40"
                        ;;
@@ -433,19 +443,18 @@ if test "x$enable_transarc_paths" = "xyes"  ; then
     afslocaldir=${afslocaldir=/usr/afs/local}
     afsbackupdir=${afsbackupdir=/usr/afs/backup}
     afsbosconfigdir=${afsbosconfigdir=/usr/afs/local}
-    else 
-    afsconfdir=${afsconfdir=\${sysconfdir\}/openafs/server}
-    viceetcdir=${viceetcdir=\${sysconfdir\}/openafs}
-    afskerneldir=${afskerneldir=\${libdir\}/openafs}
-    afssrvbindir=${afssrvbindir=\${bindir}}
-    afssrvsbindir=${afssrvsbindir=\${sbindir}}
-    afssrvlibexecdir=${afssrvlibexecdir=\${libexecdir\}/openafs}
-    afsdbdir=${afsdbdir=\${localstatedir\}/openafs/db}
-    afslogsdir=${afslogsdir=\${localstatedir\}/openafs/logs}
-    afslocaldir=${afslocaldir=\${localstatedir\}/openafs}
-    afsbackupdir=${afsbackupdir=\${localstatedir\}/openafs/backup}
-    afsbosconfigdir=${afsbosconfigdir=\${sysconfdir\}/openafs}
-
+else 
+    afsconfdir=${afsconfdir='${sysconfdir}/openafs/server'}
+    viceetcdir=${viceetcdir='${sysconfdir}/openafs'}
+    afskerneldir=${afskerneldir='${libdir}/openafs'}
+    afssrvbindir=${afssrvbindir='${bindir}'}
+    afssrvsbindir=${afssrvsbindir='${sbindir}'}
+    afssrvlibexecdir=${afssrvlibexecdir='${libexecdir}/openafs'}
+    afsdbdir=${afsdbdir='${localstatedir}/openafs/db'}
+    afslogsdir=${afslogsdir='${localstatedir}/openafs/logs'}
+    afslocaldir=${afslocaldir='${localstatedir}/openafs'}
+    afsbackupdir=${afsbackupdir='${localstatedir}/openafs/backup'}
+    afsbosconfigdir=${afsbosconfigdir='${sysconfdir}/openafs'}
 fi
 AC_SUBST(afsconfdir)
 AC_SUBST(viceetcdir)
@@ -469,6 +478,7 @@ 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)
@@ -476,5 +486,8 @@ AC_SUBST(DEST)
 AC_SUBST(WITH_OBSOLETE)
 AC_SUBST(WITH_INSECURE)
 AC_SUBST(DARWIN_INFOFILE)
+AC_SUBST(IRIX_BUILD_IP35)
+
+OPENAFS_OSCONF
 
 ])