[gtk-osx] Fix libgpg-error and libgcrypt so that they configure correctly.

[John Ralls <jralls src gnome org>]

commit 8586efe651b57017f03659dfee03871cb53628c2
Author: John Ralls <jralls ceridwen us>
Date:   Fri Dec 11 15:26:14 2015 -0800

    Fix libgpg-error and libgcrypt so that they configure correctly.

 modulesets-stable/gtk-osx-unsupported.modules   |   11 +++++++----
 modulesets-unstable/gtk-osx-unsupported.modules |    4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index d55e05d..fb63125 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -67,8 +67,9 @@
     </dependencies>
   </autotools>
 
-   <autotools id="libgpg-error" autogen-sh="autogen.sh"
-             supports-non-srdir-builds="no">
+  <autotools id="libgpg-error" autogen-sh="autogen.sh"
+             autogenargs="--disable-doc"
+             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
 %(autogenargs)s">
     <branch repo="ftp.gnupg.org" version="1.17"
             module="gcrypt/libgpg-error/libgpg-error-1.17.tar.bz2">
             <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/libgpg-error-cflags-for-cc-for-build.patch";
@@ -76,10 +77,12 @@
     </branch>
   </autotools>
 
-  <autotools id="libgcrypt" autogen-sh="autogen.sh" autogenargs="--disable-asm">
+  <autotools id="libgcrypt" autogen-sh="configure"
+             autogenargs="--disable-asm --disable-doc"
+             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
 %(autogenargs)s">
     <branch repo="ftp.gnupg.org" version="1.6.3"
             module="gcrypt/libgcrypt/libgcrypt-1.6.3.tar.bz2">
-            <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libgcrypt-cflags-for-build.patch";
+            <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/libgcrypt-cflags-for-cc-for-build.patch";
        strip="1"/>
     </branch>
     <dependencies>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index 0aa84be..fe9782a 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -45,8 +45,8 @@
     <branch repo='git.gnupg.org' module="libgpg-error" />
   </autotools>
 
-  <autotools id="libgcrypt" autogen-sh="autogeen.sh"
-             autogenargs="--disable-asm --disable-doc">
+  <autotools id="libgcrypt" autogenargs="--disable-asm --disable-doc"
+            autogen-template="./autogen.sh &amp;&amp; ./configure --prefix %(prefix)s  %(autogenargs)s">
     <branch repo="git.gnupg.org" module="libgcrypt"/>
     <dependencies>
       <dep package="libgpg-error" />