1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
diff -NrU5 evolution-sharp-0.21.1.orig/configure.in evolution-sharp-0.21.1/configure.in
--- evolution-sharp-0.21.1.orig/configure.in 2009-09-02 19:30:52.000000000 +0200
+++ evolution-sharp-0.21.1/configure.in 2009-09-02 20:45:29.000000000 +0200
@@ -109,12 +109,21 @@
AC_SUBST(CSC)
AC_SUBST(GACUTIL)
AC_SUBST(LIB_PREFIX)
AC_SUBST(LIB_SUFFIX)
-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= 2.4.0)
+PKG_CHECK_MODULES([GLIB_SHARP],
+ [glib-sharp-2.0 >= 2.4.0])
+AC_SUBST(GLIB_SHARP_LIBS)
+
+PKG_CHECK_MODULES([GTK_SHARP],
+ [gtk-sharp-2.0 >= 2.4.0],
+ [HAVE_GTK_SHARP=yes],
+ [AC_MSG_WARN([You will not be able to compile the "make check" programs])])
AC_SUBST(GTK_SHARP_LIBS)
+AM_CONDITIONAL([HAVE_GTK_SHARP],
+ [test x$HAVE_GTK_SHARP = xyes])
AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no)
if test "x$GAPI_CODEGEN" = "xno"; then
AC_MSG_ERROR([You need to install gtk-sharp2-gapi])
fi
diff -NrU5 evolution-sharp-0.21.1.orig/evolution/Makefile.am evolution-sharp-0.21.1/evolution/Makefile.am
--- evolution-sharp-0.21.1.orig/evolution/Makefile.am 2009-09-02 19:30:52.000000000 +0200
+++ evolution-sharp-0.21.1/evolution/Makefile.am 2009-09-02 22:23:08.000000000 +0200
@@ -26,11 +26,12 @@
endif
API=evolution-api.xml
METADATA = Evolution.metadata
ASSEMBLY_NAME = evolution-sharp
-references = $(GTK_SHARP_LIBS)
+references = $(GLIB_SHARP_LIBS)
+check_references = $(GTK_SHARP_LIBS)
TARGET = $(ASSEMBLY)
ASSEMBLY = $(ASSEMBLY_NAME).dll
gapidir = $(datadir)/gapi-2.0
noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config
@@ -90,12 +91,10 @@
&& touch generated-stamp
$(ASSEMBLY): $(build_sources) generated-stamp evolution-sharp.snk
$(CSC) -debug -unsafe /out:$(ASSEMBLY) $(CSFLAGS) /target:library $(references) $(build_sources) generated/*.cs
-all: $(ASSEMBLY) $(TEST_TARGETS)
-
install-data-local:
@if test -n '$(TARGET)'; then \
echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib"; \
$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1; \
fi
@@ -107,33 +106,35 @@
fi
evolution-sharp.snk: $(top_srcdir)/evolution-sharp.snk
cp $(top_srcdir)/evolution-sharp.snk .
+if HAVE_GTK_SHARP
+
if USE_EDS_2_24
-TEST_TARGETS_2_24 = $(TESTCACHE_TARGET)
+TESTCACHE_TARGET = TestCache.exe
+TESTCACHE_CSFILES = $(srcdir)/TestCache.cs
+$(TESTCACHE_TARGET): $(TESTCACHE_CSFILES) $(ASSEMBLY)
+ $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTCACHE_CSFILES) -r:$(ASSEMBLY) $(check_references)
endif
-TEST_TARGETS = $(TESTCAL_TARGET) $(TESTTASK_TARGET) $(TESTBOOK_TARGET) $(TEST_TARGETS_2_24)
+check_SCRIPTS = $(TESTCAL_TARGET) $(TESTTASK_TARGET) $(TESTBOOK_TARGET) $(TESTCACHE_TARGET)
TESTCAL_TARGET = TestCal.exe
TESTCAL_CSFILES = $(srcdir)/TestCal.cs
$(TESTCAL_TARGET): $(TESTCAL_CSFILES) $(ASSEMBLY)
- $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTCAL_CSFILES) -r:$(ASSEMBLY) $(references)
-
-TESTCACHE_TARGET = TestCache.exe
-TESTCACHE_CSFILES = $(srcdir)/TestCache.cs
-$(TESTCACHE_TARGET): $(TESTCACHE_CSFILES) $(ASSEMBLY)
- $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTCACHE_CSFILES) -r:$(ASSEMBLY) $(references)
+ $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTCAL_CSFILES) -r:$(ASSEMBLY) $(check_references)
TESTTASK_TARGET = TestTask.exe
TESTTASK_CSFILES = $(srcdir)/TestTask.cs
$(TESTTASK_TARGET): $(TESTTASK_CSFILES) $(ASSEMBLY)
- $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTTASK_CSFILES) -r:$(ASSEMBLY) $(references)
+ $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTTASK_CSFILES) -r:$(ASSEMBLY) $(check_references)
TESTBOOK_TARGET = TestBook.exe
TESTBOOK_CSFILES = $(srcdir)/TestBook.cs
$(TESTBOOK_TARGET): $(TESTBOOK_CSFILES) $(ASSEMBLY)
- $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTBOOK_CSFILES) -r:$(ASSEMBLY) $(references)
+ $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTBOOK_CSFILES) -r:$(ASSEMBLY) $(check_references)
+
+endif
|
GitWeb