--- m4/pvm.m4	2008-11-01 16:40:02.000000000 +1100
+++ m4/pvm.m4.newer	2008-11-01 16:31:29.000000000 +1100
@@ -82,7 +82,7 @@
 		if test ! -z "$USER_PVMINCLUDE"; then ## 
 			AC_MSG_WARN([Cannot find PVM sources in the specified directory ($F). Looking for PVM sources elsewhere.])
 		fi 
-		incpath="$PVMROOT/include $PVM_ROOT/include /usr/include /usr/share /usr/share/include /usr/array/PVM /usr/local /usr/local/include /usr/local/src"
+		incpath="$PVMROOT/include $PVM_ROOT/include /usr/include /usr/share /usr/share/include /usr/array/PVM /usr/local /usr/local/include /usr/local/src /usr/share/pvm3/include"
 		for INC_PATH in $incpath; do
 		    F="$INC_PATH/pvm3.h"
 			if test -f "$F"; then
@@ -126,7 +126,7 @@
 AC_DEFUN([AC_PVM_LIBRARY], [
 USER_PVMLIBDIR=$1
   AC_MSG_CHECKING([for PVM3 library])
-dirs="$USER_PVMLIBDIR /lib /usr/lib /usr/lib/pvm3 /shlib /shlib/pvm3 /usr/shlib /usr/shlib/pvm3 /usr/local/lib /usr/local/lib/pvm3 /usr/local/shlib /usr/local/pvm3 /usr/pvm3 /usr/local/pvm3/lib /sw/lib/ /usr/share/pvm3 ."
+dirs="$USER_PVMLIBDIR /lib /usr/lib /usr/lib/pvm3 /shlib /shlib/pvm3 /usr/shlib /usr/shlib/pvm3 /usr/local/lib /usr/local/lib/pvm3 /usr/local/shlib /usr/local/pvm3 /usr/pvm3 /usr/local/pvm3/lib /sw/lib/ /usr/share/pvm3 /usr/share/pvm3/lib/LINUX /usr/share/pvm3/lib/LINUXI386"
 libexts="so so.1.0 sl dylib a"
 libnames="pvm pvm3"