From be47f4de0595dd044053695de3cdcedb2ec2a113 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 2 Jun 2009 18:39:28 +0000
Subject: [PATCH] vfsck-conditional-for-namei-20090602

LICENSE IPL10

make build fly again on solaris when namei and not inode is in play
---
 Makefile.in  | 4 ++--
 acinclude.m4 | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a3bf6f2b63..06dd0a5e14 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -616,14 +616,14 @@ jafs: libjafs
 jafsadm: libjafsadm
 
 finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ libuafs audit kauth log \
-	ptserver tptserver scout bu_utils ubik uss bozo vfsck volser tvolser tsalvaged \
+	ptserver tptserver scout bu_utils ubik uss bozo @VFSCK@ volser tvolser tsalvaged \
 	venus update xstat afsmonitor rxdebug libafsrpc \
 	libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
 	platform kopenafs authtools
 	${COMPILE_PART1} finale ${COMPILE_PART2}
 
 finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth log \
-	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 rxdebug libafsrpc \
 	libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
 	platform kopenafs authtools
diff --git a/acinclude.m4 b/acinclude.m4
index 98b77fa788..3b18a45414 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1471,20 +1471,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
 
@@ -1659,6 +1665,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)