572ced7c3f
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1632 6952d904-891a-0410-993b-d76249ca496b
62 lines
2.7 KiB
Diff
62 lines
2.7 KiB
Diff
diff -uNr ifolder.orig/configure.in ifolder/configure.in
|
|
--- ifolder.orig/configure.in 2009-02-21 17:03:50.447382682 +0100
|
|
+++ ifolder/configure.in 2009-02-21 17:04:22.689853328 +0100
|
|
@@ -20,21 +20,21 @@
|
|
case $host_os in
|
|
linux*)
|
|
IFOLDER_OS='linux'
|
|
- AC_CHECK_PROG(CSC, mcs, mcs)
|
|
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: mcs not found in \$PATH])
|
|
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
|
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
|
|
PKG_CONFIG_DIR='lib'
|
|
;;
|
|
darwin*)
|
|
IFOLDER_OS='darwin'
|
|
- AC_CHECK_PROG(CSC, mcs, mcs)
|
|
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: mcs not found in \$PATH])
|
|
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
|
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
|
|
PKG_CONFIG_DIR='lib'
|
|
;;
|
|
cygwin*)
|
|
IFOLDER_OS='windows'
|
|
AC_CHECK_PROG(CSC, csc, csc)
|
|
- test -z "$CSC" && AC_CHECK_PROG(CSC, mcs, mcs)
|
|
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: neither csc nor mcs found in \$PATH])
|
|
+ test -z "$CSC" && AC_CHECK_PROG(CSC, gmcs, gmcs)
|
|
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: neither csc nor gmcs found in \$PATH])
|
|
PKG_CONFIG_DIR='.'
|
|
;;
|
|
*)
|
|
@@ -47,7 +47,7 @@
|
|
AM_CONDITIONAL(LINUX, test "$IFOLDER_OS" = "linux")
|
|
AM_CONDITIONAL(WINDOWS, test "$IFOLDER_OS" = "windows")
|
|
AM_CONDITIONAL(DARWIN, test "$IFOLDER_OS" = "darwin")
|
|
-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
|
+AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
|
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
|
|
|
|
#
|
|
@@ -80,7 +80,7 @@
|
|
#
|
|
# Mono-specific configuration
|
|
#
|
|
- mcs)
|
|
+ gmcs)
|
|
CSC_EXEFLAG=/target:exe
|
|
CSC_LIBFLAG=/target:library
|
|
CSC_WINEXEFLAG=/target:winexe
|
|
diff -uNr ifolder.orig/src/WebService/Makefile.am ifolder/src/WebService/Makefile.am
|
|
--- ifolder.orig/src/WebService/Makefile.am 2009-02-21 17:17:40.134595669 +0100
|
|
+++ ifolder/src/WebService/Makefile.am 2009-02-21 17:19:12.055858183 +0100
|
|
@@ -25,7 +25,7 @@
|
|
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderWebService_FLAGS) $(SIMIAS_LIBS) $(SIMIAS_CLIENT_LIBS) $(iFolderWebService_LIBS:%=/r:%) $(iFolderWebService_LIBPATH:%=/lib:%) $(iFolderWebService_RESOURCES:%=$(ICON_FLAG)%) $(srcdir)/AssemblyInfo.cs $(iFolderWebService_CSFILES_CSC) $(DOC_FILE_CMD)
|
|
|
|
../iFolder/iFolderWebService.cs: iFolderWebService.wsdl
|
|
- wsdl -out:../iFolder/iFolderWebService.cs iFolderWebService.wsdl
|
|
+ wsdl2 -out:../iFolder/iFolderWebService.cs iFolderWebService.wsdl
|
|
|
|
iFolderWebService.wsdl: Novell.iFolder.Web.dll GenerateWsdl.exe copy
|
|
$(MONO) GenerateWsdl.exe Novell.iFolder.Web.dll Novell.iFolder.Web.iFolderService http://127.0.0.1:8086/simias10/iFolder.asmx $@
|