diff -ur -x *~ xerces-c-src1_5_1.orig/obj/Makefile.in xerces-c-src1_5_1/obj/Makefile.in
--- xerces-c-src1_5_1.orig/obj/Makefile.in	Wed Jul 18 10:15:34 2001
+++ xerces-c-src1_5_1/obj/Makefile.in	Tue Oct 23 11:40:42 2001
@@ -70,6 +70,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 PREFIX = @prefix@
 LDFLAGS = @ldflags@
 LIBS = @libs@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/CreateDOMDocument/Makefile.in xerces-c-src1_5_1/samples/CreateDOMDocument/Makefile.in
--- xerces-c-src1_5_1.orig/samples/CreateDOMDocument/Makefile.in	Wed Jul 18 10:15:36 2001
+++ xerces-c-src1_5_1/samples/CreateDOMDocument/Makefile.in	Tue Oct 23 11:31:27 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/DOMCount/Makefile.in xerces-c-src1_5_1/samples/DOMCount/Makefile.in
--- xerces-c-src1_5_1.orig/samples/DOMCount/Makefile.in	Wed Jul 18 10:15:36 2001
+++ xerces-c-src1_5_1/samples/DOMCount/Makefile.in	Tue Oct 23 11:41:26 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/DOMPrint/Makefile.in xerces-c-src1_5_1/samples/DOMPrint/Makefile.in
--- xerces-c-src1_5_1.orig/samples/DOMPrint/Makefile.in	Wed Jul 18 10:15:36 2001
+++ xerces-c-src1_5_1/samples/DOMPrint/Makefile.in	Tue Oct 23 11:31:27 2001
@@ -70,6 +70,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/EnumVal/Makefile.in xerces-c-src1_5_1/samples/EnumVal/Makefile.in
--- xerces-c-src1_5_1.orig/samples/EnumVal/Makefile.in	Wed Jul 18 10:15:36 2001
+++ xerces-c-src1_5_1/samples/EnumVal/Makefile.in	Tue Oct 23 11:31:27 2001
@@ -68,6 +68,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/IDOMCount/Makefile.in xerces-c-src1_5_1/samples/IDOMCount/Makefile.in
--- xerces-c-src1_5_1.orig/samples/IDOMCount/Makefile.in	Wed Jul 18 10:15:36 2001
+++ xerces-c-src1_5_1/samples/IDOMCount/Makefile.in	Tue Oct 23 11:31:27 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/IDOMPrint/Makefile.in xerces-c-src1_5_1/samples/IDOMPrint/Makefile.in
--- xerces-c-src1_5_1.orig/samples/IDOMPrint/Makefile.in	Wed Jul 18 10:15:36 2001
+++ xerces-c-src1_5_1/samples/IDOMPrint/Makefile.in	Tue Oct 23 11:31:27 2001
@@ -70,6 +70,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/Makefile.in xerces-c-src1_5_1/samples/Makefile.in
--- xerces-c-src1_5_1.orig/samples/Makefile.in	Wed Jul 18 10:15:36 2001
+++ xerces-c-src1_5_1/samples/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -76,6 +76,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/Makefile.incl xerces-c-src1_5_1/samples/Makefile.incl
--- xerces-c-src1_5_1.orig/samples/Makefile.incl	Wed Jul 18 10:15:36 2001
+++ xerces-c-src1_5_1/samples/Makefile.incl	Tue Oct 23 11:31:28 2001
@@ -79,10 +79,10 @@
 
 #=============== IRIX SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, IRIX)
-  ifeq (${COMPILER}, g++)
+  ifeq (${GXX}, yes)
 	CMP= -c ${CXXFLAGS}
-	CC= g++ -c -D${PLATFORM} -D_REENTRANT -fpic -instances=static
-	LINK = g++ -D${PLATFORM} -fpic
+	CC= $(COMPILER) -c -D${PLATFORM} -D_REENTRANT -fpic -instances=static
+	LINK = $(COMPILER) -D${PLATFORM} -fpic
 	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
 	EXTRA_LINK_OPTIONS=-lc
   else
@@ -97,10 +97,10 @@
 
 #=============== SOLARIS SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, SOLARIS)
