diff --git a/src/xercesc/Makefile.in b/src/xercesc/Makefile.in
index 4a5e920ec3ee1e05fa45b24557d2425df144863a..1a9fdb207e49c997acc82e7ca2acd00def030622 100644
--- a/src/xercesc/Makefile.in
+++ b/src/xercesc/Makefile.in
@@ -71,6 +71,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 PREFIX = @prefix@
 MESSAGELOADER=@messageloader@
 TRANSCODER=@transcoder@
diff --git a/src/xercesc/Makefile.incl b/src/xercesc/Makefile.incl
index 4da545af2067fe00797e3f3f0e7514a4b80c4bb7..282facf7de62888932ca7994bfb5e86fe90c223f 100644
--- a/src/xercesc/Makefile.incl
+++ b/src/xercesc/Makefile.incl
@@ -495,10 +495,14 @@ ifeq (${PLATFORM}, HPUX)
   endif
 
   ifeq (${CXX}, aCC)
-    PLATFORM_COMPILE_OPTIONS = -D_HP_UX -DHPaCC \
-        -D${OSVERDEFINE} +DAportable +Z
-    MAKE_SHARED = ${CXX} -D${PLATFORM} ${LDFLAGS}
-    MAKE_SHARED_C = ${CC} -D${PLATFORM} ${LDFLAGS}
+    ifeq (${CXXVER}, aCC05)
+       PLATFORM_COMPILE_OPTIONS = -D_HP_UX -DHPaCC -D${OSVERDEFINE} -mt +Z
+    else
+       PLATFORM_COMPILE_OPTIONS = -D_HP_UX -DHPaCC -D${OSVERDEFINE} +DAportable +Z    
+    endif
+            
+    MAKE_SHARED   = ${CXX} ${PLATFORM_COMPILE_OPTIONS} -D${PLATFORM} ${LDFLAGS}
+    MAKE_SHARED_C = ${CC}  ${PLATFORM_COMPILE_OPTIONS} -D${PLATFORM} ${LDFLAGS}  
     ifeq (${TRANSCODER}, ICU)
         ALLLIBS = ${LIBS} -licuuc -licudata
     else
@@ -509,8 +513,14 @@ ifeq (${PLATFORM}, HPUX)
         ALLLIBS = ${LIBS} -licuuc -licudata -lXercesMessages
     endif
 
-    EXTRA_LINK_OPTIONS = -b -Wl,+s -Wl,+b,.
-    DEPDOM_LINK_OPTIONS = -b -Wl,+s -Wl,+b,.    
+    ifeq (${CXXVER}, aCC05)
+       EXTRA_LINK_OPTIONS = -b -Wl,+s -Wl,+b,. -mt
+       DEPDOM_LINK_OPTIONS = -b -Wl,+s -Wl,+b,. -mt   
+    else
+       EXTRA_LINK_OPTIONS = -b -Wl,+s -Wl,+b,. 
+       DEPDOM_LINK_OPTIONS = -b -Wl,+s -Wl,+b,.
+    endif
+    
     SHLIBSUFFIX=.sl
     ICUSHLIBSUFFIX=.sl
   else
diff --git a/src/xercesc/configure b/src/xercesc/configure
index 03a52b9068c3c46433f7d95dde43fef8f4211301..6cca04dfaf30013944706005443d848c7396b75a 100755
--- a/src/xercesc/configure
+++ b/src/xercesc/configure
@@ -1340,7 +1340,7 @@ esac
 
 cxx=${CXX}
 
-
+cxxver=${CXXVER}
 
 cc=${CC}
 
@@ -1604,6 +1604,7 @@ s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
 s%@platform@%$platform%g
 s%@cxx@%$cxx%g
+s%@cxxver@%$cxxver%g
 s%@GXX@%$GXX%g
 s%@cc@%$cc%g
 s%@GCC@%$GCC%g
diff --git a/src/xercesc/configure.in b/src/xercesc/configure.in
index e9da39d0eb056859df84f33870707eba8e24a2a1..ef6a78f01fda16c082e880e2c369448b80ff7d67 100644
--- a/src/xercesc/configure.in
+++ b/src/xercesc/configure.in
@@ -68,6 +68,9 @@ cxx=${CXX}
 AC_SUBST(cxx)
 AC_SUBST(GXX)
 
+cxxver=${CXXVER}
+AC_SUBST(cxxver)
+
 cc=${CC}
 AC_SUBST(cc)
 AC_SUBST(GCC)
diff --git a/src/xercesc/dom/Makefile.in b/src/xercesc/dom/Makefile.in
index ddae68409ac9d62b72342e2df8d1df24c292f803..46238438ee52f96c05b99a7a7198d5b39f36c37d 100644
--- a/src/xercesc/dom/Makefile.in
+++ b/src/xercesc/dom/Makefile.in
@@ -60,6 +60,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/dom/deprecated/Makefile.in b/src/xercesc/dom/deprecated/Makefile.in
index ce3a03bc0d3b3d229e62f8ec759c7e5be827c8d9..3e5452f63cec1ba8514e772d4e6ff78886365f8e 100644
--- a/src/xercesc/dom/deprecated/Makefile.in
+++ b/src/xercesc/dom/deprecated/Makefile.in
@@ -60,6 +60,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/dom/impl/Makefile.in b/src/xercesc/dom/impl/Makefile.in
index 143da74e69ef6ad20f2e9aa5ebc436d03701df58..3890b6e95186e11388898dd53e47b1003a8f3a11 100644
--- a/src/xercesc/dom/impl/Makefile.in
+++ b/src/xercesc/dom/impl/Makefile.in
@@ -60,6 +60,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/framework/Makefile.in b/src/xercesc/framework/Makefile.in
index 5426d1ca47f29e192ffe0effd386c56815940321..52194c7742026ed27402eb5c4d645a25ff46949a 100644
--- a/src/xercesc/framework/Makefile.in
+++ b/src/xercesc/framework/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.16  2004/07/09 16:11:11  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.15  2003/11/12 20:28:16  peiyongz
 # Stateless Grammar: ValidationContext
 #
