You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/07/26 18:40:20 UTC
cvs commit: xml-xerces/c/tests/ThreadTest Makefile.in
tng 2002/07/26 09:40:20
Modified: c/tests Makefile.in Makefile.incl configure configure.in
c/tests/DOM/DOMMemTest Makefile.in
c/tests/DOM/DOMTest Makefile.in
c/tests/DOM/DeprecatedDOMCount Makefile.in
c/tests/DOM/RangeTest Makefile.in
c/tests/DOM/Traversal Makefile.in
c/tests/EncodingTest Makefile.in
c/tests/InitTermTest Makefile.in
c/tests/ThreadTest Makefile.in
Log:
[Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'. Patch from Jonathan Lennox.
Revision Changes Path
1.24 +3 -1 xml-xerces/c/tests/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.in 21 May 2002 18:40:34 -0000 1.23
+++ Makefile.in 26 Jul 2002 16:40:19 -0000 1.24
@@ -70,6 +70,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
1.30 +11 -11 xml-xerces/c/tests/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/Makefile.incl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.incl 15 Jul 2002 12:15:59 -0000 1.29
+++ Makefile.incl 26 Jul 2002 16:40:19 -0000 1.30
@@ -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
- 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 ${EXTRA_LIBS}
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 ${EXTRA_LIBS}
else
@@ -126,8 +126,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 ${LDFLAGS}
+ CC= ${COMPILER} -O2 -c -D${PLATFORM} -D_REENTRANT -fpic -pthread
+ LINK = ${COMPILER} -D${PLATFORM} -fpic -pthread ${LDFLAGS}
EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
SHLIBSUFFIX=.so
@@ -191,8 +191,8 @@
#=============== FREEBSD SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, FREEBSD)
CMP= -c ${CXXFLAGS}
- CC= g++ -c -D${PLATFORM} -fPIC
- LINK = g++ -D${PLATFORM} -fPIC ${LDFLAGS}
+ CC= ${COMPILER} -c -D${PLATFORM} -fPIC
+ LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-Wl,-rpath,${XERCESCROOT}/lib
ifdef ICUROOT
PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
1.20 +4 -0 xml-xerces/c/tests/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/configure,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure 5 Jul 2002 16:19:40 -0000 1.19
+++ configure 26 Jul 2002 16:40:19 -0000 1.20
@@ -1333,6 +1333,8 @@
# prefix=${prefix}
+
+
cxxflags=${CXXFLAGS}
@@ -1519,6 +1521,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
1.24 +2 -0 xml-xerces/c/tests/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- configure.in 5 Jul 2002 16:19:40 -0000 1.23
+++ configure.in 26 Jul 2002 16:40:19 -0000 1.24
@@ -57,6 +57,8 @@
compiler=${CXX}
AC_SUBST(compiler)
+AC_SUBST(GXX)
+AC_SUBST(GCC)
# prefix=${prefix}
AC_SUBST(prefix)
1.11 +3 -1 xml-xerces/c/tests/DOM/DOMMemTest/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/DOM/DOMMemTest/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 18 Jan 2002 19:48:55 -0000 1.10
+++ Makefile.in 26 Jul 2002 16:40:19 -0000 1.11
@@ -70,6 +70,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.11 +3 -1 xml-xerces/c/tests/DOM/DOMTest/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/DOM/DOMTest/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 18 Jan 2002 19:48:55 -0000 1.10
+++ Makefile.in 26 Jul 2002 16:40:19 -0000 1.11
@@ -70,6 +70,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.2 +3 -1 xml-xerces/c/tests/DOM/DeprecatedDOMCount/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/DOM/DeprecatedDOMCount/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 21 May 2002 18:41:41 -0000 1.1
+++ Makefile.in 26 Jul 2002 16:40:19 -0000 1.2
@@ -70,6 +70,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.5 +3 -1 xml-xerces/c/tests/DOM/RangeTest/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/DOM/RangeTest/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 18 Jan 2002 19:48:55 -0000 1.4
+++ Makefile.in 26 Jul 2002 16:40:19 -0000 1.5
@@ -70,6 +70,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.10 +3 -1 xml-xerces/c/tests/DOM/Traversal/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/DOM/Traversal/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 18 Jan 2002 19:48:55 -0000 1.9
+++ Makefile.in 26 Jul 2002 16:40:19 -0000 1.10
@@ -70,6 +70,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.9 +3 -1 xml-xerces/c/tests/EncodingTest/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/EncodingTest/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 18 Jan 2002 19:48:55 -0000 1.8
+++ Makefile.in 26 Jul 2002 16:40:19 -0000 1.9
@@ -69,6 +69,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.5 +3 -1 xml-xerces/c/tests/InitTermTest/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/InitTermTest/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 18 Jan 2002 19:48:56 -0000 1.4
+++ Makefile.in 26 Jul 2002 16:40:20 -0000 1.5
@@ -70,6 +70,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.10 +3 -1 xml-xerces/c/tests/ThreadTest/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/ThreadTest/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 18 Jan 2002 19:48:56 -0000 1.9
+++ Makefile.in 26 Jul 2002 16:40:20 -0000 1.10
@@ -69,6 +69,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org