--- src/tools/port/jam/bldenv	2008-06-18 11:40:08.000000000 -0400
+++ src/tools/port/jam/bldenv	2009-07-27 06:35:47.000000000 -0400
@@ -103,7 +103,7 @@
 
 umask 002
 
-xvers=25 # Xerces version
+xvers=28 # Xerces version
 config_string=unknown
 gtk_need=false
 rpm_need=false
@@ -145,6 +145,22 @@
 		;;
         x86_64)
 		config_string=a64_lnx
+  		if [ -f /etc/SuSE-release ] ; then
+		    export OSVER=SUSE
+		    export PAXLOC=/usr/bin
+		    export XERCESCROOT=/usr/include/xercesc
+		    if [ -f /usr/lib64/libxerces-c.so ]; then
+		    	export XERCESLOC=/usr/lib64
+		    fi
+		    if [ -f /usr/lib/libxerces-c.so ]; then
+		    	export XERCESLOCHB=/usr/lib
+		    fi
+		    XERCESCLIB=`readlink -n ${XERCESLOC}/libxerces-c.so`
+		    if [ -z "$XERCESCLIB" ]; then
+		    	XERCESCLIB=libxerces-c.so
+		    fi
+		    export XERCESCLIB
+		fi
 		;;
         ppc64)
 		config_string=ppc_lnx
@@ -244,66 +260,6 @@
 done
 fi
 
-# Xerces code and library (hopefully)
-[ "$XERCESCROOT" ] && [ -d ${XERCESCROOT}/src/xercesc ] ||
-{
-    if [ -d ${ING_ROOT}/xerces-c-src_2_5_0/src/xercesc ] ; then
-	export XERCESCROOT=${ING_ROOT}/xerces-c-src_2_5_0
-    else
-	while [ -z "$XERCESCROOT" ] ; do
-            read -p "Please enter a value for XERCESCROOT: " loc
-	    [ -z "$loc" ] && continue
-
-            [ -d $loc/src/xercesc ] || 
-	    {
-                echo "Directory $loc/src/xercesc does not exist"
-                continue
-            }
-
-            export XERCESCROOT=$loc
-
-            break
-	done
-    fi
-}
-
-[ -d ${XERCESCROOT}/lib ] && \
-	export XERCESLOC=${XERCESCROOT}/lib
-while [ -z "$XERCESLOC" ] ; do
-    read -p "Please enter a value for XERCESLOC: " loc
-    [ -z "$loc" ] && continue
-
-    [ -f $loc/libxerces-c.so.${xvers}.0 ] || 
-    {
-        echo "libxerces-c.so.${xvers}.0 does not exist under $loc"
-        continue
-    }
-
-    export XERCESLOC=$loc
-
-    break
-done
-
-
-# pax for Linux
-if [ "${unames}" = "Linux" ]; then
-[ -x $ING_ROOT/pax/bin/pax ] && export PAXLOC=${ING_ROOT}/pax/bin
-while [ -z "$PAXLOC" ] ; do
-        read -p "Please enter a value for PAXLOC: " loc
-	[ -z "$loc" ] && continue
-
-        [ -d $loc ] || 
-	{
-                echo "pax executable if not present under $loc"
-                continue
-        }
-
-        export PAXLOC=$loc
-
-        break
-done
-fi 
-
 # Prompt for cross compiler location if we need to
 [ "${xcc_need}" ] && [ -z "${XCCLOC}" ] &&
 {