[gtk-osx] Avoid passing extra autogenargs to openssl

[John Ralls <jralls src gnome org>]

commit 69b58e5f1a3628968deab915132f4c828c8ded09
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Feb 16 23:25:15 2016 -0800

    Avoid passing extra autogenargs to openssl
    
    Openssl will error out if passed arguments to its configure script that
    it doesn't understand. This is a problem when setting disable_Werror in
    jhbuildrc, because that will cause --disable-Werror to be passed to all
    autotools modules, after any chance we may have to edit the module's
    autogenargs. Luckily we can negate any extra args that jhbuild may try to
    pass by adding a # character.

 jhbuildrc-gtk-osx |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index e8afd2f..44fd76a 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -291,15 +291,17 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
     #
     if architectures == ["i386"]:
         append_autogenargs("glib", "ac_cv_c_bigendian=no")
-        append_autogenargs("openssl", "darwin-i386-cc")
+        # The '#' on openssl is to stop jhbuild from appending any more autogen
+        # arguments such as --disable-Werror; they cause openssl to error out
+        append_autogenargs("openssl", "darwin-i386-cc #")
     elif architectures == ["x86_64"]:
         conditions.add('64-bit')
         append_autogenargs("glib", "ac_cv_c_bigendian=no")
-        append_autogenargs("openssl", "darwin64-x86_64-cc")
+        append_autogenargs("openssl", "darwin64-x86_64-cc #")
     elif architectures == ["ppc"]:
         append_autogenargs("glib", "ac_cv_c_bigendian=yes")
         append_autogenargs("gmp", 'CFLAGS="-force_cpusubtype_ALL $CFLAGS"')
-        append_autogenargs("openssl", "darwin-ppc-cc")
+        append_autogenargs("openssl", "darwin-ppc-cc #")
 
     # For unknown reasons, iconv is not picked up correctly without this
     #