[gtk-osx] Use jhbuild's autogen-sh="autoreconf" magic instead of an autogen-template

[John Ralls <jralls src gnome org>]

commit 4f35a6ed42ca1e53283143446d287fa844663735
Author: John Ralls <jralls ceridwen us>
Date:   Fri May 3 10:57:40 2013 -0700

    Use jhbuild's autogen-sh="autoreconf" magic instead of an autogen-template
    
    As well as handle a few modules that seem to work better with autoreconf than with a straight configure.

 modulesets-stable/gtk-osx-bootstrap.modules |    2 +-
 modulesets-stable/gtk-osx-random.modules    |   12 +++++-------
 modulesets-stable/gtk-osx.modules           |    5 ++---
 3 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 757322b..8f12db5 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -124,7 +124,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="fontconfig" autogen-sh="configure"
+  <autotools id="fontconfig" autogen-sh="autoreconf"
             autogenargs="--disable-docs">
     <branch repo="fontconfig" version="2.10.91" module="fontconfig-2.10.91.tar.gz"/>
     <dependencies>
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index bc4bcdf..c60142d 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -50,8 +50,7 @@
 
 <!-- Libglade's functions are now part of Gtk+ with different names and
 Libglade itself is deprecated. This is the last release. -->
-  <autotools id="libglade" autogen-sh='configure'
-            autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s">
+  <autotools id="libglade" autogen-sh='autoreconf'>
     <branch module="libglade/2.6/libglade-2.6.4.tar.bz2" version="2.6.4"
             md5sum="d1776b40f4e166b5e9c107f1c8fe4139" >
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libglade-gmodule.patch"; strip="1"/>
@@ -262,11 +261,10 @@ Libglade itself is deprecated. This is the last release. -->
     </dependencies>
   </autotools>
 
-  <autotools id="gimp"  autogen-sh="configure"
-             autogenargs="--disable-python --without-x
-                          --without-dbus --without-gnomevfs --without-wmf --enable-binreloc "
-            autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s"
-             makeargs='LDFLAGS="-framework Carbon"'>
+  <autotools id="gimp"  autogen-sh="autoreconf"
+             autogenargs="--disable-python --without-x --without-dbus
+                         --without-gnomevfs --without-wmf --enable-binreloc "
+            makeargs='LDFLAGS="-framework Carbon"'>
     <branch module="gimp/v2.8/gimp-2.8.2.tar.bz2" version="2.8.2"
             md5sum="b542138820ca3a41cbd63fc331907955" repo="gimp">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch"; strip="1" />
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 9661bf8..60d9fe6 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -143,9 +143,8 @@
     </after>
   </autotools>
 
-  <autotools id="gtk+" autogen-sh="configure"
-             autogenargs="--with-gdktarget=quartz --enable-quartz-relocation --disable-introspection"
-             autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s">
+  <autotools id="gtk+" autogen-sh="autoreconf"
+             autogenargs="--with-gdktarget=quartz --enable-quartz-relocation --disable-introspection">
     <branch module="gtk+/2.24/gtk+-2.24.16.tar.xz" version="2.24.16"
             hash="sha256:93cd69cc2cecf9a3aa31a50caf4a24752a6928a48c527ae967b109df6f9302d3">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch";
 strip="1"/>