diff -p -up ./src/xercesc/util/RefArrayOf.c.orig ./src/xercesc/util/RefArrayOf.c
--- ./src/xercesc/util/RefArrayOf.c.orig	2007-08-28 20:44:52.000000000 +0200
+++ ./src/xercesc/util/RefArrayOf.c	2008-10-16 23:20:44.000000000 +0200
@@ -27,6 +27,8 @@
 #include <xercesc/util/RefArrayOf.hpp>
 #endif
 
+#include <xercesc/framework/MemoryManager.hpp>
+
 XERCES_CPP_NAMESPACE_BEGIN
 
 // ---------------------------------------------------------------------------
diff -p -up ./tests/runConfigure.orig ./tests/runConfigure
--- ./tests/runConfigure.orig	2007-08-28 20:46:48.000000000 +0200
+++ ./tests/runConfigure	2008-10-16 23:20:44.000000000 +0200
@@ -490,6 +490,73 @@ if test $platform = "freebsd"; then
 fi
 
 #
+# Check for the type of net accessor
+#
+
+netaccessor=socket
+NETACCESSOR=Socket               # By default use socket (does HTTP URL's)
+if test $netaccessor ; then
+case $netaccessor in
+   fileonly)
+       NETACCESSOR=FileOnly
+       netaccessorDefines="" ;;
+
+   socket)
+       NETACCESSOR=Socket
+       netaccessorDefines="-DXML_USE_NETACCESSOR_SOCKET"
+       case $platform in
+           unixware|openserver)
+               netaccessorLibs="-lnsl -lsocket";;
+           hp-11)
+               netaccessorLibs="-lnsl";;
+           aix)
+               #netaccessorLibs="-lbsd";;
+               netaccessorLibs="";;
+           beos)
+               netaccessorLibs="-lnet";;
+           qnx) 
+               netaccessorLibs="-lsocket";;
+           solaris)
+               netaccessorLibs="-lnsl -lsocket"
+             if test $thread = "dce"; then
+                 netaccessorLibs=""
+             fi
+             ;;
+           *)
+               ;;
+       esac;;
+
+   libwww)
+       NETACCESSOR=LibWWW
+       if test -z "`libwww-config --libs 2>/dev/null`" ; then
+           echo "Netaccessor is libwww, but libwww-config is not found. Cannot proceed further."
+           exit ${ERROR_EXIT_CODE};
+       fi
+       netaccessorDefines="-DXML_USE_NETACCESSOR_LIBWWW `libwww-config --cflags`"
+       netaccessorLibs="`libwww-config --libs`"
+       USELIBWWW=1;;
+
+   native)
+       if test $platform = "macosx"; then
+           NETACCESSOR=NATIVE
+           netaccessorDefines="-DXML_USE_NETACCESSOR_NATIVE"
+           netaccessorLibs=""
+       else
+           echo "netaccessor option '$netaccessor' is supported on 'macosx' only."
+           exit ${ERROR_EXIT_CODE}
+       fi
+
+       ;;
+
+   *)
+       echo "I do not recognize the netaccessor option '$netaccessor'. Please type '${0} -h' for help."
+       exit ${ERROR_EXIT_CODE};;
+esac
+fi
+
+export NETACCESSOR
+
+#
 # Set the C compiler and C++ compiler environment variables
 #
 case $cppcompiler in
@@ -546,7 +613,7 @@ fi
 LDFLAGS="$LDFLAGS $linkeroptions $bitstobuildLink"
 export LDFLAGS
 
-EXTRA_LIBS="$transcodingLibs $threadingLibs"
+EXTRA_LIBS="$transcodingLibs $threadingLibs $netaccessorLibs"
 export EXTRA_LIBS
 
 echo
diff -p -up ./tests/Makefile.incl.orig ./tests/Makefile.incl
--- ./tests/Makefile.incl.orig	2007-08-28 20:46:48.000000000 +0200
+++ ./tests/Makefile.incl	2008-10-16 23:31:38.000000000 +0200
@@ -36,9 +36,9 @@ LIBDEPDOM=xercesdepdom
 endif
 THISLIB=${LIB_DIR}/${LIBNAME}
 
