diff --git a/obj/Makefile.in b/obj/Makefile.in
index b08b7b6af51797dc0fa93035304e840bf29ae25f..aff160520b5ae44fabd32741c1cb761293f4d321 100644
--- a/obj/Makefile.in
+++ b/obj/Makefile.in
@@ -70,6 +70,7 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
PREFIX = @prefix@
diff --git a/samples/CreateDOMDocument/Makefile.in b/samples/CreateDOMDocument/Makefile.in
index d0171b8de0fbe7b5937488e39b8bcefedc32ddec..5f50ec90397c623b948256ec716c9fa5e5f2ca6c 100644
--- a/samples/CreateDOMDocument/Makefile.in
+++ b/samples/CreateDOMDocument/Makefile.in
@@ -69,6 +69,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/DOMCount/Makefile.in b/samples/DOMCount/Makefile.in
index 8e8a3c243138035dbdcfcd265eb70da70d5a6964..209e461d1c32bf2189dae9c0d60cfc402c1fa1e0 100644
--- a/samples/DOMCount/Makefile.in
+++ b/samples/DOMCount/Makefile.in
@@ -69,6 +69,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/DOMPrint/Makefile.in b/samples/DOMPrint/Makefile.in
index 3ad24083001ee4b6a4a4ea89387068c845e436b1..030c9b413d6995f60f342ea4a333938ed2198518 100644
--- a/samples/DOMPrint/Makefile.in
+++ b/samples/DOMPrint/Makefile.in
@@ -70,6 +70,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/EnumVal/Makefile.in b/samples/EnumVal/Makefile.in
index 6ee699fed3a7871b3f405058c90b5c49d62d290b..bababaf04ec054df93c4236220c4501b783ce65b 100644
--- a/samples/EnumVal/Makefile.in
+++ b/samples/EnumVal/Makefile.in
@@ -68,6 +68,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/Makefile.in b/samples/Makefile.in
index 1a848f54eb35885796c0a691fa5a6444612bf576..77d144ea47feaf07c2f0d146091a31599ed7a60c 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -77,6 +77,7 @@ LIB_DIR=${XERCESCROOT}/lib
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/Makefile.incl b/samples/Makefile.incl
index 1af53dd353849065fd5b18d201db08abf9f1b16e..33cbbc7e64f0ef97a92863afcb4568c8066fe3bb 100644
--- a/samples/Makefile.incl
+++ b/samples/Makefile.incl
@@ -267,10 +267,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/samples/MemParse/Makefile.in b/samples/MemParse/Makefile.in
index 7a85753a6f1d46fdba9f4590b8e2e04781c3b88a..5e409c1300681f6dd179c615b99119b5f688607c 100644
--- a/samples/MemParse/Makefile.in
+++ b/samples/MemParse/Makefile.in
@@ -69,6 +69,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/PParse/Makefile.in b/samples/PParse/Makefile.in
index af04ad41b7134c3e5913d0f635672dd0a03b6c14..2fe75be85b43f2cfaf79a6c9e4c9c712ee4252fe 100644
--- a/samples/PParse/Makefile.in
+++ b/samples/PParse/Makefile.in
@@ -69,6 +69,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/PSVIWriter/Makefile.in b/samples/PSVIWriter/Makefile.in
index e8318f6aa41de1bf2bdc189d59a15e0eceac39ab..e444787cd2155fe9a6e6c964abb70a378067b6a8 100644
--- a/samples/PSVIWriter/Makefile.in
+++ b/samples/PSVIWriter/Makefile.in
@@ -69,6 +69,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/Redirect/Makefile.in b/samples/Redirect/Makefile.in
index 232026cf8e24d9dbdd1e1ebe9f7e3d600a421c4a..9d04052c6e6de8c3e5564f90c5a72fed79c6fcb3 100644
--- a/samples/Redirect/Makefile.in
+++ b/samples/Redirect/Makefile.in
@@ -69,6 +69,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/SAX2Count/Makefile.in b/samples/SAX2Count/Makefile.in
index 5c667623fe5ee58bf450ea9a4a91ae25e999592b..cdc6adb8b037d7da44bd91bf6073bbcd6b27660e 100644
--- a/samples/SAX2Count/Makefile.in
+++ b/samples/SAX2Count/Makefile.in
@@ -69,6 +69,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/SAX2Print/Makefile.in b/samples/SAX2Print/Makefile.in
index 2f6ad48307a70d730b56afb9fbbdc8a838cefca3..33d89bff2f3bc42d0ae3b1bad2dd9afd9b69f8a4 100644
--- a/samples/SAX2Print/Makefile.in
+++ b/samples/SAX2Print/Makefile.in
@@ -69,6 +69,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/SAXCount/Makefile.in b/samples/SAXCount/Makefile.in
index e0fd5c4b740571226e11cdd582d33442a460abc2..2c6b41857194524ce7f5080bd71c44725cad5bf1 100644
--- a/samples/SAXCount/Makefile.in
+++ b/samples/SAXCount/Makefile.in
@@ -69,6 +69,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/SAXPrint/Makefile.in b/samples/SAXPrint/Makefile.in
index 534b6babc78e25936d90e346287f15c79e8f13f0..d0520eaa5a320c1157a1261d084f8fdbaa814f31 100644
--- a/samples/SAXPrint/Makefile.in
+++ b/samples/SAXPrint/Makefile.in
@@ -69,6 +69,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/SCMPrint/Makefile.in b/samples/SCMPrint/Makefile.in
index ee5cd2868d94061060db7a02190a35fd31c7d1aa..59220c2d73913eab4adc0355f772c9dd87358cc1 100644
--- a/samples/SCMPrint/Makefile.in
+++ b/samples/SCMPrint/Makefile.in
@@ -69,6 +69,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/SEnumVal/Makefile.in b/samples/SEnumVal/Makefile.in
index 3e62e1a5efd8333ea114d05bbc41dab859ca4833..d870b26cf653996c42925974109244ff4e5a978c 100644
--- a/samples/SEnumVal/Makefile.in
+++ b/samples/SEnumVal/Makefile.in
@@ -55,6 +55,9 @@
#
# $Id$
# $Log$
+# Revision 1.8 2004/07/09 15:54:38 peiyongz
+# Build on HP-Itanium, aCC A.05.52
+#
# Revision 1.7 2003/07/28 20:02:41 neilg
# fix to permit the samples source to be copied from a non-writable to a writable part of the filesystem, then compiled. Binaries will also be dropped in a writable directory. This should make experimentation easier on multi-user systems. Patch by Steve Dulin
#
@@ -87,6 +90,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/StdInParse/Makefile.in b/samples/StdInParse/Makefile.in
index 4a1da0708ea9475590d6577a8a54ba61523427b9..95bd1a5cae30050cd8eaecf97e19fa409491a520 100644
--- a/samples/StdInParse/Makefile.in
+++ b/samples/StdInParse/Makefile.in
@@ -69,6 +69,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
diff --git a/samples/configure b/samples/configure
index 1cc0e64d4399320167993a6bbc8526b6e703743e..8304fa0bc7ae5c242cb2408e4f7b4f3465e8d91d 100755
--- a/samples/configure
+++ b/samples/configure
@@ -1387,7 +1387,7 @@ esac
compiler=${CXX}
-
+cxxver=${CXXVER}
# prefix=${prefix}
@@ -1590,6 +1590,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/samples/configure.in b/samples/configure.in
index f7f3155d7ee85096f49298c5022fa319b6c503c3..3463bb0d373aaf6c727a1fe8b7186bab12c6f4d4 100644
--- a/samples/configure.in
+++ b/samples/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/samples/runConfigure b/samples/runConfigure
index 597b51567a650e52c849fb2348110ea49f30382a..2b7b1ff652f5a4dcace82a63ff121aadf09ee1e4 100755
--- a/samples/runConfigure
+++ b/samples/runConfigure
@@ -90,7 +90,7 @@ platforms"
[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'
@@ -402,8 +402,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 " ;;
*)
@@ -461,8 +471,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..."
;;
@@ -475,9 +490,10 @@ esac
CC="$ccompiler"
export CC
-CXX="$cppcompiler"
export CXX
+export CXXVER
+
#
# Set the extra C and C++ compiler flags
#
@@ -526,6 +542,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\"