|
|
|
|
@ -25,14 +25,16 @@
|
|
|
|
|
|
|
|
|
|
###### End HP-UX CC compiler specific stuff #######
|
|
|
|
|
else
|
|
|
|
|
@@ -164,12 +167,8 @@
|
|
|
|
|
@@ -164,14 +167,8 @@
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
${FQ_REAL_NAME}: $(ALL_OBJECTS)
|
|
|
|
|
- @echo Building ${FQ_REAL_NAME}
|
|
|
|
|
- ${MAKE_SHARED} ${LD_SONAME} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
|
|
|
|
|
- @echo symlink ${FQ_SO_NAME}
|
|
|
|
|
- ifneq (${FQ_SO_NAME},${FQ_REAL_NAME})
|
|
|
|
|
- @echo symlink ${FQ_SO_NAME}
|
|
|
|
|
- rm -rf ${FQ_SO_NAME} && ln -s ${FQ_REAL_NAME} ${FQ_SO_NAME}
|
|
|
|
|
- endif
|
|
|
|
|
- @echo symlink ${FQ_LINK_NAME}
|
|
|
|
|
- rm -rf ${FQ_LINK_NAME} && ln -s ${FQ_SO_NAME} ${FQ_LINK_NAME}
|
|
|
|
|
+ @echo Building ${FQ_LINK_NAME:.so=.a}
|
|
|
|
|
@ -40,7 +42,7 @@
|
|
|
|
|
|
|
|
|
|
## Start OS390 ##
|
|
|
|
|
ifeq (${PLATFORM},OS390)
|
|
|
|
|
@@ -224,8 +223,7 @@
|
|
|
|
|
@@ -226,8 +223,7 @@
|
|
|
|
|
$(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib
|
|
|
|
|
(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_NAME}.a libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxerces.dll.a)
|
|
|
|
|
else
|
|
|
|
|
@ -264,32 +266,3 @@
|
|
|
|
|
+ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
|
|
|
|
|
SHLIBSUFFIX=.dylib
|
|
|
|
|
endif
|
|
|
|
|
--- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp.dist Mon Feb 10 15:31:26 2003
|
|
|
|
|
+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp Mon Feb 10 15:37:22 2003
|
|
|
|
|
@@ -103,8 +103,6 @@
|
|
|
|
|
# include <errno.h>
|
|
|
|
|
# include <machine/endian.h>
|
|
|
|
|
|
|
|
|
|
-XERCES_CPP_NAMESPACE_BEGIN
|
|
|
|
|
-
|
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
|
// Description of encoding schemas, supported by iconv()
|
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
|
@@ -209,6 +207,8 @@
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
|
|
+XERCES_CPP_NAMESPACE_BEGIN
|
|
|
|
|
+
|
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
|
// Local, const data
|
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
|
@@ -1563,6 +1563,7 @@
|
|
|
|
|
return (rc != (size_t)-1) && (len == 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+#endif /* XML_USE_LIBICONV */
|
|
|
|
|
+
|
|
|
|
|
XERCES_CPP_NAMESPACE_END
|
|
|
|
|
|
|
|
|
|
-#endif /* XML_USE_LIBICONV */
|
|
|
|
|
|