-LIBRARY_NAMES=-l${LIBNAME}
-LIBRARY_DEPDOM=-l${LIBDEPDOM}
-LIBRARY_SEARCH_PATHS=-L${LIB_DIR}
+LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}.a
+LIBRARY_DEPDOM=${LIB_DIR}/lib${LIBDEPDOM}.a
+LIBRARY_SEARCH_PATHS=
 
 TO = o
 ####################### PLATFORM DEPENDENCIES #####################
@@ -49,7 +49,7 @@ ifeq (${PLATFORM}, IRIX)
 	CMP= -c ${CXXFLAGS}
 	CC= ${COMPILER} -c -D${PLATFORM} -fpic
 	LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 	EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 
         ifneq (${THREADS},none)
@@ -57,7 +57,7 @@ ifeq (${PLATFORM}, IRIX)
         endif
   else
 	CMP= -c ${CXXFLAGS}
-	CC= ${COMPILER} -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -I/usr/local/include -no_auto_include
+	CC= ${COMPILER} -c -D${PLATFORM} -LANG:pch -LANG:std -O2  -no_auto_include
 	LINK =  ${COMPILER} -D${PLATFORM} ${LDFLAGS}
 	PLATFORM_LIB_LINK_OPTIONS=
 	EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
@@ -74,7 +74,7 @@ ifeq (${PLATFORM}, SOLARIS)
 	CMP= -c ${CXXFLAGS}
 	CC= ${COMPILER} -c -D${PLATFORM} -fpic
 	LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 	EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 
         ifneq (${THREADS},none)
@@ -99,7 +99,7 @@ ifeq (${PLATFORM}, OPENSERVER)
   CMP=-c ${CXXFLAGS}
   LINK=${CC} ${LDFLAGS}
   EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
-  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 endif
 
 #=============== UNIXWARE SPECIFIC OPTIONS =========================
@@ -108,7 +108,7 @@ ifeq (${PLATFORM}, UNIXWARE)
   CC= ${COMPILER} -D${PLATFORM} -fpic
   LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
   EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
-  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 
   ifneq (${THREADS},none)
     CMP += -D_REENTRANT -pthread
@@ -122,7 +122,7 @@ ifeq (${PLATFORM}, PTX)
   CC= ${COMPILER}
   LINK =  ${COMPILER} -D${PLATFORM} ${LDFLAGS}
   EXTRA_LINK_OPTIONS=-lm -lgen ${EXTRA_LIBS}
-  PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib -L${XMLINSTALL}/lib
+  PLATFORM_LIB_LINK_OPTIONS=-L${XMLINSTALL}/lib
 
   ifneq (${THREADS},none)
     CMP += -Kthread
@@ -137,7 +137,7 @@ ifeq (${PLATFORM}, AIX)
     CMP= -c ${CXXFLAGS}
     CC= ${COMPILER} -c -D${PLATFORM} -fpic
     LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-    PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+    PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
     EXTRA_LINK_OPTIONS= ${EXTRA_LIBS}
 
     ifneq (${THREADS},none)
@@ -195,7 +195,7 @@ ifeq (${PLATFORM}, LINUX)
     CMP= -c ${CXXFLAGS} -qnotempinc
     CC= ${COMPILER} -c -D${PLATFORM}
     LINK =  ${COMPILER} ${LDFLAGS}
-    PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+    PLATFORM_LIB_LINK_OPTIONS=
     EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 
     ifneq (${THREADS},none)
@@ -205,7 +205,7 @@ ifeq (${PLATFORM}, LINUX)
     CMP= -c ${CXXFLAGS}
     CC= ${COMPILER} -c -D${PLATFORM} -fpic
     LINK =  ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-    PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+    PLATFORM_LIB_LINK_OPTIONS=
     EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 
     ifneq (${THREADS},none)
@@ -219,7 +219,7 @@ ifeq (${PLATFORM}, QNX)
 CMP= -c ${CXXFLAGS}
 CC= ${COMPILER}
 LINK = ${COMPILER} ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=
 EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 endif
 
@@ -229,7 +229,7 @@ ifeq (${PLATFORM}, CYGWIN)
 CMP= -c ${CXXFLAGS}
 CC= ${COMPILER} -c -D__${PLATFORM}__
 LINK =  ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 endif
 
