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 2005/05/27 04:03:45 UTC
svn commit: r178728 - in /xerces/c/branches/jberry/3.0-unstable: configure
m4/xerces_mutexmgr_selection.m4 src/Makefile.am src/Makefile.in
Author: jberry
Date: Thu May 26 19:03:45 2005
New Revision: 178728
URL: http://svn.apache.org/viewcvs?rev=178728&view=rev
Log:
More work on pthreads flags
Modified:
xerces/c/branches/jberry/3.0-unstable/configure
xerces/c/branches/jberry/3.0-unstable/m4/xerces_mutexmgr_selection.m4
xerces/c/branches/jberry/3.0-unstable/src/Makefile.am
xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
Modified: xerces/c/branches/jberry/3.0-unstable/configure
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/configure?rev=178728&r1=178727&r2=178728&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/configure (original)
+++ xerces/c/branches/jberry/3.0-unstable/configure Thu May 26 19:03:45 2005
@@ -25125,6 +25125,10 @@
_ACEOF
+ # Set additional flags for link and compile
+ LIBS="${LIBS} ${PTHREAD_LIBS}"
+ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}"
+
fi
Modified: xerces/c/branches/jberry/3.0-unstable/m4/xerces_mutexmgr_selection.m4
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_mutexmgr_selection.m4?rev=178728&r1=178727&r2=178728&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_mutexmgr_selection.m4 (original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_mutexmgr_selection.m4 Thu May 26 19:03:45 2005
@@ -39,6 +39,10 @@
[
mgr=POSIX;
AC_DEFINE([XERCES_USE_MUTEXMGR_POSIX], 1, [Define to use the POSIX mutex mgr])
+
+ # Set additional flags for link and compile
+ LIBS="${LIBS} ${PTHREAD_LIBS}"
+ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}"
])
# If we still didn't find a mutex package, bail
Modified: xerces/c/branches/jberry/3.0-unstable/src/Makefile.am
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/Makefile.am?rev=178728&r1=178727&r2=178728&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.am (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.am Thu May 26 19:03:45 2005
@@ -110,7 +110,7 @@
libicu_ladir = ${includedir}
nobase_libicu_la_HEADERS = ${icu_headers}
libicu_la_SOURCES = ${icu_sources}
-libicu_la_CPPFLAGS = -I${ICU_PREFIX}/include $(AM_CPPFLAGS)
+libicu_la_CPPFLAGS = -I${ICU_PREFIX}/include ${AM_CPPFLAGS}
libicu_la_LIBADD = -L${ICU_PREFIX}/lib -licuuc -licudata
endif
@@ -179,8 +179,6 @@
libposixmmgr_ladir = ${includedir}
nobase_libposixmmgr_la_HEADERS = ${posixmmgr_headers}
libposixmmgr_la_SOURCES = ${posixmmgr_sources}
-libposixmmgr_la_LIBADD = ${PTHREAD_LIBS}
-libposixmmgr_la_CPPFLAGS = ${PTHREAD_CFLAGS} $(AM_CPPFLAGS)
endif
#
Modified: xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/Makefile.in?rev=178728&r1=178727&r2=178728&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.in Thu May 26 19:03:45 2005
@@ -354,13 +354,10 @@
@XERCES_USE_FILEMGR_POSIX_TRUE@ $(am__objects_15)
libposixfmgr_la_OBJECTS = $(am_libposixfmgr_la_OBJECTS)
@XERCES_USE_FILEMGR_POSIX_TRUE@am_libposixfmgr_la_rpath =
-am__DEPENDENCIES_1 =
-@XERCES_USE_MUTEXMGR_POSIX_TRUE@libposixmmgr_la_DEPENDENCIES = \
-@XERCES_USE_MUTEXMGR_POSIX_TRUE@ $(am__DEPENDENCIES_1)
+libposixmmgr_la_LIBADD =
am__libposixmmgr_la_SOURCES_DIST = \
xercesc/util/MutexManagers/PosixMutexMgr.cpp
-am__objects_16 = \
- xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo
+am__objects_16 = xercesc/util/MutexManagers/PosixMutexMgr.lo
@XERCES_USE_MUTEXMGR_POSIX_TRUE@am_libposixmmgr_la_OBJECTS = \
@XERCES_USE_MUTEXMGR_POSIX_TRUE@ $(am__objects_16)
libposixmmgr_la_OBJECTS = $(am_libposixmmgr_la_OBJECTS)
@@ -383,34 +380,34 @@
@XERCES_USE_NETACCESSOR_SOCKET_TRUE@ $(am__objects_19)
libsockets_la_OBJECTS = $(am_libsockets_la_OBJECTS)
@XERCES_USE_NETACCESSOR_SOCKET_TRUE@am_libsockets_la_rpath =
-@XERCES_USE_NETACCESSOR_SOCKET_TRUE@am__DEPENDENCIES_2 = \
+@XERCES_USE_NETACCESSOR_SOCKET_TRUE@am__DEPENDENCIES_1 = \
@XERCES_USE_NETACCESSOR_SOCKET_TRUE@ libsockets.la
-@XERCES_USE_NETACCESSOR_CFURL_TRUE@am__DEPENDENCIES_3 = libcfurl.la
-@XERCES_USE_TRANSCODER_ICU_TRUE@am__DEPENDENCIES_4 = libicu.la
-@XERCES_USE_TRANSCODER_ICONV_TRUE@am__DEPENDENCIES_5 = libiconv.la
-@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@am__DEPENDENCIES_6 = libmacosunicodeconverter.la
-@XERCES_USE_MSGLOADER_INMEMORY_TRUE@am__DEPENDENCIES_7 = \
+@XERCES_USE_NETACCESSOR_CFURL_TRUE@am__DEPENDENCIES_2 = libcfurl.la
+@XERCES_USE_TRANSCODER_ICU_TRUE@am__DEPENDENCIES_3 = libicu.la
+@XERCES_USE_TRANSCODER_ICONV_TRUE@am__DEPENDENCIES_4 = libiconv.la
+@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@am__DEPENDENCIES_5 = libmacosunicodeconverter.la
+@XERCES_USE_MSGLOADER_INMEMORY_TRUE@am__DEPENDENCIES_6 = \
@XERCES_USE_MSGLOADER_INMEMORY_TRUE@ libinmemory.la
-@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@am__DEPENDENCIES_8 = \
+@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@am__DEPENDENCIES_7 = \
@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@ libnothreadaomgr.la
-@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@am__DEPENDENCIES_9 = \
+@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@am__DEPENDENCIES_8 = \
@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@ libposixaomgr.la
-@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@am__DEPENDENCIES_10 = \
+@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@am__DEPENDENCIES_9 = \
@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@ libmacosaomgr.la
-@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@am__DEPENDENCIES_11 = \
+@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@am__DEPENDENCIES_10 = \
@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@ libnothreadmmgr.la
-@XERCES_USE_MUTEXMGR_POSIX_TRUE@am__DEPENDENCIES_12 = libposixmmgr.la
-@XERCES_USE_FILEMGR_POSIX_TRUE@am__DEPENDENCIES_13 = libposixfmgr.la
-am__DEPENDENCIES_14 = libutil.la libdom.la libdomimpl.la \
+@XERCES_USE_MUTEXMGR_POSIX_TRUE@am__DEPENDENCIES_11 = libposixmmgr.la
+@XERCES_USE_FILEMGR_POSIX_TRUE@am__DEPENDENCIES_12 = libposixfmgr.la
+am__DEPENDENCIES_13 = libutil.la libdom.la libdomimpl.la \
libframework.la libinternal.la libparsers.la libsax.la \
- libsax2.la libvalidators.la $(am__DEPENDENCIES_2) \
- $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \
- $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
- $(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \
- $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \
- $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_12) \
- $(am__DEPENDENCIES_13)
-libsrc_la_DEPENDENCIES = $(am__DEPENDENCIES_14)
+ libsax2.la libvalidators.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \
+ $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_9) \
+ $(am__DEPENDENCIES_10) $(am__DEPENDENCIES_11) \
+ $(am__DEPENDENCIES_12)
+libsrc_la_DEPENDENCIES = $(am__DEPENDENCIES_13)
am_libsrc_la_OBJECTS =
libsrc_la_OBJECTS = $(am_libsrc_la_OBJECTS)
libutil_la_LIBADD =
@@ -889,7 +886,7 @@
@XERCES_USE_TRANSCODER_ICU_TRUE@libicu_ladir = ${includedir}
@XERCES_USE_TRANSCODER_ICU_TRUE@nobase_libicu_la_HEADERS = ${icu_headers}
@XERCES_USE_TRANSCODER_ICU_TRUE@libicu_la_SOURCES = ${icu_sources}
-@XERCES_USE_TRANSCODER_ICU_TRUE@libicu_la_CPPFLAGS = -I${ICU_PREFIX}/include $(AM_CPPFLAGS)
+@XERCES_USE_TRANSCODER_ICU_TRUE@libicu_la_CPPFLAGS = -I${ICU_PREFIX}/include ${AM_CPPFLAGS}
@XERCES_USE_TRANSCODER_ICU_TRUE@libicu_la_LIBADD = -L${ICU_PREFIX}/lib -licuuc -licudata
@XERCES_USE_TRANSCODER_ICONV_TRUE@libiconv_ladir = ${includedir}
@XERCES_USE_TRANSCODER_ICONV_TRUE@nobase_libiconv_la_HEADERS = ${iconv_headers}
@@ -917,8 +914,6 @@
@XERCES_USE_MUTEXMGR_POSIX_TRUE@libposixmmgr_ladir = ${includedir}
@XERCES_USE_MUTEXMGR_POSIX_TRUE@nobase_libposixmmgr_la_HEADERS = ${posixmmgr_headers}
@XERCES_USE_MUTEXMGR_POSIX_TRUE@libposixmmgr_la_SOURCES = ${posixmmgr_sources}
-@XERCES_USE_MUTEXMGR_POSIX_TRUE@libposixmmgr_la_LIBADD = ${PTHREAD_LIBS}
-@XERCES_USE_MUTEXMGR_POSIX_TRUE@libposixmmgr_la_CPPFLAGS = ${PTHREAD_CFLAGS} $(AM_CPPFLAGS)
@XERCES_USE_FILEMGR_POSIX_TRUE@libposixfmgr_ladir = ${includedir}
@XERCES_USE_FILEMGR_POSIX_TRUE@nobase_libposixfmgr_la_HEADERS = ${posixfmgr_headers}
@XERCES_USE_FILEMGR_POSIX_TRUE@libposixfmgr_la_SOURCES = ${posixfmgr_sources}
@@ -2257,7 +2252,7 @@
xercesc/util/FileManagers/$(DEPDIR)/$(am__dirstamp)
libposixfmgr.la: $(libposixfmgr_la_OBJECTS) $(libposixfmgr_la_DEPENDENCIES)
$(CXXLINK) $(am_libposixfmgr_la_rpath) $(libposixfmgr_la_LDFLAGS) $(libposixfmgr_la_OBJECTS) $(libposixfmgr_la_LIBADD) $(LIBS)
-xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo: \
+xercesc/util/MutexManagers/PosixMutexMgr.lo: \
xercesc/util/MutexManagers/$(am__dirstamp) \
xercesc/util/MutexManagers/$(DEPDIR)/$(am__dirstamp)
libposixmmgr.la: $(libposixmmgr_la_OBJECTS) $(libposixmmgr_la_DEPENDENCIES)
@@ -3054,8 +3049,8 @@
-rm -f xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.lo
-rm -f xercesc/util/MutexManagers/NoThreadMutexMgr.$(OBJEXT)
-rm -f xercesc/util/MutexManagers/NoThreadMutexMgr.lo
- -rm -f xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.$(OBJEXT)
- -rm -f xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo
+ -rm -f xercesc/util/MutexManagers/PosixMutexMgr.$(OBJEXT)
+ -rm -f xercesc/util/MutexManagers/PosixMutexMgr.lo
-rm -f xercesc/util/Mutexes.$(OBJEXT)
-rm -f xercesc/util/Mutexes.lo
-rm -f xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.$(OBJEXT)
@@ -3550,7 +3545,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/FileManagers/$(DEPDIR)/PosixFileMgr.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/MsgLoaders/InMemory/$(DEPDIR)/InMemMsgLoader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/MutexManagers/$(DEPDIR)/NoThreadMutexMgr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/MutexManagers/$(DEPDIR)/libposixmmgr_la-PosixMutexMgr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/MutexManagers/$(DEPDIR)/PosixMutexMgr.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR)/MacOSURLAccessCF.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR)/URLAccessCFBinInputStream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/NetAccessors/Socket/$(DEPDIR)/SocketNetAccessor.Plo@am__quote@
@@ -3702,13 +3697,6 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='xercesc/util/Transcoders/ICU/ICUTransService.cpp' object='xercesc/util/Transcoders/ICU/libicu_la-ICUTransService.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libicu_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xercesc/util/Transcoders/ICU/libicu_la-ICUTransService.lo `test -f 'xercesc/util/Transcoders/ICU/ICUTransService.cpp' || echo '$(srcdir)/'`xercesc/util/Transcoders/ICU/ICUTransService.cpp
-
-xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo: xercesc/util/MutexManagers/PosixMutexMgr.cpp
-@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libposixmmgr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo -MD -MP -MF "xercesc/util/MutexManagers/$(DEPDIR)/libposixmmgr_la-PosixMutexMgr.Tpo" -c -o xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo `test -f 'xercesc/util/MutexManagers/PosixMutexMgr.cpp' || echo '$(srcdir)/'`xercesc/util/MutexManagers/PosixMutexMgr.cpp; \
-@am__fastdepCXX_TRUE@ then mv -f "xercesc/util/MutexManagers/$(DEPDIR)/libposixmmgr_la-PosixMutexMgr.Tpo" "xercesc/util/MutexManagers/$(DEPDIR)/libposixmmgr_la-PosixMutexMgr.Plo"; else rm -f "xercesc/util/MutexManagers/$(DEPDIR)/libposixmmgr_la-PosixMutexMgr.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='xercesc/util/MutexManagers/PosixMutexMgr.cpp' object='xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libposixmmgr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo `test -f 'xercesc/util/MutexManagers/PosixMutexMgr.cpp' || echo '$(srcdir)/'`xercesc/util/MutexManagers/PosixMutexMgr.cpp
mostlyclean-libtool:
-rm -f *.lo
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org