@@ -148,6 +151,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/framework/psvi/Makefile.in b/src/xercesc/framework/psvi/Makefile.in
index 332c53066e50e1fa90497f5f870e3db591ec26d9..b1e3bb544e876e8c53384d86ede7ac95e64d1f7d 100644
--- a/src/xercesc/framework/psvi/Makefile.in
+++ b/src/xercesc/framework/psvi/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.2  2004/07/09 16:11:32  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.1  2003/09/16 14:33:36  neilg
 # PSVI/schema component model classes, with Makefile/configuration changes necessary to build them
 #
@@ -62,6 +65,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/internal/Makefile.in b/src/xercesc/internal/Makefile.in
index ec2d8d8d6439091f0ef3c032be35d842901831bc..7b2b0f85d2d159a8e122cf4839b388661cc2dab0 100644
--- a/src/xercesc/internal/Makefile.in
+++ b/src/xercesc/internal/Makefile.in
@@ -60,6 +60,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/parsers/Makefile.in b/src/xercesc/parsers/Makefile.in
index b28b8595b689f6477b83148e3a13d4fc286d4902..1583a900eb5f1927b6213fb6684c3bfbc5efd244 100644
--- a/src/xercesc/parsers/Makefile.in
+++ b/src/xercesc/parsers/Makefile.in
@@ -60,6 +60,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/runConfigure b/src/xercesc/runConfigure
index 8614ddd15baef0d4b5e157f05e1c2fed45fa6fe3..39b8dc7252578e55f476edaaed11c8e64f03bcb2 100755
--- a/src/xercesc/runConfigure
+++ b/src/xercesc/runConfigure
@@ -92,7 +92,7 @@ usage()
             [required; no default]"
     echo "       -c <C compiler name> (e.g. gcc, cc, xlc_r, qcc, icc or ecc) 
             [default is make default; cc for gnu make]"
-    echo "       -x <C++ compiler name> (e.g. g++, CC, aCC, xlC_r, QCC, 
+    echo "       -x <C++ compiler name> (e.g. g++, CC, aCC, aCC05, xlC_r, QCC, 
             icc or ecc) [default is make default; g++ for gnu make]"
     echo "       -d (specifies that you want to build debug version)
             [default: no debug]"
@@ -465,8 +465,18 @@ if test $bitsToBuild = 64; then
            aix)
               bitstobuildDefines=" $bitstobuildDefines -q64 -qwarn64 " ;;
            hp-11)
-              bitstobuildDefines=" $bitstobuildDefines +DA2.0W "
-              bitstobuildLink=" +DA2.0W " ;;
+               if test $cppcompiler; then
+                   case $cppcompiler in
+                       aCC)
+                          bitstobuildDefines=" $bitstobuildDefines +DA2.0W "
+                          bitstobuildLink=" +DA2.0W " ;;     
+                       aCC05)
+                          bitstobuildDefines=" $bitstobuildDefines +DD64 "
+                          bitstobuildLink=" +DD64 " ;;
+                       *)
+                       ;;
+                   esac
+               fi ;;
            linux)
               bitstobuildDefines=" $bitstobuildDefines " ;;
            *)
@@ -652,8 +662,13 @@ export NETACCESSOR
 
 case $cppcompiler in
    xlC* | xlc* | g++ | c++ | cc | CC | aCC | icc | ICC | cxx | ecc | QCC )
+      CXX="$cppcompiler"
       ;;
       
+   aCC05)
+      CXX="aCC"
+      CXXVER="aCC05"
+      ;;      
    '')
    	  echo "C++ compiler not specified...we'll assume that configure will find it..."
    	  ;;
@@ -666,9 +681,10 @@ esac
 CC="$ccompiler"
 export CC
 
-CXX="$cppcompiler"
 export CXX
 
+export CXXVER
+
 #
 # Set the extra C and C++ compiler flags
 #
diff --git a/src/xercesc/sax/Makefile.in b/src/xercesc/sax/Makefile.in
index 1eef8a67aa3d153146ac556230bc1bbf10eebdff..3a1ffc8588419f7c9e45063b91e0790f2fe09ce5 100644
--- a/src/xercesc/sax/Makefile.in
+++ b/src/xercesc/sax/Makefile.in
@@ -60,6 +60,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/sax2/Makefile.in b/src/xercesc/sax2/Makefile.in
index ed06b2f16ac5456b1e3815dce82275d32e12b559..7ec879a9c0a3a0d1781462091ffb84c218cba0d8 100644
--- a/src/xercesc/sax2/Makefile.in
+++ b/src/xercesc/sax2/Makefile.in
@@ -60,6 +60,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Compilers/Makefile.in b/src/xercesc/util/Compilers/Makefile.in
index da9acec1a0b55cdd8dece9c94f8337e61fa78d11..f61a65d00cffc3ed32c099d2038ead521c48ec8b 100644
--- a/src/xercesc/util/Compilers/Makefile.in
+++ b/src/xercesc/util/Compilers/Makefile.in
@@ -60,6 +60,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Makefile.in b/src/xercesc/util/Makefile.in
index 72c7536be7d9b3766ed77f67f53ab2b1024767c2..2ac1b009257b9e5113e835881f24cd47c67904eb 100644
--- a/src/xercesc/util/Makefile.in
+++ b/src/xercesc/util/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.43  2004/07/09 16:13:57  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.42  2004/02/24 22:57:27  peiyongz
 # XercesDeprecatedDOMLib
 #
