peiyongz 2004/07/09 09:33:49
Modified: c/tests runConfigure Makefile.incl Makefile.in configure.in
configure
Log:
Build on HP-Itanium, aCC A.05.52
Revision Changes Path
1.35 +22 -5 xml-xerces/c/tests/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/runConfigure,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- runConfigure 19 May 2004 14:49:15 -0000 1.34
+++ runConfigure 9 Jul 2004 16:33:49 -0000 1.35
@@ -89,7 +89,7 @@
[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 @@
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 @@
#
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 @@
CC="$ccompiler"
export CC
-CXX="$cppcompiler"
export CXX
+export CXXVER
+
#
# Set the extra C and C++ compiler flags
#
@@ -525,6 +541,7 @@
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\"
1.43 +14 -3 xml-xerces/c/tests/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/Makefile.incl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile.incl 17 Mar 2004 21:22:47 -0000 1.42
+++ Makefile.incl 9 Jul 2004 16:33:49 -0000 1.43
@@ -265,10 +265,21 @@
#================= 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)
1.28 +2 -1 xml-xerces/c/tests/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/Makefile.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile.in 12 Dec 2003 21:06:17 -0000 1.27
+++ Makefile.in 9 Jul 2004 16:33:49 -0000 1.28
@@ -73,6 +73,7 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CXXVER = @cxxver@
GCC = @GCC@
GXX = @GXX@
CXXFLAGS = @cxxflags@
1.34 +3 -0 xml-xerces/c/tests/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- configure.in 15 Mar 2004 17:06:06 -0000 1.33
+++ configure.in 9 Jul 2004 16:33:49 -0000 1.34
@@ -66,6 +66,9 @@
AC_SUBST(GXX)
AC_SUBST(GCC)
+cxxver=${CXXVER}
+AC_SUBST(cxxver)
+
# prefix=${prefix}
AC_SUBST(prefix)
1.33 +2 -1 xml-xerces/c/tests/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/configure,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- configure 15 Mar 2004 17:06:06 -0000 1.32
+++ configure 9 Jul 2004 16:33:49 -0000 1.33
@@ -1387,7 +1387,7 @@
compiler=${CXX}
-
+cxxver=${CXXVER}
# prefix=${prefix}
@@ -1587,6 +1587,7 @@
[EMAIL PROTECTED]@%$host_os%g
[EMAIL PROTECTED]@%$platform%g
[EMAIL PROTECTED]@%$compiler%g
[EMAIL PROTECTED]@%$cxxver%g
[EMAIL PROTECTED]@%$GXX%g
[EMAIL PROTECTED]@%$GCC%g
[EMAIL PROTECTED]@%$cxxflags%g
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
