Author: amassari
Date: Wed Jun 1 11:18:35 2005
New Revision: 179393
URL: http://svn.apache.org/viewcvs?rev=179393&view=rev
Log:
configure can now pick pieces from Windows environments
Added:
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/AtomicOpManagers/WindowsAtomicOpMgr.cpp
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/AtomicOpManagers/WindowsAtomicOpMgr.hpp
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/FileManagers/WindowsFileMgr.cpp
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/FileManagers/WindowsFileMgr.hpp
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/MutexManagers/WindowsMutexMgr.cpp
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/MutexManagers/WindowsMutexMgr.hpp
Modified:
xerces/c/branches/jberry/3.0-unstable/Makefile.in
xerces/c/branches/jberry/3.0-unstable/configure
xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in
xerces/c/branches/jberry/3.0-unstable/m4/xerces_atomicopmgr_selection.m4
xerces/c/branches/jberry/3.0-unstable/m4/xerces_filemgr_selection.m4
xerces/c/branches/jberry/3.0-unstable/m4/xerces_mutexmgr_selection.m4
xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4
xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4
xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in
xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in
xerces/c/branches/jberry/3.0-unstable/src/Makefile.am
xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/NetAccessors/WinSock/
(props changed)
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.cpp
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/Win32/
(props changed)
Modified: xerces/c/branches/jberry/3.0-unstable/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Makefile.in?rev=179393&r1=179392&r2=179393&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/Makefile.in Wed Jun 1 11:18:35 2005
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -33,7 +33,6 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -99,7 +98,6 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
-AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -165,14 +163,20 @@
XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE = @XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@
XERCES_USE_ATOMICOPMGR_POSIX_FALSE = @XERCES_USE_ATOMICOPMGR_POSIX_FALSE@
XERCES_USE_ATOMICOPMGR_POSIX_TRUE = @XERCES_USE_ATOMICOPMGR_POSIX_TRUE@
+XERCES_USE_ATOMICOPMGR_WINDOWS_FALSE = @XERCES_USE_ATOMICOPMGR_WINDOWS_FALSE@
+XERCES_USE_ATOMICOPMGR_WINDOWS_TRUE = @XERCES_USE_ATOMICOPMGR_WINDOWS_TRUE@
XERCES_USE_FILEMGR_POSIX_FALSE = @XERCES_USE_FILEMGR_POSIX_FALSE@
XERCES_USE_FILEMGR_POSIX_TRUE = @XERCES_USE_FILEMGR_POSIX_TRUE@
+XERCES_USE_FILEMGR_WINDOWS_FALSE = @XERCES_USE_FILEMGR_WINDOWS_FALSE@
+XERCES_USE_FILEMGR_WINDOWS_TRUE = @XERCES_USE_FILEMGR_WINDOWS_TRUE@
XERCES_USE_MSGLOADER_INMEMORY_FALSE = @XERCES_USE_MSGLOADER_INMEMORY_FALSE@
XERCES_USE_MSGLOADER_INMEMORY_TRUE = @XERCES_USE_MSGLOADER_INMEMORY_TRUE@
XERCES_USE_MUTEXMGR_NOTHREAD_FALSE = @XERCES_USE_MUTEXMGR_NOTHREAD_FALSE@
XERCES_USE_MUTEXMGR_NOTHREAD_TRUE = @XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@
XERCES_USE_MUTEXMGR_POSIX_FALSE = @XERCES_USE_MUTEXMGR_POSIX_FALSE@
XERCES_USE_MUTEXMGR_POSIX_TRUE = @XERCES_USE_MUTEXMGR_POSIX_TRUE@
+XERCES_USE_MUTEXMGR_WINDOWS_FALSE = @XERCES_USE_MUTEXMGR_WINDOWS_FALSE@
+XERCES_USE_MUTEXMGR_WINDOWS_TRUE = @XERCES_USE_MUTEXMGR_WINDOWS_TRUE@
XERCES_USE_NETACCESSOR_CFURL_FALSE = @XERCES_USE_NETACCESSOR_CFURL_FALSE@
XERCES_USE_NETACCESSOR_CFURL_TRUE = @XERCES_USE_NETACCESSOR_CFURL_TRUE@
XERCES_USE_NETACCESSOR_CURL_FALSE = @XERCES_USE_NETACCESSOR_CURL_FALSE@
@@ -189,7 +193,8 @@
XERCES_USE_TRANSCODER_ICU_TRUE = @XERCES_USE_TRANSCODER_ICU_TRUE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE =
@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE =
@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@
-ac_ct_AR = @ac_ct_AR@
+XERCES_USE_TRANSCODER_WINDOWS_FALSE = @XERCES_USE_TRANSCODER_WINDOWS_FALSE@
+XERCES_USE_TRANSCODER_WINDOWS_TRUE = @XERCES_USE_TRANSCODER_WINDOWS_TRUE@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
@@ -317,13 +322,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -335,7 +334,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -343,13 +342,7 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -370,7 +363,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
