DEVEL15-vfsck-conditional-for-namei-20090602

LICENSE IPL10

make build fly again on solaris when namei and not inode is in play

(cherry picked from commit be47f4de0595dd044053695de3cdcedb2ec2a113)

diff --git a/Makefile.in b/Makefile.in
index 50924c8..06fdd60 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -644,14 +644,14 @@ jafs: libjafs
 jafsadm: libjafsadm
 
 finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ libuafs audit kauth log package \
-       ptserver tptserver scout bu_utils ubik tubik uss bozo vfsck volser tvolser tsalvaged \
+       ptserver tptserver scout bu_utils ubik tubik uss bozo @VFSCK@ volser tvolser tsalvaged \
        venus update xstat afsmonitor dauth rxdebug libafsrpc \
        libafsauthent shlibafsrpc shlibafsauthent libadmin login man-pages \
        platform
        ${COMPILE_PART1} finale ${COMPILE_PART2}
 
 finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth log package \
-       ptserver tptserver scout bu_utils ubik tubik uss bozo vfsck volser tvolser tsalvaged \
+       ptserver tptserver scout bu_utils ubik tubik uss bozo @VFSCK@ volser tvolser tsalvaged \
        venus update xstat afsmonitor dauth rxdebug libafsrpc \
        libafsauthent shlibafsrpc shlibafsauthent libadmin login man-pages \
        platform

diff --git a/acinclude.m4 b/acinclude.m4
index 7d40fda..72f9d4e 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1506,20 +1506,26 @@ fi
 
 if test "$enable_namei_fileserver" = "yes"; then
        AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
+       VFSCK=""
 else
        if test "$enable_namei_fileserver" = "default"; then
                case $host in
                        *-solaris2.10*)
                                AC_MSG_WARN(Some Solaris 10 versions are not safe with the inode fileserver. Forcing namei. Override with --disable-namei-fileserver)
                                AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
+                               VFSCK=""
                                ;;
                        *-solaris2.11*)
                                AC_MSG_WARN(Solaris 11 versions are not safe with the inode fileserver. Forcing namei. Override with --disable-namei-fileserver)
                                AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
+                               VFSCK=""
                                ;;
                        *)
+                               VFSCK="vfsck"
                                ;;
                esac
+        else
+               VFSCK="vfsck"
        fi
 fi
 
@@ -1669,6 +1675,7 @@ if test "x$enable_pthreaded_ubik" = "xyes"; then
 ENABLE_PTHREADED_UBIK=yes
 fi
 
+AC_SUBST(VFSCK)
 AC_SUBST(AFS_SYSNAME)
 AC_SUBST(AFS_PARAM_COMMON)
 AC_SUBST(ENABLE_KERNEL_MODULE)