-  ifeq (${COMPILER}, g++)
+  ifeq (${GXX}, yes)
 	CMP= -c ${CXXFLAGS}
-	CC= g++ -c -D${PLATFORM} -D_REENTRANT -fpic
- LINK = g++ -D${PLATFORM} -fpic ${LDFLAGS}
+	CC= $(COMPILER) -c -D${PLATFORM} -D_REENTRANT -fpic
+	LINK = $(COMPILER) -D${PLATFORM} -fpic ${LDFLAGS}
 	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
 	EXTRA_LINK_OPTIONS=-lc
   else
@@ -116,8 +116,8 @@
 #=============== UNIXWARE SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, UNIXWARE)
   CMP= -O2 -c ${CXXFLAGS} -pthread
-  CC= g++ -O2 -c -D${PLATFORM} -D_REENTRANT -fpic -pthread
-  LINK = g++ -D${PLATFORM} -fpic -pthread
+  CC= $(COMPILER) -O2 -c -D${PLATFORM} -D_REENTRANT -fpic -pthread
+  LINK = $(COMPILER) -D${PLATFORM} -fpic -pthread
   EXTRA_LINK_OPTIONS=-lc -lsocket
   PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
   SHLIBSUFFIX=.so
@@ -171,8 +171,8 @@
 #=============== LINUX SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, LINUX)
 CMP= -c ${CXXFLAGS}
-CC= g++ -c -D${PLATFORM} -D_REENTRANT -fpic
-LINK =  g++ -D${PLATFORM} -fpic
+CC= $(COMPILER) -c -D${PLATFORM} -D_REENTRANT -fpic
+LINK =  $(COMPILER) -D${PLATFORM} -fpic
 PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
 EXTRA_LINK_OPTIONS=-lc
 SHLIBSUFFIX=.so
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/MemParse/Makefile.in xerces-c-src1_5_1/samples/MemParse/Makefile.in
--- xerces-c-src1_5_1.orig/samples/MemParse/Makefile.in	Wed Jul 18 10:15:36 2001
+++ xerces-c-src1_5_1/samples/MemParse/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/PParse/Makefile.in xerces-c-src1_5_1/samples/PParse/Makefile.in
--- xerces-c-src1_5_1.orig/samples/PParse/Makefile.in	Wed Jul 18 10:15:36 2001
+++ xerces-c-src1_5_1/samples/PParse/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/Redirect/Makefile.in xerces-c-src1_5_1/samples/Redirect/Makefile.in
--- xerces-c-src1_5_1.orig/samples/Redirect/Makefile.in	Wed Jul 18 10:15:38 2001
+++ xerces-c-src1_5_1/samples/Redirect/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/SAX2Count/Makefile.in xerces-c-src1_5_1/samples/SAX2Count/Makefile.in
--- xerces-c-src1_5_1.orig/samples/SAX2Count/Makefile.in	Wed Jul 18 10:15:40 2001
+++ xerces-c-src1_5_1/samples/SAX2Count/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/SAX2Print/Makefile.in xerces-c-src1_5_1/samples/SAX2Print/Makefile.in
--- xerces-c-src1_5_1.orig/samples/SAX2Print/Makefile.in	Wed Jul 18 10:15:40 2001
+++ xerces-c-src1_5_1/samples/SAX2Print/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/SAXCount/Makefile.in xerces-c-src1_5_1/samples/SAXCount/Makefile.in
--- xerces-c-src1_5_1.orig/samples/SAXCount/Makefile.in	Wed Jul 18 10:15:40 2001
+++ xerces-c-src1_5_1/samples/SAXCount/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/SAXPrint/Makefile.in xerces-c-src1_5_1/samples/SAXPrint/Makefile.in
--- xerces-c-src1_5_1.orig/samples/SAXPrint/Makefile.in	Wed Jul 18 10:15:40 2001
+++ xerces-c-src1_5_1/samples/SAXPrint/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/StdInParse/Makefile.in xerces-c-src1_5_1/samples/StdInParse/Makefile.in
--- xerces-c-src1_5_1.orig/samples/StdInParse/Makefile.in	Wed Jul 18 10:15:40 2001
+++ xerces-c-src1_5_1/samples/StdInParse/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 LDFLAGS = @ldflags@
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/configure xerces-c-src1_5_1/samples/configure
--- xerces-c-src1_5_1.orig/samples/configure	Wed Jul 18 10:15:34 2001
+++ xerces-c-src1_5_1/samples/configure	Tue Oct 23 11:48:26 2001
@@ -1328,6 +1328,8 @@
 compiler=${CXX}
 
 
