--- obj/Makefile.in.dist	Mon Feb 10 15:35:07 2003
+++ obj/Makefile.in	Mon Feb 10 15:36:50 2003
@@ -83,6 +83,9 @@
 include ../version.incl
 include ../src/xercesc/Makefile.incl
 
+#override AR definition in Makefile.incl
+AR  = @l_ar@
+
 LIB=${XERCESCROOT}/lib
 ## OS390BATCH
 ifeq (${OS390BATCH},1)
@@ -121,7 +124,7 @@
 	\rm -f $(DUMMYEXE)
 
     $(DUMMYEXE): $(ALL_OBJECTS)
-	${MAKE_SHARED} -o ${@} $^ $(PLATFORM_LIBRARIES) $(ALLLIBS)
+	${AR} ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS)
 
     ######  End HP-UX  CC compiler specific stuff #######
   else
@@ -164,12 +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}
-	rm -rf ${FQ_SO_NAME}   && ln -s ${FQ_REAL_NAME} ${FQ_SO_NAME}
-	@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}
+	${AR} ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS)
 
 ## Start OS390 ##
 ifeq (${PLATFORM},OS390)
@@ -224,7 +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
-	$(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib
+	$(CP) ${FQ_LINK_NAME:.so=.a} ${DESTDIR}$(PREFIX)/lib
 	(cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_NAME} ${SO_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
 endif
 ifeq (${PLATFORM},OS390)
--- samples/Makefile.incl.dist	Mon Feb 10 16:47:03 2003
+++ samples/Makefile.incl	Tue Feb 11 09:23:20 2003
@@ -71,8 +71,8 @@
 endif
 THISLIB=${LIB_DIR}/${LIBNAME}
 
-LIBRARY_NAMES=-l${LIBNAME}
-LIBRARY_SEARCH_PATHS=-L${LIB_DIR}
+LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}.a
+LIBRARY_SEARCH_PATHS=
 
 TO = o
 ####################### PLATFORM DEPENDENCIES #####################
@@ -83,11 +83,11 @@
 	CMP= -c ${CXXFLAGS}
 	CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
 	LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 	EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
   else
 	CMP= -c ${CXXFLAGS}
-	CC= CC -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -D_REENTRANT -I/usr/local/include
+	CC= CC -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -D_REENTRANT
 	LINK =  CC -D${PLATFORM} ${LDFLAGS}
 	PLATFORM_LIB_LINK_OPTIONS=
 	EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
@@ -101,7 +101,7 @@
 	CMP= -c ${CXXFLAGS}
 	CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
 	LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 	EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
   else
 	CMP= -c ${CXXFLAGS}
@@ -119,7 +119,7 @@
   CMP=-c ${CXXFLAGS}
   LINK=${CC} ${LDFLAGS}
   EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
-  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
   SHLIBSUFFIX=.so
 endif
 
@@ -129,7 +129,7 @@
   CC= ${COMPILER} -O2 -c -D${PLATFORM} -D_REENTRANT -fpic -pthread
   LINK = ${COMPILER} -D${PLATFORM} -fpic -pthread ${LDFLAGS}
   EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
-  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
   SHLIBSUFFIX=.so
 endif
 
@@ -145,7 +145,7 @@
 PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -DPTX
 MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -DPTX -G
 MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -DPTX  -G
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib -L${XMLINSTALL}/lib
+PLATFORM_LIB_LINK_OPTIONS=-L${XMLINSTALL}/lib
 EXTRA_LINK_OPTIONS=-lm -lgen ${EXTRA_LIBS}
 SHLIBSUFFIX=.so
 endif
@@ -194,7 +194,7 @@
 CMP= -c ${CXXFLAGS}
 CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
 LINK =  ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=
 EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
 SHLIBSUFFIX=.so
 endif
@@ -204,7 +204,7 @@
 CMP= -c ${CXXFLAGS}
 CC= ${COMPILER} -c -D__${PLATFORM}__
 LINK =  ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 SHLIBSUFFIX=.dll
 endif
@@ -214,7 +214,7 @@
   CMP= -c ${CXXFLAGS}
   CC= ${COMPILER} -c -D${PLATFORM} -fPIC
   LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
-  PLATFORM_LIB_LINK_OPTIONS=-Wl,-rpath,${XERCESCROOT}/lib
+  PLATFORM_LIB_LINK_OPTIONS=
   ifdef ICUROOT
     PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
     EXTRA_LINK_OPTIONS=-licudata -lstdc++ ${EXTRA_LIBS}
@@ -299,7 +299,7 @@
 CMP= -c ${CXXFLAGS}
 CC = ${COMPILER} -c -D${PLATFORM}
 LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 SHLIBSUFFIX=.so
 endif
 
@@ -309,6 +309,6 @@
 	CMP= -c ${CXXFLAGS}
 	CC= c++ -c -D${PLATFORM} -D_REENTRANT
 	LINK = c++ -D${PLATFORM} ${LDFLAGS}
-	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 	SHLIBSUFFIX=.dylib
 endif
--- tests/Makefile.incl.dist	Mon Feb 10 16:46:44 2003
+++ tests/Makefile.incl	Tue Feb 11 09:33:34 2003
@@ -71,8 +71,8 @@
 endif
 THISLIB=${LIB_DIR}/${LIBNAME}
 
-LIBRARY_NAMES=-l${LIBNAME}
-LIBRARY_SEARCH_PATHS=-L${LIB_DIR}
+LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}.a
+LIBRARY_SEARCH_PATHS=
 
 TO = o
 ####################### PLATFORM DEPENDENCIES #####################
