Author: jberry
Date: Sat May 28 11:32:25 2005
New Revision: 178876
URL: http://svn.apache.org/viewcvs?rev=178876&view=rev
Log:
Cleanups to autoconf output. Thanks to Axel Weis.
Modified:
xerces/c/branches/jberry/3.0-unstable/configure
xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4
xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4
Modified: xerces/c/branches/jberry/3.0-unstable/configure
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/configure?rev=178876&r1=178875&r2=178876&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/configure (original)
+++ xerces/c/branches/jberry/3.0-unstable/configure Sat May 28 11:32:25 2005
@@ -24255,10 +24255,10 @@
fi
-
- list_add=
+ # Check for OS-specific transcoders
case $host_os in
darwin*)
+ list_add=
echo "$as_me:$LINENO: checking for whether we can support the
CFURL NetAccessor (Mac OS X)" >&5
echo $ECHO_N "checking for whether we can support the CFURL NetAccessor (Mac
OS X)... $ECHO_C" >&6
if test x"$ac_cv_header_CoreServices_CoreServices_h" = xyes;
then
@@ -24277,9 +24277,7 @@
fi
- ;;
- esac
- if test x"$list_add" != x; then
+ if test x"$list_add" != x; then
na_list="$na_list -$list_add-"; echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
@@ -24288,14 +24286,12 @@
fi
-
-
- # TODO: FINALIZE THIS TEST FOR AVAILABILITY OF WINSOCK NETACCESSOR
- echo "$as_me:$LINENO: checking for whether we can support the WinSock
NetAccessor (Windows)" >&5
+ ;;
+ windows*)
+ # TODO: FINALIZE THIS TEST FOR AVAILABILITY OF WINSOCK
NETACCESSOR
+ list_add=
+ echo "$as_me:$LINENO: checking for whether we can support the
WinSock NetAccessor (Windows)" >&5
echo $ECHO_N "checking for whether we can support the WinSock NetAccessor
(Windows)... $ECHO_C" >&6
- list_add=
- case $host_os in
- some-test-for-windows-os*)
# Check whether --enable-netaccessor-winsock or
--disable-netaccessor-winsock was given.
if test "${enable_netaccessor_winsock+set}" = set; then
enableval="$enable_netaccessor_winsock"
@@ -24306,9 +24302,7 @@
else
list_add=winsock
fi;
- ;;
- esac
- if test x"$list_add" != x; then
+ if test x"$list_add" != x; then
na_list="$na_list -$list_add-"; echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
@@ -24317,6 +24311,8 @@
fi
+ ;;
+ esac
######################################################
@@ -24845,7 +24841,8 @@
echo "$as_me:$LINENO: checking for whether we can support the
MacOSUnicodeConverter Transcoder" >&5
echo $ECHO_N "checking for whether we can support the MacOSUnicodeConverter
Transcoder... $ECHO_C" >&6
if test x"$ac_cv_header_CoreServices_CoreServices_h" = xyes;
then
- # Check whether --enable-transcoder-macosunicodeconverter or
--disable-transcoder-macosunicodeconverter was given.
+
+ # Check whether
--enable-transcoder-macosunicodeconverter or
--disable-transcoder-macosunicodeconverter was given.
if test "${enable_transcoder_macosunicodeconverter+set}" = set; then
enableval="$enable_transcoder_macosunicodeconverter"
if test x"$enableval" = xyes; then
@@ -24855,10 +24852,10 @@
else
list_add=macosunicodeconverter
fi;
- fi
- ;;
- esac
- if test x"$list_add" != x; then
+
+fi
+
+ if test x"$list_add" != x; then
tc_list="$tc_list -$list_add-"; echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
@@ -24867,6 +24864,8 @@
fi
+ ;;
+ esac
# TODO: Tests for additional transcoders
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=178876&r1=178875&r2=178876&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
Sat May 28 11:32:25 2005
@@ -68,10 +68,10 @@
[AC_MSG_RESULT(no)]
)
-
- list_add=
+ # Check for OS-specific transcoders
case $host_os in
darwin*)
+ list_add=
AC_MSG_CHECKING([for whether we can support the CFURL
NetAccessor (Mac OS X)])
AS_IF([test x"$ac_cv_header_CoreServices_CoreServices_h" =
xyes], [
AC_ARG_ENABLE([netaccessor-cfurl],
@@ -82,32 +82,28 @@
[list_add=cfurl])
]
)
+ AS_IF([test x"$list_add" != x],
+ [na_list="$na_list -$list_add-"; AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)]
+ )
;;
- esac
- AS_IF([test x"$list_add" != x],
- [na_list="$na_list -$list_add-"; AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)]
- )
-
-
- # TODO: FINALIZE THIS TEST FOR AVAILABILITY OF WINSOCK NETACCESSOR
- AC_MSG_CHECKING([for whether we can support the WinSock NetAccessor
(Windows)])
- list_add=
- case $host_os in
- some-test-for-windows-os*)
+ windows*)
+ # TODO: FINALIZE THIS TEST FOR AVAILABILITY OF WINSOCK
NETACCESSOR
+ list_add=
+ AC_MSG_CHECKING([for 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([test x"$list_add" != x],
+ [na_list="$na_list -$list_add-"; AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)]
+ )
;;
esac
- AS_IF([test x"$list_add" != x],
- [na_list="$na_list -$list_add-"; AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)]
- )
-
+
######################################################
# Determine which netaccessor to use.
Modified:
xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4?rev=178876&r1=178875&r2=178876&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4
(original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4 Sat
May 28 11:32:25 2005
@@ -63,20 +63,20 @@
case $host_os in
darwin*)
AC_MSG_CHECKING([for whether we can support the
MacOSUnicodeConverter Transcoder])
- if test x"$ac_cv_header_CoreServices_CoreServices_h" = xyes;
then
- AC_ARG_ENABLE([transcoder-macosunicodeconverter],
-
AS_HELP_STRING([--enable-transcoder-macosunicodeconverter],
- [Enable MacOSUnicodeConverter-based transcoder
support]),
- [AS_IF([test x"$enableval" = xyes],
- [list_add=MACOSUNICODECONVERTER])],
- [list_add=macosunicodeconverter])
- fi
+ AS_IF([test x"$ac_cv_header_CoreServices_CoreServices_h" =
xyes], [
+ AC_ARG_ENABLE([transcoder-macosunicodeconverter],
+
AS_HELP_STRING([--enable-transcoder-macosunicodeconverter],
+ [Enable MacOSUnicodeConverter-based
transcoder support]),
+ [AS_IF([test x"$enableval" = xyes],
+ [list_add=MACOSUNICODECONVERTER])],
+ [list_add=macosunicodeconverter])
+ ])
+ AS_IF([test x"$list_add" != x],
+ [tc_list="$tc_list -$list_add-"; AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)]
+ )
;;
esac
- AS_IF([test x"$list_add" != x],
- [tc_list="$tc_list -$list_add-"; AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)]
- )
# TODO: Tests for additional transcoders
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