+
+
 # prefix=${prefix}
 
 
@@ -1514,6 +1516,8 @@
 s%@host_os@%$host_os%g
 s%@platform@%$platform%g
 s%@compiler@%$compiler%g
+s%@GXX@%$GXX%g
+s%@GCC@%$GCC%g
 s%@cxxflags@%$cxxflags%g
 s%@cflags@%$cflags%g
 s%@ldflags@%$ldflags%g
diff -ur -x *~ xerces-c-src1_5_1.orig/samples/configure.in xerces-c-src1_5_1/samples/configure.in
--- xerces-c-src1_5_1.orig/samples/configure.in	Wed Jul 18 10:15:34 2001
+++ xerces-c-src1_5_1/samples/configure.in	Tue Oct 23 11:47:46 2001
@@ -55,6 +55,8 @@
 
 compiler=${CXX}
 AC_SUBST(compiler)
+AC_SUBST(GXX)
+AC_SUBST(GCC)
 
 # prefix=${prefix}
 AC_SUBST(prefix)
diff -ur -x *~ xerces-c-src1_5_1.orig/src/Makefile.in xerces-c-src1_5_1/src/Makefile.in
--- xerces-c-src1_5_1.orig/src/Makefile.in	Wed Jul 18 10:15:48 2001
+++ xerces-c-src1_5_1/src/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -98,6 +98,9 @@
 MESSAGELOADER=@messageloader@
 TRANSCODER=@transcoder@
 
+GCC = @GCC@
+GXX = @GXX@
+
 PRODUCTNAME=xerces
 PRODUCTVERSION=${VER}
 BINTARGETDIR=${HOME}/${PRODUCTNAME}-c-${PLATFORM}-${CXX}-${PRODUCTVERSION}
diff -ur -x *~ xerces-c-src1_5_1.orig/src/Makefile.incl xerces-c-src1_5_1/src/Makefile.incl
--- xerces-c-src1_5_1.orig/src/Makefile.incl	Wed Jul 18 10:15:48 2001
+++ xerces-c-src1_5_1/src/Makefile.incl	Tue Oct 23 11:31:28 2001
@@ -108,8 +108,8 @@
 
 #=============== SOLARIS SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, SOLARIS)
-  ifeq (${CXX}, g++)
-    PLATFORM_COMPILE_OPTIONS = -fPIC -instances=static -D${PLATFORM} -D_REENTRANT
+  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}
     ifeq (${TRANSCODER}, ICU)
@@ -135,7 +135,7 @@
 
 #=============== 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}
@@ -359,7 +359,7 @@
 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 -ur -x *~ xerces-c-src1_5_1.orig/src/configure xerces-c-src1_5_1/src/configure
--- xerces-c-src1_5_1.orig/src/configure	Wed Jul 18 10:15:42 2001
+++ xerces-c-src1_5_1/src/configure	Tue Oct 23 11:48:20 2001
@@ -1281,10 +1281,12 @@
 cxx=${CXX}
 
 
+
 cc=${CC}
 
 
 
+
 prefix_include=${prefix}/include/xercesc
 
 
@@ -1519,7 +1521,9 @@
 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 -ur -x *~ xerces-c-src1_5_1.orig/src/configure.in xerces-c-src1_5_1/src/configure.in
--- xerces-c-src1_5_1.orig/src/configure.in	Wed Jul 18 10:15:42 2001
+++ xerces-c-src1_5_1/src/configure.in	Tue Oct 23 11:31:28 2001
@@ -57,9 +57,11 @@
 
 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 -ur -x *~ xerces-c-src1_5_1.orig/src/dom/Makefile.in xerces-c-src1_5_1/src/dom/Makefile.in
