You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by jb...@apache.org on 2002/02/18 07:36:44 UTC
cvs commit: xml-xerces/c/src/xercesc/util Makefile.in
jberry 02/02/17 22:36:44
Modified: c/src/xercesc Makefile.incl configure configure.in
c/src/xercesc/util Makefile.in
Log:
Modify Mac OS X "unix" build to use new MacOSURLAccessCF NetAccessor.
This means that Xerces no longer relies on the Carbon.framework and
links only to CoreServices.framework, which allows it to be called
from a remote context where no GUI is available.
Revision Changes Path
1.2 +1 -3 xml-xerces/c/src/xercesc/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/Makefile.incl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.incl 1 Feb 2002 22:21:39 -0000 1.1
+++ Makefile.incl 18 Feb 2002 06:36:44 -0000 1.2
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.1 2002/02/01 22:21:39 peiyongz Exp $
+# $Id: Makefile.incl,v 1.2 2002/02/18 06:36:44 jberry Exp $
#
###################################################################
@@ -398,8 +398,6 @@
#=============== MacOS SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, MACOSX)
PLATFORM_LIBRARIES = \
- -framework Carbon \
- -framework CoreFoundation \
-framework CoreServices
PLATFORM_COMPILE_OPTIONS = \
-D${PLATFORM} \
1.2 +2 -2 xml-xerces/c/src/xercesc/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure 1 Feb 2002 22:21:39 -0000 1.1
+++ configure 18 Feb 2002 06:36:44 -0000 1.2
@@ -1462,7 +1462,7 @@
util/MsgLoaders/MsgFile/Makefile \
util/NetAccessors/Socket/Makefile \
util/NetAccessors/libWWW/Makefile \
-util/NetAccessors/MacOSURLAccess/Makefile \
+util/NetAccessors/MacOSURLAccessCF/Makefile \
util/regx/Makefile \
validators/Makefile \
validators/common/Makefile \
@@ -1605,7 +1605,7 @@
util/MsgLoaders/MsgFile/Makefile \
util/NetAccessors/Socket/Makefile \
util/NetAccessors/libWWW/Makefile \
-util/NetAccessors/MacOSURLAccess/Makefile \
+util/NetAccessors/MacOSURLAccessCF/Makefile \
util/regx/Makefile \
validators/Makefile \
validators/common/Makefile \
1.2 +1 -1 xml-xerces/c/src/xercesc/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure.in 1 Feb 2002 22:21:39 -0000 1.1
+++ configure.in 18 Feb 2002 06:36:44 -0000 1.2
@@ -128,7 +128,7 @@
util/MsgLoaders/MsgFile/Makefile \
util/NetAccessors/Socket/Makefile \
util/NetAccessors/libWWW/Makefile \
-util/NetAccessors/MacOSURLAccess/Makefile \
+util/NetAccessors/MacOSURLAccessCF/Makefile \
util/regx/Makefile \
validators/Makefile \
validators/common/Makefile \
1.3 +7 -4 xml-xerces/c/src/xercesc/util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 11 Feb 2002 18:19:19 -0000 1.2
+++ Makefile.in 18 Feb 2002 06:36:44 -0000 1.3
@@ -55,6 +55,12 @@
#
#
# $Log: Makefile.in,v $
+# Revision 1.3 2002/02/18 06:36:44 jberry
+# Modify Mac OS X "unix" build to use new MacOSURLAccessCF NetAccessor.
+# This means that Xerces no longer relies on the Carbon.framework and
+# links only to CoreServices.framework, which allows it to be called
+# from a remote context where no GUI is available.
+#
# Revision 1.2 2002/02/11 18:19:19 tng
# [Bug 2715] Build recursion suppresses make failures.
#
@@ -272,9 +278,9 @@
ifeq (${TRANSCODER},NATIVE)
ifeq (${PLATFORM},MACOSX)
TRANSCODERMODULE=MacOSUnicodeConverter
- else
- TRANSCODERMODULE=Iconv
- endif
+ else
+ TRANSCODERMODULE=Iconv
+ endif
else
ifeq (${TRANSCODER},ICU)
TRANSCODERMODULE=ICU
@@ -313,7 +319,7 @@
ifeq (${NETACCESSOR},NATIVE)
ifeq (${PLATFORM},MACOSX)
- NETACCESSORMODULE=MacOSURLAccess
+ NETACCESSORMODULE=MacOSURLAccessCF
endif
else
ifeq (${NETACCESSOR},Socket)
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org