summaryrefslogtreecommitdiff
blob: 2947af310827ad3908fd7294388ec48922798d01 (plain)
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
From b75b9d5aa7f6207eca190b9d8e08059872c99365 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gmail.com>
Date: Fri, 20 May 2011 17:53:43 -0400
Subject: [PATCH] Fix automagic libcap dependency (GNOME bug #649936)

Backport of the patch by Saleem Abdulrasool <compnerd@compnerd.org>
to gnome-keyring-3.0.x

Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
---
 configure.in |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/configure.in b/configure.in
index b2d07a7..88f7e66 100644
--- a/configure.in
+++ b/configure.in
@@ -445,16 +445,29 @@ fi
 # libcap2
 #

-AC_CHECK_LIB([cap], [cap_get_proc], have_libcap="yes", have_libcap="no")
-
-if test $have_libcap = yes; then
-   AC_DEFINE(HAVE_LIBCAP, 1, [Have libcap2 package, libcap library])
-   DAEMON_LIBS="$DAEMON_LIBS -lcap"
-else
-   AC_MSG_WARN([libcap2 (or development headers) is not installed])
+AC_ARG_WITH([libcap],
+            [AC_HELP_STRING([--without-libcap],
+                            [build without libcap2 (disables Linux capabilities support)])],,
+            [with_libcap=auto])
+
+if test x"$with_libcap" != x"no" ; then
+    AC_CHECK_LIB([cap], [cap_get_proc],
+                 [
+                   with_libcap="yes"
+                   AC_DEFINE([HAVE_LIBCAP], [1], [Have libcap2 package, libcap library])
+                   DAEMON_LIBS="$DAEMON_LIBS -lcap"
+                 ],
+                 [
+                   if test x"$with_libcap" = x"yes" ; then
+                     AC_MSG_ERROR([libcap2 support requested, but package not found])
+                   else
+                     AC_MSG_WARN([libcap2 (or development headers) is not installed])
+                   fi
+                   with_libcap="no"
+                 ])
 fi

-libcap_status=$have_libcap
+libcap_status=$with_libcap

 # --------------------------------------------------------------------
 # Debug mode
--
1.7.5.rc3