--- xerces-c-src1_5_1.orig/src/dom/Makefile.in	Wed Jul 18 10:15:44 2001
+++ xerces-c-src1_5_1/src/dom/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -60,6 +60,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/framework/Makefile.in xerces-c-src1_5_1/src/framework/Makefile.in
--- xerces-c-src1_5_1.orig/src/framework/Makefile.in	Wed Jul 18 10:15:44 2001
+++ xerces-c-src1_5_1/src/framework/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -103,6 +103,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/idom/Makefile.in xerces-c-src1_5_1/src/idom/Makefile.in
--- xerces-c-src1_5_1.orig/src/idom/Makefile.in	Wed Jul 18 10:15:46 2001
+++ xerces-c-src1_5_1/src/idom/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -60,6 +60,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/internal/Makefile.in xerces-c-src1_5_1/src/internal/Makefile.in
--- xerces-c-src1_5_1.orig/src/internal/Makefile.in	Wed Jul 18 10:15:48 2001
+++ xerces-c-src1_5_1/src/internal/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -60,6 +60,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/parsers/Makefile.in xerces-c-src1_5_1/src/parsers/Makefile.in
--- xerces-c-src1_5_1.orig/src/parsers/Makefile.in	Wed Jul 18 10:15:48 2001
+++ xerces-c-src1_5_1/src/parsers/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -60,6 +60,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/sax/Makefile.in xerces-c-src1_5_1/src/sax/Makefile.in
--- xerces-c-src1_5_1.orig/src/sax/Makefile.in	Wed Jul 18 10:15:48 2001
+++ xerces-c-src1_5_1/src/sax/Makefile.in	Tue Oct 23 11:31:28 2001
@@ -60,6 +60,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/sax2/Makefile.in xerces-c-src1_5_1/src/sax2/Makefile.in
--- xerces-c-src1_5_1.orig/src/sax2/Makefile.in	Wed Jul 18 10:15:48 2001
+++ xerces-c-src1_5_1/src/sax2/Makefile.in	Tue Oct 23 11:37:25 2001
@@ -60,6 +60,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Compilers/Makefile.in xerces-c-src1_5_1/src/util/Compilers/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Compilers/Makefile.in	Wed Jul 18 10:15:50 2001
+++ xerces-c-src1_5_1/src/util/Compilers/Makefile.in	Tue Oct 23 11:33:03 2001
@@ -60,6 +60,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
@@ -113,7 +115,7 @@
 ifeq (xlC_r,$(findstring xlC_r,${CXX}))
     CPP_OBJECTS = CSetDefs.$(TO)
 endif
-ifeq (${CXX},g++)
+ifeq (${GXX},yes)
     CPP_OBJECTS = GCCDefs.$(TO)
 endif
 ifeq (${CXX},aCC)
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Makefile.in xerces-c-src1_5_1/src/util/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Makefile.in	Wed Jul 18 10:15:50 2001
+++ xerces-c-src1_5_1/src/util/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -212,6 +212,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/MsgLoaders/ICU/Makefile.in xerces-c-src1_5_1/src/util/MsgLoaders/ICU/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/MsgLoaders/ICU/Makefile.in	Wed Jul 18 10:15:50 2001
+++ xerces-c-src1_5_1/src/util/MsgLoaders/ICU/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -91,6 +91,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/MsgLoaders/InMemory/Makefile.in xerces-c-src1_5_1/src/util/MsgLoaders/InMemory/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/MsgLoaders/InMemory/Makefile.in	Wed Jul 18 10:15:50 2001
+++ xerces-c-src1_5_1/src/util/MsgLoaders/InMemory/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -91,6 +91,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/MsgLoaders/MsgCatalog/Makefile.in xerces-c-src1_5_1/src/util/MsgLoaders/MsgCatalog/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/MsgLoaders/MsgCatalog/Makefile.in	Wed Jul 18 10:15:50 2001
+++ xerces-c-src1_5_1/src/util/MsgLoaders/MsgCatalog/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -91,6 +91,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/MsgLoaders/MsgFile/Makefile.in xerces-c-src1_5_1/src/util/MsgLoaders/MsgFile/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/MsgLoaders/MsgFile/Makefile.in	Wed Jul 18 10:15:50 2001
+++ xerces-c-src1_5_1/src/util/MsgLoaders/MsgFile/Makefile.in	Tue Oct 23 11:42:37 2001
@@ -57,6 +57,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 PREFIX = @prefix@
 THREADS = @threads@
 PREFIX_INCLUDE = @prefix_include@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/NetAccessors/MacOSURLAccess/Makefile.in xerces-c-src1_5_1/src/util/NetAccessors/MacOSURLAccess/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/NetAccessors/MacOSURLAccess/Makefile.in	Wed Jul 18 10:15:52 2001
