Author: amassari
Date: Sat Sep 30 17:44:49 2006
New Revision: 451701
URL: http://svn.apache.org/viewvc?view=rev&rev=451701
Log:
Give priority to Windows transcoder and Mac netaccessor; cygwin can use the
Windows transcoder
Modified:
xerces/c/trunk/m4/xerces_netaccessor_selection.m4
xerces/c/trunk/m4/xerces_transcoder_selection.m4
Modified: xerces/c/trunk/m4/xerces_netaccessor_selection.m4
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_netaccessor_selection.m4?view=diff&rev=451701&r1=451700&r2=451701
==============================================================================
--- xerces/c/trunk/m4/xerces_netaccessor_selection.m4 (original)
+++ xerces/c/trunk/m4/xerces_netaccessor_selection.m4 Sat Sep 30 17:44:49 2006
@@ -87,15 +87,19 @@
[AC_MSG_RESULT(no)]
)
;;
- windows* | mingw*)
+ windows* | mingw* | cygwin*)
list_add=
+ no_winsock=false
+ AC_CHECK_HEADERS([winsock2.h], [], [no_winsock=true])
AC_MSG_CHECKING([whether we can support the WinSock NetAccessor
(Windows)])
- AC_ARG_ENABLE([netaccessor-winsock],
- AS_HELP_STRING([--enable-netaccessor-winsock],
- [Enable winsock-based NetAccessor support]),
- [AS_IF([test x"$enableval" = xyes],
- [list_add=WINSOCK])],
- [list_add=winsock])
+ AS_IF([! $no_winsock], [
+ AC_ARG_ENABLE([netaccessor-winsock],
+ AS_HELP_STRING([--enable-netaccessor-winsock],
+ [Enable winsock-based NetAccessor
support]),
+ [AS_IF([test x"$enableval" = xyes],
+ [list_add=WINSOCK])],
+ [list_add=winsock])
+ ])
AS_IF([test x"$list_add" != x],
[na_list="$na_list -$list_add-"; AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]
@@ -121,17 +125,17 @@
# 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
- ;;
-
*-cfurl-*)
netaccessor=cfurl
AC_DEFINE([XERCES_USE_NETACCESSOR_CFURL], 1, [Define to
use the Mac OS X CFURL NetAccessor])
XERCES_LINK_DARWIN_FRAMEWORK([CoreServices])
+ 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
;;
Modified: xerces/c/trunk/m4/xerces_transcoder_selection.m4
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_transcoder_selection.m4?view=diff&rev=451701&r1=451700&r2=451701
==============================================================================
--- xerces/c/trunk/m4/xerces_transcoder_selection.m4 (original)
+++ xerces/c/trunk/m4/xerces_transcoder_selection.m4 Sat Sep 30 17:44:49 2006
@@ -149,18 +149,18 @@
break
;;
- *-iconv-*)
- transcoder=iconv
- AC_DEFINE([XERCES_USE_TRANSCODER_ICONV], 1, [Define to
use the iconv transcoder])
- break
- ;;
-
*-windows-*)
transcoder=windows
AC_DEFINE([XERCES_USE_TRANSCODER_WINDOWS], 1, [Define
to use the Windows transcoder])
break
;;
+ *-iconv-*)
+ transcoder=iconv
+ AC_DEFINE([XERCES_USE_TRANSCODER_ICONV], 1, [Define to
use the iconv transcoder])
+ break
+ ;;
+
*)
AS_IF([test $i -eq 2], [
AC_MSG_RESULT([none])
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
