diff --git a/src/xercesc/Makefile.in b/src/xercesc/Makefile.in
index 57dc3bc528314f669ea770f63032befcef724092..841026d71e45381184d9bb251b41666b981aa195 100644
--- a/src/xercesc/Makefile.in
+++ b/src/xercesc/Makefile.in
@@ -96,6 +96,9 @@ PREFIX = @prefix@
MESSAGELOADER=@messageloader@
TRANSCODER=@transcoder@
+GCC = @GCC@
+GXX = @GXX@
+
PRODUCTNAME=xerces
PRODUCTVERSION=${VER}
BINTARGETDIR=${HOME}/${PRODUCTNAME}-c-${PLATFORM}-${CXX}-${PRODUCTVERSION}
diff --git a/src/xercesc/Makefile.incl b/src/xercesc/Makefile.incl
index 4da66b53c4695380ff1bd7f7230f705f10ef5cbf..510fd2623ceb6bcca7afed7223772216d0f1b3a3 100644
--- a/src/xercesc/Makefile.incl
+++ b/src/xercesc/Makefile.incl
@@ -112,7 +112,7 @@ LD_SONAME =
#=============== SOLARIS SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, SOLARIS)
- ifeq (${CXX}, g++)
+ ifeq (${GXX}, yes)
PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
@@ -141,7 +141,7 @@ endif
#=============== UNIXWARE SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, UNIXWARE)
- ifeq (${CXX}, g++)
+ ifeq (${GXX}, yes)
PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
@@ -170,7 +170,7 @@ endif
#=============== OPENSERVER SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, OPENSERVER)
- ifeq (${CXX}, g++)
+ ifeq (${GXX}, yes)
COMMON_COMPILE_OPTIONS = -D${PLATFORM} -fPIC
ifeq (${THREADS}, none)
PLATFORM_COMPILE_OPTIONS = ${COMMON_COMPILE_OPTIONS}
@@ -423,7 +423,7 @@ endif
ifeq (${PLATFORM}, TRU64)
SHLIBSUFFIX=.so
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
- ifeq (${CXX}, g++)
+ ifeq (${GXX}, yes)
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT
ifeq (${TRANSCODER}, ICU)
diff --git a/src/xercesc/configure b/src/xercesc/configure
index c20946c3de03d72c8e2bdd834ee7e3b969bfc0e2..fd328a9a284fd8b1c592682b7a4e3fb0085648a3 100755
--- a/src/xercesc/configure
+++ b/src/xercesc/configure
@@ -1527,7 +1527,9 @@ s%@host_vendor@%$host_vendor%g
s%@host_os@%$host_os%g
s%@platform@%$platform%g
s%@cxx@%$cxx%g
+s%@GXX@%$GXX%g
s%@cc@%$cc%g
+s%@GCC@%$GCC%g
s%@prefix_include@%$prefix_include%g
s%@osver@%$osver%g
s%@cxxflags@%$cxxflags%g
diff --git a/src/xercesc/configure.in b/src/xercesc/configure.in
index 78c69ae38907c9c56eee5697717c27d7c877f87b..0fc858ef070207323a2e2c46e09b6373541e0a4e 100644
--- a/src/xercesc/configure.in
+++ b/src/xercesc/configure.in
@@ -60,9 +60,11 @@ AC_SUBST(platform)
cxx=${CXX}
AC_SUBST(cxx)
+AC_SUBST(GXX)
cc=${CC}
AC_SUBST(cc)
+AC_SUBST(GCC)
AC_SUBST(prefix)
prefix_include='${PREFIX}/include/xercesc'
diff --git a/src/xercesc/dom/Makefile.in b/src/xercesc/dom/Makefile.in
index 81e1dcf33f0571f6cffe58bdf36b392560c27b55..842672839c4ad6b84c2372c8eb41f002127d66a1 100644
--- a/src/xercesc/dom/Makefile.in
+++ b/src/xercesc/dom/Makefile.in
@@ -60,6 +60,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/dom/deprecated/Makefile.in b/src/xercesc/dom/deprecated/Makefile.in
index dc8a7162c1e551cbd455f8e7e3a5cf5f1132c890..aa218bc562e64be6f51eaba507a8a935cc28abb1 100644
--- a/src/xercesc/dom/deprecated/Makefile.in
+++ b/src/xercesc/dom/deprecated/Makefile.in
@@ -60,6 +60,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/dom/impl/Makefile.in b/src/xercesc/dom/impl/Makefile.in
index e515d89495db59ba95543fdbafc3527b3f79a04a..db224b803e160fa3dd22a2c6884956acd5d22c56 100644
--- a/src/xercesc/dom/impl/Makefile.in
+++ b/src/xercesc/dom/impl/Makefile.in
@@ -60,6 +60,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/framework/Makefile.in b/src/xercesc/framework/Makefile.in
index 092f3c67e40159cf2b4113f35bf16505330014bd..fbf99d128d6fb41db3c8dcd11b0c58cab4dcfb91 100644
--- a/src/xercesc/framework/Makefile.in
+++ b/src/xercesc/framework/Makefile.in
@@ -55,6 +55,9 @@
#
#
# $Log$
+# Revision 1.6 2002/07/26 16:49:27 tng
+# [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'. Patch from Jonathan Lennox.
+#
# Revision 1.5 2002/06/19 21:59:26 peiyongz
# DOM3:DOMSave Interface support: LocalFileFormatTarget
#
@@ -118,6 +121,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/internal/Makefile.in b/src/xercesc/internal/Makefile.in
index 51bb08493459ce8e724bdf798998f02ca4a0ff1f..32feb2e634109e2d7ee0e07b39949227819bed20 100644
--- a/src/xercesc/internal/Makefile.in
+++ b/src/xercesc/internal/Makefile.in
@@ -60,6 +60,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/parsers/Makefile.in b/src/xercesc/parsers/Makefile.in
index 3520de8568acaaa7b29915df5ede7c646a577df9..a2a96be3bd3689ef90aa049476458d3c49375515 100644
--- a/src/xercesc/parsers/Makefile.in
+++ b/src/xercesc/parsers/Makefile.in
@@ -60,6 +60,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/sax/Makefile.in b/src/xercesc/sax/Makefile.in
index 041878a2f970a3c59fcdbc5fa85ac422b959fd93..1b4243c5b7ea2470782c8e725c81e4220df9d2e2 100644
--- a/src/xercesc/sax/Makefile.in
+++ b/src/xercesc/sax/Makefile.in
@@ -60,6 +60,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/sax2/Makefile.in b/src/xercesc/sax2/Makefile.in
index 28525a7ad8bdaf32741bcdd6565e37afb0b922ca..963044199c19df947af5217bf3d54c138f859e2b 100644
--- a/src/xercesc/sax2/Makefile.in
+++ b/src/xercesc/sax2/Makefile.in
@@ -60,6 +60,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Compilers/Makefile.in b/src/xercesc/util/Compilers/Makefile.in
index c25ae5236edaab1a9b959235cb3a1051c2d56b29..9ef3d7435fa979dc502a29f8e9eda2b6553a24c1 100644
--- a/src/xercesc/util/Compilers/Makefile.in
+++ b/src/xercesc/util/Compilers/Makefile.in
@@ -60,6 +60,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
@@ -113,7 +115,7 @@ endif
ifeq (xlC,$(findstring xlC,${CXX}))
CPP_OBJECTS = CSetDefs.$(TO)
endif
-ifeq (${CXX},g++)
+ifeq (${GXX},yes)
CPP_OBJECTS = GCCDefs.$(TO)
endif
ifeq (${CXX},ecc)
diff --git a/src/xercesc/util/Makefile.in b/src/xercesc/util/Makefile.in
index fe352ab8d10f0c0c0741b41e384035f149b287d2..1836f179ad72a218609f72cb63817cce60de09d7 100644
--- a/src/xercesc/util/Makefile.in
+++ b/src/xercesc/util/Makefile.in
@@ -55,6 +55,9 @@
#
#
# $Log$
+# Revision 1.11 2002/07/26 16:49:27 tng
+# [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'. Patch from Jonathan Lennox.
+#
# Revision 1.10 2002/07/18 21:57:27 knoaman
# Makefile update.
#
@@ -281,6 +284,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/MsgLoaders/ICU/Makefile.in b/src/xercesc/util/MsgLoaders/ICU/Makefile.in
index 3a8ba63b7ecebf9b9e925356738d333048c4ae47..7198510ea412322c865d231780294b5d9c05edef 100644
--- a/src/xercesc/util/MsgLoaders/ICU/Makefile.in
+++ b/src/xercesc/util/MsgLoaders/ICU/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:19 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:19 peiyongz
+# sane_include
#
# Revision 1.7 2001/07/06 17:11:59 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -94,6 +97,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/MsgLoaders/InMemory/Makefile.in b/src/xercesc/util/MsgLoaders/InMemory/Makefile.in
index 02ba3a0b10c1c2d599fe2fafa3f4216e54e3a6ac..62e8cfad423963ea03f239a6dfe194720581adbc 100644
--- a/src/xercesc/util/MsgLoaders/InMemory/Makefile.in
+++ b/src/xercesc/util/MsgLoaders/InMemory/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:21 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:21 peiyongz
+# sane_include
#
# Revision 1.7 2001/07/06 17:11:59 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -94,6 +97,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in b/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
index b18438583246225c78bbb520d8d78ced6a10a4dc..418a3db89c0acc9437450ea9df88ff65b656c7c4 100644
--- a/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:21 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:21 peiyongz
+# sane_include
#
# Revision 1.7 2001/07/06 17:12:00 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -94,6 +97,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/MsgLoaders/MsgFile/Makefile.in b/src/xercesc/util/MsgLoaders/MsgFile/Makefile.in
index 84bfeec4e7855a228898a47ec1d9e4e228695e8b..df3facadea5a84a1fbab5ab3628a4b2a50937b63 100644
--- a/src/xercesc/util/MsgLoaders/MsgFile/Makefile.in
+++ b/src/xercesc/util/MsgLoaders/MsgFile/Makefile.in
@@ -57,6 +57,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
PREFIX = @prefix@
THREADS = @threads@
PREFIX_INCLUDE = @prefix_include@
diff --git a/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in b/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in
index c8406347a6ede51de7fba58b986ec642ae34641e..c8e124b1bb60ca5e93891214f113f42707dc5ce4 100644
--- a/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in
+++ b/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:23 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:23 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:00 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -66,6 +69,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in b/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in
index 0f8d00320f1d8cdec53239f485a96e085efcb82d..0b129a4566e59bfdd1a9a1a2ddc094e95dac0cae 100644
--- a/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in
+++ b/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in
@@ -55,6 +55,9 @@
#
#
# $Log$
+# 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.
+#
# Revision 1.1 2002/02/18 05:50:42 jberry
# Create new NetAccessor class for Mac OS that doesn't rely on Carbon
# APIs, but only on CoreServices APIs, and thus can be run from a
@@ -65,6 +68,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/NetAccessors/Socket/Makefile.in b/src/xercesc/util/NetAccessors/Socket/Makefile.in
index 65d022bba6daa0c8a33bc5cbc61c26995c61896b..ac7b19c581d3c06fef5350cddcfd84f31d59956c 100644
--- a/src/xercesc/util/NetAccessors/Socket/Makefile.in
+++ b/src/xercesc/util/NetAccessors/Socket/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:23 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:23 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:01 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -78,6 +81,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/NetAccessors/libWWW/Makefile.in b/src/xercesc/util/NetAccessors/libWWW/Makefile.in
index 7f196bb30729951da127b9638ed25903da6e1898..4436fe38c736964908932de757e306fe4136e751 100644
--- a/src/xercesc/util/NetAccessors/libWWW/Makefile.in
+++ b/src/xercesc/util/NetAccessors/libWWW/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:23 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:23 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:01 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -85,6 +88,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/AIX/Makefile.in b/src/xercesc/util/Platforms/AIX/Makefile.in
index 52f3f3748f20d64409b26dd51723e00c4c27aeba..06fd2187305781b1efcf9031fff9f04cfd4d25f5 100644
--- a/src/xercesc/util/Platforms/AIX/Makefile.in
+++ b/src/xercesc/util/Platforms/AIX/Makefile.in
@@ -54,8 +54,11 @@
# <http://www.apache.org/>.
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:23 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:23 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:02 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -71,6 +74,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/FreeBSD/Makefile.in b/src/xercesc/util/Platforms/FreeBSD/Makefile.in
index 14251c2daaf0b034d792f280d23dd7b26b8bcd3f..f49afb1419dcaa9300c9a4b33c0dfe4303252f21 100644
--- a/src/xercesc/util/Platforms/FreeBSD/Makefile.in
+++ b/src/xercesc/util/Platforms/FreeBSD/Makefile.in
@@ -54,8 +54,11 @@
# <http://www.apache.org/>.
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:24 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:24 peiyongz
+# sane_include
#
# Revision 1.1 2001/11/29 18:25:18 tng
# FreeBSD support by Michael Huedepohl.
@@ -65,6 +68,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/HPUX/Makefile.in b/src/xercesc/util/Platforms/HPUX/Makefile.in
index fae7cb96405bcf6277929de38e6db9e4e936b87e..0b8330cd69c96c7b94e7b8be7277bee3605eb8d1 100644
--- a/src/xercesc/util/Platforms/HPUX/Makefile.in
+++ b/src/xercesc/util/Platforms/HPUX/Makefile.in
@@ -54,8 +54,11 @@
# <http://www.apache.org/>.
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:24 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:24 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:03 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -71,6 +74,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/IRIX/Makefile.in b/src/xercesc/util/Platforms/IRIX/Makefile.in
index c50ffc7542d0a059542bebdc0a3c02a48ced1e22..3a47267e02351c0141019cab36c4ca5308e0f7c7 100644
--- a/src/xercesc/util/Platforms/IRIX/Makefile.in
+++ b/src/xercesc/util/Platforms/IRIX/Makefile.in
@@ -54,8 +54,11 @@
# <http://www.apache.org/>.
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:24 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:24 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:04 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -71,6 +74,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/Linux/Makefile.in b/src/xercesc/util/Platforms/Linux/Makefile.in
index bb17487ae8565992563bcfe0d7e0b0f66c7e784b..5b1822ba5807fbac6be0361624c0244d11dc5834 100644
--- a/src/xercesc/util/Platforms/Linux/Makefile.in
+++ b/src/xercesc/util/Platforms/Linux/Makefile.in
@@ -54,8 +54,11 @@
# <http://www.apache.org/>.
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:24 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:24 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:05 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -71,6 +74,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/MacOS/Makefile.in b/src/xercesc/util/Platforms/MacOS/Makefile.in
index 7e744d6b7948a6ad94ceb3c04b160729ced34153..cdffbbcd8a69ef319f93dd284d0578ae8686bdc5 100644
--- a/src/xercesc/util/Platforms/MacOS/Makefile.in
+++ b/src/xercesc/util/Platforms/MacOS/Makefile.in
@@ -59,6 +59,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/Makefile.in b/src/xercesc/util/Platforms/Makefile.in
index 0bbfa9d76e13b0e883e6e24162d927ae2f3c6d80..abb5dec725acb0ae1c5fc39e15ef9286cff05c76 100644
--- a/src/xercesc/util/Platforms/Makefile.in
+++ b/src/xercesc/util/Platforms/Makefile.in
@@ -55,6 +55,9 @@
#
#
# $Log$
+# Revision 1.4 2002/07/26 16:49:28 tng
+# [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'. Patch from Jonathan Lennox.
+#
# Revision 1.3 2002/02/27 22:38:42 peiyongz
# Bug# 6445 Caldera (SCO) OpenServer Port : patch from Martin Kalen
#
@@ -122,6 +125,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/OS390/Makefile.in b/src/xercesc/util/Platforms/OS390/Makefile.in
index 543f757ed48363856b530c32e47fa1acbc72f3fe..960e48681b9eb6fbb077a8c6594d8b1998008f01 100644
--- a/src/xercesc/util/Platforms/OS390/Makefile.in
+++ b/src/xercesc/util/Platforms/OS390/Makefile.in
@@ -54,8 +54,11 @@
# <http://www.apache.org/>.
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:25 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:25 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:06 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -71,6 +74,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/OS400/Makefile.in b/src/xercesc/util/Platforms/OS400/Makefile.in
index 5c4949030bae4074653391961dee6e088ff0fb22..347fde85ad96f0f7c2a8d1a6b3ee8c735d44a491 100644
--- a/src/xercesc/util/Platforms/OS400/Makefile.in
+++ b/src/xercesc/util/Platforms/OS400/Makefile.in
@@ -54,8 +54,11 @@
# <http://www.apache.org/>.
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:25 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:25 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:07 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -71,6 +74,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/OpenServer/Makefile.in b/src/xercesc/util/Platforms/OpenServer/Makefile.in
index 5b8e6e53762e1e5f90255215b520ae5fac556534..9d64a4f2773da52de6e0ddcc1ba701854605ef51 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.2 2002/07/26 16:49:28 tng
+# [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'. Patch from Jonathan Lennox.
+#
# Revision 1.1 2002/02/27 22:57:59 peiyongz
# Bug# 6445 Caldera (SCO) OpenServer Port : patch from Martin Kalen
#
@@ -62,6 +65,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/PTX/Makefile.in b/src/xercesc/util/Platforms/PTX/Makefile.in
index 91c7a5babdd644cd47adac11924b3e59de969245..e2d7a4b910b1d67d2e06d94ba042dd5349e9e1ae 100644
--- a/src/xercesc/util/Platforms/PTX/Makefile.in
+++ b/src/xercesc/util/Platforms/PTX/Makefile.in
@@ -54,8 +54,11 @@
# <http://www.apache.org/>.
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:25 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:25 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:07 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -71,6 +74,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/Solaris/Makefile.in b/src/xercesc/util/Platforms/Solaris/Makefile.in
index 2ec0e501f75e2e82bd213ab484614da95d3a75d5..fa6868aabeaed63f639622cc481eeb7f3a98c28d 100644
--- a/src/xercesc/util/Platforms/Solaris/Makefile.in
+++ b/src/xercesc/util/Platforms/Solaris/Makefile.in
@@ -54,8 +54,11 @@
# <http://www.apache.org/>.
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:25 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:25 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:07 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -71,6 +74,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/Tru64/Makefile.in b/src/xercesc/util/Platforms/Tru64/Makefile.in
index 3c766d50dc5fbff2c9a811713633dcc79ba7a19f..518152db7a814a1e92ea516297361664bec759cf 100644
--- a/src/xercesc/util/Platforms/Tru64/Makefile.in
+++ b/src/xercesc/util/Platforms/Tru64/Makefile.in
@@ -59,6 +59,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Platforms/UnixWare/Makefile.in b/src/xercesc/util/Platforms/UnixWare/Makefile.in
index 401d927e584e17ea5e13dd37a788947ecb169dc3..b8d0257dd93ab203b75fbd5dcc7f5f22f42286b5 100644
--- a/src/xercesc/util/Platforms/UnixWare/Makefile.in
+++ b/src/xercesc/util/Platforms/UnixWare/Makefile.in
@@ -54,8 +54,11 @@
# <http://www.apache.org/>.
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:26 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:26 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:08 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -71,6 +74,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Transcoders/ICU/Makefile.in b/src/xercesc/util/Transcoders/ICU/Makefile.in
index 953e9c347c97604ffa47e7f796dacd227e60dddd..72df285b5dc5a8fff69d2ec934ee191439e6b04b 100644
--- a/src/xercesc/util/Transcoders/ICU/Makefile.in
+++ b/src/xercesc/util/Transcoders/ICU/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:36 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+# sane_include
#
# Revision 1.7 2001/07/06 17:12:08 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -94,6 +97,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Transcoders/Iconv/Makefile.in b/src/xercesc/util/Transcoders/Iconv/Makefile.in
index 543efa3bac3a381152ce9a91960b52a569981bd0..ab8d3e92273be910b634402f51ef9ff7e7040f38 100644
--- a/src/xercesc/util/Transcoders/Iconv/Makefile.in
+++ b/src/xercesc/util/Transcoders/Iconv/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:36 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+# sane_include
#
# Revision 1.7 2001/07/06 17:12:08 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -94,6 +97,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Transcoders/Iconv390/Makefile.in b/src/xercesc/util/Transcoders/Iconv390/Makefile.in
index ca0851bfb752027fd2bbc6fa1a90b88618e1c8ae..645e7bcf20f856bdbad98288a3fe99743d81eb5a 100644
--- a/src/xercesc/util/Transcoders/Iconv390/Makefile.in
+++ b/src/xercesc/util/Transcoders/Iconv390/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:36 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:08 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -72,6 +75,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Transcoders/Iconv400/Makefile.in b/src/xercesc/util/Transcoders/Iconv400/Makefile.in
index e06a8194c14130f48928abe4a0e07b22df7b1c27..e1ee8d50a2e72092baa170a39223e4ea92cedc66 100644
--- a/src/xercesc/util/Transcoders/Iconv400/Makefile.in
+++ b/src/xercesc/util/Transcoders/Iconv400/Makefile.in
@@ -57,8 +57,11 @@
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:36 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:09 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -73,6 +76,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+CC = @GCC@
+CXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in b/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in
index 340abb5f059ffa31a720a2cf0bedfbd6d145bd70..faddd14a5749f1e79ed97e902274dfb8dcdcc7c4 100644
--- a/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in
+++ b/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:36 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+# sane_include
#
# Revision 1.1 2001/12/03 14:45:11 tng
# FreeBSD native transcoder (IconvFBSD) added by Max Gotlib.
@@ -66,6 +69,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in
index 8434d72eb71ff616e936d4746c5581c0dad82dfc..a42ddd869638cd579258aecbab2f8c1a22285ad3 100644
--- a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in
+++ b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:37 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+# sane_include
#
# Revision 1.3 2001/07/06 17:12:09 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -97,6 +100,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/util/regx/Makefile.in b/src/xercesc/util/regx/Makefile.in
index 3051316df003f6d135d3d461f0e8062fcc07dc11..26b107ba66c07ab844918289fe5aa53e01a604c4 100644
--- a/src/xercesc/util/regx/Makefile.in
+++ b/src/xercesc/util/regx/Makefile.in
@@ -56,8 +56,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:29 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:29 peiyongz
+# sane_include
#
# Revision 1.5 2001/07/06 17:12:09 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -93,6 +96,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/validators/DTD/Makefile.in b/src/xercesc/validators/DTD/Makefile.in
index 80aca6810be8bdfb02386c3c88e65a185e6583a1..db5ce0d08aab6b2a1db401ffb599cfcdf5115acc 100644
--- a/src/xercesc/validators/DTD/Makefile.in
+++ b/src/xercesc/validators/DTD/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:45 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:45 peiyongz
+# sane_include
#
# Revision 1.11 2001/07/06 17:12:10 tng
# Automatic build of single-threaded library. By Martin Kalen.
@@ -107,6 +110,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/validators/Makefile.in b/src/xercesc/validators/Makefile.in
index 0aee230242e3686111286a61bbf3c3a2fc1adbe8..554c0cfda3b1ec87c3e75bfe8c77554a1da042b7 100644
--- a/src/xercesc/validators/Makefile.in
+++ b/src/xercesc/validators/Makefile.in
@@ -55,6 +55,9 @@
#
#
# $Log$
+# Revision 1.3 2002/07/26 16:49:29 tng
+# [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'. Patch from Jonathan Lennox.
+#
# Revision 1.2 2002/02/11 18:19:19 tng
# [Bug 2715] Build recursion suppresses make failures.
#
@@ -85,6 +88,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/validators/common/Makefile.in b/src/xercesc/validators/common/Makefile.in
index 9b2be94ece7928c9b88a7630a61068508b7c1444..5a253eba258945f59b34ad5f6acca1004f0c8de0 100644
--- a/src/xercesc/validators/common/Makefile.in
+++ b/src/xercesc/validators/common/Makefile.in
@@ -54,8 +54,11 @@
# <http://www.apache.org/>.
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:39 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:39 peiyongz
+# sane_include
#
# Revision 1.7 2001/08/24 12:48:48 tng
# Schema: AllContentModel
@@ -84,6 +87,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/validators/datatype/Makefile.in b/src/xercesc/validators/datatype/Makefile.in
index 1e81da23f5a754d0d9975e08757b527d203cacb5..4843f1d2b1c20ccdb6d6484745a5db8013488b9e 100644
--- a/src/xercesc/validators/datatype/Makefile.in
+++ b/src/xercesc/validators/datatype/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:42 peiyongz
-# Initial revision
+# 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.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+# sane_include
#
# Revision 1.22 2001/11/07 19:18:52 peiyongz
# DateTime Port
@@ -132,6 +135,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/validators/schema/Makefile.in b/src/xercesc/validators/schema/Makefile.in
index 1f7804b0ab49a28e7cb969ca5138c6435e49721b..99b9756c2bfac8cb4fc10e01291fd504139fb0db 100644
--- a/src/xercesc/validators/schema/Makefile.in
+++ b/src/xercesc/validators/schema/Makefile.in
@@ -55,6 +55,9 @@
#
#
# $Log$
+# Revision 1.5 2002/07/26 16:49:29 tng
+# [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'. Patch from Jonathan Lennox.
+#
# Revision 1.4 2002/05/21 19:33:44 tng
# DOM Reorganization: rename XSDIDOMParser to XSDDOMParser
#
@@ -127,6 +130,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
diff --git a/src/xercesc/validators/schema/identity/Makefile.in b/src/xercesc/validators/schema/identity/Makefile.in
index 5c05353ee50c115d802970413d39c6e4410c4c4c..894b027687177ece7ce092def782d91735002c1e 100644
--- a/src/xercesc/validators/schema/identity/Makefile.in
+++ b/src/xercesc/validators/schema/identity/Makefile.in
@@ -55,8 +55,11 @@
#
#
# $Log$
-# Revision 1.1 2002/02/01 22:22:51 peiyongz
-# Initial revision
+# Revision 1.2 2002/07/26 16:49:30 tng
+# [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'. Patch from Jonathan Lennox.
+#
+# Revision 1.1.1.1 2002/02/01 22:22:51 peiyongz
+# sane_include
#
# Revision 1.1 2001/11/02 14:08:40 knoaman
# Add support for identity constraints.
@@ -66,6 +69,8 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@