+++ xerces-c-src1_5_1/src/util/NetAccessors/MacOSURLAccess/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -63,6 +63,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/NetAccessors/Socket/Makefile.in xerces-c-src1_5_1/src/util/NetAccessors/Socket/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/NetAccessors/Socket/Makefile.in	Wed Jul 18 10:15:52 2001
+++ xerces-c-src1_5_1/src/util/NetAccessors/Socket/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -75,6 +75,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/NetAccessors/libWWW/Makefile.in xerces-c-src1_5_1/src/util/NetAccessors/libWWW/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/NetAccessors/libWWW/Makefile.in	Wed Jul 18 10:15:52 2001
+++ xerces-c-src1_5_1/src/util/NetAccessors/libWWW/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -82,6 +82,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Platforms/AIX/Makefile.in xerces-c-src1_5_1/src/util/Platforms/AIX/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Platforms/AIX/Makefile.in	Wed Jul 18 10:15:52 2001
+++ xerces-c-src1_5_1/src/util/Platforms/AIX/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -68,6 +68,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Platforms/HPUX/Makefile.in xerces-c-src1_5_1/src/util/Platforms/HPUX/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Platforms/HPUX/Makefile.in	Wed Jul 18 10:15:52 2001
+++ xerces-c-src1_5_1/src/util/Platforms/HPUX/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -68,6 +68,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Platforms/IRIX/Makefile.in xerces-c-src1_5_1/src/util/Platforms/IRIX/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Platforms/IRIX/Makefile.in	Wed Jul 18 10:15:52 2001
+++ xerces-c-src1_5_1/src/util/Platforms/IRIX/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -68,6 +68,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Platforms/Linux/Makefile.in xerces-c-src1_5_1/src/util/Platforms/Linux/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Platforms/Linux/Makefile.in	Wed Jul 18 10:15:52 2001
+++ xerces-c-src1_5_1/src/util/Platforms/Linux/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -68,6 +68,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Platforms/MacOS/Makefile.in xerces-c-src1_5_1/src/util/Platforms/MacOS/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Platforms/MacOS/Makefile.in	Wed Jul 18 10:15:52 2001
+++ xerces-c-src1_5_1/src/util/Platforms/MacOS/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -59,6 +59,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Platforms/Makefile.in xerces-c-src1_5_1/src/util/Platforms/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Platforms/Makefile.in	Wed Jul 18 10:15:52 2001
+++ xerces-c-src1_5_1/src/util/Platforms/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -110,6 +110,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Platforms/OS390/Makefile.in xerces-c-src1_5_1/src/util/Platforms/OS390/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Platforms/OS390/Makefile.in	Wed Jul 18 10:15:54 2001
+++ xerces-c-src1_5_1/src/util/Platforms/OS390/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -68,6 +68,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Platforms/OS400/Makefile.in xerces-c-src1_5_1/src/util/Platforms/OS400/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Platforms/OS400/Makefile.in	Wed Jul 18 10:15:54 2001
+++ xerces-c-src1_5_1/src/util/Platforms/OS400/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -68,6 +68,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Platforms/PTX/Makefile.in xerces-c-src1_5_1/src/util/Platforms/PTX/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Platforms/PTX/Makefile.in	Wed Jul 18 10:15:54 2001
+++ xerces-c-src1_5_1/src/util/Platforms/PTX/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -68,6 +68,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Platforms/Solaris/Makefile.in xerces-c-src1_5_1/src/util/Platforms/Solaris/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Platforms/Solaris/Makefile.in	Wed Jul 18 10:15:54 2001
+++ xerces-c-src1_5_1/src/util/Platforms/Solaris/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -68,6 +68,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Platforms/Tru64/Makefile.in xerces-c-src1_5_1/src/util/Platforms/Tru64/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Platforms/Tru64/Makefile.in	Wed Jul 18 10:15:54 2001
+++ xerces-c-src1_5_1/src/util/Platforms/Tru64/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -59,6 +59,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Platforms/UnixWare/Makefile.in xerces-c-src1_5_1/src/util/Platforms/UnixWare/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Platforms/UnixWare/Makefile.in	Wed Jul 18 10:15:54 2001
+++ xerces-c-src1_5_1/src/util/Platforms/UnixWare/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -68,6 +68,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Transcoders/ICU/Makefile.in xerces-c-src1_5_1/src/util/Transcoders/ICU/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Transcoders/ICU/Makefile.in	Wed Jul 18 10:15:56 2001
+++ xerces-c-src1_5_1/src/util/Transcoders/ICU/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -91,6 +91,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Transcoders/Iconv/Makefile.in xerces-c-src1_5_1/src/util/Transcoders/Iconv/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Transcoders/Iconv/Makefile.in	Wed Jul 18 10:15:56 2001
+++ xerces-c-src1_5_1/src/util/Transcoders/Iconv/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -91,6 +91,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Transcoders/Iconv390/Makefile.in xerces-c-src1_5_1/src/util/Transcoders/Iconv390/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Transcoders/Iconv390/Makefile.in	Wed Jul 18 10:15:56 2001
+++ xerces-c-src1_5_1/src/util/Transcoders/Iconv390/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -69,6 +69,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Transcoders/Iconv400/Makefile.in xerces-c-src1_5_1/src/util/Transcoders/Iconv400/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Transcoders/Iconv400/Makefile.in	Wed Jul 18 10:15:56 2001
+++ xerces-c-src1_5_1/src/util/Transcoders/Iconv400/Makefile.in	Tue Oct 23 11:42:58 2001
@@ -70,6 +70,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+CC = @GCC@
+CXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/Transcoders/MacOSUnicodeConverter/Makefile.in xerces-c-src1_5_1/src/util/Transcoders/MacOSUnicodeConverter/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/Transcoders/MacOSUnicodeConverter/Makefile.in	Wed Jul 18 10:15:56 2001
+++ xerces-c-src1_5_1/src/util/Transcoders/MacOSUnicodeConverter/Makefile.in	Tue Oct 23 11:31:29 2001
@@ -94,6 +94,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/util/regx/Makefile.in xerces-c-src1_5_1/src/util/regx/Makefile.in
--- xerces-c-src1_5_1.orig/src/util/regx/Makefile.in	Wed Jul 18 10:15:54 2001
+++ xerces-c-src1_5_1/src/util/regx/Makefile.in	Tue Oct 23 11:31:30 2001
@@ -90,6 +90,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS =  @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/validators/DTD/Makefile.in xerces-c-src1_5_1/src/validators/DTD/Makefile.in
--- xerces-c-src1_5_1.orig/src/validators/DTD/Makefile.in	Wed Jul 18 10:16:00 2001
+++ xerces-c-src1_5_1/src/validators/DTD/Makefile.in	Tue Oct 23 11:31:30 2001
@@ -104,6 +104,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/validators/Makefile.in xerces-c-src1_5_1/src/validators/Makefile.in
--- xerces-c-src1_5_1.orig/src/validators/Makefile.in	Wed Jul 18 10:16:00 2001
+++ xerces-c-src1_5_1/src/validators/Makefile.in	Tue Oct 23 11:31:30 2001
@@ -79,6 +79,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/validators/common/Makefile.in xerces-c-src1_5_1/src/validators/common/Makefile.in
--- xerces-c-src1_5_1.orig/src/validators/common/Makefile.in	Wed Jul 18 10:15:58 2001
+++ xerces-c-src1_5_1/src/validators/common/Makefile.in	Tue Oct 23 11:31:30 2001
@@ -78,6 +78,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/validators/datatype/Makefile.in xerces-c-src1_5_1/src/validators/datatype/Makefile.in
--- xerces-c-src1_5_1.orig/src/validators/datatype/Makefile.in	Wed Jul 18 10:16:00 2001
+++ xerces-c-src1_5_1/src/validators/datatype/Makefile.in	Tue Oct 23 11:31:30 2001
@@ -104,6 +104,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/src/validators/schema/Makefile.in xerces-c-src1_5_1/src/validators/schema/Makefile.in
--- xerces-c-src1_5_1.orig/src/validators/schema/Makefile.in	Wed Jul 18 10:16:00 2001
+++ xerces-c-src1_5_1/src/validators/schema/Makefile.in	Tue Oct 23 11:31:30 2001
@@ -100,6 +100,8 @@
 PLATFORM = @platform@
 CC  = @cc@
 CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/DOM/DOMIDTest/Makefile.in xerces-c-src1_5_1/tests/DOM/DOMIDTest/Makefile.in
