head 1.11; access; symbols OPENPKG_E1_MP_HEAD:1.10 OPENPKG_E1_MP:1.10 OPENPKG_E1_MP_2_STABLE:1.10.2.2 OPENPKG_E1_FP:1.10.2.2 OPENPKG_2_STABLE_MP:1.10 OPENPKG_2_STABLE_20061018:1.10.2.2 OPENPKG_2_STABLE:1.10.0.2 OPENPKG_CW_FP:1.10 OPENPKG_1_STABLE_MP:1.9; locks; strict; comment @# @; 1.11 date 2008.10.18.08.15.27; author rse; state Exp; branches; next 1.10; commitid ZXqAbawpCPBzg5nt; 1.10 date 2004.10.25.15.32.05; author ms; state Exp; branches 1.10.2.1; next 1.9; 1.9 date 2003.07.03.16.14.28; author mlelstv; state Exp; branches; next 1.8; 1.8 date 2003.07.03.15.53.17; author mlelstv; state Exp; branches; next 1.7; 1.7 date 2003.07.03.15.33.35; author mlelstv; state Exp; branches; next 1.6; 1.6 date 2003.06.02.15.10.34; author mlelstv; state Exp; branches; next 1.5; 1.5 date 2003.05.28.14.47.01; author thl; state Exp; branches; next 1.4; 1.4 date 2003.02.11.10.33.20; author mlelstv; state Exp; branches; next 1.3; 1.3 date 2003.02.11.09.35.17; author mlelstv; state Exp; branches; next 1.2; 1.2 date 2002.12.07.10.35.56; author mlelstv; state Exp; branches; next 1.1; 1.1 date 2002.12.06.14.56.00; author mlelstv; state Exp; branches; next ; 1.10.2.1 date 2004.10.25.15.32.05; author rse; state dead; branches; next 1.10.2.2; commitid iZxwRSmmWscPXUQr; 1.10.2.2 date 2006.10.16.14.58.17; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.11 log @upgrading package: xerces-c 2.4.0 -> 2.8.0 @ text @diff -p -up ./src/xercesc/util/RefArrayOf.c.orig ./src/xercesc/util/RefArrayOf.c --- ./src/xercesc/util/RefArrayOf.c.orig 2007-08-28 20:44:52.000000000 +0200 +++ ./src/xercesc/util/RefArrayOf.c 2008-10-16 23:20:44.000000000 +0200 @@@@ -27,6 +27,8 @@@@ #include #endif +#include + XERCES_CPP_NAMESPACE_BEGIN // --------------------------------------------------------------------------- diff -p -up ./tests/runConfigure.orig ./tests/runConfigure --- ./tests/runConfigure.orig 2007-08-28 20:46:48.000000000 +0200 +++ ./tests/runConfigure 2008-10-16 23:20:44.000000000 +0200 @@@@ -490,6 +490,73 @@@@ if test $platform = "freebsd"; then fi # +# Check for the type of net accessor +# + +netaccessor=socket +NETACCESSOR=Socket # By default use socket (does HTTP URL's) +if test $netaccessor ; then +case $netaccessor in + fileonly) + NETACCESSOR=FileOnly + netaccessorDefines="" ;; + + socket) + NETACCESSOR=Socket + netaccessorDefines="-DXML_USE_NETACCESSOR_SOCKET" + case $platform in + unixware|openserver) + netaccessorLibs="-lnsl -lsocket";; + hp-11) + netaccessorLibs="-lnsl";; + aix) + #netaccessorLibs="-lbsd";; + netaccessorLibs="";; + beos) + netaccessorLibs="-lnet";; + qnx) + netaccessorLibs="-lsocket";; + solaris) + netaccessorLibs="-lnsl -lsocket" + if test $thread = "dce"; then + netaccessorLibs="" + fi + ;; + *) + ;; + esac;; + + libwww) + NETACCESSOR=LibWWW + if test -z "`libwww-config --libs 2>/dev/null`" ; then + echo "Netaccessor is libwww, but libwww-config is not found. Cannot proceed further." + exit ${ERROR_EXIT_CODE}; + fi + netaccessorDefines="-DXML_USE_NETACCESSOR_LIBWWW `libwww-config --cflags`" + netaccessorLibs="`libwww-config --libs`" + USELIBWWW=1;; + + native) + if test $platform = "macosx"; then + NETACCESSOR=NATIVE + netaccessorDefines="-DXML_USE_NETACCESSOR_NATIVE" + netaccessorLibs="" + else + echo "netaccessor option '$netaccessor' is supported on 'macosx' only." + exit ${ERROR_EXIT_CODE} + fi + + ;; + + *) + echo "I do not recognize the netaccessor option '$netaccessor'. Please type '${0} -h' for help." + exit ${ERROR_EXIT_CODE};; +esac +fi + +export NETACCESSOR + +# # Set the C compiler and C++ compiler environment variables # case $cppcompiler in @@@@ -546,7 +613,7 @@@@ fi LDFLAGS="$LDFLAGS $linkeroptions $bitstobuildLink" export LDFLAGS -EXTRA_LIBS="$transcodingLibs $threadingLibs" +EXTRA_LIBS="$transcodingLibs $threadingLibs $netaccessorLibs" export EXTRA_LIBS echo diff -p -up ./tests/Makefile.incl.orig ./tests/Makefile.incl --- ./tests/Makefile.incl.orig 2007-08-28 20:46:48.000000000 +0200 +++ ./tests/Makefile.incl 2008-10-16 23:31:38.000000000 +0200 @@@@ -36,9 +36,9 @@@@ LIBDEPDOM=xercesdepdom endif THISLIB=${LIB_DIR}/${LIBNAME} -LIBRARY_NAMES=-l${LIBNAME} -LIBRARY_DEPDOM=-l${LIBDEPDOM} -LIBRARY_SEARCH_PATHS=-L${LIB_DIR} +LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}.a +LIBRARY_DEPDOM=${LIB_DIR}/lib${LIBDEPDOM}.a +LIBRARY_SEARCH_PATHS= TO = o ####################### PLATFORM DEPENDENCIES ##################### @@@@ -49,7 +49,7 @@@@ ifeq (${PLATFORM}, IRIX) CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -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=${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -57,7 +57,7 @@@@ ifeq (${PLATFORM}, IRIX) endif else CMP= -c ${CXXFLAGS} - CC= ${COMPILER} -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -I/usr/local/include -no_auto_include + CC= ${COMPILER} -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -no_auto_include LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS} PLATFORM_LIB_LINK_OPTIONS= EXTRA_LINK_OPTIONS=${EXTRA_LIBS} @@@@ -74,7 +74,7 @@@@ ifeq (${PLATFORM}, SOLARIS) CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -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=${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -99,7 +99,7 @@@@ ifeq (${PLATFORM}, OPENSERVER) 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 endif #=============== UNIXWARE SPECIFIC OPTIONS ========================= @@@@ -108,7 +108,7 @@@@ ifeq (${PLATFORM}, UNIXWARE) CC= ${COMPILER} -D${PLATFORM} -fpic LINK = ${COMPILER} -D${PLATFORM} -fpic ${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 ifneq (${THREADS},none) CMP += -D_REENTRANT -pthread @@@@ -122,7 +122,7 @@@@ ifeq (${PLATFORM}, PTX) CC= ${COMPILER} LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS} EXTRA_LINK_OPTIONS=-lm -lgen ${EXTRA_LIBS} - PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib -L${XMLINSTALL}/lib + PLATFORM_LIB_LINK_OPTIONS=-L${XMLINSTALL}/lib ifneq (${THREADS},none) CMP += -Kthread @@@@ -137,7 +137,7 @@@@ ifeq (${PLATFORM}, AIX) CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -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= ${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -195,7 +195,7 @@@@ ifeq (${PLATFORM}, LINUX) CMP= -c ${CXXFLAGS} -qnotempinc CC= ${COMPILER} -c -D${PLATFORM} LINK = ${COMPILER} ${LDFLAGS} - PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib + PLATFORM_LIB_LINK_OPTIONS= EXTRA_LINK_OPTIONS=${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -205,7 +205,7 @@@@ ifeq (${PLATFORM}, LINUX) CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -fpic LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS} - PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib + PLATFORM_LIB_LINK_OPTIONS= EXTRA_LINK_OPTIONS=${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -219,7 +219,7 @@@@ ifeq (${PLATFORM}, QNX) CMP= -c ${CXXFLAGS} CC= ${COMPILER} LINK = ${COMPILER} ${LDFLAGS} -PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib +PLATFORM_LIB_LINK_OPTIONS= EXTRA_LINK_OPTIONS=${EXTRA_LIBS} endif @@@@ -229,7 +229,7 @@@@ ifeq (${PLATFORM}, CYGWIN) 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} endif @@@@ -238,7 +238,7 @@@@ ifeq (${PLATFORM}, INTERIX) CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -D_ALL_SOURCE LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS} - PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib + PLATFORM_LIB_LINK_OPTIONS= EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -251,7 +251,7 @@@@ ifeq (${PLATFORM}, MINGW) CMP= -c ${CXXFLAGS} -fexceptions CC= ${COMPILER} -c -D__${PLATFORM}__ -DPLATFORM_WIN32 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} endif @@@@ -260,7 +260,7 @@@@ ifeq (${PLATFORM}, FREEBSD) 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} @@@@ -274,7 +274,7 @@@@ ifeq (${PLATFORM}, NETBSD) 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} @@@@ -289,7 +289,7 @@@@ ifeq (${PLATFORM}, HPUX) CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -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= ${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -405,7 +405,7 @@@@ ifeq (${PLATFORM}, TRU64) 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 endif diff -p -up ./samples/runConfigure.orig ./samples/runConfigure --- ./samples/runConfigure.orig 2007-08-28 20:47:02.000000000 +0200 +++ ./samples/runConfigure 2008-10-16 23:20:44.000000000 +0200 @@@@ -491,6 +491,73 @@@@ if test $platform = "freebsd"; then fi # +# Check for the type of net accessor +# + +netaccessor=socket +NETACCESSOR=Socket # By default use socket (does HTTP URL's) +if test $netaccessor ; then +case $netaccessor in + fileonly) + NETACCESSOR=FileOnly + netaccessorDefines="" ;; + + socket) + NETACCESSOR=Socket + netaccessorDefines="-DXML_USE_NETACCESSOR_SOCKET" + case $platform in + unixware|openserver) + netaccessorLibs="-lnsl -lsocket";; + hp-11) + netaccessorLibs="-lnsl";; + aix) + #netaccessorLibs="-lbsd";; + netaccessorLibs="";; + beos) + netaccessorLibs="-lnet";; + qnx) + netaccessorLibs="-lsocket";; + solaris) + netaccessorLibs="-lnsl -lsocket" + if test $thread = "dce"; then + netaccessorLibs="" + fi + ;; + *) + ;; + esac;; + + libwww) + NETACCESSOR=LibWWW + if test -z "`libwww-config --libs 2>/dev/null`" ; then + echo "Netaccessor is libwww, but libwww-config is not found. Cannot proceed further." + exit ${ERROR_EXIT_CODE}; + fi + netaccessorDefines="-DXML_USE_NETACCESSOR_LIBWWW `libwww-config --cflags`" + netaccessorLibs="`libwww-config --libs`" + USELIBWWW=1;; + + native) + if test $platform = "macosx"; then + NETACCESSOR=NATIVE + netaccessorDefines="-DXML_USE_NETACCESSOR_NATIVE" + netaccessorLibs="" + else + echo "netaccessor option '$netaccessor' is supported on 'macosx' only." + exit ${ERROR_EXIT_CODE} + fi + + ;; + + *) + echo "I do not recognize the netaccessor option '$netaccessor'. Please type '${0} -h' for help." + exit ${ERROR_EXIT_CODE};; +esac +fi + +export NETACCESSOR + +# # Set the C compiler and C++ compiler environment variables # case $cppcompiler in @@@@ -548,7 +615,7 @@@@ fi LDFLAGS="$LDFLAGS $linkeroptions $bitstobuildLink" export LDFLAGS -EXTRA_LIBS="$transcodingLibs $threadingLibs" +EXTRA_LIBS="$transcodingLibs $threadingLibs $netaccessorLibs" export EXTRA_LIBS echo diff -p -up ./samples/Makefile.incl.orig ./samples/Makefile.incl --- ./samples/Makefile.incl.orig 2007-08-28 20:47:02.000000000 +0200 +++ ./samples/Makefile.incl 2008-10-16 23:20:44.000000000 +0200 @@@@ -33,8 +33,8 @@@@ LIBNAME=xercesc 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= ifndef XERCESCOUT XERCESCOUT=${XERCESCROOT} @@@@ -49,7 +49,7 @@@@ ifeq (${PLATFORM}, IRIX) CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -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=${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -57,7 +57,7 @@@@ ifeq (${PLATFORM}, IRIX) endif else CMP= -c ${CXXFLAGS} - CC= ${COMPILER} -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -I/usr/local/include -no_auto_include + CC= ${COMPILER} -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -no_auto_include LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS} PLATFORM_LIB_LINK_OPTIONS= EXTRA_LINK_OPTIONS=${EXTRA_LIBS} @@@@ -74,7 +74,7 @@@@ ifeq (${PLATFORM}, SOLARIS) CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -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=${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -99,7 +99,7 @@@@ ifeq (${PLATFORM}, OPENSERVER) 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 endif #=============== UNIXWARE SPECIFIC OPTIONS ========================= @@@@ -108,7 +108,7 @@@@ ifeq (${PLATFORM}, UNIXWARE) CC= ${COMPILER} -D${PLATFORM} -fpic LINK = ${COMPILER} -D${PLATFORM} -fpic ${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 ifneq (${THREADS},none) CMP += -D_REENTRANT -pthread @@@@ -122,7 +122,7 @@@@ ifeq (${PLATFORM}, PTX) CC= ${COMPILER} LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS} EXTRA_LINK_OPTIONS=-lm -lgen ${EXTRA_LIBS} - PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib -L${XMLINSTALL}/lib + PLATFORM_LIB_LINK_OPTIONS=-L${XMLINSTALL}/lib ifneq (${THREADS},none) CMP += -Kthread @@@@ -137,7 +137,7 @@@@ ifeq (${PLATFORM}, AIX) CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -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= ${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -196,7 +196,7 @@@@ ifeq (${PLATFORM}, LINUX) CMP= -c ${CXXFLAGS} -qnotempinc CC= ${COMPILER} -c -D${PLATFORM} LINK = ${COMPILER} ${LDFLAGS} - PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib + PLATFORM_LIB_LINK_OPTIONS= EXTRA_LINK_OPTIONS=${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -206,7 +206,7 @@@@ ifeq (${PLATFORM}, LINUX) CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -fpic LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS} - PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib + PLATFORM_LIB_LINK_OPTIONS= EXTRA_LINK_OPTIONS=${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -220,7 +220,7 @@@@ ifeq (${PLATFORM}, QNX) CMP= -c ${CXXFLAGS} CC= ${COMPILER} LINK = ${COMPILER} ${LDFLAGS} -PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib +PLATFORM_LIB_LINK_OPTIONS= EXTRA_LINK_OPTIONS=${EXTRA_LIBS} endif @@@@ -230,7 +230,7 @@@@ ifeq (${PLATFORM}, CYGWIN) 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} endif @@@@ -239,7 +239,7 @@@@ ifeq (${PLATFORM}, INTERIX) CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -D_ALL_SOURCE LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS} - PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib + PLATFORM_LIB_LINK_OPTIONS= EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -252,7 +252,7 @@@@ ifeq (${PLATFORM}, MINGW) CMP= -c ${CXXFLAGS} -fexceptions 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} endif @@@@ -261,7 +261,7 @@@@ ifeq (${PLATFORM}, FREEBSD) 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} @@@@ -275,7 +275,7 @@@@ ifeq (${PLATFORM}, NETBSD) 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} @@@@ -290,7 +290,7 @@@@ ifeq (${PLATFORM}, HPUX) CMP= -c ${CXXFLAGS} CC= ${COMPILER} -c -D${PLATFORM} -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= ${EXTRA_LIBS} ifneq (${THREADS},none) @@@@ -403,7 +403,7 @@@@ ifeq (${PLATFORM}, TRU64) 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 endif @ 1.10 log @add missing class definition from header file MemoryManager.hpp @ text @d1 8 a8 4 --- obj/Makefile.in.dist 2003-05-27 17:04:32.000000000 +0200 +++ obj/Makefile.in 2003-06-02 16:27:08.000000000 +0200 @@@@ -1,4 +1,4 @@@@ -# d10 1 a10 21 # The Apache Software License, Version 1.1 # # Copyright (c) 1999-2000 The Apache Software Foundation. All rights @@@@ -83,6 +83,10 @@@@ include ../version.incl include ../src/xercesc/Makefile.incl +#override AR definition in Makefile.incl +AR = @@l_ar@@ +RANLIB = @@l_ranlib@@ + LIB=${XERCESCROOT}/lib ## OS390BATCH ifeq (${OS390BATCH},1) @@@@ -121,7 +125,8 @@@@ \rm -f $(DUMMYEXE) $(DUMMYEXE): $(ALL_OBJECTS) - ${MAKE_SHARED} -o ${@@} $^ $(PLATFORM_LIBRARIES) $(ALLLIBS) + ${AR} ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS) + ${RANLIB} ${FQ_LINK_NAME:.so=.a} d12 5 a16 247 ###### End HP-UX CC compiler specific stuff ####### else @@@@ -164,14 +169,9 @@@@ endif ${FQ_REAL_NAME}: $(ALL_OBJECTS) - @@echo Building ${FQ_REAL_NAME} - ${MAKE_SHARED} ${LD_SONAME} -o ${@@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS) - 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} + ${AR} ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS) + ${RANLIB} ${FQ_LINK_NAME:.so=.a} 2>/dev/null || true ## Start OS390 ## ifeq (${PLATFORM},OS390) @@@@ -226,8 +226,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 - (cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_NAME} ${SO_NAME}; ln -s ${REAL_NAME} ${LINK_NAME}) + $(CP) ${FQ_LINK_NAME:.so=.a} ${DESTDIR}$(PREFIX)/lib endif ifeq (${PLATFORM},OS390) $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib --- samples/Makefile.incl.dist 2003-05-27 17:04:33.000000000 +0200 +++ samples/Makefile.incl 2003-06-02 16:25:06.000000000 +0200 @@@@ -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 @@@@ -215,7 +215,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 @@@@ -225,7 +225,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} @@@@ -325,7 +325,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 @@@@ -335,6 +335,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 2003-05-27 17:05:07.000000000 +0200 +++ tests/Makefile.incl 2003-06-02 16:25:06.000000000 +0200 @@@@ -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 @@@@ -214,7 +214,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 @@@@ -224,7 +224,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} @@@@ -324,7 +324,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 @@@@ -334,6 +334,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 --- samples/runConfigure.dist 2003-07-03 17:00:52.000000000 +0200 +++ samples/runConfigure 2003-07-03 17:02:56.000000000 +0200 @@@@ -415,6 +415,73 @@@@ d90 1 a90 1 @@@@ -458,7 +524,7 @@@@ d99 173 a271 3 --- tests/runConfigure.dist 2003-07-03 17:47:41.000000000 +0200 +++ tests/runConfigure 2003-07-03 17:48:03.000000000 +0200 @@@@ -415,6 +415,73 @@@@ d345 1 a345 1 @@@@ -458,7 +524,7 @@@@ d354 165 a518 5 --- src/xercesc/util/RefArrayOf.c.orig 2004-10-25 16:47:18 +0200 +++ src/xercesc/util/RefArrayOf.c 2004-10-25 17:03:22 +0200 @@@@ -92,6 +92,8 @@@@ #include #endif a519 3 +#include + XERCES_CPP_NAMESPACE_BEGIN a520 1 // --------------------------------------------------------------------------- @ 1.10.2.1 log @file xerces-c.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:58:17 +0000 @ text @d1 452 @ 1.10.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 452 --- obj/Makefile.in.dist 2003-05-27 17:04:32.000000000 +0200 +++ obj/Makefile.in 2003-06-02 16:27:08.000000000 +0200 @@@@ -1,4 +1,4 @@@@ -# + # The Apache Software License, Version 1.1 # # Copyright (c) 1999-2000 The Apache Software Foundation. All rights @@@@ -83,6 +83,10 @@@@ include ../version.incl include ../src/xercesc/Makefile.incl +#override AR definition in Makefile.incl +AR = @@l_ar@@ +RANLIB = @@l_ranlib@@ + LIB=${XERCESCROOT}/lib ## OS390BATCH ifeq (${OS390BATCH},1) @@@@ -121,7 +125,8 @@@@ \rm -f $(DUMMYEXE) $(DUMMYEXE): $(ALL_OBJECTS) - ${MAKE_SHARED} -o ${@@} $^ $(PLATFORM_LIBRARIES) $(ALLLIBS) + ${AR} ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS) + ${RANLIB} ${FQ_LINK_NAME:.so=.a} ###### End HP-UX CC compiler specific stuff ####### else @@@@ -164,14 +169,9 @@@@ endif ${FQ_REAL_NAME}: $(ALL_OBJECTS) - @@echo Building ${FQ_REAL_NAME} - ${MAKE_SHARED} ${LD_SONAME} -o ${@@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS) - 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} + ${AR} ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS) + ${RANLIB} ${FQ_LINK_NAME:.so=.a} 2>/dev/null || true ## Start OS390 ## ifeq (${PLATFORM},OS390) @@@@ -226,8 +226,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 - (cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_NAME} ${SO_NAME}; ln -s ${REAL_NAME} ${LINK_NAME}) + $(CP) ${FQ_LINK_NAME:.so=.a} ${DESTDIR}$(PREFIX)/lib endif ifeq (${PLATFORM},OS390) $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib --- samples/Makefile.incl.dist 2003-05-27 17:04:33.000000000 +0200 +++ samples/Makefile.incl 2003-06-02 16:25:06.000000000 +0200 @@@@ -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 @@@@ -215,7 +215,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 @@@@ -225,7 +225,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} @@@@ -325,7 +325,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 @@@@ -335,6 +335,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 2003-05-27 17:05:07.000000000 +0200 +++ tests/Makefile.incl 2003-06-02 16:25:06.000000000 +0200 @@@@ -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 @@@@ -214,7 +214,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 @@@@ -224,7 +224,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} @@@@ -324,7 +324,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 @@@@ -334,6 +334,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 --- samples/runConfigure.dist 2003-07-03 17:00:52.000000000 +0200 +++ samples/runConfigure 2003-07-03 17:02:56.000000000 +0200 @@@@ -415,6 +415,73 @@@@ fi # +# Check for the type of net accessor +# + +netaccessor=socket +NETACCESSOR=Socket # By default use socket (does HTTP URL's) +if test $netaccessor ; then +case $netaccessor in + fileonly) + NETACCESSOR=FileOnly + netaccessorDefines="" ;; + + socket) + NETACCESSOR=Socket + netaccessorDefines="-DXML_USE_NETACCESSOR_SOCKET" + case $platform in + unixware|openserver) + netaccessorLibs="-lnsl -lsocket";; + hp-11) + netaccessorLibs="-lnsl";; + aix) + #netaccessorLibs="-lbsd";; + netaccessorLibs="";; + beos) + netaccessorLibs="-lnet";; + qnx) + netaccessorLibs="-lsocket";; + solaris) + netaccessorLibs="-lnsl -lsocket" + if test $thread = "dce"; then + netaccessorLibs="" + fi + ;; + *) + ;; + esac;; + + libwww) + NETACCESSOR=LibWWW + if test -z "`libwww-config --libs 2>/dev/null`" ; then + echo "Netaccessor is libwww, but libwww-config is not found. Cannot proceed further." + exit ${ERROR_EXIT_CODE}; + fi + netaccessorDefines="-DXML_USE_NETACCESSOR_LIBWWW `libwww-config --cflags`" + netaccessorLibs="`libwww-config --libs`" + USELIBWWW=1;; + + native) + if test $platform = "macosx"; then + NETACCESSOR=NATIVE + netaccessorDefines="-DXML_USE_NETACCESSOR_NATIVE" + netaccessorLibs="" + else + echo "netaccessor option '$netaccessor' is supported on 'macosx' only." + exit ${ERROR_EXIT_CODE} + fi + + ;; + + *) + echo "I do not recognize the netaccessor option '$netaccessor'. Please type '${0} -h' for help." + exit ${ERROR_EXIT_CODE};; +esac +fi + +export NETACCESSOR + +# # Set the C compiler and C++ compiler environment variables # case $cppcompiler in @@@@ -458,7 +524,7 @@@@ LDFLAGS="$LDFLAGS $linkeroptions $bitstobuildLink" export LDFLAGS -EXTRA_LIBS="$transcodingLibs $threadingLibs" +EXTRA_LIBS="$transcodingLibs $threadingLibs $netaccessorLibs" export EXTRA_LIBS echo --- tests/runConfigure.dist 2003-07-03 17:47:41.000000000 +0200 +++ tests/runConfigure 2003-07-03 17:48:03.000000000 +0200 @@@@ -415,6 +415,73 @@@@ fi # +# Check for the type of net accessor +# + +netaccessor=socket +NETACCESSOR=Socket # By default use socket (does HTTP URL's) +if test $netaccessor ; then +case $netaccessor in + fileonly) + NETACCESSOR=FileOnly + netaccessorDefines="" ;; + + socket) + NETACCESSOR=Socket + netaccessorDefines="-DXML_USE_NETACCESSOR_SOCKET" + case $platform in + unixware|openserver) + netaccessorLibs="-lnsl -lsocket";; + hp-11) + netaccessorLibs="-lnsl";; + aix) + #netaccessorLibs="-lbsd";; + netaccessorLibs="";; + beos) + netaccessorLibs="-lnet";; + qnx) + netaccessorLibs="-lsocket";; + solaris) + netaccessorLibs="-lnsl -lsocket" + if test $thread = "dce"; then + netaccessorLibs="" + fi + ;; + *) + ;; + esac;; + + libwww) + NETACCESSOR=LibWWW + if test -z "`libwww-config --libs 2>/dev/null`" ; then + echo "Netaccessor is libwww, but libwww-config is not found. Cannot proceed further." + exit ${ERROR_EXIT_CODE}; + fi + netaccessorDefines="-DXML_USE_NETACCESSOR_LIBWWW `libwww-config --cflags`" + netaccessorLibs="`libwww-config --libs`" + USELIBWWW=1;; + + native) + if test $platform = "macosx"; then + NETACCESSOR=NATIVE + netaccessorDefines="-DXML_USE_NETACCESSOR_NATIVE" + netaccessorLibs="" + else + echo "netaccessor option '$netaccessor' is supported on 'macosx' only." + exit ${ERROR_EXIT_CODE} + fi + + ;; + + *) + echo "I do not recognize the netaccessor option '$netaccessor'. Please type '${0} -h' for help." + exit ${ERROR_EXIT_CODE};; +esac +fi + +export NETACCESSOR + +# # Set the C compiler and C++ compiler environment variables # case $cppcompiler in @@@@ -458,7 +524,7 @@@@ LDFLAGS="$LDFLAGS $linkeroptions $bitstobuildLink" export LDFLAGS -EXTRA_LIBS="$transcodingLibs $threadingLibs" +EXTRA_LIBS="$transcodingLibs $threadingLibs $netaccessorLibs" export EXTRA_LIBS echo --- src/xercesc/util/RefArrayOf.c.orig 2004-10-25 16:47:18 +0200 +++ src/xercesc/util/RefArrayOf.c 2004-10-25 17:03:22 +0200 @@@@ -92,6 +92,8 @@@@ #include #endif +#include + XERCES_CPP_NAMESPACE_BEGIN // --------------------------------------------------------------------------- @ 1.9 log @set default netaccessor @ text @d442 11 @ 1.8 log @add netaccessor libs to build of tests/ @ text @d274 1 a274 1 @@@@ -415,6 +415,72 @@@@ d281 1 d359 1 a359 1 @@@@ -415,6 +415,72 @@@@ d366 1 @ 1.7 log @add netaccessor libs to build of samples/ @ text @d356 84 @ 1.6 log @fix build process, EVAL again @ text @d272 84 @ 1.5 log @flush pendig work; still does not build @ text @d1 2 a2 2 --- obj/Makefile.in.dist Mon Feb 10 15:35:07 2003 +++ obj/Makefile.in Tue Feb 11 10:46:55 2003 d9 1 a9 1 @@@@ -83,6 +83,9 @@@@ d15 1 d20 1 a20 1 @@@@ -121,7 +124,7 @@@@ d26 1 d30 1 a30 1 @@@@ -164,14 +167,8 @@@@ d44 1 d48 1 a48 1 @@@@ -226,8 +223,7 @@@@ d58 2 a59 2 --- samples/Makefile.incl.dist Mon Feb 10 16:47:03 2003 +++ samples/Makefile.incl Tue Feb 11 09:23:20 2003 d130 1 a130 1 @@@@ -204,7 +204,7 @@@@ d139 1 a139 1 @@@@ -214,7 +214,7 @@@@ d148 1 a148 1 @@@@ -299,7 +299,7 @@@@ d157 1 a157 1 @@@@ -309,6 +309,6 @@@@ d165 2 a166 2 --- tests/Makefile.incl.dist Mon Feb 10 16:46:44 2003 +++ tests/Makefile.incl Tue Feb 11 09:33:34 2003 d237 1 a237 1 @@@@ -203,7 +203,7 @@@@ d246 1 a246 1 @@@@ -213,7 +213,7 @@@@ d255 1 a255 1 @@@@ -298,7 +298,7 @@@@ d264 1 a264 1 @@@@ -308,6 +308,6 @@@@ @ 1.4 log @get rid of symlinks to non-existent shared library @ text @d28 1 a28 1 @@@@ -164,12 +167,8 @@@@ d34 2 a35 1 - @@echo symlink ${FQ_SO_NAME} d37 1 d45 1 a45 1 @@@@ -224,8 +223,7 @@@@ a268 29 --- 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 # include -XERCES_CPP_NAMESPACE_BEGIN - // --------------------------------------------------------------------------- // Description of encoding schemas, supported by iconv() // --------------------------------------------------------------------------- @@@@ -209,6 +207,8 @@@@ #include #include +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 */ @ 1.3 log @upgrade 2.1.0 -> 2.2.0 @ text @d2 7 a8 1 +++ obj/Makefile.in Mon Feb 10 15:36:50 2003 d43 1 a43 1 @@@@ -224,7 +223,7 @@@@ d48 1 a49 1 (cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_NAME} ${SO_NAME}; ln -s ${REAL_NAME} ${LINK_NAME}) d52 1 @ 1.2 log @finally use libtool to build static library @ text @d1 3 a3 3 --- obj/Makefile.in.dist Sat Dec 7 10:19:48 2002 +++ obj/Makefile.in Sat Dec 7 10:21:05 2002 @@@@ -82,6 +82,9 @@@@ d13 1 a13 1 @@@@ -117,7 +120,7 @@@@ d22 2 a23 2 @@@@ -146,12 +149,8 @@@@ ######################################################## d37 3 a39 3 @@@@ -200,7 +199,7 @@@@ ln -s ${PREFIX}/lib/${LIBNAME}${VER}.dll.a ${PREFIX}/lib/${LIBNAME}.dll.a ln -s ${PREFIX}/lib/${LIBNAME}${VER}.dll.a ${PREFIX}/lib/libxerces.dll.a d41 3 a43 2 - $(CP) ${FQ_REAL_NAME} $(PREFIX)/lib + $(CP) ${FQ_LINK_NAME:.so=.a} $(PREFIX)/lib d46 243 a288 1 $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} $(PREFIX)/lib @ 1.1 log @building static library now @ text @d1 5 a5 4 --- obj/Makefile.in.dist Fri Dec 6 15:39:08 2002 +++ obj/Makefile.in Fri Dec 6 15:39:18 2002 @@@@ -68,6 +68,7 @@@@ ################################################################### d7 1 a7 1 PLATFORM = @@platform@@ d9 5 a13 4 CC = @@cc@@ CXX = @@cxx@@ GCC = @@GCC@@ @@@@ -117,7 +118,7 @@@@ d18 1 a18 1 + $(AR) ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS) d22 2 a23 1 @@@@ -147,11 +148,7 @@@@ d26 1 a26 1 @@echo Building ${FQ_REAL_NAME} d32 2 a33 1 + $(AR) ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS) d37 1 a37 1 @@@@ -200,7 +197,7 @@@@ @