@@ -397,6 +400,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/MsgLoaders/ICU/Makefile.in b/src/xercesc/util/MsgLoaders/ICU/Makefile.in
index 7198510ea412322c865d231780294b5d9c05edef..dec7b9985855f11420addcba85d81addf93a87e2 100644
--- a/src/xercesc/util/MsgLoaders/ICU/Makefile.in
+++ b/src/xercesc/util/MsgLoaders/ICU/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:15:04  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:27  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -97,6 +100,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in b/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
index ccb0b44a30ffe79a84bb5360e666fe37d53d4585..7633e947f2de97b1a53d2bacba2f18c5a19a13ab 100644
--- a/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
+++ b/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
@@ -28,6 +28,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/MsgLoaders/InMemory/Makefile.in b/src/xercesc/util/MsgLoaders/InMemory/Makefile.in
index b84ccd79e25673def03c0f6357024333f5fa13ba..3106c163e521397f070455f4d1fe8faf603247b7 100644
--- a/src/xercesc/util/MsgLoaders/InMemory/Makefile.in
+++ b/src/xercesc/util/MsgLoaders/InMemory/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.4  2004/07/09 16:15:46  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.3  2002/12/12 19:14:00  peiyongz
 # InMem Message file name changed.
 #
@@ -100,6 +103,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in b/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
index 418a3db89c0acc9437450ea9df88ff65b656c7c4..66df1f5f69ddec19aabaa752366163208f6904f7 100644
--- a/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:16:09  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:27  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -97,6 +100,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in b/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in
index c8e124b1bb60ca5e93891214f113f42707dc5ce4..2a404d9c9c0211b3a537b415abdf430b94eb052b 100644
--- a/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in
+++ b/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:17:18  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:28  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -69,6 +72,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in b/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in
index 0b129a4566e59bfdd1a9a1a2ddc094e95dac0cae..483850ff63920a04885ddd8b3bfa5318a0837aa9 100644
--- a/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in
+++ b/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:17:37  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:28  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -68,6 +71,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/NetAccessors/Socket/Makefile.in b/src/xercesc/util/NetAccessors/Socket/Makefile.in
index ac7b19c581d3c06fef5350cddcfd84f31d59956c..1109f0de8bccc345e7d79b7db20267381766c934 100644
--- a/src/xercesc/util/NetAccessors/Socket/Makefile.in
+++ b/src/xercesc/util/NetAccessors/Socket/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:18:08  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:28  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -81,6 +84,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/NetAccessors/libWWW/Makefile.in b/src/xercesc/util/NetAccessors/libWWW/Makefile.in
index 4436fe38c736964908932de757e306fe4136e751..12d2e9a55bdc057b3faa63fbbe7ccc59f423a632 100644
--- a/src/xercesc/util/NetAccessors/libWWW/Makefile.in
+++ b/src/xercesc/util/NetAccessors/libWWW/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:16:49  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:28  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -88,6 +91,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/AIX/Makefile.in b/src/xercesc/util/Platforms/AIX/Makefile.in
index 06fd2187305781b1efcf9031fff9f04cfd4d25f5..dd44a7363a2c26d156c556a511ccf41f6500ea27 100644
--- a/src/xercesc/util/Platforms/AIX/Makefile.in
+++ b/src/xercesc/util/Platforms/AIX/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:19:14  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:28  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -74,6 +77,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/BeOS/Makefile.in b/src/xercesc/util/Platforms/BeOS/Makefile.in
index 44b3e6ef16b4a966c97932a8c2351ecdbf0c8a4d..6b5b45c14962625429a98a06520e43f736fd0fc9 100644
--- a/src/xercesc/util/Platforms/BeOS/Makefile.in
+++ b/src/xercesc/util/Platforms/BeOS/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.4  2004/07/09 16:19:33  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.3  2003/02/23 05:44:12  jberry
 # Ripple through changes of BeOSDefs.h name change
 #
@@ -68,6 +71,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/Cygwin/Makefile.in b/src/xercesc/util/Platforms/Cygwin/Makefile.in
index 3defee03d87815014df6d0f86ec776bb4b869df9..0c07afc3364c1a8fa2bb4e10dc30e8f22df4caab 100755
--- a/src/xercesc/util/Platforms/Cygwin/Makefile.in
+++ b/src/xercesc/util/Platforms/Cygwin/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.2  2004/07/09 16:19:51  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.1  2004/02/17 15:56:50  neilg
 # fix for bug 25035; much thanks to Abe Backus
 #
