add missing files to the tree
This commit is contained in:
@@ -1,38 +0,0 @@
|
||||
diff -uNr simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-04-20 09:26:07.736014674 +0200
|
||||
+++ simias/configure.in 2009-04-20 09:31:35.060549522 +0200
|
||||
@@ -22,13 +22,13 @@
|
||||
case $host_os in
|
||||
linux*)
|
||||
SIMIAS_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="$LIB64"
|
||||
AC_CHECK_PROG(CSC2, gmcs, gmcs)
|
||||
test -z "$CSC" && AC_MSG_ERROR([no C Sharp .Net 2.0 compiler: gmcs not found in \$PATH])
|
||||
PKG_CONFIG_DIR="$LIB64"
|
||||
- AC_CHECK_PROG(WSDL, wsdl1, wsdl1,wsdl)
|
||||
+ AC_CHECK_PROG(WSDL, wsdl2, wsdl2)
|
||||
;;
|
||||
darwin*)
|
||||
SIMIAS_OS='darwin'
|
||||
@@ -53,7 +53,7 @@
|
||||
AM_CONDITIONAL(WINDOWS, test "$SIMIAS_OS" = "windows")
|
||||
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
|
||||
AM_CONDITIONAL(DARWIN_X86, test "$host_cpu" = "i686")
|
||||
-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
||||
+AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
||||
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
#
|
||||
# Mono-specific configuration
|
||||
#
|
||||
- mcs)
|
||||
+ gmcs)
|
||||
CSC_EXEFLAG=/target:exe
|
||||
CSC_LIBFLAG=/target:library
|
||||
CSC_WINEXEFLAG=/target:winexe
|
||||
@@ -1,38 +0,0 @@
|
||||
diff -uNr simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-07-25 01:01:14.788228670 +0200
|
||||
+++ simias/configure.in 2009-07-25 01:03:19.218740035 +0200
|
||||
@@ -32,15 +32,15 @@
|
||||
linux*)
|
||||
SIMIAS_OS='linux'
|
||||
if test "$runasclient" = "TRUE"; then
|
||||
- AC_CHECK_PROG(CSC, mcs, mcs)
|
||||
- AC_CHECK_PROG(WSDL, wsdl1, wsdl1,wsdl)
|
||||
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
||||
+ AC_CHECK_PROG(WSDL, wsdl2, wsdl2,wsdl)
|
||||
else
|
||||
AC_CHECK_PROG(WSDL, wsdl, wsdl,wsdl)
|
||||
if pkg-config --atleast-version=2.4 mono > /dev/null 2>&1
|
||||
then
|
||||
AC_CHECK_PROG(CSC, gmcs, gmcs)
|
||||
else
|
||||
- AC_CHECK_PROG(CSC, mcs, mcs)
|
||||
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
||||
fi
|
||||
fi
|
||||
test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
|
||||
@@ -73,13 +73,13 @@
|
||||
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
|
||||
AM_CONDITIONAL(DARWIN_X86, test "$host_cpu" = "i686")
|
||||
if test "$runasclient" = "TRUE"; then
|
||||
- AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
||||
+ AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
||||
else
|
||||
if pkg-config --atleast-version=2.4 mono > /dev/null 2>&1
|
||||
then
|
||||
AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
||||
else
|
||||
- AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
||||
+ AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
||||
fi
|
||||
fi
|
||||
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
|
||||
@@ -1,68 +0,0 @@
|
||||
diff -uNr simias.orig/src/core/libsimias/Makefile.am simias/src/core/libsimias/Makefile.am
|
||||
--- simias.orig/src/core/libsimias/Makefile.am 2009-04-19 18:28:33.292587761 +0200
|
||||
+++ simias/src/core/libsimias/Makefile.am 2009-04-19 18:31:32.025741548 +0200
|
||||
@@ -6,7 +6,6 @@
|
||||
dist-hook:
|
||||
rm -rf `find $(distdir) |grep simiasClientLib.c`
|
||||
rm -rf `find $(distdir) |grep envC.c`
|
||||
- rm -rf `find $(distdir) |grep stdsoap2.c`
|
||||
|
||||
|
||||
lib_LTLIBRARIES = libsimias.la
|
||||
@@ -14,7 +13,7 @@
|
||||
override CFLAGS =
|
||||
|
||||
libsimias_la_SOURCES = \
|
||||
- envC.c simiasClientLib.c stdsoap2.c simias.c simias.h simiasweb.c simiasweb.h
|
||||
+ envC.c simiasClientLib.c simias.c simias.h simiasweb.c simiasweb.h
|
||||
|
||||
libsimias_la_CFLAGS = \
|
||||
$(XML2_CFLAGS) -DWITH_NONAMESPACES -DWITH_COOKIES
|
||||
@@ -22,19 +21,15 @@
|
||||
libsimias_la_LDFLAGS = \
|
||||
$(XML2_LIBS)
|
||||
|
||||
-envC.c: $(srcdir)/stdsoap2.c
|
||||
+envC.c:
|
||||
> $(srcdir)/env.h
|
||||
- $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
|
||||
+ soapcpp2 -c -penv $(srcdir)/env.h
|
||||
|
||||
-$(srcdir)/stdsoap2.c:
|
||||
- cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
|
||||
- cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)
|
||||
-
|
||||
-$(srcdir)/libsimias.h: $(srcdir)/stdsoap2.c $(SIMIAS_WSDL)
|
||||
- $(GSOAP_PATH)/wsdl2h -c -o $@ $(SIMIAS_WSDL)
|
||||
+$(srcdir)/libsimias.h: $(SIMIAS_WSDL)
|
||||
+ wsdl2h -c -o $@ $(SIMIAS_WSDL)
|
||||
|
||||
$(srcdir)/simiasClientLib.c: $(srcdir)/libsimias.h
|
||||
- $(GSOAP_PATH)/soapcpp2 -c -n -psimias $(srcdir)/libsimias.h
|
||||
+ soapcpp2 -c -n -psimias $(srcdir)/libsimias.h
|
||||
|
||||
install-exec-hook:
|
||||
if !WINDOWS
|
||||
@@ -46,7 +41,6 @@
|
||||
$(mkinstalldirs) $(DESTDIR)$(includedir)
|
||||
$(INSTALL_PROGRAM) simiasStub.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simias.nsmap $(DESTDIR)$(includedir)/simias
|
||||
- $(INSTALL_PROGRAM) stdsoap2.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simiasH.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simias.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simiasweb.h $(DESTDIR)$(includedir)/simias
|
||||
@@ -54,13 +48,12 @@
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simiasStub.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simias.nsmap
|
||||
- rm -f $(DESTDIR)$(includedir)/simias/stdsoap2.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simiasH.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simias.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simiasweb.h
|
||||
|
||||
clean-local:
|
||||
- rm -f stdsoap2.* *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap*
|
||||
+ rm -f *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap*
|
||||
rm -rf $(COMMON_CLEAN_FILES)
|
||||
|
||||
distclean-local:
|
||||
@@ -1,11 +0,0 @@
|
||||
--- src/core/FlaimProvider/FlaimWrapper/Makefile.am 2009/05/25 14:39:53 1.1
|
||||
+++ src/core/FlaimProvider/FlaimWrapper/Makefile.am 2009/05/25 14:40:02
|
||||
@@ -91,7 +91,7 @@
|
||||
lib=@LIB64@
|
||||
|
||||
# NOTE: The following is a _hack_.
|
||||
-LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses /usr/$(lib)/libflaim.a"
|
||||
+LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses -lflaim"
|
||||
|
||||
libFlaimWrapper_la_LDFLAGS = $(LIBFLAIM_LIBS_HACK)
|
||||
|
||||
@@ -5,9 +5,9 @@ Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: build with mono22
|
||||
|
||||
diff -Naur ifolder3-enterprise-3.8.0.9328.1.orig/configure.in ifolder3-enterprise-3.8.0.9328.1/configure.in
|
||||
--- ifolder3-enterprise-3.8.0.9328.1.orig/configure.in 2009-12-03 07:36:11.000000000 +0000
|
||||
+++ ifolder3-enterprise-3.8.0.9328.1/configure.in 2010-01-30 15:33:18.812160514 +0000
|
||||
diff -uNr simias-1.9.1.7638.orig/configure.in simias-1.9.1.7638/configure.in
|
||||
--- simias-1.9.1.7638.orig/configure.in 2013-04-17 15:58:17.743474516 +0200
|
||||
+++ simias-1.9.1.7638/configure.in 2013-04-17 15:59:52.822285868 +0200
|
||||
@@ -31,15 +31,15 @@
|
||||
linux*)
|
||||
SIMIAS_OS='linux'
|
||||
@@ -28,12 +28,13 @@ diff -Naur ifolder3-enterprise-3.8.0.9328.1.orig/configure.in ifolder3-enterpris
|
||||
fi
|
||||
fi
|
||||
test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
|
||||
@@ -72,13 +72,13 @@
|
||||
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
|
||||
AM_CONDITIONAL(DARWIN_X86, test "$host_cpu" = "i686")
|
||||
if test "$runasclient" = "TRUE"; then
|
||||
- AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
||||
+ AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
||||
@@ -75,14 +75,14 @@
|
||||
if test "$host_os" = "darwin"; then
|
||||
AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
||||
else
|
||||
- AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
||||
+ AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
||||
fi
|
||||
else
|
||||
if pkg-config --atleast-version=2.4 mono > /dev/null 2>&1
|
||||
then
|
||||
@@ -1,15 +0,0 @@
|
||||
diff -uNr simias.orig/src/core/FlaimProvider/FlaimWrapper/Makefile.am simias/src/core/FlaimProvider/FlaimWrapper/Makefile.am
|
||||
--- simias.orig/src/core/FlaimProvider/FlaimWrapper/Makefile.am 2007-10-16 17:56:05.000000000 +0200
|
||||
+++ simias/src/core/FlaimProvider/FlaimWrapper/Makefile.am 2009-02-21 13:50:24.654598727 +0100
|
||||
@@ -92,9 +92,9 @@
|
||||
lib=@LIB64@
|
||||
|
||||
# NOTE: The following is a _hack_.
|
||||
-LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses /usr/$(lib)/libflaim.a"
|
||||
+# LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses /usr/$(lib)/libflaim.a"
|
||||
|
||||
-libFlaimWrapper_la_LDFLAGS = $(LIBFLAIM_LIBS_HACK)
|
||||
+libFlaimWrapper_la_LDFLAGS = $(LIBFLAIM_LIBS)
|
||||
|
||||
install-exec-local: libFlaimWrapper.la
|
||||
$(mkinstalldirs) $(DESTDIR)$(webbindir)
|
||||
Reference in New Issue
Block a user