You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by jb...@apache.org on 2005/05/27 00:49:10 UTC
svn commit: r178702 - in /xerces/c/branches/jberry/3.0-unstable: Makefile.in
config.h config.h.in configure lib/Makefile.in
m4/xerces_transcoder_selection.m4 obj/Makefile.in src/Makefile.am
src/Makefile.in src/xercesc/util/Transcoders/Iconv/ tests/Makefile.in
Author: jberry
Date: Thu May 26 15:49:09 2005
New Revision: 178702
URL: http://svn.apache.org/viewcvs?rev=178702&view=rev
Log:
Add support for iconv transcoder
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/config.h.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_transcoder_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/Transcoders/Iconv/ (props changed)
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=178702&r1=178701&r2=178702&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/Makefile.in Thu May 26 15:49:09 2005
@@ -173,6 +173,8 @@
XERCES_USE_NETACCESSOR_SOCKET_TRUE = @XERCES_USE_NETACCESSOR_SOCKET_TRUE@
XERCES_USE_NETACCESSOR_WINSOCK_FALSE = @XERCES_USE_NETACCESSOR_WINSOCK_FALSE@
XERCES_USE_NETACCESSOR_WINSOCK_TRUE = @XERCES_USE_NETACCESSOR_WINSOCK_TRUE@
+XERCES_USE_TRANSCODER_ICONV_FALSE = @XERCES_USE_TRANSCODER_ICONV_FALSE@
+XERCES_USE_TRANSCODER_ICONV_TRUE = @XERCES_USE_TRANSCODER_ICONV_TRUE@
XERCES_USE_TRANSCODER_ICU_FALSE = @XERCES_USE_TRANSCODER_ICU_FALSE@
XERCES_USE_TRANSCODER_ICU_TRUE = @XERCES_USE_TRANSCODER_ICU_TRUE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE@
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=178702&r1=178701&r2=178702&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/config.h (original)
+++ xerces/c/branches/jberry/3.0-unstable/config.h Thu May 26 15:49:09 2005
@@ -1,6 +1,9 @@
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to specify no threading is used */
+/* #undef APP_NO_THREADS */
+
/* Define to 1 if you have the <arpa/inet.h> header file. */
#define HAVE_ARPA_INET_H 1
@@ -58,6 +61,9 @@
/* Define to 1 if you have the `mblen' function. */
#define HAVE_MBLEN 1
+/* Define to 1 if you have the `mbstowcs' function. */
+#define HAVE_MBSTOWCS 1
+
/* Define to 1 if you have the `memmove' function. */
#define HAVE_MEMMOVE 1
@@ -166,12 +172,21 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
+/* Define to 1 if you have the `towlower' function. */
+#define HAVE_TOWLOWER 1
+
+/* Define to 1 if you have the `towupper' function. */
+#define HAVE_TOWUPPER 1
+
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define to 1 if you have the <wchar.h> header file. */
#define HAVE_WCHAR_H 1
+/* Define to 1 if you have the `wcstombs' function. */
+#define HAVE_WCSTOMBS 1
+
/* Define to 1 if you have the <wctype.h> header file. */
#define HAVE_WCTYPE_H 1
@@ -181,9 +196,6 @@
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */
-/* Define to specify no threading is used */
-/* #undef NO_THREADS */
-
/* Name of package */
#define PACKAGE "xercesc3"
@@ -305,8 +317,11 @@
/* Define to use the WinSock NetAccessor */
/* #undef XERCES_USE_NETACCESSOR_WINSOCK */
+/* Define to use the iconv transcoder */
+#define XERCES_USE_TRANSCODER_ICONV 1
+
/* Define to use the ICU-based transcoder */
-#define XERCES_USE_TRANSCODER_ICU 1
+/* #undef XERCES_USE_TRANSCODER_ICU */
/* Define to use the Mac OS UnicodeConverter-based transcoder */
/* #undef XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER */
Modified: xerces/c/branches/jberry/3.0-unstable/config.h.in
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/config.h.in?rev=178702&r1=178701&r2=178702&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/config.h.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/config.h.in Thu May 26 15:49:09 2005
@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to specify no threading is used */
+#undef APP_NO_THREADS
+
/* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
@@ -57,6 +60,9 @@
/* Define to 1 if you have the `mblen' function. */
#undef HAVE_MBLEN
+/* Define to 1 if you have the `mbstowcs' function. */
+#undef HAVE_MBSTOWCS
+
/* Define to 1 if you have the `memmove' function. */
#undef HAVE_MEMMOVE
@@ -165,12 +171,21 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
+/* Define to 1 if you have the `towlower' function. */
+#undef HAVE_TOWLOWER
+
+/* Define to 1 if you have the `towupper' function. */
+#undef HAVE_TOWUPPER
+
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the <wchar.h> header file. */
#undef HAVE_WCHAR_H
+/* Define to 1 if you have the `wcstombs' function. */
+#undef HAVE_WCSTOMBS
+
/* Define to 1 if you have the <wctype.h> header file. */
#undef HAVE_WCTYPE_H
@@ -180,9 +195,6 @@
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
-/* Define to specify no threading is used */
-#undef NO_THREADS
-
/* Name of package */
#undef PACKAGE
@@ -303,6 +315,9 @@
/* Define to use the WinSock NetAccessor */
#undef XERCES_USE_NETACCESSOR_WINSOCK
+
+/* Define to use the iconv transcoder */
+#undef XERCES_USE_TRANSCODER_ICONV
/* Define to use the ICU-based transcoder */
#undef XERCES_USE_TRANSCODER_ICU
Modified: xerces/c/branches/jberry/3.0-unstable/configure
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/configure?rev=178702&r1=178701&r2=178702&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/configure (original)
+++ xerces/c/branches/jberry/3.0-unstable/configure Thu May 26 15:49:09 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 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_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 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_files=''
# Initialize some variables set by options.
@@ -1047,6 +1047,8 @@
Enable cfurl-based NetAccessor support
--enable-netaccessor-winsock
Enable winsock-based NetAccessor support
+ --enable-transcoder-iconv
+ Enable iconv-based transcoder support
--enable-transcoder-icu Enable icu-based transcoder support
--enable-transcoder-macosunicodeconverter
Enable MacOSUnicodeConverter-based transcoder
@@ -4268,7 +4270,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4271 "configure"' > conftest.$ac_ext
+ echo '#line 4273 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5383,7 +5385,7 @@
# Provide some information about the compiler.
-echo "$as_me:5386:" \
+echo "$as_me:5388:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6452,11 +6454,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6455: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6457: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6459: \$? = $ac_status" >&5
+ echo "$as_me:6461: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6707,11 +6709,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6710: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6712: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6714: \$? = $ac_status" >&5
+ echo "$as_me:6716: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6767,11 +6769,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6770: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6772: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6774: \$? = $ac_status" >&5
+ echo "$as_me:6776: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8967,7 +8969,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8970 "configure"
+#line 8972 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9065,7 +9067,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9068 "configure"
+#line 9070 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11285,11 +11287,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11288: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11290: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11292: \$? = $ac_status" >&5
+ echo "$as_me:11294: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -11345,11 +11347,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11348: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11350: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11352: \$? = $ac_status" >&5
+ echo "$as_me:11354: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12708,7 +12710,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12711 "configure"
+#line 12713 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12806,7 +12808,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12809 "configure"
+#line 12811 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13661,11 +13663,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13664: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13666: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13668: \$? = $ac_status" >&5
+ echo "$as_me:13670: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -13721,11 +13723,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13724: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13726: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13728: \$? = $ac_status" >&5
+ echo "$as_me:13730: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15777,11 +15779,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15780: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15782: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15784: \$? = $ac_status" >&5
+ echo "$as_me:15786: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -16032,11 +16034,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16035: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16037: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16039: \$? = $ac_status" >&5
+ echo "$as_me:16041: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -16092,11 +16094,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16095: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16097: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16099: \$? = $ac_status" >&5
+ echo "$as_me:16101: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18292,7 +18294,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18295 "configure"
+#line 18297 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18390,7 +18392,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18393 "configure"
+#line 18395 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -24037,6 +24039,295 @@
tc_list=
+ # Check for iconv support
+
+for ac_header in wchar.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ----------------------------------- ##
+## Report this to the xercesc3 lists. ##
+## ----------------------------------- ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+ no_iconv=true
+fi
+
+done
+
+
+
+
+
+
+for ac_func in towupper towlower mblen wcstombs mbstowcs
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+ no_iconv=true
+fi
+done
+
+ echo "$as_me:$LINENO: checking for whether we can support the iconv Transcoder" >&5
+echo $ECHO_N "checking for whether we can support the iconv Transcoder... $ECHO_C" >&6
+ list_add=
+ no_iconv=false
+ if ! $no_iconv; then
+
+ # Check whether --enable-transcoder-iconv or --disable-transcoder-iconv was given.
+if test "${enable_transcoder_iconv+set}" = set; then
+ enableval="$enable_transcoder_iconv"
+ if test x"$enableval" = xyes; then
+ list_add=ICONV
+fi
+
+else
+ list_add=iconv
+fi;
+
+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
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+fi
+
# Check for ICU
@@ -24059,7 +24350,7 @@
fi
if test x"$list_add" != x; then
- tc_list="$tc_list $list_add"; echo "$as_me:$LINENO: result: yes" >&5
+ tc_list="$tc_list -$list_add-"; echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
@@ -24090,7 +24381,7 @@
;;
esac
if test x"$list_add" != x; then
- tc_list="$tc_list $list_add"; echo "$as_me:$LINENO: result: yes" >&5
+ tc_list="$tc_list -$list_add-"; echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
@@ -24119,7 +24410,7 @@
# Check for each transcoder, in implicit rank order
case $tc_list in
- *icu*)
+ *-icu-*)
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_TRANSCODER_ICU 1
@@ -24128,7 +24419,7 @@
transcoder=icu
break
;;
- *macosunicodeconverter*)
+ *-macosunicodeconverter-*)
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER 1
@@ -24137,6 +24428,17 @@
transcoder=macosunicodeconverter
break
;;
+
+ *-iconv-*)
+
+cat >>confdefs.h <<\_ACEOF
+#define XERCES_USE_TRANSCODER_ICONV 1
+_ACEOF
+
+ transcoder=iconv
+ break
+ ;;
+
*)
if test $i -eq 2; then
echo "$as_me:$LINENO: result: none" >&5
@@ -24177,6 +24479,16 @@
+if test x"$transcoder" = xiconv; then
+ XERCES_USE_TRANSCODER_ICONV_TRUE=
+ XERCES_USE_TRANSCODER_ICONV_FALSE='#'
+else
+ XERCES_USE_TRANSCODER_ICONV_TRUE='#'
+ XERCES_USE_TRANSCODER_ICONV_FALSE=
+fi
+
+
+
@@ -24335,7 +24647,7 @@
if test x$xerces_cv_no_threads = xyes; then
cat >>confdefs.h <<\_ACEOF
-#define NO_THREADS 1
+#define APP_NO_THREADS 1
_ACEOF
fi
@@ -24815,6 +25127,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${XERCES_USE_TRANSCODER_ICONV_TRUE}" && test -z "${XERCES_USE_TRANSCODER_ICONV_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"XERCES_USE_TRANSCODER_ICONV\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"XERCES_USE_TRANSCODER_ICONV\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${XERCES_USE_MSGLOADER_INMEMORY_TRUE}" && test -z "${XERCES_USE_MSGLOADER_INMEMORY_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"XERCES_USE_MSGLOADER_INMEMORY\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -25486,6 +25805,8 @@
s,@XERCES_USE_TRANSCODER_ICU_FALSE@,$XERCES_USE_TRANSCODER_ICU_FALSE,;t t
s,@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@,$XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE,;t t
s,@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE@,$XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE,;t t
+s,@XERCES_USE_TRANSCODER_ICONV_TRUE@,$XERCES_USE_TRANSCODER_ICONV_TRUE,;t t
+s,@XERCES_USE_TRANSCODER_ICONV_FALSE@,$XERCES_USE_TRANSCODER_ICONV_FALSE,;t t
s,@XERCES_USE_MSGLOADER_INMEMORY_TRUE@,$XERCES_USE_MSGLOADER_INMEMORY_TRUE,;t t
s,@XERCES_USE_MSGLOADER_INMEMORY_FALSE@,$XERCES_USE_MSGLOADER_INMEMORY_FALSE,;t t
s,@XERCES_USE_FILEMGR_POSIX_TRUE@,$XERCES_USE_FILEMGR_POSIX_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=178702&r1=178701&r2=178702&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in Thu May 26 15:49:09 2005
@@ -189,6 +189,8 @@
XERCES_USE_NETACCESSOR_SOCKET_TRUE = @XERCES_USE_NETACCESSOR_SOCKET_TRUE@
XERCES_USE_NETACCESSOR_WINSOCK_FALSE = @XERCES_USE_NETACCESSOR_WINSOCK_FALSE@
XERCES_USE_NETACCESSOR_WINSOCK_TRUE = @XERCES_USE_NETACCESSOR_WINSOCK_TRUE@
+XERCES_USE_TRANSCODER_ICONV_FALSE = @XERCES_USE_TRANSCODER_ICONV_FALSE@
+XERCES_USE_TRANSCODER_ICONV_TRUE = @XERCES_USE_TRANSCODER_ICONV_TRUE@
XERCES_USE_TRANSCODER_ICU_FALSE = @XERCES_USE_TRANSCODER_ICU_FALSE@
XERCES_USE_TRANSCODER_ICU_TRUE = @XERCES_USE_TRANSCODER_ICU_TRUE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE@
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=178702&r1=178701&r2=178702&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 Thu May 26 15:49:09 2005
@@ -21,6 +21,24 @@
tc_list=
+ # Check for iconv support
+ AC_CHECK_HEADERS([wchar.h], [], [no_iconv=true])
+ AC_CHECK_FUNCS([towupper towlower mblen wcstombs mbstowcs], [], [no_iconv=true])
+ AC_MSG_CHECKING([for whether we can support the iconv Transcoder])
+ list_add=
+ no_iconv=false
+ AS_IF([! $no_iconv], [
+ AC_ARG_ENABLE([transcoder-iconv],
+ AS_HELP_STRING([--enable-transcoder-iconv],
+ [Enable iconv-based transcoder support]),
+ [AS_IF([test x"$enableval" = xyes],
+ [list_add=ICONV])],
+ [list_add=iconv])
+ ])
+ AS_IF([test x"$list_add" != x],
+ [tc_list="$tc_list -$list_add-"; AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)]
+ )
# Check for ICU
AC_REQUIRE([XERCES_ICU_PREFIX])
@@ -35,7 +53,7 @@
[list_add=icu])
])
AS_IF([test x"$list_add" != x],
- [tc_list="$tc_list $list_add"; AC_MSG_RESULT(yes)],
+ [tc_list="$tc_list -$list_add-"; AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]
)
@@ -56,7 +74,7 @@
;;
esac
AS_IF([test x"$list_add" != x],
- [tc_list="$tc_list $list_add"; AC_MSG_RESULT(yes)],
+ [tc_list="$tc_list -$list_add-"; AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]
)
@@ -79,16 +97,23 @@
# Check for each transcoder, in implicit rank order
case $tc_list in
- *icu*)
+ *-icu-*)
AC_DEFINE([XERCES_USE_TRANSCODER_ICU], 1, [Define to use the ICU-based transcoder])
transcoder=icu
break
;;
- *macosunicodeconverter*)
+ *-macosunicodeconverter-*)
AC_DEFINE([XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER], 1, [Define to use the Mac OS UnicodeConverter-based transcoder])
transcoder=macosunicodeconverter
break
;;
+
+ *-iconv-*)
+ AC_DEFINE([XERCES_USE_TRANSCODER_ICONV], 1, [Define to use the iconv transcoder])
+ transcoder=iconv
+ break
+ ;;
+
*)
if [test $i -eq 2]; then
AC_MSG_RESULT([none])
@@ -105,6 +130,7 @@
# Note that these macros can't be executed conditionally, which is why they're here, not above.
AM_CONDITIONAL([XERCES_USE_TRANSCODER_ICU], [test x"$transcoder" = xicu])
AM_CONDITIONAL([XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER], [test x"$transcoder" = xmacosunicodeconverter])
+ AM_CONDITIONAL([XERCES_USE_TRANSCODER_ICONV], [test x"$transcoder" = xiconv])
]
)
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=178702&r1=178701&r2=178702&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in Thu May 26 15:49:09 2005
@@ -195,6 +195,8 @@
XERCES_USE_NETACCESSOR_SOCKET_TRUE = @XERCES_USE_NETACCESSOR_SOCKET_TRUE@
XERCES_USE_NETACCESSOR_WINSOCK_FALSE = @XERCES_USE_NETACCESSOR_WINSOCK_FALSE@
XERCES_USE_NETACCESSOR_WINSOCK_TRUE = @XERCES_USE_NETACCESSOR_WINSOCK_TRUE@
+XERCES_USE_TRANSCODER_ICONV_FALSE = @XERCES_USE_TRANSCODER_ICONV_FALSE@
+XERCES_USE_TRANSCODER_ICONV_TRUE = @XERCES_USE_TRANSCODER_ICONV_TRUE@
XERCES_USE_TRANSCODER_ICU_FALSE = @XERCES_USE_TRANSCODER_ICU_FALSE@
XERCES_USE_TRANSCODER_ICU_TRUE = @XERCES_USE_TRANSCODER_ICU_TRUE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE@
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=178702&r1=178701&r2=178702&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.am (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.am Thu May 26 15:49:09 2005
@@ -107,6 +107,13 @@
libicu_la_LIBADD = -L${ICU_PREFIX}/lib -licuuc -licudata
endif
+if XERCES_USE_TRANSCODER_ICONV
+src_libraries += libiconv.la
+libiconv_ladir = ${includedir}
+nobase_libiconv_la_HEADERS = ${iconv_headers}
+libiconv_la_SOURCES = ${iconv_sources}
+endif
+
if XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER
src_libraries += libmacosunicodeconverter.la
libmacosunicodeconverter_ladir = ${includedir}
@@ -960,6 +967,11 @@
icu_sources = \
xercesc/util/Transcoders/ICU/ICUTransService.cpp
+iconv_headers = \
+ xercesc/util/Transcoders/Iconv/IconvTransService.hpp
+
+iconv_sources = \
+ xercesc/util/Transcoders/Iconv/IconvTransService.cpp
macosunicodeconverter_headers = \
xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.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=178702&r1=178701&r2=178702&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.in Thu May 26 15:49:09 2005
@@ -35,7 +35,7 @@
#
-SOURCES = $(libcfurl_la_SOURCES) $(libdom_la_SOURCES) $(libdomimpl_la_SOURCES) $(libframework_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) $(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) $(libsrc_la_SOURCES) $(libutil_la_SOURCES) $(libvalidators_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -69,32 +69,34 @@
# NetAccessors, conditionally built based on settings from configure
#
@XERCES_USE_TRANSCODER_ICU_TRUE@am__append_2 = libicu.la
-@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@am__append_3 = libmacosunicodeconverter.la
+@XERCES_USE_TRANSCODER_ICONV_TRUE@am__append_3 = libiconv.la
+@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@am__append_4 = libmacosunicodeconverter.la
#
# MsgLoaders, conditionally built based on settings from configure
#
-@XERCES_USE_MSGLOADER_INMEMORY_TRUE@am__append_4 = libinmemory.la
+@XERCES_USE_MSGLOADER_INMEMORY_TRUE@am__append_5 = libinmemory.la
#
# AtomicOp Managers, conditionally built based on settings from configure
#
-@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@am__append_5 = libnothreadaomgr.la
-@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@am__append_6 = libposixaomgr.la
-@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@am__append_7 = libmacosaomgr.la
+@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@am__append_6 = libnothreadaomgr.la
+@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@am__append_7 = libposixaomgr.la
+@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@am__append_8 = libmacosaomgr.la
#
# Mutex Managers, conditionally built based on settings from configure
#
-@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@am__append_8 = libnothreadmmgr.la
-@XERCES_USE_MUTEXMGR_POSIX_TRUE@am__append_9 = libposixmmgr.la
+@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@am__append_9 = libnothreadmmgr.la
+@XERCES_USE_MUTEXMGR_POSIX_TRUE@am__append_10 = libposixmmgr.la
#
# File Managers, conditionally built based on settings from configure
#
-@XERCES_USE_FILEMGR_POSIX_TRUE@am__append_10 = libposixfmgr.la
+@XERCES_USE_FILEMGR_POSIX_TRUE@am__append_11 = libposixfmgr.la
subdir = src
DIST_COMMON = $(am__nobase_libcfurl_la_HEADERS_DIST) \
+ $(am__nobase_libiconv_la_HEADERS_DIST) \
$(am__nobase_libicu_la_HEADERS_DIST) \
$(am__nobase_libinmemory_la_HEADERS_DIST) \
$(am__nobase_libmacosaomgr_la_HEADERS_DIST) \
@@ -245,25 +247,33 @@
xercesc/framework/XMLValidator.lo
am_libframework_la_OBJECTS = $(am__objects_4)
libframework_la_OBJECTS = $(am_libframework_la_OBJECTS)
+libiconv_la_LIBADD =
+am__libiconv_la_SOURCES_DIST = \
+ xercesc/util/Transcoders/Iconv/IconvTransService.cpp
+am__objects_5 = xercesc/util/Transcoders/Iconv/IconvTransService.lo
+@XERCES_USE_TRANSCODER_ICONV_TRUE@am_libiconv_la_OBJECTS = \
+@XERCES_USE_TRANSCODER_ICONV_TRUE@ $(am__objects_5)
+libiconv_la_OBJECTS = $(am_libiconv_la_OBJECTS)
+@XERCES_USE_TRANSCODER_ICONV_TRUE@am_libiconv_la_rpath =
libicu_la_DEPENDENCIES =
am__libicu_la_SOURCES_DIST = \
xercesc/util/Transcoders/ICU/ICUTransService.cpp
-am__objects_5 = \
+am__objects_6 = \
xercesc/util/Transcoders/ICU/libicu_la-ICUTransService.lo
@XERCES_USE_TRANSCODER_ICU_TRUE@am_libicu_la_OBJECTS = \
-@XERCES_USE_TRANSCODER_ICU_TRUE@ $(am__objects_5)
+@XERCES_USE_TRANSCODER_ICU_TRUE@ $(am__objects_6)
libicu_la_OBJECTS = $(am_libicu_la_OBJECTS)
@XERCES_USE_TRANSCODER_ICU_TRUE@am_libicu_la_rpath =
libinmemory_la_LIBADD =
am__libinmemory_la_SOURCES_DIST = \
xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp
-am__objects_6 = xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.lo
+am__objects_7 = xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.lo
@XERCES_USE_MSGLOADER_INMEMORY_TRUE@am_libinmemory_la_OBJECTS = \
-@XERCES_USE_MSGLOADER_INMEMORY_TRUE@ $(am__objects_6)
+@XERCES_USE_MSGLOADER_INMEMORY_TRUE@ $(am__objects_7)
libinmemory_la_OBJECTS = $(am_libinmemory_la_OBJECTS)
@XERCES_USE_MSGLOADER_INMEMORY_TRUE@am_libinmemory_la_rpath =
libinternal_la_LIBADD =
-am__objects_7 = xercesc/internal/BinFileOutputStream.lo \
+am__objects_8 = xercesc/internal/BinFileOutputStream.lo \
xercesc/internal/BinMemOutputStream.lo \
xercesc/internal/DGXMLScanner.lo xercesc/internal/ElemStack.lo \
xercesc/internal/IGXMLScanner.lo \
@@ -283,109 +293,110 @@
xercesc/internal/XSerializeEngine.lo \
xercesc/internal/XSObjectFactory.lo \
xercesc/internal/XTemplateSerializer.lo
-am_libinternal_la_OBJECTS = $(am__objects_7)
+am_libinternal_la_OBJECTS = $(am__objects_8)
libinternal_la_OBJECTS = $(am_libinternal_la_OBJECTS)
libmacosaomgr_la_LIBADD =
am__libmacosaomgr_la_SOURCES_DIST = \
xercesc/util/AtomicOpManagers/MacOSAtomicOpMgr.cpp
-am__objects_8 = xercesc/util/AtomicOpManagers/MacOSAtomicOpMgr.lo
+am__objects_9 = xercesc/util/AtomicOpManagers/MacOSAtomicOpMgr.lo
@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@am_libmacosaomgr_la_OBJECTS = \
-@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@ $(am__objects_8)
+@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@ $(am__objects_9)
libmacosaomgr_la_OBJECTS = $(am_libmacosaomgr_la_OBJECTS)
@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@am_libmacosaomgr_la_rpath =
libmacosunicodeconverter_la_LIBADD =
am__libmacosunicodeconverter_la_SOURCES_DIST = xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
-am__objects_9 = xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.lo
-@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@am_libmacosunicodeconverter_la_OBJECTS = $(am__objects_9)
+am__objects_10 = xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.lo
+@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@am_libmacosunicodeconverter_la_OBJECTS = $(am__objects_10)
libmacosunicodeconverter_la_OBJECTS = \
$(am_libmacosunicodeconverter_la_OBJECTS)
@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@am_libmacosunicodeconverter_la_rpath =
libnothreadaomgr_la_LIBADD =
am__libnothreadaomgr_la_SOURCES_DIST = \
xercesc/util/AtomicOpManagers/NoThreadAtomicOpMgr.cpp
-am__objects_10 = xercesc/util/AtomicOpManagers/NoThreadAtomicOpMgr.lo
+am__objects_11 = xercesc/util/AtomicOpManagers/NoThreadAtomicOpMgr.lo
@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@am_libnothreadaomgr_la_OBJECTS = \
-@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@ $(am__objects_10)
+@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@ $(am__objects_11)
libnothreadaomgr_la_OBJECTS = $(am_libnothreadaomgr_la_OBJECTS)
@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@am_libnothreadaomgr_la_rpath =
libnothreadmmgr_la_LIBADD =
am__libnothreadmmgr_la_SOURCES_DIST = \
xercesc/util/MutexManagers/NoThreadMutexMgr.cpp
-am__objects_11 = xercesc/util/MutexManagers/NoThreadMutexMgr.lo
+am__objects_12 = xercesc/util/MutexManagers/NoThreadMutexMgr.lo
@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@am_libnothreadmmgr_la_OBJECTS = \
-@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@ $(am__objects_11)
+@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@ $(am__objects_12)
libnothreadmmgr_la_OBJECTS = $(am_libnothreadmmgr_la_OBJECTS)
@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@am_libnothreadmmgr_la_rpath =
libparsers_la_LIBADD =
-am__objects_12 = xercesc/parsers/AbstractDOMParser.lo \
+am__objects_13 = xercesc/parsers/AbstractDOMParser.lo \
xercesc/parsers/DOMBuilderImpl.lo \
xercesc/parsers/SAX2XMLFilterImpl.lo \
xercesc/parsers/SAX2XMLReaderImpl.lo \
xercesc/parsers/SAXParser.lo \
xercesc/parsers/XercesDOMParser.lo
-am_libparsers_la_OBJECTS = $(am__objects_12)
+am_libparsers_la_OBJECTS = $(am__objects_13)
libparsers_la_OBJECTS = $(am_libparsers_la_OBJECTS)
libposixaomgr_la_LIBADD =
am__libposixaomgr_la_SOURCES_DIST = \
xercesc/util/AtomicOpManagers/PosixAtomicOpMgr.cpp
-am__objects_13 = xercesc/util/AtomicOpManagers/PosixAtomicOpMgr.lo
+am__objects_14 = xercesc/util/AtomicOpManagers/PosixAtomicOpMgr.lo
@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@am_libposixaomgr_la_OBJECTS = \
-@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@ $(am__objects_13)
+@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@ $(am__objects_14)
libposixaomgr_la_OBJECTS = $(am_libposixaomgr_la_OBJECTS)
@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@am_libposixaomgr_la_rpath =
libposixfmgr_la_LIBADD =
am__libposixfmgr_la_SOURCES_DIST = \
xercesc/util/FileManagers/PosixFileMgr.cpp
-am__objects_14 = xercesc/util/FileManagers/PosixFileMgr.lo
+am__objects_15 = xercesc/util/FileManagers/PosixFileMgr.lo
@XERCES_USE_FILEMGR_POSIX_TRUE@am_libposixfmgr_la_OBJECTS = \
-@XERCES_USE_FILEMGR_POSIX_TRUE@ $(am__objects_14)
+@XERCES_USE_FILEMGR_POSIX_TRUE@ $(am__objects_15)
libposixfmgr_la_OBJECTS = $(am_libposixfmgr_la_OBJECTS)
@XERCES_USE_FILEMGR_POSIX_TRUE@am_libposixfmgr_la_rpath =
libposixmmgr_la_LIBADD =
am__libposixmmgr_la_SOURCES_DIST = \
xercesc/util/MutexManagers/PosixMutexMgr.cpp
-am__objects_15 = xercesc/util/MutexManagers/PosixMutexMgr.lo
+am__objects_16 = xercesc/util/MutexManagers/PosixMutexMgr.lo
@XERCES_USE_MUTEXMGR_POSIX_TRUE@am_libposixmmgr_la_OBJECTS = \
-@XERCES_USE_MUTEXMGR_POSIX_TRUE@ $(am__objects_15)
+@XERCES_USE_MUTEXMGR_POSIX_TRUE@ $(am__objects_16)
libposixmmgr_la_OBJECTS = $(am_libposixmmgr_la_OBJECTS)
@XERCES_USE_MUTEXMGR_POSIX_TRUE@am_libposixmmgr_la_rpath =
libsax_la_LIBADD =
-am__objects_16 = xercesc/sax/Dummy.lo xercesc/sax/InputSource.lo \
+am__objects_17 = xercesc/sax/Dummy.lo xercesc/sax/InputSource.lo \
xercesc/sax/SAXException.lo xercesc/sax/SAXParseException.lo
-am_libsax_la_OBJECTS = $(am__objects_16)
+am_libsax_la_OBJECTS = $(am__objects_17)
libsax_la_OBJECTS = $(am_libsax_la_OBJECTS)
libsax2_la_LIBADD =
-am__objects_17 = xercesc/sax2/sax2Dummy.lo
-am_libsax2_la_OBJECTS = $(am__objects_17)
+am__objects_18 = xercesc/sax2/sax2Dummy.lo
+am_libsax2_la_OBJECTS = $(am__objects_18)
libsax2_la_OBJECTS = $(am_libsax2_la_OBJECTS)
@XERCES_USE_NETACCESSOR_CFURL_TRUE@am__DEPENDENCIES_1 = libcfurl.la
@XERCES_USE_TRANSCODER_ICU_TRUE@am__DEPENDENCIES_2 = libicu.la
-@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@am__DEPENDENCIES_3 = libmacosunicodeconverter.la
-@XERCES_USE_MSGLOADER_INMEMORY_TRUE@am__DEPENDENCIES_4 = \
+@XERCES_USE_TRANSCODER_ICONV_TRUE@am__DEPENDENCIES_3 = libiconv.la
+@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@am__DEPENDENCIES_4 = libmacosunicodeconverter.la
+@XERCES_USE_MSGLOADER_INMEMORY_TRUE@am__DEPENDENCIES_5 = \
@XERCES_USE_MSGLOADER_INMEMORY_TRUE@ libinmemory.la
-@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@am__DEPENDENCIES_5 = \
+@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@am__DEPENDENCIES_6 = \
@XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@ libnothreadaomgr.la
-@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@am__DEPENDENCIES_6 = \
+@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@am__DEPENDENCIES_7 = \
@XERCES_USE_ATOMICOPMGR_POSIX_TRUE@ libposixaomgr.la
-@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@am__DEPENDENCIES_7 = \
+@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@am__DEPENDENCIES_8 = \
@XERCES_USE_ATOMICOPMGR_MACOS_TRUE@ libmacosaomgr.la
-@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@am__DEPENDENCIES_8 = \
+@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@am__DEPENDENCIES_9 = \
@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@ libnothreadmmgr.la
-@XERCES_USE_MUTEXMGR_POSIX_TRUE@am__DEPENDENCIES_9 = libposixmmgr.la
-@XERCES_USE_FILEMGR_POSIX_TRUE@am__DEPENDENCIES_10 = libposixfmgr.la
-am__DEPENDENCIES_11 = libutil.la libdom.la libdomimpl.la \
+@XERCES_USE_MUTEXMGR_POSIX_TRUE@am__DEPENDENCIES_10 = libposixmmgr.la
+@XERCES_USE_FILEMGR_POSIX_TRUE@am__DEPENDENCIES_11 = libposixfmgr.la
+am__DEPENDENCIES_12 = 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) \
$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
$(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \
$(am__DEPENDENCIES_8) $(am__DEPENDENCIES_9) \
- $(am__DEPENDENCIES_10)
-libsrc_la_DEPENDENCIES = $(am__DEPENDENCIES_11)
+ $(am__DEPENDENCIES_10) $(am__DEPENDENCIES_11)
+libsrc_la_DEPENDENCIES = $(am__DEPENDENCIES_12)
am_libsrc_la_OBJECTS =
libsrc_la_OBJECTS = $(am_libsrc_la_OBJECTS)
libutil_la_LIBADD =
-am__objects_18 = xercesc/util/Base64.lo \
+am__objects_19 = xercesc/util/Base64.lo \
xercesc/util/BinFileInputStream.lo \
xercesc/util/BinInputStream.lo \
xercesc/util/BinMemInputStream.lo xercesc/util/BitSet.lo \
@@ -437,10 +448,10 @@
xercesc/util/XMLUTF16Transcoder.lo \
xercesc/util/XMLUTF8Transcoder.lo \
xercesc/util/XMLWin1252Transcoder.lo
-am_libutil_la_OBJECTS = $(am__objects_18)
+am_libutil_la_OBJECTS = $(am__objects_19)
libutil_la_OBJECTS = $(am_libutil_la_OBJECTS)
libvalidators_la_LIBADD =
-am__objects_19 = xercesc/validators/common/AllContentModel.lo \
+am__objects_20 = xercesc/validators/common/AllContentModel.lo \
xercesc/validators/common/CMAny.lo \
xercesc/validators/common/CMBinaryOp.lo \
xercesc/validators/common/CMUnaryOp.lo \
@@ -528,7 +539,7 @@
xercesc/validators/schema/XSDErrorReporter.lo \
xercesc/validators/schema/XSDLocator.lo \
xercesc/validators/schema/XUtil.lo
-am_libvalidators_la_OBJECTS = $(am__objects_19)
+am_libvalidators_la_OBJECTS = $(am__objects_20)
libvalidators_la_OBJECTS = $(am_libvalidators_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -551,8 +562,9 @@
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libcfurl_la_SOURCES) $(libdom_la_SOURCES) \
$(libdomimpl_la_SOURCES) $(libframework_la_SOURCES) \
- $(libicu_la_SOURCES) $(libinmemory_la_SOURCES) \
- $(libinternal_la_SOURCES) $(libmacosaomgr_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) \
@@ -562,7 +574,7 @@
$(libvalidators_la_SOURCES)
DIST_SOURCES = $(am__libcfurl_la_SOURCES_DIST) $(libdom_la_SOURCES) \
$(libdomimpl_la_SOURCES) $(libframework_la_SOURCES) \
- $(am__libicu_la_SOURCES_DIST) \
+ $(am__libiconv_la_SOURCES_DIST) $(am__libicu_la_SOURCES_DIST) \
$(am__libinmemory_la_SOURCES_DIST) $(libinternal_la_SOURCES) \
$(am__libmacosaomgr_la_SOURCES_DIST) \
$(am__libmacosunicodeconverter_la_SOURCES_DIST) \
@@ -583,7 +595,8 @@
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libcfurl_ladir)" \
"$(DESTDIR)$(libdom_ladir)" "$(DESTDIR)$(libdomimpl_ladir)" \
- "$(DESTDIR)$(libframework_ladir)" "$(DESTDIR)$(libicu_ladir)" \
+ "$(DESTDIR)$(libframework_ladir)" \
+ "$(DESTDIR)$(libiconv_ladir)" "$(DESTDIR)$(libicu_ladir)" \
"$(DESTDIR)$(libinmemory_ladir)" \
"$(DESTDIR)$(libinternal_ladir)" \
"$(DESTDIR)$(libmacosaomgr_ladir)" \
@@ -600,6 +613,9 @@
nobase_libdom_laHEADERS_INSTALL = $(install_sh_DATA)
nobase_libdomimpl_laHEADERS_INSTALL = $(install_sh_DATA)
nobase_libframework_laHEADERS_INSTALL = $(install_sh_DATA)
+am__nobase_libiconv_la_HEADERS_DIST = \
+ xercesc/util/Transcoders/Iconv/IconvTransService.hpp
+nobase_libiconv_laHEADERS_INSTALL = $(install_sh_DATA)
am__nobase_libicu_la_HEADERS_DIST = \
xercesc/util/Transcoders/ICU/ICUTransService.hpp
nobase_libicu_laHEADERS_INSTALL = $(install_sh_DATA)
@@ -635,7 +651,8 @@
nobase_libvalidators_laHEADERS_INSTALL = $(install_sh_DATA)
HEADERS = $(nobase_libcfurl_la_HEADERS) $(nobase_libdom_la_HEADERS) \
$(nobase_libdomimpl_la_HEADERS) \
- $(nobase_libframework_la_HEADERS) $(nobase_libicu_la_HEADERS) \
+ $(nobase_libframework_la_HEADERS) \
+ $(nobase_libiconv_la_HEADERS) $(nobase_libicu_la_HEADERS) \
$(nobase_libinmemory_la_HEADERS) \
$(nobase_libinternal_la_HEADERS) \
$(nobase_libmacosaomgr_la_HEADERS) \
@@ -733,6 +750,8 @@
XERCES_USE_NETACCESSOR_SOCKET_TRUE = @XERCES_USE_NETACCESSOR_SOCKET_TRUE@
XERCES_USE_NETACCESSOR_WINSOCK_FALSE = @XERCES_USE_NETACCESSOR_WINSOCK_FALSE@
XERCES_USE_NETACCESSOR_WINSOCK_TRUE = @XERCES_USE_NETACCESSOR_WINSOCK_TRUE@
+XERCES_USE_TRANSCODER_ICONV_FALSE = @XERCES_USE_TRANSCODER_ICONV_FALSE@
+XERCES_USE_TRANSCODER_ICONV_TRUE = @XERCES_USE_TRANSCODER_ICONV_TRUE@
XERCES_USE_TRANSCODER_ICU_FALSE = @XERCES_USE_TRANSCODER_ICU_FALSE@
XERCES_USE_TRANSCODER_ICU_TRUE = @XERCES_USE_TRANSCODER_ICU_TRUE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE@
@@ -804,7 +823,7 @@
libvalidators.la $(am__append_1) $(am__append_2) \
$(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_9) $(am__append_10) $(am__append_11)
libutil_ladir = ${includedir}
nobase_libutil_la_HEADERS = ${util_headers}
libutil_la_SOURCES = ${util_sources}
@@ -840,6 +859,9 @@
@XERCES_USE_TRANSCODER_ICU_TRUE@libicu_la_SOURCES = ${icu_sources}
@XERCES_USE_TRANSCODER_ICU_TRUE@libicu_la_CPPFLAGS = -I${ICU_PREFIX}/include
@XERCES_USE_TRANSCODER_ICU_TRUE@libicu_la_LIBADD = -L${ICU_PREFIX}/lib -licuuc -licudata
+@XERCES_USE_TRANSCODER_ICONV_TRUE@libiconv_ladir = ${includedir}
+@XERCES_USE_TRANSCODER_ICONV_TRUE@nobase_libiconv_la_HEADERS = ${iconv_headers}
+@XERCES_USE_TRANSCODER_ICONV_TRUE@libiconv_la_SOURCES = ${iconv_sources}
@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@libmacosunicodeconverter_ladir = ${includedir}
@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@nobase_libmacosunicodeconverter_la_HEADERS = ${macosunicodeconverter_headers}
@XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@libmacosunicodeconverter_la_SOURCES = ${macosunicodeconverter_sources}
@@ -1640,6 +1662,12 @@
icu_sources = \
xercesc/util/Transcoders/ICU/ICUTransService.cpp
+iconv_headers = \
+ xercesc/util/Transcoders/Iconv/IconvTransService.hpp
+
+iconv_sources = \
+ xercesc/util/Transcoders/Iconv/IconvTransService.cpp
+
macosunicodeconverter_headers = \
xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
@@ -2030,6 +2058,17 @@
xercesc/framework/$(DEPDIR)/$(am__dirstamp)
libframework.la: $(libframework_la_OBJECTS) $(libframework_la_DEPENDENCIES)
$(CXXLINK) $(libframework_la_LDFLAGS) $(libframework_la_OBJECTS) $(libframework_la_LIBADD) $(LIBS)
+xercesc/util/Transcoders/Iconv/$(am__dirstamp):
+ @$(mkdir_p) xercesc/util/Transcoders/Iconv
+ @: > xercesc/util/Transcoders/Iconv/$(am__dirstamp)
+xercesc/util/Transcoders/Iconv/$(DEPDIR)/$(am__dirstamp):
+ @$(mkdir_p) xercesc/util/Transcoders/Iconv/$(DEPDIR)
+ @: > xercesc/util/Transcoders/Iconv/$(DEPDIR)/$(am__dirstamp)
+xercesc/util/Transcoders/Iconv/IconvTransService.lo: \
+ xercesc/util/Transcoders/Iconv/$(am__dirstamp) \
+ xercesc/util/Transcoders/Iconv/$(DEPDIR)/$(am__dirstamp)
+libiconv.la: $(libiconv_la_OBJECTS) $(libiconv_la_DEPENDENCIES)
+ $(CXXLINK) $(am_libiconv_la_rpath) $(libiconv_la_LDFLAGS) $(libiconv_la_OBJECTS) $(libiconv_la_LIBADD) $(LIBS)
xercesc/util/Transcoders/ICU/$(am__dirstamp):
@$(mkdir_p) xercesc/util/Transcoders/ICU
@: > xercesc/util/Transcoders/ICU/$(am__dirstamp)
@@ -2997,6 +3036,8 @@
-rm -f xercesc/util/TransService.lo
-rm -f xercesc/util/Transcoders/ICU/libicu_la-ICUTransService.$(OBJEXT)
-rm -f xercesc/util/Transcoders/ICU/libicu_la-ICUTransService.lo
+ -rm -f xercesc/util/Transcoders/Iconv/IconvTransService.$(OBJEXT)
+ -rm -f xercesc/util/Transcoders/Iconv/IconvTransService.lo
-rm -f xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.$(OBJEXT)
-rm -f xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.lo
-rm -f xercesc/util/XML256TableTranscoder.$(OBJEXT)
@@ -3471,6 +3512,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR)/MacOSURLAccessCF.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR)/URLAccessCFBinInputStream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/Transcoders/ICU/$(DEPDIR)/libicu_la-ICUTransService.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/Transcoders/Iconv/$(DEPDIR)/IconvTransService.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/Transcoders/MacOSUnicodeConverter/$(DEPDIR)/MacOSUnicodeConverter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/regx/$(DEPDIR)/ASCIIRangeFactory.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/util/regx/$(DEPDIR)/BMPattern.Plo@am__quote@
@@ -3638,6 +3680,7 @@
-rm -rf xercesc/util/MutexManagers/.libs xercesc/util/MutexManagers/_libs
-rm -rf xercesc/util/NetAccessors/MacOSURLAccessCF/.libs xercesc/util/NetAccessors/MacOSURLAccessCF/_libs
-rm -rf xercesc/util/Transcoders/ICU/.libs xercesc/util/Transcoders/ICU/_libs
+ -rm -rf xercesc/util/Transcoders/Iconv/.libs xercesc/util/Transcoders/Iconv/_libs
-rm -rf xercesc/util/Transcoders/MacOSUnicodeConverter/.libs xercesc/util/Transcoders/MacOSUnicodeConverter/_libs
-rm -rf xercesc/util/regx/.libs xercesc/util/regx/_libs
-rm -rf xercesc/validators/DTD/.libs xercesc/validators/DTD/_libs
@@ -3725,6 +3768,25 @@
echo " rm -f '$(DESTDIR)$(libframework_ladir)/$$f'"; \
rm -f "$(DESTDIR)$(libframework_ladir)/$$f"; \
done
+install-nobase_libiconv_laHEADERS: $(nobase_libiconv_la_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(libiconv_ladir)" || $(mkdir_p) "$(DESTDIR)$(libiconv_ladir)"
+ @$(am__vpath_adj_setup) \
+ list='$(nobase_libiconv_la_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ $(am__vpath_adj) \
+ echo " $(nobase_libiconv_laHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libiconv_ladir)/$$f'"; \
+ $(nobase_libiconv_laHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libiconv_ladir)/$$f"; \
+ done
+
+uninstall-nobase_libiconv_laHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @$(am__vpath_adj_setup) \
+ list='$(nobase_libiconv_la_HEADERS)'; for p in $$list; do \
+ $(am__vpath_adj) \
+ echo " rm -f '$(DESTDIR)$(libiconv_ladir)/$$f'"; \
+ rm -f "$(DESTDIR)$(libiconv_ladir)/$$f"; \
+ done
install-nobase_libicu_laHEADERS: $(nobase_libicu_la_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(libicu_ladir)" || $(mkdir_p) "$(DESTDIR)$(libicu_ladir)"
@@ -4060,7 +4122,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/Transcoders/ICU $(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/MacOSURLAccessCF $(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 \
@@ -4091,7 +4153,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)$(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)$(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)$(libutil_ladir)" "$(DESTDIR)$(libvalidators_ladir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -4144,6 +4206,8 @@
-rm -f xercesc/util/NetAccessors/MacOSURLAccessCF/$(am__dirstamp)
-rm -f xercesc/util/Transcoders/ICU/$(DEPDIR)/$(am__dirstamp)
-rm -f xercesc/util/Transcoders/ICU/$(am__dirstamp)
+ -rm -f xercesc/util/Transcoders/Iconv/$(DEPDIR)/$(am__dirstamp)
+ -rm -f xercesc/util/Transcoders/Iconv/$(am__dirstamp)
-rm -f xercesc/util/Transcoders/MacOSUnicodeConverter/$(DEPDIR)/$(am__dirstamp)
-rm -f xercesc/util/Transcoders/MacOSUnicodeConverter/$(am__dirstamp)
-rm -f xercesc/util/regx/$(DEPDIR)/$(am__dirstamp)
@@ -4168,7 +4232,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf xercesc/dom/$(DEPDIR) xercesc/dom/impl/$(DEPDIR) xercesc/framework/$(DEPDIR) xercesc/framework/psvi/$(DEPDIR) xercesc/internal/$(DEPDIR) xercesc/parsers/$(DEPDIR) xercesc/sax/$(DEPDIR) xercesc/sax2/$(DEPDIR) xercesc/util/$(DEPDIR) xercesc/util/AtomicOpManagers/$(DEPDIR) xercesc/util/FileManagers/$(DEPDIR) xercesc/util/MsgLoaders/InMemory/$(DEPDIR) xercesc/util/MutexManagers/$(DEPDIR) xercesc/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR) xercesc/util/Transcoders/ICU/$(DEPDIR) xercesc/util/Transcoders/MacOSUnicodeConverter/$(DEPDIR) xercesc/util/regx/$(DEPDIR) xercesc/validators/DTD/$(DEPDIR) xercesc/validators/common/$(DEPDIR) xercesc/validators/datatype/$(DEPDIR) xercesc/validators/schema/$(DEPDIR) xercesc/validators/schema/identity/$(DEPDIR)
+ -rm -rf xercesc/dom/$(DEPDIR) xercesc/dom/impl/$(DEPDIR) xercesc/framework/$(DEPDIR) xercesc/framework/psvi/$(DEPDIR) xercesc/internal/$(DEPDIR) xercesc/parsers/$(DEPDIR) xercesc/sax/$(DEPDIR) xercesc/sax2/$(DEPDIR) xercesc/util/$(DEPDIR) xercesc/util/AtomicOpManagers/$(DEPDIR) xercesc/util/FileManagers/$(DEPDIR) xercesc/util/MsgLoaders/InMemory/$(DEPDIR) xercesc/util/MutexManagers/$(DEPDIR) xercesc/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR) xercesc/util/Transcoders/ICU/$(DEPDIR) xercesc/util/Transcoders/Iconv/$(DEPDIR) xercesc/util/Transcoders/MacOSUnicodeConverter/$(DEPDIR) xercesc/util/regx/$(DEPDIR) xercesc/validators/DTD/$(DEPDIR) xercesc/validators/common/$(DEPDIR) xercesc/validators/datatype/$(DEPDIR) xercesc/validators/schema/$(DEPDIR) xercesc/validators/schema/identity/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
@@ -4187,6 +4251,7 @@
install-nobase_libdom_laHEADERS \
install-nobase_libdomimpl_laHEADERS \
install-nobase_libframework_laHEADERS \
+ install-nobase_libiconv_laHEADERS \
install-nobase_libicu_laHEADERS \
install-nobase_libinmemory_laHEADERS \
install-nobase_libinternal_laHEADERS \
@@ -4212,7 +4277,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf xercesc/dom/$(DEPDIR) xercesc/dom/impl/$(DEPDIR) xercesc/framework/$(DEPDIR) xercesc/framework/psvi/$(DEPDIR) xercesc/internal/$(DEPDIR) xercesc/parsers/$(DEPDIR) xercesc/sax/$(DEPDIR) xercesc/sax2/$(DEPDIR) xercesc/util/$(DEPDIR) xercesc/util/AtomicOpManagers/$(DEPDIR) xercesc/util/FileManagers/$(DEPDIR) xercesc/util/MsgLoaders/InMemory/$(DEPDIR) xercesc/util/MutexManagers/$(DEPDIR) xercesc/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR) xercesc/util/Transcoders/ICU/$(DEPDIR) xercesc/util/Transcoders/MacOSUnicodeConverter/$(DEPDIR) xercesc/util/regx/$(DEPDIR) xercesc/validators/DTD/$(DEPDIR) xercesc/validators/common/$(DEPDIR) xercesc/validators/datatype/$(DEPDIR) xercesc/validators/schema/$(DEPDIR) xercesc/validators/schema/identity/$(DEPDIR)
+ -rm -rf xercesc/dom/$(DEPDIR) xercesc/dom/impl/$(DEPDIR) xercesc/framework/$(DEPDIR) xercesc/framework/psvi/$(DEPDIR) xercesc/internal/$(DEPDIR) xercesc/parsers/$(DEPDIR) xercesc/sax/$(DEPDIR) xercesc/sax2/$(DEPDIR) xercesc/util/$(DEPDIR) xercesc/util/AtomicOpManagers/$(DEPDIR) xercesc/util/FileManagers/$(DEPDIR) xercesc/util/MsgLoaders/InMemory/$(DEPDIR) xercesc/util/MutexManagers/$(DEPDIR) xercesc/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR) xercesc/util/Transcoders/ICU/$(DEPDIR) xercesc/util/Transcoders/Iconv/$(DEPDIR) xercesc/util/Transcoders/MacOSUnicodeConverter/$(DEPDIR) xercesc/util/regx/$(DEPDIR) xercesc/validators/DTD/$(DEPDIR) xercesc/validators/common/$(DEPDIR) xercesc/validators/datatype/$(DEPDIR) xercesc/validators/schema/$(DEPDIR) xercesc/validators/schema/identity/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -4233,6 +4298,7 @@
uninstall-nobase_libdom_laHEADERS \
uninstall-nobase_libdomimpl_laHEADERS \
uninstall-nobase_libframework_laHEADERS \
+ uninstall-nobase_libiconv_laHEADERS \
uninstall-nobase_libicu_laHEADERS \
uninstall-nobase_libinmemory_laHEADERS \
uninstall-nobase_libinternal_laHEADERS \
@@ -4259,6 +4325,7 @@
install-nobase_libdom_laHEADERS \
install-nobase_libdomimpl_laHEADERS \
install-nobase_libframework_laHEADERS \
+ install-nobase_libiconv_laHEADERS \
install-nobase_libicu_laHEADERS \
install-nobase_libinmemory_laHEADERS \
install-nobase_libinternal_laHEADERS \
@@ -4282,6 +4349,7 @@
uninstall-nobase_libdom_laHEADERS \
uninstall-nobase_libdomimpl_laHEADERS \
uninstall-nobase_libframework_laHEADERS \
+ uninstall-nobase_libiconv_laHEADERS \
uninstall-nobase_libicu_laHEADERS \
uninstall-nobase_libinmemory_laHEADERS \
uninstall-nobase_libinternal_laHEADERS \
Propchange: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/Iconv/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu May 26 15:49:09 2005
@@ -0,0 +1 @@
+.*
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=178702&r1=178701&r2=178702&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in Thu May 26 15:49:09 2005
@@ -247,6 +247,8 @@
XERCES_USE_NETACCESSOR_SOCKET_TRUE = @XERCES_USE_NETACCESSOR_SOCKET_TRUE@
XERCES_USE_NETACCESSOR_WINSOCK_FALSE = @XERCES_USE_NETACCESSOR_WINSOCK_FALSE@
XERCES_USE_NETACCESSOR_WINSOCK_TRUE = @XERCES_USE_NETACCESSOR_WINSOCK_TRUE@
+XERCES_USE_TRANSCODER_ICONV_FALSE = @XERCES_USE_TRANSCODER_ICONV_FALSE@
+XERCES_USE_TRANSCODER_ICONV_TRUE = @XERCES_USE_TRANSCODER_ICONV_TRUE@
XERCES_USE_TRANSCODER_ICU_FALSE = @XERCES_USE_TRANSCODER_ICU_FALSE@
XERCES_USE_TRANSCODER_ICU_TRUE = @XERCES_USE_TRANSCODER_ICU_TRUE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE@
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org