@@ -63,6 +66,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/FreeBSD/Makefile.in b/src/xercesc/util/Platforms/FreeBSD/Makefile.in
index f49afb1419dcaa9300c9a4b33c0dfe4303252f21..afb294b779a6a2755e6510714121ef8d269b6e81 100644
--- a/src/xercesc/util/Platforms/FreeBSD/Makefile.in
+++ b/src/xercesc/util/Platforms/FreeBSD/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:20:12  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:28  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -68,6 +71,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/HPUX/Makefile.in b/src/xercesc/util/Platforms/HPUX/Makefile.in
index 0b8330cd69c96c7b94e7b8be7277bee3605eb8d1..c2796f115ed33cc4bcf0e664ab885258705fbd79 100644
--- a/src/xercesc/util/Platforms/HPUX/Makefile.in
+++ b/src/xercesc/util/Platforms/HPUX/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:20:34  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:28  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -74,6 +77,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/IRIX/Makefile.in b/src/xercesc/util/Platforms/IRIX/Makefile.in
index 3a47267e02351c0141019cab36c4ca5308e0f7c7..e6c366188aa52d78ccc97b7ce5adbe67daf8aaa8 100644
--- a/src/xercesc/util/Platforms/IRIX/Makefile.in
+++ b/src/xercesc/util/Platforms/IRIX/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:21:18  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:28  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -74,6 +77,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/Interix/Makefile.in b/src/xercesc/util/Platforms/Interix/Makefile.in
index 183af89b8c715ede83fff716cc3694083dc232d9..269bd9663457785a7e42bc77d78a4f710e16df43 100644
--- a/src/xercesc/util/Platforms/Interix/Makefile.in
+++ b/src/xercesc/util/Platforms/Interix/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.2  2004/07/09 16:20:53  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.1  2004/02/04 13:26:44  amassari
 # Added support for the Interix platform (Windows Services for Unix 3.5)
 #
@@ -63,6 +66,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/Linux/Makefile.in b/src/xercesc/util/Platforms/Linux/Makefile.in
index 5b1822ba5807fbac6be0361624c0244d11dc5834..9d3a0f63b09af0df37625450d4a441f573186861 100644
--- a/src/xercesc/util/Platforms/Linux/Makefile.in
+++ b/src/xercesc/util/Platforms/Linux/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:21:36  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:28  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -74,6 +77,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/MacOS/Makefile.in b/src/xercesc/util/Platforms/MacOS/Makefile.in
index 4f0c41397efa7f19c457b59e2d69d33ffc63b0fd..e316add877aabb55c8fea187bbd07c0729747e48 100644
--- a/src/xercesc/util/Platforms/MacOS/Makefile.in
+++ b/src/xercesc/util/Platforms/MacOS/Makefile.in
@@ -59,6 +59,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/Makefile.in b/src/xercesc/util/Platforms/Makefile.in
index 4cc822b32bcd9468ec1dad5c8a3ec8339e4eae05..097cda226a20bac967ed990bbdc3571b58711ef0 100644
--- a/src/xercesc/util/Platforms/Makefile.in
+++ b/src/xercesc/util/Platforms/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.12  2004/07/09 16:18:53  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.11  2004/03/15 17:06:06  amassari
 # - Added support for MinGW (bug#23176)
 #
@@ -146,6 +149,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/NetBSD/Makefile.in b/src/xercesc/util/Platforms/NetBSD/Makefile.in
index 6591d64939c0fb22b09fc9edcc8e1c505f580a50..66ef22c70db77b0c1c771f68705852690a38039a 100644
--- a/src/xercesc/util/Platforms/NetBSD/Makefile.in
+++ b/src/xercesc/util/Platforms/NetBSD/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.2  2004/07/09 16:22:16  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.1  2003/05/13 13:24:07  gareth
 # Files for NetBSD Port. Patch by Hiramatsu Yoshifumi.
 #
@@ -71,6 +74,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/OS390/Makefile.in b/src/xercesc/util/Platforms/OS390/Makefile.in
index cb986d52f32b5520ec7d63eb63254f92c01ed6e1..ec5a230e9f754d79765db7f23b594af4741b4aa1 100644
--- a/src/xercesc/util/Platforms/OS390/Makefile.in
+++ b/src/xercesc/util/Platforms/OS390/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.4  2004/07/09 16:23:37  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.3  2002/11/22 14:57:32  tng
 # 390: support record-oriented MVS datasets with the DOM Level 3 serialization APIs.  Patch by Chris Larsson and Stephen Dulin.
 #
@@ -77,6 +80,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/OS400/Makefile.in b/src/xercesc/util/Platforms/OS400/Makefile.in
index 347fde85ad96f0f7c2a8d1a6b3ee8c735d44a491..131b630199812420960a4dcf13ff2831fb009085 100644
--- a/src/xercesc/util/Platforms/OS400/Makefile.in
+++ b/src/xercesc/util/Platforms/OS400/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:23:59  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:28  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -74,6 +77,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/OpenServer/Makefile.in b/src/xercesc/util/Platforms/OpenServer/Makefile.in
index 9d64a4f2773da52de6e0ddcc1ba701854605ef51..c584a0b3bf9ba436792583fc0e8f12fb7aaee429 100644
--- a/src/xercesc/util/Platforms/OpenServer/Makefile.in
+++ b/src/xercesc/util/Platforms/OpenServer/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:22:39  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:28  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -65,6 +68,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/PTX/Makefile.in b/src/xercesc/util/Platforms/PTX/Makefile.in
index e2d7a4b910b1d67d2e06d94ba042dd5349e9e1ae..bba26074e95c6cd818221abd78e0a33811c7c732 100644
--- a/src/xercesc/util/Platforms/PTX/Makefile.in
+++ b/src/xercesc/util/Platforms/PTX/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:24:27  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:28  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -74,6 +77,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/QNX/Makefile.in b/src/xercesc/util/Platforms/QNX/Makefile.in
index c5b0fad3e5b87c58e674765239f708ed8f207d2b..837f1496bfe5d1a7d22540712fb6d9ca98ac93c9 100644
--- a/src/xercesc/util/Platforms/QNX/Makefile.in
+++ b/src/xercesc/util/Platforms/QNX/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.2  2004/07/09 16:24:50  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.1  2003/03/13 22:11:16  tng
 # [Bug 17858] Support for QNX/Neutrino.  Patch from Chris McKillop.
 #
