move zarafa to its own ovelray

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@2932 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2011-06-19 05:28:25 +00:00
parent 2bb9cb61b7
commit 2bed70e30a
5 changed files with 10 additions and 8 deletions

View File

@@ -12,7 +12,7 @@ diff -Naur simias-1.8.3.9328.1.orig/configure.in simias-1.8.3.9328.1/configure.i
AC_SUBST(LOG4NET_PREFIX)
AC_SUBST(LOG4NET_LIBS)
+ PKG_CHECK_MODULES(XSP, xsp >= 2.2)
+ PKG_CHECK_MODULES(XSP, xsp-2 >= 2.2)
+ AC_SUBST(XSP_PREFIX)
+ AC_SUBST(XSP_LIBS)
+
@@ -27,7 +27,7 @@ diff -Naur simias-1.8.3.9328.1.orig/src/core/SimiasApp/Makefile.am simias-1.8.3.
endif
-MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
+MONO_WEBSERVER_PATH = $(shell pkg-config xsp --variable=assemblies_dir)/
+MONO_WEBSERVER_PATH = $(shell pkg-config xsp-2 --variable=assemblies_dir)/
Simias_CSFILES = $(srcdir)/Simias.cs \
$(srcdir)/SimiasAppInstallerClass.cs
@@ -39,7 +39,7 @@ diff -Naur simias-1.8.3.9328.1.orig/src/core/WebService/Makefile.am simias-1.8.3
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)/
+WebServerDir = $(shell pkg-config xsp-2 --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