gamin: 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.
Removed AM_PROG_CC_STDC. AC_PROG_CC to replace it was already
present.

(From OE-Core rev: 84f083ac3a218513411e7c28edada7a80af8ad8c)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 27 insertions, 2 deletions

diff --git a/meta/recipes-extended/gamin/gamin-0.1.10/obsolete_automake_macros.patch b/meta/recipes-extended/gamin/gamin-0.1.10/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..c4300ca6a0
--- /dev/null
+++ b/meta/recipes-extended/gamin/gamin-0.1.10/obsolete_automake_macros.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=693449]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd gamin-0.1.10/configure.in gamin-0.1.10/configure.in
+--- gamin-0.1.10/configure.in   2008-11-24 17:23:06.000000000 +0200
++++ gamin-0.1.10/configure.in   2013-02-08 23:11:59.656279992 +0200
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.52)
+ AC_INIT(libgamin)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CANONICAL_SYSTEM
+
+ # get any external flags setting before we start playing with the CFLAGS variable
+@@ -31,7 +31,6 @@
+
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
diff --git a/meta/recipes-extended/gamin/gamin_0.1.10.bb b/meta/recipes-extended/gamin/gamin_0.1.10.bb
index 9da7e51a19..375d265f57 100644
--- a/meta/recipes-extended/gamin/gamin_0.1.10.bb
+++ b/meta/recipes-extended/gamin/gamin_0.1.10.bb
@@ -8,11 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=412a9be54757a155d0b997b52b519f62"
 
 DEPENDS = "glib-2.0"
 PROVIDES = "fam"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \
            file://no-abstract-sockets.patch \
-           file://noconst.patch"
+           file://noconst.patch \
+           file://obsolete_automake_macros.patch \
+"
 
 SRC_URI[md5sum] = "b4ec549e57da470c04edd5ec2876a028"
 SRC_URI[sha256sum] = "28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1"