--- xerces-c-src1_5_1.orig/tests/DOM/DOMIDTest/Makefile.in	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/DOM/DOMIDTest/Makefile.in	Tue Oct 23 11:43:34 2001
@@ -70,6 +70,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/DOM/DOMMemTest/Makefile.in xerces-c-src1_5_1/tests/DOM/DOMMemTest/Makefile.in
--- xerces-c-src1_5_1.orig/tests/DOM/DOMMemTest/Makefile.in	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/DOM/DOMMemTest/Makefile.in	Tue Oct 23 11:43:46 2001
@@ -70,6 +70,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/DOM/DOMTest/Makefile.in xerces-c-src1_5_1/tests/DOM/DOMTest/Makefile.in
--- xerces-c-src1_5_1.orig/tests/DOM/DOMTest/Makefile.in	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/DOM/DOMTest/Makefile.in	Tue Oct 23 11:43:56 2001
@@ -70,6 +70,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/DOM/RangeTest/Makefile.in xerces-c-src1_5_1/tests/DOM/RangeTest/Makefile.in
--- xerces-c-src1_5_1.orig/tests/DOM/RangeTest/Makefile.in	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/DOM/RangeTest/Makefile.in	Tue Oct 23 11:44:09 2001
@@ -70,6 +70,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/DOM/Traversal/Makefile.in xerces-c-src1_5_1/tests/DOM/Traversal/Makefile.in
--- xerces-c-src1_5_1.orig/tests/DOM/Traversal/Makefile.in	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/DOM/Traversal/Makefile.in	Tue Oct 23 11:44:21 2001
@@ -70,6 +70,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/EncodingTest/Makefile.in xerces-c-src1_5_1/tests/EncodingTest/Makefile.in
--- xerces-c-src1_5_1.orig/tests/EncodingTest/Makefile.in	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/EncodingTest/Makefile.in	Tue Oct 23 11:44:34 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/IDom/IRangeTest/Makefile.in xerces-c-src1_5_1/tests/IDom/IRangeTest/Makefile.in
--- xerces-c-src1_5_1.orig/tests/IDom/IRangeTest/Makefile.in	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/IDom/IRangeTest/Makefile.in	Tue Oct 23 11:44:47 2001
@@ -70,6 +70,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/IDom/ITraversal/Makefile.in xerces-c-src1_5_1/tests/IDom/ITraversal/Makefile.in
--- xerces-c-src1_5_1.orig/tests/IDom/ITraversal/Makefile.in	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/IDom/ITraversal/Makefile.in	Tue Oct 23 11:44:56 2001
@@ -70,6 +70,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/IThreadTest/Makefile.in xerces-c-src1_5_1/tests/IThreadTest/Makefile.in
--- xerces-c-src1_5_1.orig/tests/IThreadTest/Makefile.in	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/IThreadTest/Makefile.in	Tue Oct 23 11:45:08 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/Makefile.in xerces-c-src1_5_1/tests/Makefile.in
--- xerces-c-src1_5_1.orig/tests/Makefile.in	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/Makefile.in	Tue Oct 23 11:45:17 2001
@@ -72,6 +72,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/Makefile.incl xerces-c-src1_5_1/tests/Makefile.incl
--- xerces-c-src1_5_1.orig/tests/Makefile.incl	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/Makefile.incl	Tue Oct 23 11:35:10 2001
@@ -1,3 +1,4 @@
+
 #
 # The Apache Software License, Version 1.1
 #