@@ -63,6 +66,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/Solaris/Makefile.in b/src/xercesc/util/Platforms/Solaris/Makefile.in
index fa6868aabeaed63f639622cc481eeb7f3a98c28d..6fba1122f4d7489ead4fc88da97e52ffe8491a7e 100644
--- a/src/xercesc/util/Platforms/Solaris/Makefile.in
+++ b/src/xercesc/util/Platforms/Solaris/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:25:14  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:29  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -74,6 +77,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/Tru64/Makefile.in b/src/xercesc/util/Platforms/Tru64/Makefile.in
index 518152db7a814a1e92ea516297361664bec759cf..1717f3b35a01df6b82fa85137a36f86506f95c24 100644
--- a/src/xercesc/util/Platforms/Tru64/Makefile.in
+++ b/src/xercesc/util/Platforms/Tru64/Makefile.in
@@ -59,6 +59,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/UnixWare/Makefile.in b/src/xercesc/util/Platforms/UnixWare/Makefile.in
index b8d0257dd93ab203b75fbd5dcc7f5f22f42286b5..c05b83124a714eb3308c57609dadde3e6b19bc4e 100644
--- a/src/xercesc/util/Platforms/UnixWare/Makefile.in
+++ b/src/xercesc/util/Platforms/UnixWare/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:26:03  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:29  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -74,6 +77,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Platforms/Win32/Makefile.in b/src/xercesc/util/Platforms/Win32/Makefile.in
index 51ea024b5c40e1f98748b83768ca34b5e5f9036b..cef5c7077ccbbaec8bd2cb2d8a8275405a858aa2 100644
--- a/src/xercesc/util/Platforms/Win32/Makefile.in
+++ b/src/xercesc/util/Platforms/Win32/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.4  2004/07/09 16:26:22  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.3  2004/03/15 17:06:06  amassari
 # - Added support for MinGW (bug#23176)
 #
@@ -68,6 +71,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Transcoders/Cygwin/Makefile.in b/src/xercesc/util/Transcoders/Cygwin/Makefile.in
index 4ed21a08767120893077f7c817109c88a5d3b44c..d5648fabafc3c758d0dba27c65a54fd2de8ae54e 100644
--- a/src/xercesc/util/Transcoders/Cygwin/Makefile.in
+++ b/src/xercesc/util/Transcoders/Cygwin/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.2  2004/07/09 16:27:25  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.1  2002/08/19 18:35:56  tng
 # [Bug 6467] Installing Xerces C++ on cygwin environment.
 #
@@ -63,6 +66,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Transcoders/ICU/Makefile.in b/src/xercesc/util/Transcoders/ICU/Makefile.in
index 72df285b5dc5a8fff69d2ec934ee191439e6b04b..493d8b502a13a5b7ca37dea32b439e4772e71169 100644
--- a/src/xercesc/util/Transcoders/ICU/Makefile.in
+++ b/src/xercesc/util/Transcoders/ICU/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:29:26  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:29  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -97,6 +100,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Transcoders/Iconv/Makefile.in b/src/xercesc/util/Transcoders/Iconv/Makefile.in
index ab8d3e92273be910b634402f51ef9ff7e7040f38..89b604b9391e360376be16d1c02fcb4697ff9a93 100644
--- a/src/xercesc/util/Transcoders/Iconv/Makefile.in
+++ b/src/xercesc/util/Transcoders/Iconv/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:27:45  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:29  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -97,6 +100,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Transcoders/Iconv390/Makefile.in b/src/xercesc/util/Transcoders/Iconv390/Makefile.in
index 645e7bcf20f856bdbad98288a3fe99743d81eb5a..f82da9d1f0709de3500051cdc02398d1d79ac8b7 100644
--- a/src/xercesc/util/Transcoders/Iconv390/Makefile.in
+++ b/src/xercesc/util/Transcoders/Iconv390/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:28:03  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:29  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -75,6 +78,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in b/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in
index faddd14a5749f1e79ed97e902274dfb8dcdcc7c4..423d02fe24434c951c416007402fdc8f570e2c24 100644
--- a/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in
+++ b/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:28:33  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:29  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -69,6 +72,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Transcoders/IconvGNU/Makefile.in b/src/xercesc/util/Transcoders/IconvGNU/Makefile.in
index f277dc5f921a96bc4988d08c8ed9cb25bc7f1cf4..9898c0a8f02c4861aa8c6bc70df233fe65f32956 100644
--- a/src/xercesc/util/Transcoders/IconvGNU/Makefile.in
+++ b/src/xercesc/util/Transcoders/IconvGNU/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.2  2004/07/09 16:28:52  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.1  2002/08/19 19:38:18  tng
 # [Bug 11771] Linux specific IconvGNU transcoder.  Patch from Vasily Tchekalkin.
 #
