Author: borisk
Date: Thu Feb 28 08:38:42 2008
New Revision: 632048
URL: http://svn.apache.org/viewvc?rev=632048&view=rev
Log:
Make the curl net accessor take priority over socket. Make the icu message
loader take priority over inmemory.
Modified:
xerces/c/trunk/m4/xerces_msgloader_selection.m4
xerces/c/trunk/m4/xerces_netaccessor_selection.m4
Modified: xerces/c/trunk/m4/xerces_msgloader_selection.m4
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_msgloader_selection.m4?rev=632048&r1=632047&r2=632048&view=diff
==============================================================================
--- xerces/c/trunk/m4/xerces_msgloader_selection.m4 (original)
+++ xerces/c/trunk/m4/xerces_msgloader_selection.m4 Thu Feb 28 08:38:42 2008
@@ -92,16 +92,16 @@
# Check for each msgloader, in implicit rank order
case $ml_list in
- *-inmemory-*)
- AC_DEFINE([XERCES_USE_MSGLOADER_INMEMORY], 1, [Define
to use the InMemory MsgLoader])
- msgloader=inmemory
- break
- ;;
-
*-icu-*)
AC_DEFINE([XERCES_USE_MSGLOADER_ICU], 1, [Define to use
the ICU-based MsgLoader])
msgloader=icu
LIBS="${LIBS} -L${xerces_cv_icu_prefix}/lib -licuuc
-licudata"
+ break
+ ;;
+
+ *-inmemory-*)
+ AC_DEFINE([XERCES_USE_MSGLOADER_INMEMORY], 1, [Define
to use the InMemory MsgLoader])
+ msgloader=inmemory
break
;;
Modified: xerces/c/trunk/m4/xerces_netaccessor_selection.m4
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_netaccessor_selection.m4?rev=632048&r1=632047&r2=632048&view=diff
==============================================================================
--- xerces/c/trunk/m4/xerces_netaccessor_selection.m4 (original)
+++ xerces/c/trunk/m4/xerces_netaccessor_selection.m4 Thu Feb 28 08:38:42 2008
@@ -143,6 +143,13 @@
# Check for each netaccessor, in implicit rank order
case $na_list in
+ *-curl-*)
+ netaccessor=curl
+ AC_DEFINE([XERCES_USE_NETACCESSOR_CURL], 1, [Define to
use the CURL NetAccessor])
+ LIBS="${LIBS} -L${xerces_cv_curl_prefix}/lib -lcurl"
+ break
+ ;;
+
*-winsock-*)
netaccessor=winsock
AC_DEFINE([XERCES_USE_NETACCESSOR_WINSOCK], 1, [Define
to use the WinSock NetAccessor])
@@ -152,13 +159,6 @@
*-socket-*)
netaccessor=socket
AC_DEFINE([XERCES_USE_NETACCESSOR_SOCKET], 1, [Define
to use the Sockets-based NetAccessor])
- break
- ;;
-
- *-curl-*)
- netaccessor=curl
- AC_DEFINE([XERCES_USE_NETACCESSOR_CURL], 1, [Define to
use the CURL NetAccessor])
- LIBS="${LIBS} -L${xerces_cv_curl_prefix}/lib -lcurl"
break
;;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