@@ -72,10 +73,10 @@
 
 #=============== SOLARIS SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, SOLARIS)
-  ifeq (${COMPILER}, g++)
+  ifeq (${GXX}, yes)
 	CMP= -c ${CXXFLAGS}
-	CC= g++ -c -D${PLATFORM} -D_REENTRANT -fpic -instances=static
-	LINK = g++ -D${PLATFORM} -fpic
+	CC= $(COMPILER) -c -D${PLATFORM} -D_REENTRANT -fpic
+	LINK = $(COMPILER) -D${PLATFORM} -fpic
 	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
 	EXTRA_LINK_OPTIONS=-lc
   else
@@ -101,8 +102,8 @@
 #=============== UNIXWARE SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, UNIXWARE)
 CMP= -O2 -c ${CXXFLAGS} -pthread
-CC= g++ -O2 -c -D${PLATFORM} -D_REENTRANT -fpic
-LINK =  g++ -O2 -D${PLATFORM} -fpic  -pthread
+CC= $(COMPILER) -O2 -c -D${PLATFORM} -D_REENTRANT -fpic
+LINK =  $(COMPILER) -O2 -D${PLATFORM} -fpic  -pthread
 PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
 EXTRA_LINK_OPTIONS=-lc -lsocket
 SHLIBSUFFIX=.so