@@ -72,6 +75,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in
index a42ddd869638cd579258aecbab2f8c1a22285ad3..376eb3cf62645645ebe0a460cd1c0e77a8fb4c6b 100644
--- a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in
+++ b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:29:47  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2002/07/26 16:49:29  tng
 # [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
 #
@@ -100,6 +103,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/util/Transcoders/Uniconv390/Makefile.in b/src/xercesc/util/Transcoders/Uniconv390/Makefile.in
index 0e117979ebea272554085df6a887c51968160ca8..662d84c9ade38e52662c949ad00657f232675a01 100644
--- a/src/xercesc/util/Transcoders/Uniconv390/Makefile.in
+++ b/src/xercesc/util/Transcoders/Uniconv390/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.3  2004/07/09 16:30:05  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.2  2004/02/06 15:02:41  cargilld
 # Intrinsic transcoding support for 390.
 #
@@ -66,6 +69,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff --git a/src/xercesc/util/regx/Makefile.in b/src/xercesc/util/regx/Makefile.in
index 81cc2f73b9c5e88e9e22d5f7835a9d8df2d7d63a..b105767a2c90523e5416c7ca7e233129313a70f2 100644
--- a/src/xercesc/util/regx/Makefile.in
+++ b/src/xercesc/util/regx/Makefile.in
@@ -56,6 +56,9 @@
 #
 #
 # $Log$
+# Revision 1.4  2004/07/09 16:26:49  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.3  2002/07/31 17:16:08  tng
 # [Bug 6321] gmake error in regx/Makefile.in.
 #
@@ -99,6 +102,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/validators/DTD/Makefile.in b/src/xercesc/validators/DTD/Makefile.in
index 43b96c5878009ace3dd627f3a86bbb965976d27a..252dd3dda0382b60e8ea3e86b38523df7dc40b59 100644
--- a/src/xercesc/validators/DTD/Makefile.in
+++ b/src/xercesc/validators/DTD/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.6  2004/07/09 16:31:45  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.5  2003/10/10 16:24:51  peiyongz
 # Implementation of Serialization/Deserialization
 #
@@ -119,6 +122,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/validators/Makefile.in b/src/xercesc/validators/Makefile.in
index 2e873e53aa9a8596098e656ab3abaff4595eb735..5dfded4adef947fdf2855e8a6d06a5051d9bdee8 100644
--- a/src/xercesc/validators/Makefile.in
+++ b/src/xercesc/validators/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.5  2004/07/09 16:30:42  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.4  2002/09/17 21:24:07  peiyongz
 # RPM for Xerces2.1.0, patch from Thomas Woerner (thomas@linux.de)
 #
@@ -91,6 +94,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/validators/common/Makefile.in b/src/xercesc/validators/common/Makefile.in
index 5dcb3a77ac45000533c11f677a916e590d0b4842..b34ef85d1d22a6f1c3133381fc0861b3410e58a8 100644
--- a/src/xercesc/validators/common/Makefile.in
+++ b/src/xercesc/validators/common/Makefile.in
@@ -54,6 +54,9 @@
 # <http://www.apache.org/>.
 #
 # $Log$
+# Revision 1.5  2004/07/09 16:31:05  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.4  2003/10/14 15:19:24  peiyongz
 # Implementation of Serialization/Deserialization
 #
@@ -93,6 +96,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/validators/datatype/Makefile.in b/src/xercesc/validators/datatype/Makefile.in
index 825feaffadd88d34636bc7c46e5f21b0f2f7cf90..5209ddfc82523914907f6d554ad95b6c470fbe81 100644
--- a/src/xercesc/validators/datatype/Makefile.in
+++ b/src/xercesc/validators/datatype/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.5  2004/07/09 16:31:26  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.4  2003/12/11 21:57:26  peiyongz
 # XMLCanRepGroup
 #
@@ -141,6 +144,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/validators/schema/Makefile.in b/src/xercesc/validators/schema/Makefile.in
index 6a999deea88ef486fb625f85f5e6936c748a5111..ce91ca8fefdf9e2381fdea5e83f5a8fac5c11cb0 100644
--- a/src/xercesc/validators/schema/Makefile.in
+++ b/src/xercesc/validators/schema/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.10  2004/07/09 16:32:08  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.9  2003/06/20 21:56:07  peiyongz
 # Stateless Grammar Pool :: Part I
 #
@@ -142,6 +145,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/src/xercesc/validators/schema/identity/Makefile.in b/src/xercesc/validators/schema/identity/Makefile.in
index 84531969ae6544bbb36376790b3329ca979f12e2..a5f8507e8d8a659482a50b8e4e126fc3ab07966f 100644
--- a/src/xercesc/validators/schema/identity/Makefile.in
+++ b/src/xercesc/validators/schema/identity/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.5  2004/07/09 16:32:27  peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
 # Revision 1.4  2004/04/13 16:41:17  peiyongz
 # IdentityConstraintHandler
 #
