summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/consolekit/consolekit
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
commit972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch)
tree97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-support/consolekit/consolekit
downloadpoky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-support/consolekit/consolekit')
-rw-r--r--meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch33
-rw-r--r--meta/recipes-support/consolekit/consolekit/sepbuildfix.patch19
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch b/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch
new file mode 100644
index 0000000000..ad879d466b
--- /dev/null
+++ b/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch
@@ -0,0 +1,33 @@
1Upstream-Status: Pending
2
3--- ConsoleKit-0.4.6.orig/configure.ac
4+++ ConsoleKit-0.4.6/configure.ac
5@@ -56,10 +56,24 @@ PKG_CHECK_MODULES(CONSOLE_KIT,
6 gthread-2.0 >= $GLIB_REQUIRED_VERSION
7 )
8
9-PKG_CHECK_MODULES(POLKIT,
10- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
11- have_polkit=yes,
12- have_polkit=no)
13+AC_ARG_WITH([polkit],
14+ [AS_HELP_STRING([--with-polkit],
15+ [support PolicyKit @<:@default=check@:>@])],
16+ [],
17+ [with_polkit=check])
18+
19+AS_IF([test "x$with_polkit" != xno],
20+ [PKG_CHECK_MODULES(POLKIT,
21+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
22+ have_polkit=yes,
23+ [if test "x$with_polkit" != xcheck; then
24+ AC_MSG_FAILURE(
25+ [--with-polkit was given, but test for polkit failed])
26+ else
27+ have_polkit=no
28+ fi
29+ ])])
30+
31 if test "x$have_polkit" = "xyes" ; then
32 AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
33 fi
diff --git a/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch b/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch
new file mode 100644
index 0000000000..f2f9b9c682
--- /dev/null
+++ b/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch
@@ -0,0 +1,19 @@
1Fix builds in the case of seprate source from the build directory.
2
3RP 2013/4/17
4
5Upstream-Status: Pending
6
7Index: pam-ck-connector/Makefile.am
8===================================================================
9--- consolekit/pam-ck-connector.orig/Makefile.am 2010-09-03 13:54:31.000000000 +0000
10+++ consolekit/pam-ck-connector/Makefile.am 2013-04-17 09:06:49.093524918 +0000
11@@ -4,7 +4,7 @@
12
13 INCLUDES = \
14 $(LIBDBUS_CFLAGS) \
15- -I$(top_builddir)/libck-connector \
16+ -I$(top_srcdir)/libck-connector \
17 $(NULL)
18
19 pamlibdir = $(PAM_MODULE_DIR)