Author: jberry
Date: Fri May 27 08:49:42 2005
New Revision: 178790
URL: http://svn.apache.org/viewcvs?rev=178790&view=rev
Log:
Increase libwww support, though I haven't tested it fully since libwww isn't
installed properly on my system.
libwww is basically end-of-lifed. Maybe we should shoot it. Hopefully the
still-to-be-written
libcurl netaccessor will replace it.
Modified:
xerces/c/branches/jberry/3.0-unstable/Makefile.in
xerces/c/branches/jberry/3.0-unstable/config.h
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_libwww_prefix.m4
xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4
xerces/c/branches/jberry/3.0-unstable/obj/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/PlatformUtils.cpp
xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in
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=178790&r1=178789&r2=178790&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/Makefile.in Fri May 27 08:49:42 2005
@@ -54,7 +54,6 @@
$(top_srcdir)/m4/xerces_filemgr_selection.m4 \
$(top_srcdir)/m4/xerces_icu_prefix.m4 \
$(top_srcdir)/m4/xerces_libwww_prefix.m4 \
- $(top_srcdir)/m4/xerces_link_darwin_framework.m4 \
$(top_srcdir)/m4/xerces_msgloader_selection.m4 \
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
@@ -131,6 +130,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBWWW_PREFIX = @LIBWWW_PREFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
Modified: xerces/c/branches/jberry/3.0-unstable/config.h
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/config.h?rev=178790&r1=178789&r2=178790&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/config.h (original)
+++ xerces/c/branches/jberry/3.0-unstable/config.h Fri May 27 08:49:42 2005
@@ -313,13 +313,13 @@
#define XERCES_USE_MUTEXMGR_POSIX 1
/* Define to use the Mac OS X CFURL NetAccessor */
-#define XERCES_USE_NETACCESSOR_CFURL 1
+/* #undef XERCES_USE_NETACCESSOR_CFURL */
/* Define to use the CURL NetAccessor */
/* #undef XERCES_USE_NETACCESSOR_CURL */
/* Define to use the libwww NetAccessor */
-/* #undef XERCES_USE_NETACCESSOR_LIBWWW */
+#define XERCES_USE_NETACCESSOR_LIBWWW 1
/* Define to use the Sockets-based NetAccessor */
/* #undef XERCES_USE_NETACCESSOR_SOCKET */
Modified: xerces/c/branches/jberry/3.0-unstable/configure
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/configure?rev=178790&r1=178789&r2=178790&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/configure (original)
+++ xerces/c/branches/jberry/3.0-unstable/configure Fri May 27 08:49:42 2005
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CXX CXXFLAGS LDFLAGS
CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE
AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE
CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S EGREP
ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL
acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LIBOBJS CURL_PREFIX
XERCES_USE_NETACCESSOR_CURL_TRUE XERCES_USE_NETACCESSOR_CURL_FALSE
XERCES_USE_NETACCESSOR_CFURL_TRUE XERCES_USE_NETACCESSOR_CFURL_FALSE
XERCES_USE_NETACCESSOR_WINSOCK_TRUE XERCES_USE_NETACCESSOR_WINSOCK_FALSE
XERCES_USE_NETACCESSOR_SOCKET_TRUE XERCES_USE_NETACCESSOR_SOCKET_FALSE
XERCES_USE_NETACCESSOR_LIBWWW_TRUE XERCES_USE_NETACCESSOR_LIBWWW_FALSE
ICU_PREFIX XERCES_USE_TRANSCODER_ICU_TRUE XERCES_USE_TRANSCODER_ICU_FALSE
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE
XERCES_USE_TRANSCODER_ICONV_TRUE XERCES_USE_TRANSCODER_ICONV_FALSE
XERCES_USE_MSGLOADER_INMEMORY_TRUE XERCES_USE_MSGLOADER_INMEMORY_FALSE
XERCES_USE_FILEMGR_POSIX_TRUE XERCES_USE_FILEMGR_POSIX_FALSE
XERCES_USE_MUTEXMGR_NOTHREAD_TRUE XERCES_USE_MUTEXMGR_NOTHREAD_FALSE
XERCES_USE_MUTEXMGR_POSIX_TRUE XERCES_USE_MUTEXMGR_POSIX_FALSE
XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE
XERCES_USE_ATOMICOPMGR_POSIX_TRUE XERCES_USE_ATOMICOPMGR_POSIX_FALSE
XERCES_USE_ATOMICOPMGR_MACOS_TRUE XERCES_USE_ATOMICOPMGR_MACOS_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CXX CXXFLAGS LDFLAGS
CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE
AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE
CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S EGREP
ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL
acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LIBOBJS CURL_PREFIX
LIBWWW_PREFIX XERCES_USE_NETACCESSOR_CURL_TRUE
XERCES_USE_NETACCESSOR_CURL_FALSE XERCES_USE_NETACCESSOR_CFURL_TRUE
XERCES_USE_NETACCESSOR_CFURL_FALSE XERCES_USE_NETACCESSOR_WINSOCK_TRUE
XERCES_USE_NETACCESSOR_WINSOCK_FALSE XERCES_USE_NETACCESSOR_SOCKET_TRUE
XERCES_USE_NETACCESSOR_SOCKET_FALSE XERCES_USE_NETACCESSOR_LIBWWW_TRUE
XERCES_USE_NETACCESSOR_LIBWWW_FALSE ICU_PREFIX XERCES_USE_TRANSCODER_ICU_TRUE
XERCES_USE_TRANSCODER_ICU_FALSE
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE
XERCES_USE_TRANSCODER_ICONV_TRUE XERCES_USE_TRANSCODER_ICONV_FALSE
XERCES_USE_MSGLOADER_INMEMORY_TRUE XERCES_USE_MSGLOADER_INMEMORY_FALSE
XERCES_USE_FILEMGR_POSIX_TRUE XERCES_USE_FILEMGR_POSIX_FALSE
XERCES_USE_MUTEXMGR_NOTHREAD_TRUE XERCES_USE_MUTEXMGR_NOTHREAD_FALSE
XERCES_USE_MUTEXMGR_POSIX_TRUE XERCES_USE_MUTEXMGR_POSIX_FALSE
XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE
XERCES_USE_ATOMICOPMGR_POSIX_TRUE XERCES_USE_ATOMICOPMGR_POSIX_FALSE
XERCES_USE_ATOMICOPMGR_MACOS_TRUE XERCES_USE_ATOMICOPMGR_MACOS_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -24107,7 +24107,7 @@
if test x"$with_libwww" != x"no"; then
search_list="$with_libwww /usr/local /usr"
for i in $search_list; do
- if test -r "$i/include/w3c-libwww/HTTP.h"; then
+ if test -r "$i/include/w3c-libwww/WWWInit.h";
then
xerces_cv_libwww_prefix=$i
break
fi
@@ -24119,6 +24119,9 @@
echo "${ECHO_T}$xerces_cv_libwww_prefix" >&6
+ LIBWWW_PREFIX=$xerces_cv_libwww_prefix
+
+
@@ -24151,7 +24154,7 @@
fi
if test x"$list_add" != x; then
- na_list="$na_list $list_add"; echo "$as_me:$LINENO: result: yes" >&5
+ na_list="$na_list -$list_add-"; echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
@@ -24164,7 +24167,7 @@
echo "$as_me:$LINENO: checking for whether we can support the
libwww-based NetAccessor" >&5
echo $ECHO_N "checking for whether we can support the libwww-based
NetAccessor... $ECHO_C" >&6
list_add=
- if test x"$libwww_dir" != x; then
+ if test x"$xerces_cv_libwww_prefix" != x; then
# Check whether --enable-netaccessor-libwww or
--disable-netaccessor-libwww was given.
if test "${enable_netaccessor_libwww+set}" = set; then
@@ -24180,7 +24183,7 @@
fi
if test x"$list_add" != x; then
- na_list="$na_list $list_add"; echo "$as_me:$LINENO: result: yes" >&5
+ na_list="$na_list -$list_add-"; echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
@@ -24208,7 +24211,7 @@
fi
if test x"$list_add" != x; then
- na_list="$na_list $list_add"; echo "$as_me:$LINENO: result: yes" >&5
+ na_list="$na_list -$list_add-"; echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
@@ -24224,7 +24227,8 @@
case $host_os in
darwin*)
if test x"$ac_cv_header_CoreServices_CoreServices_h" = xyes;
then
- # Check whether --enable-netaccessor-cfurl or
--disable-netaccessor-cfurl was given.
+
+ # Check whether --enable-netaccessor-cfurl or
--disable-netaccessor-cfurl was given.
if test "${enable_netaccessor_cfurl+set}" = set; then
enableval="$enable_netaccessor_cfurl"
if test x"$enableval" = xyes; then
@@ -24234,11 +24238,14 @@
else
list_add=cfurl
fi;
- fi
+
+
+fi
+
;;
esac
if test x"$list_add" != x; then
- na_list="$na_list $list_add"; echo "$as_me:$LINENO: result: yes" >&5
+ na_list="$na_list -$list_add-"; echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
@@ -24267,7 +24274,7 @@
;;
esac
if test x"$list_add" != x; then
- na_list="$na_list $list_add"; echo "$as_me:$LINENO: result: yes" >&5
+ na_list="$na_list -$list_add-"; echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
@@ -24294,7 +24301,8 @@
# Check for each netaccessor, in implicit rank order
case $na_list in
- *curl*)
+
+ *-curl-*)
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_NETACCESSOR_CURL 1
@@ -24303,31 +24311,18 @@
netaccessor=curl
break
;;
- *cfurl*)
+
+ *-cfurl-*)
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_NETACCESSOR_CFURL 1
_ACEOF
netaccessor=cfurl
-
- case $host_os in
- darwin*)
- test -z "${xerces_darwin_frameworks}" &&
xerces_darwin_frameworks="-"
- case ${xerces_darwin_frameworks} in
- *-CoreServices-*)
- ;;
- *)
-
xerces_darwin_frameworks="-CoreServices${xerces_darwin_frameworks}"
- LIBS="-Wl,-framework -Wl,CoreServices $LIBS"
- ;;
- esac
- ;;
- esac
-
break
;;
- *winsock*)
+
+ *-winsock-*)
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_NETACCESSOR_WINSOCK 1
@@ -24336,7 +24331,8 @@
netaccessor=winsock
break
;;
- *socket*)
+
+ *-socket-*)
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_NETACCESSOR_SOCKET 1
@@ -24345,7 +24341,8 @@
netaccessor=socket
break
;;
- *libwww*)
+
+ *-libwww-*)
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_NETACCESSOR_LIBWWW 1
@@ -24354,12 +24351,14 @@
netaccessor=libwww
break
;;
+
*)
if test $i -eq 2; then
echo "$as_me:$LINENO: result: none available;
there will be no network access!!!" >&5
echo "${ECHO_T}none available; there will be no network access!!!" >&6
fi
;;
+
esac
done
if test x"$netaccessor" != x; then
@@ -24838,6 +24837,7 @@
# Check for each transcoder, in implicit rank order
case $tc_list in
+
*-icu-*)
cat >>confdefs.h <<\_ACEOF
@@ -24847,6 +24847,7 @@
transcoder=icu
break
;;
+
*-macosunicodeconverter-*)
cat >>confdefs.h <<\_ACEOF
@@ -26236,6 +26237,7 @@
s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@CURL_PREFIX@,$CURL_PREFIX,;t t
+s,@LIBWWW_PREFIX@,$LIBWWW_PREFIX,;t t
s,@XERCES_USE_NETACCESSOR_CURL_TRUE@,$XERCES_USE_NETACCESSOR_CURL_TRUE,;t t
s,@XERCES_USE_NETACCESSOR_CURL_FALSE@,$XERCES_USE_NETACCESSOR_CURL_FALSE,;t t
s,@XERCES_USE_NETACCESSOR_CFURL_TRUE@,$XERCES_USE_NETACCESSOR_CFURL_TRUE,;t t
Modified: xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in?rev=178790&r1=178789&r2=178790&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in Fri May 27 08:49:42
2005
@@ -73,7 +73,6 @@
$(top_srcdir)/m4/xerces_filemgr_selection.m4 \
$(top_srcdir)/m4/xerces_icu_prefix.m4 \
$(top_srcdir)/m4/xerces_libwww_prefix.m4 \
- $(top_srcdir)/m4/xerces_link_darwin_framework.m4 \
$(top_srcdir)/m4/xerces_msgloader_selection.m4 \
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
@@ -148,6 +147,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBWWW_PREFIX = @LIBWWW_PREFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
Modified: xerces/c/branches/jberry/3.0-unstable/m4/xerces_libwww_prefix.m4
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_libwww_prefix.m4?rev=178790&r1=178789&r2=178790&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_libwww_prefix.m4 (original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_libwww_prefix.m4 Fri May 27
08:49:42 2005
@@ -22,7 +22,7 @@
if test x"$with_libwww" != x"no"; then
search_list="$with_libwww /usr/local /usr"
for i in $search_list; do
- if test -r "$i/include/w3c-libwww/HTTP.h"; then
+ if test -r "$i/include/w3c-libwww/WWWInit.h";
then
xerces_cv_libwww_prefix=$i
break
fi
@@ -30,6 +30,8 @@
fi
])
+
+ AC_SUBST([LIBWWW_PREFIX], [$xerces_cv_libwww_prefix])
]
)
Modified:
xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4?rev=178790&r1=178789&r2=178790&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4
(original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4
Fri May 27 08:49:42 2005
@@ -32,14 +32,14 @@
[list_add=curl])
])
AS_IF([test x"$list_add" != x],
- [na_list="$na_list $list_add"; AC_MSG_RESULT(yes)],
+ [na_list="$na_list -$list_add-"; AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]
)
-
+ AC_REQUIRE([XERCES_LIBWWW_PREFIX])
AC_MSG_CHECKING([for whether we can support the libwww-based
NetAccessor])
list_add=
- AS_IF([test x"$libwww_dir" != x], [
+ AS_IF([test x"$xerces_cv_libwww_prefix" != x], [
AC_ARG_ENABLE([netaccessor-libwww],
AS_HELP_STRING([--enable-netaccessor-libwww],
[Enable libwww-based NetAccessor support]),
@@ -48,7 +48,7 @@
[na_list=libwww])
])
AS_IF([test x"$list_add" != x],
- [na_list="$na_list $list_add"; AC_MSG_RESULT(yes)],
+ [na_list="$na_list -$list_add-"; AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]
)
@@ -64,7 +64,7 @@
[list_add=socket])
])
AS_IF([test x"$list_add" != x],
- [na_list="$na_list $list_add"; AC_MSG_RESULT(yes)],
+ [na_list="$na_list -$list_add-"; AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]
)
@@ -73,18 +73,19 @@
list_add=
case $host_os in
darwin*)
- if test x"$ac_cv_header_CoreServices_CoreServices_h" = xyes;
then
- AC_ARG_ENABLE([netaccessor-cfurl],
- AS_HELP_STRING([--enable-netaccessor-cfurl],
- [Enable cfurl-based NetAccessor support]),
- [AS_IF([test x"$enableval" = xyes],
- [list_add=CFURL])],
- [list_add=cfurl])
- fi
+ AS_IF([test x"$ac_cv_header_CoreServices_CoreServices_h" =
xyes], [
+ AC_ARG_ENABLE([netaccessor-cfurl],
+ AS_HELP_STRING([--enable-netaccessor-cfurl],
+ [Enable cfurl-based NetAccessor
support]),
+ [AS_IF([test x"$enableval" = xyes],
+ [list_add=CFURL])],
+ [list_add=cfurl])
+ ]
+ )
;;
esac
AS_IF([test x"$list_add" != x],
- [na_list="$na_list $list_add"; AC_MSG_RESULT(yes)],
+ [na_list="$na_list -$list_add-"; AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]
)
@@ -103,7 +104,7 @@
;;
esac
AS_IF([test x"$list_add" != x],
- [na_list="$na_list $list_add"; AC_MSG_RESULT(yes)],
+ [na_list="$na_list -$list_add-"; AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]
)
@@ -124,37 +125,43 @@
# Check for each netaccessor, in implicit rank order
case $na_list in
- *curl*)
+
+ *-curl-*)
AC_DEFINE([XERCES_USE_NETACCESSOR_CURL], 1, [Define to
use the CURL NetAccessor])
netaccessor=curl
break
;;
- *cfurl*)
+
+ *-cfurl-*)
AC_DEFINE([XERCES_USE_NETACCESSOR_CFURL], 1, [Define to
use the Mac OS X CFURL NetAccessor])
netaccessor=cfurl
- XERCES_LINK_DARWIN_FRAMEWORK([CoreServices])
break
;;
- *winsock*)
+
+ *-winsock-*)
AC_DEFINE([XERCES_USE_NETACCESSOR_WINSOCK], 1, [Define
to use the WinSock NetAccessor])
netaccessor=winsock
break
;;
- *socket*)
+
+ *-socket-*)
AC_DEFINE([XERCES_USE_NETACCESSOR_SOCKET], 1, [Define
to use the Sockets-based NetAccessor])
netaccessor=socket
break
;;
- *libwww*)
+
+ *-libwww-*)
AC_DEFINE([XERCES_USE_NETACCESSOR_LIBWWW], 1, [Define
to use the libwww NetAccessor])
netaccessor=libwww
break
;;
+
*)
if [test $i -eq 2]; then
AC_MSG_RESULT([none available; there will be no
network access!!!])
fi
;;
+
esac
done
if test x"$netaccessor" != x; then
Modified: xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in?rev=178790&r1=178789&r2=178790&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in Fri May 27 08:49:42
2005
@@ -72,7 +72,6 @@
$(top_srcdir)/m4/xerces_filemgr_selection.m4 \
$(top_srcdir)/m4/xerces_icu_prefix.m4 \
$(top_srcdir)/m4/xerces_libwww_prefix.m4 \
- $(top_srcdir)/m4/xerces_link_darwin_framework.m4 \
$(top_srcdir)/m4/xerces_msgloader_selection.m4 \
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
@@ -154,6 +153,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBWWW_PREFIX = @LIBWWW_PREFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
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=178790&r1=178789&r2=178790&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.am (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.am Fri May 27 08:49:42
2005
@@ -95,11 +95,21 @@
libsockets_la_SOURCES = ${sockets_sources}
endif
+if XERCES_USE_NETACCESSOR_LIBWWW
+src_libraries += libwww.la
+libwww_ladir = ${includedir}
+nobase_libwww_la_HEADERS = ${libwww_headers}
+libwww_la_SOURCES = ${libwww_sources}
+libwww_la_CXXFLAGS = ${AM_CXXFLAGS}
-I${LIBWWW_PREFIX}/include/w3c-libwww
+libwww_la_LIBADD = -L${LIBWWW_PREFIX}/lib
-lwww
+endif
+
if XERCES_USE_NETACCESSOR_CFURL
src_libraries += libcfurl.la
libcfurl_ladir = ${includedir}
nobase_libcfurl_la_HEADERS = ${cfurl_headers}
libcfurl_la_SOURCES = ${cfurl_sources}
+libcfurl_la_LDFLAGS = ${AM_LDFLAGS} -Wl,-framework
-Wl,CoreServices
endif
#
@@ -110,7 +120,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_CXXFLAGS = ${AM_CXXFLAGS}
-I${ICU_PREFIX}/include
libicu_la_LIBADD = -L${ICU_PREFIX}/lib
-licuuc -licudata
endif
@@ -161,7 +171,7 @@
libmacosaomgr_ladir = ${includedir}
nobase_libmacosaomgr_la_HEADERS = ${macosaomgr_headers}
libmacosaomgr_la_SOURCES = ${macosaomgr_sources}
-libmacosaomgr_la_LDFLAGS = -Wl,-framework -Wl,CoreServices
+libmacosaomgr_la_LDFLAGS = ${AM_LDFLAGS} -Wl,-framework
-Wl,CoreServices
endif
#
@@ -983,6 +993,14 @@
sockets_sources = \
xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp \
xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
+
+libwww_headers = \
+ xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.hpp \
+ xercesc/util/NetAccessors/LibWWW/BinURLInputStream.hpp
+
+libwww_sources = \
+ xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.cpp \
+ xercesc/util/NetAccessors/LibWWW/BinURLInputStream.cpp
cfurl_headers = \
xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.hpp \
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=178790&r1=178789&r2=178790&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.in Fri May 27 08:49:42
2005
@@ -35,7 +35,7 @@
#
-SOURCES = $(libcfurl_la_SOURCES) $(libdom_la_SOURCES) $(libdomimpl_la_SOURCES)
$(libframework_la_SOURCES) $(libiconv_la_SOURCES) $(libicu_la_SOURCES)
$(libinmemory_la_SOURCES) $(libinternal_la_SOURCES) $(libmacosaomgr_la_SOURCES)
$(libmacosunicodeconverter_la_SOURCES) $(libnothreadaomgr_la_SOURCES)
$(libnothreadmmgr_la_SOURCES) $(libparsers_la_SOURCES)
$(libposixaomgr_la_SOURCES) $(libposixfmgr_la_SOURCES)
$(libposixmmgr_la_SOURCES) $(libsax_la_SOURCES) $(libsax2_la_SOURCES)
$(libsockets_la_SOURCES) $(libsrc_la_SOURCES) $(libutil_la_SOURCES)
$(libvalidators_la_SOURCES)
+SOURCES = $(libcfurl_la_SOURCES) $(libdom_la_SOURCES) $(libdomimpl_la_SOURCES)
$(libframework_la_SOURCES) $(libiconv_la_SOURCES) $(libicu_la_SOURCES)
$(libinmemory_la_SOURCES) $(libinternal_la_SOURCES) $(libmacosaomgr_la_SOURCES)
$(libmacosunicodeconverter_la_SOURCES) $(libnothreadaomgr_la_SOURCES)
$(libnothreadmmgr_la_SOURCES) $(libparsers_la_SOURCES)
$(libposixaomgr_la_SOURCES) $(libposixfmgr_la_SOURCES)
$(libposixmmgr_la_SOURCES) $(libsax_la_SOURCES) $(libsax2_la_SOURCES)
$(libsockets_la_SOURCES) $(libsrc_la_SOURCES) $(libutil_la_SOURCES)
$(libvalidators_la_SOURCES) $(libwww_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -64,37 +64,38 @@
# NetAccessors, conditionally built based on settings from configure
#
@[EMAIL PROTECTED] = libsockets.la
[EMAIL PROTECTED]@am__append_2 = libcfurl.la
[EMAIL PROTECTED]@am__append_2 = libwww.la
[EMAIL PROTECTED]@am__append_3 = libcfurl.la
#
# Transcoders, conditionally built based on settings from configure
#
[EMAIL PROTECTED]@am__append_3 = libicu.la
[EMAIL PROTECTED]@am__append_4 = libiconv.la
[EMAIL PROTECTED]@am__append_5 = libmacosunicodeconverter.la
[EMAIL PROTECTED]@am__append_4 = libicu.la
[EMAIL PROTECTED]@am__append_5 = libiconv.la
[EMAIL PROTECTED]@am__append_6 = libmacosunicodeconverter.la
#
# MsgLoaders, conditionally built based on settings from configure
#
[EMAIL PROTECTED]@am__append_6 = libinmemory.la
[EMAIL PROTECTED]@am__append_7 = libinmemory.la
#
# AtomicOp Managers, conditionally built based on settings from configure
#
[EMAIL PROTECTED]@am__append_7 = libnothreadaomgr.la
[EMAIL PROTECTED]@am__append_8 = libposixaomgr.la
[EMAIL PROTECTED]@am__append_9 = libmacosaomgr.la
[EMAIL PROTECTED]@am__append_8 = libnothreadaomgr.la
[EMAIL PROTECTED]@am__append_9 = libposixaomgr.la
[EMAIL PROTECTED]@am__append_10 = libmacosaomgr.la
#
# Mutex Managers, conditionally built based on settings from configure
#
[EMAIL PROTECTED]@am__append_10 = libnothreadmmgr.la
[EMAIL PROTECTED]@am__append_11 = libposixmmgr.la
[EMAIL PROTECTED]@am__append_11 = libnothreadmmgr.la
[EMAIL PROTECTED]@am__append_12 = libposixmmgr.la
#
# File Managers, conditionally built based on settings from configure
#
[EMAIL PROTECTED]@am__append_12 = libposixfmgr.la
[EMAIL PROTECTED]@am__append_13 = libposixfmgr.la
subdir = src
DIST_COMMON = $(am__nobase_libcfurl_la_HEADERS_DIST) \
$(am__nobase_libiconv_la_HEADERS_DIST) \
@@ -108,6 +109,7 @@
$(am__nobase_libposixfmgr_la_HEADERS_DIST) \
$(am__nobase_libposixmmgr_la_HEADERS_DIST) \
$(am__nobase_libsockets_la_HEADERS_DIST) \
+ $(am__nobase_libwww_la_HEADERS_DIST) \
$(nobase_libdom_la_HEADERS) $(nobase_libdomimpl_la_HEADERS) \
$(nobase_libframework_la_HEADERS) \
$(nobase_libinternal_la_HEADERS) \
@@ -127,7 +129,6 @@
$(top_srcdir)/m4/xerces_filemgr_selection.m4 \
$(top_srcdir)/m4/xerces_icu_prefix.m4 \
$(top_srcdir)/m4/xerces_libwww_prefix.m4 \
- $(top_srcdir)/m4/xerces_link_darwin_framework.m4 \
$(top_srcdir)/m4/xerces_msgloader_selection.m4 \
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
@@ -311,23 +312,24 @@
@[EMAIL PROTECTED] =
@[EMAIL PROTECTED] = \
@XERCES_USE_NETACCESSOR_SOCKET_TRUE@ libsockets.la
[EMAIL PROTECTED]@am__DEPENDENCIES_2 = libcfurl.la
[EMAIL PROTECTED]@am__DEPENDENCIES_3 = libicu.la
[EMAIL PROTECTED]@am__DEPENDENCIES_4 = libiconv.la
[EMAIL PROTECTED]@am__DEPENDENCIES_5 = libmacosunicodeconverter.la
[EMAIL PROTECTED]@am__DEPENDENCIES_6 = \
[EMAIL PROTECTED]@am__DEPENDENCIES_2 = libwww.la
[EMAIL PROTECTED]@am__DEPENDENCIES_3 = libcfurl.la
[EMAIL PROTECTED]@am__DEPENDENCIES_4 = libicu.la
[EMAIL PROTECTED]@am__DEPENDENCIES_5 = libiconv.la
[EMAIL PROTECTED]@am__DEPENDENCIES_6 = libmacosunicodeconverter.la
[EMAIL PROTECTED]@am__DEPENDENCIES_7 = \
@XERCES_USE_MSGLOADER_INMEMORY_TRUE@ libinmemory.la
[EMAIL PROTECTED]@am__DEPENDENCIES_7 = \
[EMAIL PROTECTED]@am__DEPENDENCIES_8 = \
@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@ libnothreadaomgr.la
[EMAIL PROTECTED]@am__DEPENDENCIES_8 = \
[EMAIL PROTECTED]@am__DEPENDENCIES_9 = \
@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@ libposixaomgr.la
[EMAIL PROTECTED]@am__DEPENDENCIES_9 = \
[EMAIL PROTECTED]@am__DEPENDENCIES_10 = \
@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@ libmacosaomgr.la
[EMAIL PROTECTED]@am__DEPENDENCIES_10 = \
[EMAIL PROTECTED]@am__DEPENDENCIES_11 = \
@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@ libnothreadmmgr.la
[EMAIL PROTECTED]@am__DEPENDENCIES_11 = libposixmmgr.la
[EMAIL PROTECTED]@am__DEPENDENCIES_12 = libposixfmgr.la
-am__DEPENDENCIES_13 = libutil.la libdom.la libdomimpl.la \
[EMAIL PROTECTED]@am__DEPENDENCIES_12 = libposixmmgr.la
[EMAIL PROTECTED]@am__DEPENDENCIES_13 = libposixfmgr.la
+am__DEPENDENCIES_14 = libutil.la libdom.la libdomimpl.la \
libframework.la libinternal.la libparsers.la libsax.la \
libsax2.la libvalidators.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
@@ -335,8 +337,8 @@
$(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__DEPENDENCIES_12) $(am__DEPENDENCIES_13)
+libsrc_la_DEPENDENCIES = $(am__DEPENDENCIES_14)
am_libsrc_la_OBJECTS =
libsrc_la_OBJECTS = $(am_libsrc_la_OBJECTS)
libutil_la_LIBADD =
@@ -405,6 +407,16 @@
XSDErrorReporter.lo XSDLocator.lo XUtil.lo
am_libvalidators_la_OBJECTS = $(am__objects_21)
libvalidators_la_OBJECTS = $(am_libvalidators_la_OBJECTS)
+libwww_la_DEPENDENCIES =
+am__libwww_la_SOURCES_DIST = \
+ xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.cpp \
+ xercesc/util/NetAccessors/LibWWW/BinURLInputStream.cpp
+am__objects_22 = libwww_la-LibWWWNetAccessor.lo \
+ libwww_la-BinURLInputStream.lo
[EMAIL PROTECTED]@am_libwww_la_OBJECTS = \
[EMAIL PROTECTED]@ $(am__objects_22)
+libwww_la_OBJECTS = $(am_libwww_la_OBJECTS)
[EMAIL PROTECTED]@am_libwww_la_rpath =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -435,7 +447,8 @@
$(libposixfmgr_la_SOURCES) $(libposixmmgr_la_SOURCES) \
$(libsax_la_SOURCES) $(libsax2_la_SOURCES) \
$(libsockets_la_SOURCES) $(libsrc_la_SOURCES) \
- $(libutil_la_SOURCES) $(libvalidators_la_SOURCES)
+ $(libutil_la_SOURCES) $(libvalidators_la_SOURCES) \
+ $(libwww_la_SOURCES)
DIST_SOURCES = $(am__libcfurl_la_SOURCES_DIST) $(libdom_la_SOURCES) \
$(libdomimpl_la_SOURCES) $(libframework_la_SOURCES) \
$(am__libiconv_la_SOURCES_DIST) $(am__libicu_la_SOURCES_DIST) \
@@ -449,7 +462,7 @@
$(am__libposixmmgr_la_SOURCES_DIST) $(libsax_la_SOURCES) \
$(libsax2_la_SOURCES) $(am__libsockets_la_SOURCES_DIST) \
$(libsrc_la_SOURCES) $(libutil_la_SOURCES) \
- $(libvalidators_la_SOURCES)
+ $(libvalidators_la_SOURCES) $(am__libwww_la_SOURCES_DIST)
am__nobase_libcfurl_la_HEADERS_DIST =
xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.hpp \
xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -474,7 +487,7 @@
"$(DESTDIR)$(libposixmmgr_ladir)" "$(DESTDIR)$(libsax2_ladir)" \
"$(DESTDIR)$(libsax_ladir)" "$(DESTDIR)$(libsockets_ladir)" \
"$(DESTDIR)$(libutil_ladir)" \
- "$(DESTDIR)$(libvalidators_ladir)"
+ "$(DESTDIR)$(libvalidators_ladir)" "$(DESTDIR)$(libwww_ladir)"
nobase_libcfurl_laHEADERS_INSTALL = $(install_sh_DATA)
nobase_libdom_laHEADERS_INSTALL = $(install_sh_DATA)
nobase_libdomimpl_laHEADERS_INSTALL = $(install_sh_DATA)
@@ -519,6 +532,10 @@
nobase_libsockets_laHEADERS_INSTALL = $(install_sh_DATA)
nobase_libutil_laHEADERS_INSTALL = $(install_sh_DATA)
nobase_libvalidators_laHEADERS_INSTALL = $(install_sh_DATA)
+am__nobase_libwww_la_HEADERS_DIST = \
+ xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.hpp \
+ xercesc/util/NetAccessors/LibWWW/BinURLInputStream.hpp
+nobase_libwww_laHEADERS_INSTALL = $(install_sh_DATA)
HEADERS = $(nobase_libcfurl_la_HEADERS) $(nobase_libdom_la_HEADERS) \
$(nobase_libdomimpl_la_HEADERS) \
$(nobase_libframework_la_HEADERS) \
@@ -535,7 +552,7 @@
$(nobase_libposixmmgr_la_HEADERS) $(nobase_libsax2_la_HEADERS) \
$(nobase_libsax_la_HEADERS) $(nobase_libsockets_la_HEADERS) \
$(nobase_libutil_la_HEADERS) \
- $(nobase_libvalidators_la_HEADERS)
+ $(nobase_libvalidators_la_HEADERS) $(nobase_libwww_la_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -578,6 +595,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBWWW_PREFIX = @LIBWWW_PREFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -699,7 +717,7 @@
$(am__append_3) $(am__append_4) $(am__append_5) \
$(am__append_6) $(am__append_7) $(am__append_8) \
$(am__append_9) $(am__append_10) $(am__append_11) \
- $(am__append_12)
+ $(am__append_12) $(am__append_13)
libutil_ladir = ${includedir}
nobase_libutil_la_HEADERS = ${util_headers}
libutil_la_SOURCES = ${util_sources}
@@ -730,13 +748,19 @@
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${sockets_headers}
@[EMAIL PROTECTED] = ${sockets_sources}
[EMAIL PROTECTED]@libwww_ladir = ${includedir}
[EMAIL PROTECTED]@nobase_libwww_la_HEADERS = ${libwww_headers}
[EMAIL PROTECTED]@libwww_la_SOURCES = ${libwww_sources}
[EMAIL PROTECTED]@libwww_la_CXXFLAGS = ${AM_CXXFLAGS}
-I${LIBWWW_PREFIX}/include/w3c-libwww
[EMAIL PROTECTED]@libwww_la_LIBADD = -L${LIBWWW_PREFIX}/lib -lwww
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${cfurl_headers}
@[EMAIL PROTECTED] = ${cfurl_sources}
[EMAIL PROTECTED]@libcfurl_la_LDFLAGS = ${AM_LDFLAGS} -Wl,-framework
-Wl,CoreServices
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${icu_headers}
@[EMAIL PROTECTED] = ${icu_sources}
[EMAIL PROTECTED]@libicu_la_CPPFLAGS = -I${ICU_PREFIX}/include ${AM_CPPFLAGS}
[EMAIL PROTECTED]@libicu_la_CXXFLAGS = ${AM_CXXFLAGS} -I${ICU_PREFIX}/include
@[EMAIL PROTECTED] = -L${ICU_PREFIX}/lib -licuuc -licudata
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${iconv_headers}
@@ -757,7 +781,7 @@
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${macosaomgr_headers}
@[EMAIL PROTECTED] = ${macosaomgr_sources}
[EMAIL PROTECTED]@libmacosaomgr_la_LDFLAGS = -Wl,-framework -Wl,CoreServices
[EMAIL PROTECTED]@libmacosaomgr_la_LDFLAGS = ${AM_LDFLAGS} -Wl,-framework
-Wl,CoreServices
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${nothreadmmgr_headers}
@[EMAIL PROTECTED] = ${nothreadmmgr_sources}
@@ -1550,6 +1574,14 @@
xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp \
xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
+libwww_headers = \
+ xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.hpp \
+ xercesc/util/NetAccessors/LibWWW/BinURLInputStream.hpp
+
+libwww_sources = \
+ xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.cpp \
+ xercesc/util/NetAccessors/LibWWW/BinURLInputStream.cpp
+
cfurl_headers = \
xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.hpp \
xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp
@@ -1699,6 +1731,8 @@
$(CXXLINK) $(libutil_la_LDFLAGS) $(libutil_la_OBJECTS)
$(libutil_la_LIBADD) $(LIBS)
libvalidators.la: $(libvalidators_la_OBJECTS) $(libvalidators_la_DEPENDENCIES)
$(CXXLINK) $(libvalidators_la_LDFLAGS) $(libvalidators_la_OBJECTS)
$(libvalidators_la_LIBADD) $(LIBS)
+libwww.la: $(libwww_la_OBJECTS) $(libwww_la_DEPENDENCIES)
+ $(CXXLINK) $(am_libwww_la_rpath) $(libwww_la_LDFLAGS)
$(libwww_la_OBJECTS) $(libwww_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -2005,6 +2039,8 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
.cpp.o:
@@ -2680,11 +2716,11 @@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS)
$(CXXFLAGS) -c -o IconvTransService.lo `test -f
'xercesc/util/Transcoders/Iconv/IconvTransService.cpp' || echo
'$(srcdir)/'`xercesc/util/Transcoders/Iconv/IconvTransService.cpp
libicu_la-ICUTransService.lo: xercesc/util/Transcoders/ICU/ICUTransService.cpp
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(libicu_la_CPPFLAGS) $(CPPFLAGS)
$(AM_CXXFLAGS) $(CXXFLAGS) -MT libicu_la-ICUTransService.lo -MD -MP -MF
"$(DEPDIR)/libicu_la-ICUTransService.Tpo" -c -o libicu_la-ICUTransService.lo
`test -f 'xercesc/util/Transcoders/ICU/ICUTransService.cpp' || echo
'$(srcdir)/'`xercesc/util/Transcoders/ICU/ICUTransService.cpp; \
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libicu_la_CXXFLAGS) $(CXXFLAGS) -MT libicu_la-ICUTransService.lo -MD -MP -MF
"$(DEPDIR)/libicu_la-ICUTransService.Tpo" -c -o libicu_la-ICUTransService.lo
`test -f 'xercesc/util/Transcoders/ICU/ICUTransService.cpp' || echo
'$(srcdir)/'`xercesc/util/Transcoders/ICU/ICUTransService.cpp; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libicu_la-ICUTransService.Tpo"
"$(DEPDIR)/libicu_la-ICUTransService.Plo"; else rm -f
"$(DEPDIR)/libicu_la-ICUTransService.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@
source='xercesc/util/Transcoders/ICU/ICUTransService.cpp'
object='libicu_la-ICUTransService.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(libicu_la_CPPFLAGS) $(CPPFLAGS)
$(AM_CXXFLAGS) $(CXXFLAGS) -c -o libicu_la-ICUTransService.lo `test -f
'xercesc/util/Transcoders/ICU/ICUTransService.cpp' || echo
'$(srcdir)/'`xercesc/util/Transcoders/ICU/ICUTransService.cpp
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libicu_la_CXXFLAGS) $(CXXFLAGS) -c -o libicu_la-ICUTransService.lo `test -f
'xercesc/util/Transcoders/ICU/ICUTransService.cpp' || echo
'$(srcdir)/'`xercesc/util/Transcoders/ICU/ICUTransService.cpp
InMemMsgLoader.lo: xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS)
$(CXXFLAGS) -MT InMemMsgLoader.lo -MD -MP -MF "$(DEPDIR)/InMemMsgLoader.Tpo" -c
-o InMemMsgLoader.lo `test -f
'xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp' || echo
'$(srcdir)/'`xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp; \
@@ -4128,6 +4164,20 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS)
$(CXXFLAGS) -c -o XUtil.lo `test -f 'xercesc/validators/schema/XUtil.cpp' ||
echo '$(srcdir)/'`xercesc/validators/schema/XUtil.cpp
+libwww_la-LibWWWNetAccessor.lo:
xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.cpp
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libwww_la_CXXFLAGS) $(CXXFLAGS) -MT libwww_la-LibWWWNetAccessor.lo -MD -MP
-MF "$(DEPDIR)/libwww_la-LibWWWNetAccessor.Tpo" -c -o
libwww_la-LibWWWNetAccessor.lo `test -f
'xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.cpp' || echo
'$(srcdir)/'`xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.cpp; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/libwww_la-LibWWWNetAccessor.Tpo"
"$(DEPDIR)/libwww_la-LibWWWNetAccessor.Plo"; else rm -f
"$(DEPDIR)/libwww_la-LibWWWNetAccessor.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@
source='xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.cpp'
object='libwww_la-LibWWWNetAccessor.lo' libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libwww_la_CXXFLAGS) $(CXXFLAGS) -c -o libwww_la-LibWWWNetAccessor.lo `test -f
'xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.cpp' || echo
'$(srcdir)/'`xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.cpp
+
+libwww_la-BinURLInputStream.lo:
xercesc/util/NetAccessors/LibWWW/BinURLInputStream.cpp
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libwww_la_CXXFLAGS) $(CXXFLAGS) -MT libwww_la-BinURLInputStream.lo -MD -MP
-MF "$(DEPDIR)/libwww_la-BinURLInputStream.Tpo" -c -o
libwww_la-BinURLInputStream.lo `test -f
'xercesc/util/NetAccessors/LibWWW/BinURLInputStream.cpp' || echo
'$(srcdir)/'`xercesc/util/NetAccessors/LibWWW/BinURLInputStream.cpp; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/libwww_la-BinURLInputStream.Tpo"
"$(DEPDIR)/libwww_la-BinURLInputStream.Plo"; else rm -f
"$(DEPDIR)/libwww_la-BinURLInputStream.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@
source='xercesc/util/NetAccessors/LibWWW/BinURLInputStream.cpp'
object='libwww_la-BinURLInputStream.lo' libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libwww_la_CXXFLAGS) $(CXXFLAGS) -c -o libwww_la-BinURLInputStream.lo `test -f
'xercesc/util/NetAccessors/LibWWW/BinURLInputStream.cpp' || echo
'$(srcdir)/'`xercesc/util/NetAccessors/LibWWW/BinURLInputStream.cpp
+
mostlyclean-libtool:
-rm -f *.lo
@@ -4536,6 +4586,25 @@
echo " rm -f '$(DESTDIR)$(libvalidators_ladir)/$$f'"; \
rm -f "$(DESTDIR)$(libvalidators_ladir)/$$f"; \
done
+install-nobase_libwww_laHEADERS: $(nobase_libwww_la_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(libwww_ladir)" || $(mkdir_p) "$(DESTDIR)$(libwww_ladir)"
+ @$(am__vpath_adj_setup) \
+ list='$(nobase_libwww_la_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ $(am__vpath_adj) \
+ echo " $(nobase_libwww_laHEADERS_INSTALL) '$$d$$p'
'$(DESTDIR)$(libwww_ladir)/$$f'"; \
+ $(nobase_libwww_laHEADERS_INSTALL) "$$d$$p"
"$(DESTDIR)$(libwww_ladir)/$$f"; \
+ done
+
+uninstall-nobase_libwww_laHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @$(am__vpath_adj_setup) \
+ list='$(nobase_libwww_la_HEADERS)'; for p in $$list; do \
+ $(am__vpath_adj) \
+ echo " rm -f '$(DESTDIR)$(libwww_ladir)/$$f'"; \
+ rm -f "$(DESTDIR)$(libwww_ladir)/$$f"; \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -4586,7 +4655,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/xercesc/dom $(distdir)/xercesc/dom/impl
$(distdir)/xercesc/framework $(distdir)/xercesc/framework/psvi
$(distdir)/xercesc/internal $(distdir)/xercesc/parsers $(distdir)/xercesc/sax
$(distdir)/xercesc/sax2 $(distdir)/xercesc/util
$(distdir)/xercesc/util/AtomicOpManagers $(distdir)/xercesc/util/FileManagers
$(distdir)/xercesc/util/MsgLoaders/InMemory
$(distdir)/xercesc/util/MutexManagers
$(distdir)/xercesc/util/NetAccessors/MacOSURLAccessCF
$(distdir)/xercesc/util/NetAccessors/Socket
$(distdir)/xercesc/util/Transcoders/ICU
$(distdir)/xercesc/util/Transcoders/Iconv
$(distdir)/xercesc/util/Transcoders/MacOSUnicodeConverter
$(distdir)/xercesc/util/regx $(distdir)/xercesc/validators/DTD
$(distdir)/xercesc/validators/common $(distdir)/xercesc/validators/datatype
$(distdir)/xercesc/validators/schema
$(distdir)/xercesc/validators/schema/identity
+ $(mkdir_p) $(distdir)/xercesc/dom $(distdir)/xercesc/dom/impl
$(distdir)/xercesc/framework $(distdir)/xercesc/framework/psvi
$(distdir)/xercesc/internal $(distdir)/xercesc/parsers $(distdir)/xercesc/sax
$(distdir)/xercesc/sax2 $(distdir)/xercesc/util
$(distdir)/xercesc/util/AtomicOpManagers $(distdir)/xercesc/util/FileManagers
$(distdir)/xercesc/util/MsgLoaders/InMemory
$(distdir)/xercesc/util/MutexManagers
$(distdir)/xercesc/util/NetAccessors/LibWWW
$(distdir)/xercesc/util/NetAccessors/MacOSURLAccessCF
$(distdir)/xercesc/util/NetAccessors/Socket
$(distdir)/xercesc/util/Transcoders/ICU
$(distdir)/xercesc/util/Transcoders/Iconv
$(distdir)/xercesc/util/Transcoders/MacOSUnicodeConverter
$(distdir)/xercesc/util/regx $(distdir)/xercesc/validators/DTD
$(distdir)/xercesc/validators/common $(distdir)/xercesc/validators/datatype
$(distdir)/xercesc/validators/schema
$(distdir)/xercesc/validators/schema/identity
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -4617,7 +4686,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libcfurl_ladir)" "$(DESTDIR)$(libdom_ladir)"
"$(DESTDIR)$(libdomimpl_ladir)" "$(DESTDIR)$(libframework_ladir)"
"$(DESTDIR)$(libiconv_ladir)" "$(DESTDIR)$(libicu_ladir)"
"$(DESTDIR)$(libinmemory_ladir)" "$(DESTDIR)$(libinternal_ladir)"
"$(DESTDIR)$(libmacosaomgr_ladir)"
"$(DESTDIR)$(libmacosunicodeconverter_ladir)"
"$(DESTDIR)$(libnothreadaomgr_ladir)" "$(DESTDIR)$(libnothreadmmgr_ladir)"
"$(DESTDIR)$(libparsers_ladir)" "$(DESTDIR)$(libposixaomgr_ladir)"
"$(DESTDIR)$(libposixfmgr_ladir)" "$(DESTDIR)$(libposixmmgr_ladir)"
"$(DESTDIR)$(libsax2_ladir)" "$(DESTDIR)$(libsax_ladir)"
"$(DESTDIR)$(libsockets_ladir)" "$(DESTDIR)$(libutil_ladir)"
"$(DESTDIR)$(libvalidators_ladir)"; do \
+ for dir in "$(DESTDIR)$(libcfurl_ladir)" "$(DESTDIR)$(libdom_ladir)"
"$(DESTDIR)$(libdomimpl_ladir)" "$(DESTDIR)$(libframework_ladir)"
"$(DESTDIR)$(libiconv_ladir)" "$(DESTDIR)$(libicu_ladir)"
"$(DESTDIR)$(libinmemory_ladir)" "$(DESTDIR)$(libinternal_ladir)"
"$(DESTDIR)$(libmacosaomgr_ladir)"
"$(DESTDIR)$(libmacosunicodeconverter_ladir)"
"$(DESTDIR)$(libnothreadaomgr_ladir)" "$(DESTDIR)$(libnothreadmmgr_ladir)"
"$(DESTDIR)$(libparsers_ladir)" "$(DESTDIR)$(libposixaomgr_ladir)"
"$(DESTDIR)$(libposixfmgr_ladir)" "$(DESTDIR)$(libposixmmgr_ladir)"
"$(DESTDIR)$(libsax2_ladir)" "$(DESTDIR)$(libsax_ladir)"
"$(DESTDIR)$(libsockets_ladir)" "$(DESTDIR)$(libutil_ladir)"
"$(DESTDIR)$(libvalidators_ladir)" "$(DESTDIR)$(libwww_ladir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -4685,7 +4754,8 @@
install-nobase_libsax_laHEADERS \
install-nobase_libsockets_laHEADERS \
install-nobase_libutil_laHEADERS \
- install-nobase_libvalidators_laHEADERS
+ install-nobase_libvalidators_laHEADERS \
+ install-nobase_libwww_laHEADERS
install-exec-am:
@@ -4733,7 +4803,8 @@
uninstall-nobase_libsax_laHEADERS \
uninstall-nobase_libsockets_laHEADERS \
uninstall-nobase_libutil_laHEADERS \
- uninstall-nobase_libvalidators_laHEADERS
+ uninstall-nobase_libvalidators_laHEADERS \
+ uninstall-nobase_libwww_laHEADERS
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
@@ -4761,8 +4832,9 @@
install-nobase_libsax_laHEADERS \
install-nobase_libsockets_laHEADERS \
install-nobase_libutil_laHEADERS \
- install-nobase_libvalidators_laHEADERS install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ install-nobase_libvalidators_laHEADERS \
+ install-nobase_libwww_laHEADERS install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-info-am \
@@ -4786,7 +4858,8 @@
uninstall-nobase_libsax_laHEADERS \
uninstall-nobase_libsockets_laHEADERS \
uninstall-nobase_libutil_laHEADERS \
- uninstall-nobase_libvalidators_laHEADERS
+ uninstall-nobase_libvalidators_laHEADERS \
+ uninstall-nobase_libwww_laHEADERS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified:
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.cpp?rev=178790&r1=178789&r2=178790&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.cpp
(original)
+++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.cpp
Fri May 27 08:49:42 2005
@@ -23,12 +23,19 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
-// *** TODO: protect and x-platform
-#include <limits.h>
-// #include <sys/timeb.h>
-#include <sys/time.h>
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#if HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#if HAVE_SYS_TIMEB_H
+# include <sys/timeb.h>
+#endif
#include <xercesc/util/Mutexes.hpp>
#include <xercesc/util/PlatformUtils.hpp>
Modified: xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in?rev=178790&r1=178789&r2=178790&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in Fri May 27 08:49:42
2005
@@ -72,7 +72,6 @@
$(top_srcdir)/m4/xerces_filemgr_selection.m4 \
$(top_srcdir)/m4/xerces_icu_prefix.m4 \
$(top_srcdir)/m4/xerces_libwww_prefix.m4 \
- $(top_srcdir)/m4/xerces_link_darwin_framework.m4 \
$(top_srcdir)/m4/xerces_msgloader_selection.m4 \
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
@@ -204,6 +203,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBWWW_PREFIX = @LIBWWW_PREFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