@@ -75,6 +78,7 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/DOM/DOMMemTest/Makefile.in b/tests/DOM/DOMMemTest/Makefile.in
index 46fa4cf57ece0b3023f9c18f77401e1f68899049..7c46dcd5f81fd0038bc599fe6622e653c226aa2c 100644
--- a/tests/DOM/DOMMemTest/Makefile.in
+++ b/tests/DOM/DOMMemTest/Makefile.in
@@ -70,6 +70,7 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/DOM/DOMTest/Makefile.in b/tests/DOM/DOMTest/Makefile.in
index db3bd40b767b4401c2352e306b8baf188b03ed39..6160185b653e4bfe25b3ccd56d54492829b6e7d2 100644
--- a/tests/DOM/DOMTest/Makefile.in
+++ b/tests/DOM/DOMTest/Makefile.in
@@ -70,6 +70,7 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/DOM/DeprecatedDOMCount/Makefile.in b/tests/DOM/DeprecatedDOMCount/Makefile.in
index d652f5f7ce1fa64eb4984afbec45e76e65d90004..5449065a657381a6eefa207a91b685e8f06f3a46 100644
--- a/tests/DOM/DeprecatedDOMCount/Makefile.in
+++ b/tests/DOM/DeprecatedDOMCount/Makefile.in
@@ -70,6 +70,7 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/DOM/Normalizer/Makefile.in b/tests/DOM/Normalizer/Makefile.in
index ce08c697de61388db098402192083c4dbd32f673..ee16d367d845a3e1026d2f8691e7b7c45c682711 100644
--- a/tests/DOM/Normalizer/Makefile.in
+++ b/tests/DOM/Normalizer/Makefile.in
@@ -70,6 +70,7 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/DOM/RangeTest/Makefile.in b/tests/DOM/RangeTest/Makefile.in
index eb8a4e31985a782a6e328f90fb0cd0bbbc67ea25..3ef08192bb6d0a246df9ef221646e65e5e2f2010 100644
--- a/tests/DOM/RangeTest/Makefile.in
+++ b/tests/DOM/RangeTest/Makefile.in
@@ -70,6 +70,7 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/DOM/Traversal/Makefile.in b/tests/DOM/Traversal/Makefile.in
index 91a7be034ecd96ce400991bff4a4a33aef254dcd..b9d8e3385338ae3c5db81d3a4394aff26389d75b 100644
--- a/tests/DOM/Traversal/Makefile.in
+++ b/tests/DOM/Traversal/Makefile.in
@@ -70,6 +70,7 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/DOM/TypeInfo/Makefile.in b/tests/DOM/TypeInfo/Makefile.in
index 32d0b4473ae42e38515a3993a6b945012122d124..1add8df8620ecdd21a53ab5b014e84e68060510c 100644
--- a/tests/DOM/TypeInfo/Makefile.in
+++ b/tests/DOM/TypeInfo/Makefile.in
@@ -70,6 +70,7 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/EncodingTest/Makefile.in b/tests/EncodingTest/Makefile.in
index c7f92962af401956ac357e4b35179998e22d7cf7..a31525d72da5784ca5342a7831019765e01f143f 100644
--- a/tests/EncodingTest/Makefile.in
+++ b/tests/EncodingTest/Makefile.in
@@ -69,6 +69,7 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/InitTermTest/Makefile.in b/tests/InitTermTest/Makefile.in
index 9a7d99e3b9b0650b9e4155c7f982df7c85133d9a..38a6e98e845852ac4ea5372d2676c3ac5a7562b1 100644
--- a/tests/InitTermTest/Makefile.in
+++ b/tests/InitTermTest/Makefile.in
@@ -70,6 +70,7 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7fd993e5c04cc8a342bce00a0ecd148fdc792d23..394f7e46454c5fc1028ab8b5ca513b8600f71118 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -73,6 +73,7 @@ LIB_DIR=${XERCESCROOT}/lib
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/Makefile.incl b/tests/Makefile.incl
index d2dae654c16b8c9411fee19f3c351435799dd616..f09d721bf7bffa994cf4a7faaa06cf43fdda6a22 100644
--- a/tests/Makefile.incl
+++ b/tests/Makefile.incl
@@ -265,10 +265,21 @@ endif
 #================= HP SPECIFIC OPTIONS ===========================
 ifeq (${PLATFORM}, HPUX)
   ifeq (${COMPILER}, aCC)
-    CMP = -c +DAportable $(CXXFLAGS) -D_HP_UX -DHPaCC -w +z
+    ifeq (${CXXVER}, aCC05)
+       CMP = -c +DAportable $(CXXFLAGS) -D_HP_UX -DHPaCC -w +z -mt
+    else
+       CMP = -c +DAportable $(CXXFLAGS) -D_HP_UX -DHPaCC -w +z
+    endif    
+
     CC = aCC
     LINK =  ${CC} -Wl,+s -Wl,+b,. ${LDFLAGS}
-    PLATFORM_LIB_LINK_OPTIONS=-L/opt/aCC/lib -L/usr/ccs/lib -lpthread
+    
+    ifeq (${CXXVER}, aCC05)
+       PLATFORM_LIB_LINK_OPTIONS=-L/opt/aCC/lib -L/usr/ccs/lib -mt
+    else
+       PLATFORM_LIB_LINK_OPTIONS=-L/opt/aCC/lib -L/usr/ccs/lib -lpthread    
+    endif      
+        
     SHLIBSUFFIX=.sl
   else
     ifneq (${DEBUG}, 1)
