From 698b79e8d57b9ae6e83cfe92fe232a0e68b4b006 Mon Sep 17 00:00:00 2001
From: Tinny Ng <tng@apache.org>
Date: Fri, 26 Jul 2002 16:49:30 +0000
Subject: [PATCH] [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'. 
 Patch from Jonathan Lennox.

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@174064 13f79535-47bb-0310-9956-ffa450edef68
---
 src/xercesc/Makefile.in                                  | 3 +++
 src/xercesc/Makefile.incl                                | 8 ++++----
 src/xercesc/configure                                    | 2 ++
 src/xercesc/configure.in                                 | 2 ++
 src/xercesc/dom/Makefile.in                              | 2 ++
 src/xercesc/dom/deprecated/Makefile.in                   | 2 ++
 src/xercesc/dom/impl/Makefile.in                         | 2 ++
 src/xercesc/framework/Makefile.in                        | 5 +++++
 src/xercesc/internal/Makefile.in                         | 2 ++
 src/xercesc/parsers/Makefile.in                          | 2 ++
 src/xercesc/sax/Makefile.in                              | 2 ++
 src/xercesc/sax2/Makefile.in                             | 2 ++
 src/xercesc/util/Compilers/Makefile.in                   | 4 +++-
 src/xercesc/util/Makefile.in                             | 5 +++++
 src/xercesc/util/MsgLoaders/ICU/Makefile.in              | 9 +++++++--
 src/xercesc/util/MsgLoaders/InMemory/Makefile.in         | 9 +++++++--
 src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in       | 9 +++++++--
 src/xercesc/util/MsgLoaders/MsgFile/Makefile.in          | 2 ++
 src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in | 9 +++++++--
 .../util/NetAccessors/MacOSURLAccessCF/Makefile.in       | 5 +++++
 src/xercesc/util/NetAccessors/Socket/Makefile.in         | 9 +++++++--
 src/xercesc/util/NetAccessors/libWWW/Makefile.in         | 9 +++++++--
 src/xercesc/util/Platforms/AIX/Makefile.in               | 9 +++++++--
 src/xercesc/util/Platforms/FreeBSD/Makefile.in           | 9 +++++++--
 src/xercesc/util/Platforms/HPUX/Makefile.in              | 9 +++++++--
 src/xercesc/util/Platforms/IRIX/Makefile.in              | 9 +++++++--
 src/xercesc/util/Platforms/Linux/Makefile.in             | 9 +++++++--
 src/xercesc/util/Platforms/MacOS/Makefile.in             | 2 ++
 src/xercesc/util/Platforms/Makefile.in                   | 5 +++++
 src/xercesc/util/Platforms/OS390/Makefile.in             | 9 +++++++--
 src/xercesc/util/Platforms/OS400/Makefile.in             | 9 +++++++--
 src/xercesc/util/Platforms/OpenServer/Makefile.in        | 5 +++++
 src/xercesc/util/Platforms/PTX/Makefile.in               | 9 +++++++--
 src/xercesc/util/Platforms/Solaris/Makefile.in           | 9 +++++++--
 src/xercesc/util/Platforms/Tru64/Makefile.in             | 2 ++
 src/xercesc/util/Platforms/UnixWare/Makefile.in          | 9 +++++++--
 src/xercesc/util/Transcoders/ICU/Makefile.in             | 9 +++++++--
 src/xercesc/util/Transcoders/Iconv/Makefile.in           | 9 +++++++--
 src/xercesc/util/Transcoders/Iconv390/Makefile.in        | 9 +++++++--
 src/xercesc/util/Transcoders/Iconv400/Makefile.in        | 9 +++++++--
 src/xercesc/util/Transcoders/IconvFBSD/Makefile.in       | 9 +++++++--
 .../util/Transcoders/MacOSUnicodeConverter/Makefile.in   | 9 +++++++--
 src/xercesc/util/regx/Makefile.in                        | 9 +++++++--
 src/xercesc/validators/DTD/Makefile.in                   | 9 +++++++--
 src/xercesc/validators/Makefile.in                       | 5 +++++
 src/xercesc/validators/common/Makefile.in                | 9 +++++++--
 src/xercesc/validators/datatype/Makefile.in              | 9 +++++++--
 src/xercesc/validators/schema/Makefile.in                | 5 +++++
 src/xercesc/validators/schema/identity/Makefile.in       | 9 +++++++--
 49 files changed, 258 insertions(+), 59 deletions(-)

diff --git a/src/xercesc/Makefile.in b/src/xercesc/Makefile.in
index 57dc3bc52..841026d71 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 4da66b53c..510fd2623 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 c20946c3d..fd328a9a2 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 78c69ae38..0fc858ef0 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 81e1dcf33..842672839 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 dc8a7162c..aa218bc56 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 e515d8949..db224b803 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 092f3c67e..fbf99d128 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 51bb08493..32feb2e63 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 3520de856..a2a96be3b 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 041878a2f..1b4243c5b 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 28525a7ad..963044199 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 c25ae5236..9ef3d7435 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 fe352ab8d..1836f179a 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 3a8ba63b7..7198510ea 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 02ba3a0b1..62e8cfad4 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 b18438583..418a3db89 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 84bfeec4e..df3facade 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 c8406347a..c8e124b1b 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 0f8d00320..0b129a456 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 65d022bba..ac7b19c58 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 7f196bb30..4436fe38c 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 52f3f3748..06fd21873 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 14251c2da..f49afb141 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 fae7cb964..0b8330cd6 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 c50ffc754..3a47267e0 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 bb17487ae..5b1822ba5 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 7e744d6b7..cdffbbcd8 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 0bbfa9d76..abb5dec72 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 543f757ed..960e48681 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 5c4949030..347fde85a 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 5b8e6e537..9d64a4f27 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 91c7a5bab..e2d7a4b91 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 2ec0e501f..fa6868aab 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 3c766d50d..518152db7 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 401d927e5..b8d0257dd 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 953e9c347..72df285b5 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 543efa3ba..ab8d3e922 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 ca0851bfb..645e7bcf2 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 e06a8194c..e1ee8d50a 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 340abb5f0..faddd14a5 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 8434d72eb..a42ddd869 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 3051316df..26b107ba6 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 80aca6810..db5ce0d08 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 0aee23024..554c0cfda 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 9b2be94ec..5a253eba2 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 1e81da23f..4843f1d2b 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 1f7804b0a..99b9756c2 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 5c05353ee..894b02768 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@
-- 
GitLab