From 05168f13858675fca274a65f3147b5067eabb345 Mon Sep 17 00:00:00 2001 From: Michael van Elst Date: Thu, 3 Jul 2003 15:33:35 +0000 Subject: [PATCH] add netaccessor libs to build of samples/ --- xerces-c/xerces-c.patch | 84 +++++++++++++++++++++++++++++++++++++++++ xerces-c/xerces-c.spec | 2 +- 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/xerces-c/xerces-c.patch b/xerces-c/xerces-c.patch index ad5257ed3d..ff9c263214 100644 --- a/xerces-c/xerces-c.patch +++ b/xerces-c/xerces-c.patch @@ -269,3 +269,87 @@ + 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,72 @@ + fi + + # ++# Check for the type of net accessor ++# ++ ++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 diff --git a/xerces-c/xerces-c.spec b/xerces-c/xerces-c.spec index 3dfbf629ab..1437de1ac4 100644 --- a/xerces-c/xerces-c.spec +++ b/xerces-c/xerces-c.spec @@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL] Group: Web License: Apache Software License 1.1 Version: %{V_opkg} -Release: 20030602 +Release: 20030703 # package options %option with_pth no