@@ -128,8 +129,8 @@
 #=============== LINUX SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, LINUX)
 CMP= -c ${CXXFLAGS}
-CC= g++ -c -D${PLATFORM} -D_REENTRANT -fpic
-LINK =  g++ -D${PLATFORM} -fpic
+CC= $(COMPILER) -c -D${PLATFORM} -D_REENTRANT -fpic
+LINK =  $(COMPILER) -D${PLATFORM} -fpic
 PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
 EXTRA_LINK_OPTIONS=-lc
 SHLIBSUFFIX=.so
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/ThreadTest/Makefile.in xerces-c-src1_5_1/tests/ThreadTest/Makefile.in
--- xerces-c-src1_5_1.orig/tests/ThreadTest/Makefile.in	Wed Jul 18 10:16:04 2001
+++ xerces-c-src1_5_1/tests/ThreadTest/Makefile.in	Tue Oct 23 11:45:25 2001
@@ -69,6 +69,8 @@
 
 PLATFORM = @platform@
 COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
 CXXFLAGS = @cxxflags@
 CFLAGS = @cflags@
 PREFIX = @prefix@
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/configure xerces-c-src1_5_1/tests/configure
--- xerces-c-src1_5_1.orig/tests/configure	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/configure	Tue Oct 23 11:48:23 2001
@@ -1326,6 +1326,8 @@
 
 
 
+
+
 cxxflags=${CXXFLAGS}
 
 
@@ -1507,6 +1509,8 @@
 s%@platform@%$platform%g
 s%@osver@%$osver%g
 s%@compiler@%$compiler%g
+s%@GXX@%$GXX%g
+s%@GCC@%$GCC%g
 s%@cxxflags@%$cxxflags%g
 s%@cflags@%$cflags%g
 s%@libs@%$libs%g
diff -ur -x *~ xerces-c-src1_5_1.orig/tests/configure.in xerces-c-src1_5_1/tests/configure.in
--- xerces-c-src1_5_1.orig/tests/configure.in	Wed Jul 18 10:16:02 2001
+++ xerces-c-src1_5_1/tests/configure.in	Tue Oct 23 11:46:40 2001
@@ -55,6 +55,8 @@
 
 compiler=${CXX}
 AC_SUBST(compiler)
+AC_SUBST(GXX)
+AC_SUBST(GCC)
 
 AC_SUBST(prefix)