tng 2002/07/26 09:36:32
Modified: c/samples Makefile.in Makefile.incl configure configure.in
c/samples/CreateDOMDocument Makefile.in
c/samples/DOMCount Makefile.in
c/samples/DOMPrint Makefile.in
c/samples/EnumVal Makefile.in
c/samples/MemParse Makefile.in
c/samples/PParse Makefile.in
c/samples/Redirect Makefile.in
c/samples/SAX2Count Makefile.in
c/samples/SAX2Print Makefile.in
c/samples/SAXCount Makefile.in
c/samples/SAXPrint Makefile.in
c/samples/SEnumVal Makefile.in
c/samples/StdInParse Makefile.in
Log:
[Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'. Patch from Jonathan
Lennox.
Revision Changes Path
1.18 +3 -1 xml-xerces/c/samples/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.in 5 Jul 2002 16:21:32 -0000 1.17
+++ Makefile.in 26 Jul 2002 16:36:31 -0000 1.18
@@ -75,6 +75,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
1.48 +11 -11 xml-xerces/c/samples/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Makefile.incl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile.incl 11 Jul 2002 12:55:31 -0000 1.47
+++ Makefile.incl 26 Jul 2002 16:36:31 -0000 1.48
@@ -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
@@ -192,8 +192,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.22 +4 -0 xml-xerces/c/samples/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/configure,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure 5 Jul 2002 16:21:32 -0000 1.21
+++ configure 26 Jul 2002 16:36:31 -0000 1.22
@@ -1330,6 +1330,8 @@
compiler=${CXX}
+
+
# prefix=${prefix}
@@ -1524,6 +1526,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.20 +2 -0 xml-xerces/c/samples/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure.in 5 Jul 2002 16:21:32 -0000 1.19
+++ configure.in 26 Jul 2002 16:36:31 -0000 1.20
@@ -57,6 +57,8 @@
compiler=${CXX}
AC_SUBST(compiler)
+AC_SUBST(GXX)
+AC_SUBST(GCC)
# prefix=${prefix}
AC_SUBST(prefix)
1.10 +3 -1 xml-xerces/c/samples/CreateDOMDocument/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/CreateDOMDocument/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 5 Jul 2002 16:21:32 -0000 1.9
+++ Makefile.in 26 Jul 2002 16:36:31 -0000 1.10
@@ -69,6 +69,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.11 +3 -1 xml-xerces/c/samples/DOMCount/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/DOMCount/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 5 Jul 2002 16:21:32 -0000 1.10
+++ Makefile.in 26 Jul 2002 16:36:31 -0000 1.11
@@ -69,6 +69,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.13 +3 -1 xml-xerces/c/samples/DOMPrint/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/DOMPrint/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.in 5 Jul 2002 16:21:33 -0000 1.12
+++ Makefile.in 26 Jul 2002 16:36:31 -0000 1.13
@@ -70,6 +70,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.13 +3 -1 xml-xerces/c/samples/EnumVal/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/EnumVal/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.in 5 Jul 2002 16:21:33 -0000 1.12
+++ Makefile.in 26 Jul 2002 16:36:31 -0000 1.13
@@ -68,6 +68,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.11 +3 -1 xml-xerces/c/samples/MemParse/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/MemParse/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 5 Jul 2002 16:21:33 -0000 1.10
+++ Makefile.in 26 Jul 2002 16:36:31 -0000 1.11
@@ -69,6 +69,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.11 +3 -1 xml-xerces/c/samples/PParse/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/PParse/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 5 Jul 2002 16:21:33 -0000 1.10
+++ Makefile.in 26 Jul 2002 16:36:31 -0000 1.11
@@ -69,6 +69,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.11 +3 -1 xml-xerces/c/samples/Redirect/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Redirect/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 5 Jul 2002 16:21:33 -0000 1.10
+++ Makefile.in 26 Jul 2002 16:36:32 -0000 1.11
@@ -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/samples/SAX2Count/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAX2Count/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 5 Jul 2002 16:21:33 -0000 1.4
+++ Makefile.in 26 Jul 2002 16:36:32 -0000 1.5
@@ -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/samples/SAX2Print/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAX2Print/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 5 Jul 2002 16:21:33 -0000 1.4
+++ Makefile.in 26 Jul 2002 16:36:32 -0000 1.5
@@ -69,6 +69,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.11 +3 -1 xml-xerces/c/samples/SAXCount/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAXCount/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 5 Jul 2002 16:21:33 -0000 1.10
+++ Makefile.in 26 Jul 2002 16:36:32 -0000 1.11
@@ -69,6 +69,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.11 +3 -1 xml-xerces/c/samples/SAXPrint/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAXPrint/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 5 Jul 2002 16:21:33 -0000 1.10
+++ Makefile.in 26 Jul 2002 16:36:32 -0000 1.11
@@ -69,6 +69,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.5 +6 -1 xml-xerces/c/samples/SEnumVal/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SEnumVal/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 5 Jul 2002 16:21:33 -0000 1.4
+++ Makefile.in 26 Jul 2002 16:36:32 -0000 1.5
@@ -55,6 +55,9 @@
#
# $Id$
# $Log$
+# Revision 1.5 2002/07/26 16:36:32 tng
+# [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'. Patch from Jonathan
Lennox.
+#
# Revision 1.4 2002/07/05 16:21:33 tng
# [Bug 10252] Modify FreeBSD build environment for the samples. Patch from Max
Gotlib.
#
@@ -78,6 +81,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
1.12 +3 -1 xml-xerces/c/samples/StdInParse/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/StdInParse/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 5 Jul 2002 16:21:33 -0000 1.11
+++ Makefile.in 26 Jul 2002 16:36:32 -0000 1.12
@@ -69,6 +69,8 @@
PLATFORM = @platform@
COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
LDFLAGS = @ldflags@
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
