[oe-commits] Marko Lindqvist : polkit: replace obsolete automake macros with working ones

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 9f4cca12f00327bb9a7070f305c36433ee732d7a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9f4cca12f00327bb9a7070f305c36433ee732d7a

Author: Marko Lindqvist <cazfi74 at gmail.com>
Date:   Tue Jan 15 13:44:13 2013 +0200

polkit: replace obsolete automake macros with working ones

Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../polkit-0.104/obsolete_automake_macros.patch    |   23 ++++++++++++++++++++
 meta/recipes-extended/polkit/polkit_0.104.bb       |    3 +-
 2 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch b/meta/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch
new file mode 100644
index 0000000..5a6046c
--- /dev/null
+++ b/meta/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59091]
+
+Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
+diff -Nurd polkit-0.104/configure.ac polkit-0.104/configure.ac
+--- polkit-0.104/configure.ac	2012-01-03 18:25:49.000000000 +0200
++++ polkit-0.104/configure.ac	2013-01-07 03:13:31.862125625 +0200
+@@ -3,7 +3,7 @@
+ AC_PREREQ(2.59c)
+ AC_INIT(polkit, 0.104, http://lists.freedesktop.org/mailman/listinfo/polkit-devel)
+ AM_INIT_AUTOMAKE(polkit, 0.104)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+@@ -24,7 +24,6 @@
+
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AM_PROG_LIBTOOL
+ AC_PROG_MAKE_SET
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index 4eaec8c..2c0aaca 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -10,13 +10,14 @@ DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub"
 PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
 PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
 
-PR = "r8"
+PR = "r9"
 
 PAM_SRC_URI = "file://polkit-1_pam.patch"
 SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \
            ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
            file://0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch \
            file://0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch \
+           file://obsolete_automake_macros.patch \
           "
 
 SRC_URI[md5sum] = "e380b4c6fb1e7bccf854e92edc0a8ce1"