diff -urN mpich-1.2.7p1.orig/mpid/server/aclocal.m4 mpich-1.2.7p1/mpid/server/aclocal.m4
--- mpich-1.2.7p1.orig/mpid/server/aclocal.m4	2006-09-24 21:11:27.000000000 -0700
+++ mpich-1.2.7p1/mpid/server/aclocal.m4	2006-09-24 21:14:26.000000000 -0700
@@ -27,21 +27,18 @@
 dnl Just having AFS directories doesn't mean that you can use 
 dnl AFS headers.
 AC_DEFUN(AC_CHECK_AFS,
-[AC_MSG_CHECKING(for AFS (/usr/afsws))
+[AC_MSG_CHECKING(for AFS)
     AC_CACHE_VAL(ac_cv_sys_afs, [dnl
-	if test -d /usr/afsws ; then
-	    afs_avail=1
-	    AC_CHECK_HEADER(afs/kauth.h,,afs_avail=0)
-	    AC_CHECK_HEADER(afs/kautils.h,,afs_avail=0)
-	    AC_CHECK_HEADER(afs/auth.h,,afs_avail=0)
-	    if test $afs_avail = 1 ; then
-  	        ac_cv_sys_afs="yes"
-	    else
-		ac_cv_sys_afs="no"
-	    fi
-	else
-	    ac_cv_sys_afs="no"
-	fi
+    afs_avail=1
+    AC_CHECK_HEADER(afs/kauth.h,,afs_avail=0)
+    AC_CHECK_HEADER(afs/kautils.h,,afs_avail=0)
+    AC_CHECK_HEADER(afs/auth.h,,afs_avail=0)
+    if test $afs_avail = 1 ; then
+        ac_cv_sys_afs="yes"
+    else
+	ac_cv_sys_afs="no"
+    fi
+    ac_cv_sys_afs="no"
     ])
     if test "$ac_cv_sys_afs" = "yes"; then
 	AC_DEFINE(HAVE_AFS)