1 |
loki_val 09/01/24 01:20:17 |
2 |
|
3 |
Added: gnome-keyring-sharp-1.0.0-monodoc.patch |
4 |
Log: |
5 |
Fix bug 250069, g-k-s would pick up dev-scheme/chickens csc executable instead of gmcs. Also fix bug 254122, add doc use flag for monodoc dependency. Transition to gmcs done. Multilib-safe. |
6 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-dotnet/gnome-keyring-sharp/files/gnome-keyring-sharp-1.0.0-monodoc.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/gnome-keyring-sharp/files/gnome-keyring-sharp-1.0.0-monodoc.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/gnome-keyring-sharp/files/gnome-keyring-sharp-1.0.0-monodoc.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: gnome-keyring-sharp-1.0.0-monodoc.patch |
15 |
=================================================================== |
16 |
--- configure.ac.orig 2009-01-24 01:02:06.000000000 +0100 |
17 |
+++ configure.ac 2009-01-24 01:37:22.000000000 +0100 |
18 |
@@ -49,11 +49,11 @@ |
19 |
|
20 |
# |
21 |
# Use D-Bus as a fallback to get the keyring socket address |
22 |
# |
23 |
AC_ARG_ENABLE(dbus, |
24 |
- [ --enable-dbus[[=no/yes]] compile with D-Bus support [[default: yes]]], |
25 |
+ [AC_HELP_STRING([--enable-dbus],[compile with D-Bus support default: yes])], |
26 |
ENABLE_DBUS="$enableval") |
27 |
AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" != "xno") |
28 |
|
29 |
CSFLAGS= |
30 |
DBUS_LIBS= |
31 |
@@ -67,19 +67,29 @@ |
32 |
CSFLAGS=" -d:WITH_DBUS " |
33 |
fi |
34 |
AC_SUBST(CSFLAGS) |
35 |
AC_SUBST(DBUS_LIBS) |
36 |
|
37 |
- |
38 |
-AC_PATH_PROG(MDASSEMBLER, mdassembler, no) |
39 |
-AC_PATH_PROG(MONODOCER, monodocer, no) |
40 |
-if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then |
41 |
- enable_monodoc=no |
42 |
- doc_sources_dir= |
43 |
-else |
44 |
- enable_monodoc=yes |
45 |
- doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`" |
46 |
+AC_ARG_ENABLE(monodoc, |
47 |
+ [AC_HELP_STRING([--enable-monodoc],[install monodoc documents default: yes])], |
48 |
+ [ENABLE_MONODOC="$enableval"]) |
49 |
+ |
50 |
+if test "x$ENABLE_MONODOC" != "xno" ; then |
51 |
+ AC_PATH_PROG(MDASSEMBLER, mdassembler, no) |
52 |
+ AC_PATH_PROG(MONODOCER, monodocer, no) |
53 |
+ |
54 |
+ if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then |
55 |
+ if test "x$ENABLE_MONODOC" = "xyes" ; then |
56 |
+ AC_MSG_ERROR([monodoc can't be installed even though it was explicitly enabled. mdassembler or monodocer not found.]) |
57 |
+ else |
58 |
+ enable_monodoc=no |
59 |
+ doc_sources_dir= |
60 |
+ fi |
61 |
+ else |
62 |
+ enable_monodoc=yes |
63 |
+ doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`" |
64 |
+ fi |
65 |
fi |
66 |
|
67 |
AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") |
68 |
AC_SUBST(CSC) |
69 |
AC_SUBST(RUNTIME) |