@@ -238,7 +238,7 @@ ifeq (${PLATFORM}, INTERIX)
   CMP= -c ${CXXFLAGS}
   CC= ${COMPILER} -c -D${PLATFORM} -D_ALL_SOURCE
   LINK =  ${COMPILER} -D${PLATFORM} ${LDFLAGS}
-  PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+  PLATFORM_LIB_LINK_OPTIONS=
   EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
 
   ifneq (${THREADS},none)
@@ -251,7 +251,7 @@ ifeq (${PLATFORM}, MINGW)
 CMP= -c ${CXXFLAGS} -fexceptions
 CC= ${COMPILER} -c -D__${PLATFORM}__ -DPLATFORM_WIN32
 LINK =  ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 endif
 
@@ -260,7 +260,7 @@ ifeq (${PLATFORM}, FREEBSD)
   CMP= -c ${CXXFLAGS}
   CC= ${COMPILER} -c -D${PLATFORM} -fPIC
   LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
-  PLATFORM_LIB_LINK_OPTIONS=-Wl,-rpath,${XERCESCROOT}/lib
+  PLATFORM_LIB_LINK_OPTIONS=
   ifdef ICUROOT
     PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
     EXTRA_LINK_OPTIONS=-licudata -lstdc++ ${EXTRA_LIBS}
@@ -274,7 +274,7 @@ ifeq (${PLATFORM}, NETBSD)
   CMP= -c ${CXXFLAGS}
   CC= ${COMPILER} -c -D${PLATFORM} -fPIC
   LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
-  PLATFORM_LIB_LINK_OPTIONS=-Wl,-rpath,${XERCESCROOT}/lib
+  PLATFORM_LIB_LINK_OPTIONS=
   ifdef ICUROOT
     PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
     EXTRA_LINK_OPTIONS=-licudata -lstdc++ ${EXTRA_LIBS}
@@ -289,7 +289,7 @@ ifeq (${PLATFORM}, HPUX)
     CMP= -c ${CXXFLAGS}
     CC= ${COMPILER} -c -D${PLATFORM} -fpic
     LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-    PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+    PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
     EXTRA_LINK_OPTIONS= ${EXTRA_LIBS}
 
     ifneq (${THREADS},none)
@@ -405,7 +405,7 @@ ifeq (${PLATFORM}, TRU64)
 CMP= -c ${CXXFLAGS}
 CC = ${COMPILER} -c -D${PLATFORM}
 LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 endif
 
 
diff -p -up ./samples/runConfigure.orig ./samples/runConfigure
--- ./samples/runConfigure.orig	2007-08-28 20:47:02.000000000 +0200
+++ ./samples/runConfigure	2008-10-16 23:20:44.000000000 +0200
@@ -491,6 +491,73 @@ if test $platform = "freebsd"; then
 fi
 
 #
+# Check for the type of net accessor
+#
+
+netaccessor=socket
+NETACCESSOR=Socket               # By default use socket (does HTTP URL's)
+if test $netaccessor ; then
+case $netaccessor in
+   fileonly)
+       NETACCESSOR=FileOnly
+       netaccessorDefines="" ;;
+
+   socket)
+       NETACCESSOR=Socket
+       netaccessorDefines="-DXML_USE_NETACCESSOR_SOCKET"
+       case $platform in
+           unixware|openserver)
+               netaccessorLibs="-lnsl -lsocket";;
+           hp-11)
+               netaccessorLibs="-lnsl";;
+           aix)
+               #netaccessorLibs="-lbsd";;
+               netaccessorLibs="";;
+           beos)
+               netaccessorLibs="-lnet";;
+           qnx) 
+               netaccessorLibs="-lsocket";;
+           solaris)
+               netaccessorLibs="-lnsl -lsocket"
+             if test $thread = "dce"; then
+                 netaccessorLibs=""
+             fi
+             ;;
+           *)
+               ;;
+       esac;;
+
+   libwww)
+       NETACCESSOR=LibWWW
+       if test -z "`libwww-config --libs 2>/dev/null`" ; then
+           echo "Netaccessor is libwww, but libwww-config is not found. Cannot proceed further."
+           exit ${ERROR_EXIT_CODE};
+       fi
+       netaccessorDefines="-DXML_USE_NETACCESSOR_LIBWWW `libwww-config --cflags`"
+       netaccessorLibs="`libwww-config --libs`"
+       USELIBWWW=1;;
+
+   native)
+       if test $platform = "macosx"; then
+           NETACCESSOR=NATIVE
+           netaccessorDefines="-DXML_USE_NETACCESSOR_NATIVE"
+           netaccessorLibs=""
+       else
+           echo "netaccessor option '$netaccessor' is supported on 'macosx' only."
+           exit ${ERROR_EXIT_CODE}
+       fi
+
+       ;;
+
+   *)
+       echo "I do not recognize the netaccessor option '$netaccessor'. Please type '${0} -h' for help."
+       exit ${ERROR_EXIT_CODE};;
+esac
+fi
+
+export NETACCESSOR
+
+#
 # Set the C compiler and C++ compiler environment variables
 #
 case $cppcompiler in
