ifolder/www-apps/ifolder3-enterprise/files/simias-1.8.3.9328.1-system_xsp-1.patch

46 lines
2.2 KiB
Diff
Raw Normal View History

Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
Date: 2010-01-16
Initial Package Version: 1.8.3
Origin: me
Upstream Status: unknown
Description: use system Mono.Webserver.dll instead the provided
diff -Naur simias-1.8.3.9328.1.orig/configure.in simias-1.8.3.9328.1/configure.in
--- simias-1.8.3.9328.1.orig/configure.in 2010-01-16 10:16:48.502483182 +0000
+++ simias-1.8.3.9328.1/configure.in 2010-01-16 10:32:33.695379928 +0000
@@ -226,6 +226,10 @@
AC_SUBST(LOG4NET_PREFIX)
AC_SUBST(LOG4NET_LIBS)
+ PKG_CHECK_MODULES(XSP, xsp >= 2.2)
+ AC_SUBST(XSP_PREFIX)
+ AC_SUBST(XSP_LIBS)
+
PKG_CHECK_MODULES(LIBFLAIM, libflaim >= 4.8.0)
AC_SUBST(LIBFLAIM_PREFIX)
AC_SUBST(LIBFLAIM_LIBS)
diff -Naur simias-1.8.3.9328.1.orig/src/core/SimiasApp/Makefile.am simias-1.8.3.9328.1/src/core/SimiasApp/Makefile.am
--- simias-1.8.3.9328.1.orig/src/core/SimiasApp/Makefile.am 2010-01-16 10:16:48.556215509 +0000
+++ simias-1.8.3.9328.1/src/core/SimiasApp/Makefile.am 2010-01-16 10:35:22.899098129 +0000
@@ -7,7 +7,7 @@
SYSTEM_INSTALLER_LIB =
endif
-MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
+MONO_WEBSERVER_PATH = $(shell pkg-config xsp --variable=assemblies_dir)/
Simias_CSFILES = $(srcdir)/Simias.cs \
$(srcdir)/SimiasAppInstallerClass.cs
diff -Naur simias-1.8.3.9328.1.orig/src/core/WebService/Makefile.am simias-1.8.3.9328.1/src/core/WebService/Makefile.am
--- simias-1.8.3.9328.1.orig/src/core/WebService/Makefile.am 2010-01-16 10:16:48.583078738 +0000
+++ simias-1.8.3.9328.1/src/core/WebService/Makefile.am 2010-01-16 10:36:27.839193842 +0000
@@ -8,7 +8,7 @@
SimiasWebService_FLAGS = $(CSC_LIBFLAG)
SimiasWebService_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasClient.dll SimiasLib.dll
SimiasWebService_LIBPATH = ../SimiasClient ../SimiasLib.dll $(NOVELL_SECURITY_DIR)
-WebServerDir = ../../../external/Mono.WebServer/
+WebServerDir = $(shell pkg-config xsp --variable=assemblies_dir)/
EXTRA_DIST = win.server.web.config mono.server.web.config win.web.config mono.web.config Global.asax Simias.asmx Simias.wsdl $(SimiasWebService_CSFILES) AssemblyInfo.cs.in
if MAKE_DOC_FILE