1 |
slyfox 10/09/02 18:37:38 |
2 |
|
3 |
Added: |
4 |
smbnetfs-0.5.3-0001-configure.in-allow-user-to-explicitly-enable-disable.patch |
5 |
Log: |
6 |
Version bump. |
7 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-fs/smbnetfs/files/smbnetfs-0.5.3-0001-configure.in-allow-user-to-explicitly-enable-disable.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/smbnetfs/files/smbnetfs-0.5.3-0001-configure.in-allow-user-to-explicitly-enable-disable.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/smbnetfs/files/smbnetfs-0.5.3-0001-configure.in-allow-user-to-explicitly-enable-disable.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: smbnetfs-0.5.3-0001-configure.in-allow-user-to-explicitly-enable-disable.patch |
16 |
=================================================================== |
17 |
From ec83a6c130bdfc869d28f9bce8ce100167861266 Mon Sep 17 00:00:00 2001 |
18 |
From: Sergei Trofimovich <slyfox@g.o> |
19 |
Date: Sat, 28 Aug 2010 15:10:43 +0300 |
20 |
Subject: [PATCH] configure.in: allow user to explicitly enable/disable gnome-keyring support |
21 |
|
22 |
Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
23 |
--- |
24 |
configure.in | 22 +++++++++++++++++----- |
25 |
1 files changed, 17 insertions(+), 5 deletions(-) |
26 |
|
27 |
diff --git a/configure.in b/configure.in |
28 |
index 4738bb6..8dab68e 100644 |
29 |
--- a/configure.in |
30 |
+++ b/configure.in |
31 |
@@ -87,12 +87,24 @@ CFLAGS="$CFLAGS -D_REENTRANT -D_GNU_SOURCE -DFUSE_USE_VERSION=26 $FUSE_CFLAGS" |
32 |
dnl ******************************* |
33 |
dnl *** Tests for gnome-keyring *** |
34 |
dnl ******************************* |
35 |
-PKG_CHECK_MODULES(GNOME_KEYRING, [gnome-keyring-1 >= 2.28], |
36 |
- [AC_DEFINE([HAVE_GNOME_KEYRING], [], |
37 |
- [use gnome-keyring as password storage])]) |
38 |
-LIBS="$LIBS $GNOME_KEYRING_LIBS" |
39 |
-CFLAGS="$CFLAGS $GNOME_KEYRING_CFLAGS" |
40 |
|
41 |
+AC_ARG_WITH(gnome-keyring, |
42 |
+ [AS_HELP_STRING(--with-gnome-keyring=@<:@no/yes@:>@, |
43 |
+ use gnome-keyring as password storage @<:@default=auto@:>@)], |
44 |
+ , |
45 |
+ [with_gnome_keyring=maybe]) |
46 |
+ |
47 |
+if test x"$with_gnome_keyring" != xno; then |
48 |
+ PKG_CHECK_MODULES(GNOME_KEYRING, [gnome-keyring-1 >= 2.28], |
49 |
+ [AC_DEFINE([HAVE_GNOME_KEYRING], [], |
50 |
+ [use gnome-keyring as password storage])], |
51 |
+ [# mandatory depend |
52 |
+ if test x"$with_gnome_keyring" = xyes; then |
53 |
+ AC_MSG_ERROR([unable to find usable gnome-keyring]) |
54 |
+ fi]) |
55 |
+ LIBS="$LIBS $GNOME_KEYRING_LIBS" |
56 |
+ CFLAGS="$CFLAGS $GNOME_KEYRING_CFLAGS" |
57 |
+fi |
58 |
|
59 |
dnl ****************************** |
60 |
dnl *** Tests for libsmbclient *** |
61 |
-- |
62 |
1.7.1 |