diff --git a/tests/MemHandlerTest/Makefile.in b/tests/MemHandlerTest/Makefile.in
index 192ae0fa0f6540ab3569e3f1ade7d6dbcb39b1fe..dc0c0f5eb2327adb3bef49fa47bad62bc9342dd9 100755
--- a/tests/MemHandlerTest/Makefile.in
+++ b/tests/MemHandlerTest/Makefile.in
@@ -69,6 +69,7 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/ThreadTest/Makefile.in b/tests/ThreadTest/Makefile.in
index 25f492d80b6de1aab8e156bd6bbe94ecccf34e48..13197bca441040a7d0d3759af54a0482c4744beb 100644
--- a/tests/ThreadTest/Makefile.in
+++ b/tests/ThreadTest/Makefile.in
@@ -69,6 +69,7 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/XSerializerTest/Makefile.in b/tests/XSerializerTest/Makefile.in
index 30d67ae53e794461a61b10c1a960f4c7b15f31e2..525a6d8037d6b81d484fafa5dc28a5c2724db0e8 100644
--- a/tests/XSerializerTest/Makefile.in
+++ b/tests/XSerializerTest/Makefile.in
@@ -69,6 +69,7 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CXXVER = @cxxver@
 GCC = @GCC@
 GXX = @GXX@
 CXXFLAGS = @cxxflags@
diff --git a/tests/configure b/tests/configure
index 836945418a9e3beab4dc5cc7258ad94ecbff9318..6f25ed6b067efb1ed6221ba86f00eac763ab7c8f 100755
--- a/tests/configure
+++ b/tests/configure
@@ -1387,7 +1387,7 @@ esac
 
 compiler=${CXX}
 
-
+cxxver=${CXXVER}
 
 
 # prefix=${prefix}
@@ -1587,6 +1587,7 @@ s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
 s%@platform@%$platform%g
 s%@compiler@%$compiler%g
+s%@cxxver@%$cxxver%g
 s%@GXX@%$GXX%g
 s%@GCC@%$GCC%g
 s%@cxxflags@%$cxxflags%g
diff --git a/tests/configure.in b/tests/configure.in
index 0b541b8d68b976bb154bbe897a7972649a9ebc7f..ebd8edfe4804d61a01e0db03156c70ec0f98a8b0 100644
--- a/tests/configure.in
+++ b/tests/configure.in
@@ -66,6 +66,9 @@ AC_SUBST(compiler)
 AC_SUBST(GXX)
 AC_SUBST(GCC)
 
+cxxver=${CXXVER}
+AC_SUBST(cxxver)
+
 # prefix=${prefix}
 AC_SUBST(prefix)
 
diff --git a/tests/runConfigure b/tests/runConfigure
index 70dd84a931bf5d29fc41ea8cfd4556794714caa8..b2fda4966f24e9c27a795fe9c126cca92cd282e6 100755
--- a/tests/runConfigure
+++ b/tests/runConfigure
@@ -89,7 +89,7 @@ usage()
             [required: no default]"
     echo "       -c <C compiler name> (e.g. gcc, cc, xlc_r, icc or ecc)"
     echo "            [default is make default; cc for gnu make]"
-    echo "       -x <C++ compiler name> (e.g. g++, CC, aCC, xlC_r, icc or ecc)"
+    echo "       -x <C++ compiler name> (e.g. g++, CC, aCC, aCC05, xlC_r, icc or ecc)"
     echo "            [default is make default; g++ for gnu make]"
     echo "       -d (specifies that you want to build debug version) [default: not debug]"
     echo "       -r <thread option> can be 'pthread' or 'dce'
@@ -401,8 +401,18 @@ if test $bitsToBuild = 64; then
               bitstobuildDefines=" $bitstobuildDefines -q64 -qwarn64 "
               bitstobuildLink=" -q64 -qwarn64 " ;;
            hp-11)
-              bitstobuildDefines=" $bitstobuildDefines +DA2.0W "
-              bitstobuildLink=" +DA2.0W " ;;
+               if test $cppcompiler; then
+                   case $cppcompiler in
+                       aCC)
+                          bitstobuildDefines=" $bitstobuildDefines +DA2.0W "
+                          bitstobuildLink=" +DA2.0W " ;;     
+                       aCC05)
+                          bitstobuildDefines=" $bitstobuildDefines +DD64 "
+                          bitstobuildLink=" +DD64 " ;;
+                       *)
+                       ;;
+                   esac
+               fi ;;              
            linux)
               bitstobuildDefines=" $bitstobuildDefines " ;;
            *)
@@ -460,8 +470,13 @@ fi
 #
 case $cppcompiler in
    xlC* | xlc* | g++ | c++ | cc | CC | aCC | icc | ICC | cxx | ecc)
+   CXX="$cppcompiler"
       ;;
 
+   aCC05)
+      CXX="aCC"
+      CXXVER="aCC05"
+      ;;
    '')
    	  echo "C++ compiler not specified...we'll assume that configure will find it..."
    	  ;;
@@ -474,9 +489,10 @@ esac
 CC="$ccompiler"
 export CC
 
-CXX="$cppcompiler"
 export CXX
 
+export CXXVER
+
 #
 # Set the extra C and C++ compiler flags
 #
@@ -525,6 +541,7 @@ echo export THREADS=\"$THREADS\"
 echo export BITSTOBUILD=\"$BITSTOBUILD\"
 echo export CC=\"$CC\"
 echo export CXX=\"$CXX\"
+echo export CXXVER=\"$CXXVER\"
 echo export CXXFLAGS=\"$CXXFLAGS\"
 echo export CFLAGS=\"$CFLAGS\"
 echo export LDFLAGS=\"$LDFLAGS\"