@@ -548,7 +615,7 @@ fi
 LDFLAGS="$LDFLAGS $linkeroptions $bitstobuildLink"
 export LDFLAGS
 
-EXTRA_LIBS="$transcodingLibs $threadingLibs"
+EXTRA_LIBS="$transcodingLibs $threadingLibs $netaccessorLibs"
 export EXTRA_LIBS
 
 echo
diff -p -up ./samples/Makefile.incl.orig ./samples/Makefile.incl
--- ./samples/Makefile.incl.orig	2007-08-28 20:47:02.000000000 +0200
+++ ./samples/Makefile.incl	2008-10-16 23:20:44.000000000 +0200
@@ -33,8 +33,8 @@ LIBNAME=xercesc
 endif
 THISLIB=${LIB_DIR}/${LIBNAME}
 
-LIBRARY_NAMES=-l${LIBNAME}
-LIBRARY_SEARCH_PATHS=-L${LIB_DIR}
+LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}.a
+LIBRARY_SEARCH_PATHS=
 
 ifndef XERCESCOUT
 XERCESCOUT=${XERCESCROOT}
@@ -49,7 +49,7 @@ ifeq (${PLATFORM}, IRIX)
 	CMP= -c ${CXXFLAGS}
 	CC= ${COMPILER} -c -D${PLATFORM} -fpic
 	LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 	EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 
         ifneq (${THREADS},none)
@@ -57,7 +57,7 @@ ifeq (${PLATFORM}, IRIX)
         endif
   else
 	CMP= -c ${CXXFLAGS}
-	CC= ${COMPILER} -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -I/usr/local/include -no_auto_include
+	CC= ${COMPILER} -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -no_auto_include
 	LINK =  ${COMPILER} -D${PLATFORM} ${LDFLAGS}
 	PLATFORM_LIB_LINK_OPTIONS=
 	EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
@@ -74,7 +74,7 @@ ifeq (${PLATFORM}, SOLARIS)
 	CMP= -c ${CXXFLAGS}
 	CC= ${COMPILER} -c -D${PLATFORM} -fpic
 	LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 	EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 
         ifneq (${THREADS},none)
@@ -99,7 +99,7 @@ ifeq (${PLATFORM}, OPENSERVER)
   CMP=-c ${CXXFLAGS}
   LINK=${CC} ${LDFLAGS}
   EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
-  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 endif
 
 #=============== UNIXWARE SPECIFIC OPTIONS =========================
@@ -108,7 +108,7 @@ ifeq (${PLATFORM}, UNIXWARE)
   CC= ${COMPILER} -D${PLATFORM} -fpic
   LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
   EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
-  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 
   ifneq (${THREADS},none)
     CMP += -D_REENTRANT -pthread
@@ -122,7 +122,7 @@ ifeq (${PLATFORM}, PTX)
   CC= ${COMPILER}
   LINK =  ${COMPILER} -D${PLATFORM} ${LDFLAGS}
   EXTRA_LINK_OPTIONS=-lm -lgen ${EXTRA_LIBS}
