[jhbuild] [3.x] Fix gudev build

[Craig Keogh <cskeogh src gnome org>]

commit d9bdbeab765c75916fafd7b2fb81b262c0b47a95
Author: Craig Keogh <cskeogh adam com au>
Date:   Tue Jul 5 22:08:20 2011 +0930

    [3.x] Fix gudev build

 modulesets/gnome-suites-core-deps-3.0.modules |    3 ++-
 modulesets/gnome-suites-core-deps-3.2.modules |    3 ++-
 patches/gudev-147.patch                       |   13 +++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index 444dde6..50275a6 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -517,7 +517,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gudev" check-target="false" supports-non-srcdir-builds="no">
+  <autotools id="gudev" check-target="false" supports-non-srcdir-builds="no"
+             autogen-sh="autogen.sh">
     <branch checkoutdir="gudev-147" repo="kernel.org"
             module="utils/kernel/hotplug/udev-147.tar.bz2" version="147">
       <patch file="gudev-147.patch" strip="1"/>
diff --git a/modulesets/gnome-suites-core-deps-3.2.modules b/modulesets/gnome-suites-core-deps-3.2.modules
index a2bad1a..675fe50 100644
--- a/modulesets/gnome-suites-core-deps-3.2.modules
+++ b/modulesets/gnome-suites-core-deps-3.2.modules
@@ -571,7 +571,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gudev" check-target="false" supports-non-srcdir-builds="no">
+  <autotools id="gudev" check-target="false" supports-non-srcdir-builds="no"
+             autogen-sh="autogen.sh">
     <branch checkoutdir="gudev-147" repo="kernel.org"
             module="utils/kernel/hotplug/udev-147.tar.bz2" version="147">
       <patch file="gudev-147.patch" strip="1"/>
diff --git a/patches/gudev-147.patch b/patches/gudev-147.patch
index 3573c23..3314c99 100644
--- a/patches/gudev-147.patch
+++ b/patches/gudev-147.patch
@@ -1,6 +1,6 @@
 diff -ur udev-147.orig/configure.ac udev-147/configure.ac
 --- udev-147.orig/configure.ac	2009-11-10 16:19:47.000000000 +1030
-+++ udev-147/configure.ac	2011-03-24 21:09:00.837846011 +1030
++++ udev-147/configure.ac	2011-07-19 11:42:50.023008370 +0930
 @@ -62,6 +62,10 @@
  	AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
  	AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
@@ -14,7 +14,16 @@ diff -ur udev-147.orig/configure.ac udev-147/configure.ac
  	AC_SUBST(LIBUSB_LIBS)
 diff -ur udev-147.orig/Makefile.am udev-147/Makefile.am
 --- udev-147.orig/Makefile.am	2009-11-11 00:39:27.000000000 +1030
-+++ udev-147/Makefile.am	2011-03-24 21:10:03.459845387 +1030
++++ udev-147/Makefile.am	2011-07-19 11:43:14.515425790 +0930
+@@ -7,7 +7,7 @@
+ 
+ EXTRA_DIST = autogen.sh
+ 
+-ACLOCAL_AMFLAGS = -I m4
++ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+ AM_MAKEFLAGS = --no-print-directory
+ 
 @@ -25,267 +25,9 @@
  
  CLEANFILES =