@@ -83,11 +83,11 @@
 	CMP= -c ${CXXFLAGS}
 	CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
 	LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 	EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
   else
 	CMP= -c ${CXXFLAGS}
-	CC= CC -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -D_REENTRANT -I/usr/local/include
+	CC= CC -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -D_REENTRANT
 	LINK =  CC -D${PLATFORM} ${LDFLAGS}
 	PLATFORM_LIB_LINK_OPTIONS=
 	EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
@@ -101,7 +101,7 @@
 	CMP= -c ${CXXFLAGS}
 	CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
 	LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 	EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
   else
 	CMP= -c ${CXXFLAGS}
@@ -119,7 +119,7 @@
   CMP=-c ${CXXFLAGS}
   LINK=${CC} ${LDFLAGS}
   EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
-  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
   SHLIBSUFFIX=.so
 endif
 
@@ -129,7 +129,7 @@
   CC= ${COMPILER} -O2 -c -D${PLATFORM} -D_REENTRANT -fpic -pthread
   LINK = ${COMPILER} -D${PLATFORM} -fpic -pthread ${LDFLAGS}
   EXTRA_LINK_OPTIONS=-lc -lsocket ${EXTRA_LIBS}
-  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
   SHLIBSUFFIX=.so
 endif
 
@@ -145,7 +145,7 @@
 PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -DPTX
 MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -DPTX -G
 MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -DPTX  -G
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib -L${XMLINSTALL}/lib
+PLATFORM_LIB_LINK_OPTIONS=-L${XMLINSTALL}/lib
 EXTRA_LINK_OPTIONS=-lm -lgen ${EXTRA_LIBS}
 SHLIBSUFFIX=.so
 endif
@@ -193,7 +193,7 @@
 CMP= -c ${CXXFLAGS}
 CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
 LINK =  ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=
 EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
 SHLIBSUFFIX=.so
 endif
@@ -203,7 +203,7 @@
 CMP= -c ${CXXFLAGS}
 CC= ${COMPILER} -c -D__${PLATFORM}__
 LINK =  ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
 SHLIBSUFFIX=.dll
 endif
@@ -213,7 +213,7 @@
   CMP= -c ${CXXFLAGS}
   CC= ${COMPILER} -c -D${PLATFORM} -fPIC
   LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
-  PLATFORM_LIB_LINK_OPTIONS=-Wl,-rpath,${XERCESCROOT}/lib
+  PLATFORM_LIB_LINK_OPTIONS=
   ifdef ICUROOT
     PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
     EXTRA_LINK_OPTIONS=-licudata -lstdc++ ${EXTRA_LIBS}
@@ -298,7 +298,7 @@
 CMP= -c ${CXXFLAGS}
 CC = ${COMPILER} -c -D${PLATFORM}
 LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
-PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
 SHLIBSUFFIX=.so
 endif
 
@@ -308,6 +308,6 @@
 	CMP= -c ${CXXFLAGS}
 	CC= c++ -c -D${PLATFORM} -D_REENTRANT
 	LINK = c++ -D${PLATFORM} ${LDFLAGS}
-	PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+	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 */