-  PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib -L${XMLINSTALL}/lib
+  PLATFORM_LIB_LINK_OPTIONS=-L${XMLINSTALL}/lib
 
   ifneq (${THREADS},none)
     CMP += -Kthread
@@ -137,7 +137,7 @@ ifeq (${PLATFORM}, AIX)
     CMP= -c ${CXXFLAGS}
     CC= ${COMPILER} -c -D${PLATFORM} -fpic
     LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-    PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+    PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
     EXTRA_LINK_OPTIONS= ${EXTRA_LIBS}
 
     ifneq (${THREADS},none)
@@ -196,7 +196,7 @@ ifeq (${PLATFORM}, LINUX)
     CMP= -c ${CXXFLAGS} -qnotempinc
     CC= ${COMPILER} -c -D${PLATFORM}
     LINK =  ${COMPILER} ${LDFLAGS}
-    PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+    PLATFORM_LIB_LINK_OPTIONS=
     EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 
     ifneq (${THREADS},none)
@@ -206,7 +206,7 @@ ifeq (${PLATFORM}, LINUX)
     CMP= -c ${CXXFLAGS}
     CC= ${COMPILER} -c -D${PLATFORM} -fpic
     LINK =  ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-    PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+    PLATFORM_LIB_LINK_OPTIONS=
     EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 
     ifneq (${THREADS},none)
@@ -220,7 +220,7 @@ ifeq (${PLATFORM}, QNX)
 CMP= -c ${CXXFLAGS}
 CC= ${COMPILER}
 LINK = ${COMPILER} ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=
 EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 endif
 
@@ -230,7 +230,7 @@ ifeq (${PLATFORM}, CYGWIN)
 CMP= -c ${CXXFLAGS}
 CC= ${COMPILER} -c -D__${PLATFORM}__
 LINK =  ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 endif
 
@@ -239,7 +239,7 @@ ifeq (${PLATFORM}, INTERIX)
   CMP= -c ${CXXFLAGS}
   CC= ${COMPILER} -c -D${PLATFORM} -D_ALL_SOURCE
   LINK =  ${COMPILER} -D${PLATFORM} ${LDFLAGS}
-  PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+  PLATFORM_LIB_LINK_OPTIONS=
   EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
 
   ifneq (${THREADS},none)
@@ -252,7 +252,7 @@ ifeq (${PLATFORM}, MINGW)
 CMP= -c ${CXXFLAGS} -fexceptions
 CC= ${COMPILER} -c -D__${PLATFORM}__
 LINK =  ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 endif
 
@@ -261,7 +261,7 @@ ifeq (${PLATFORM}, FREEBSD)
   CMP= -c ${CXXFLAGS}
   CC= ${COMPILER} -c -D${PLATFORM} -fPIC
   LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
-  PLATFORM_LIB_LINK_OPTIONS=-Wl,-rpath,${XERCESCROOT}/lib
+  PLATFORM_LIB_LINK_OPTIONS=
   ifdef ICUROOT
     PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
     EXTRA_LINK_OPTIONS=-licudata -lstdc++ ${EXTRA_LIBS}
@@ -275,7 +275,7 @@ ifeq (${PLATFORM}, NETBSD)
   CMP= -c ${CXXFLAGS}
   CC= ${COMPILER} -c -D${PLATFORM} -fPIC
   LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
-  PLATFORM_LIB_LINK_OPTIONS=-Wl,-rpath,${XERCESCROOT}/lib
+  PLATFORM_LIB_LINK_OPTIONS=
   ifdef ICUROOT
     PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
     EXTRA_LINK_OPTIONS=-licudata -lstdc++ ${EXTRA_LIBS}
@@ -290,7 +290,7 @@ ifeq (${PLATFORM}, HPUX)
     CMP= -c ${CXXFLAGS}
     CC= ${COMPILER} -c -D${PLATFORM} -fpic
     LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-    PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+    PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
     EXTRA_LINK_OPTIONS= ${EXTRA_LIBS}
 
     ifneq (${THREADS},none)
@@ -403,7 +403,7 @@ ifeq (${PLATFORM}, TRU64)
 CMP= -c ${CXXFLAGS}
 CC = ${COMPILER} -c -D${PLATFORM}
 LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 endif