contrib: fix gnutls / gpg-error build on OSX

don't run aclocal for those (we only patch Makefile.am)

diff --git a/contrib/TODO b/contrib/TODO
index 5b17fc906bfc180a7e4558073ffa04efef6265b5..e17cc0bb7c826bf79c50819dd5566d62fc64f675 100644 (file)
--- a/contrib/TODO
+++ b/contrib/TODO
@@ -8,9 +8,6 @@ SDL_image
 dvdcss
     Undefined symbols (missing CF framework?)
 
-gnutls, gpg-error
-    infrastructure mismatch between Makefile.in.in and autoconf macros (different gettext vers)
-
 ### Missing software for MacOSX (was present in extras/contrib)
 
 # These 3 are binary framework downloads : no source code is used

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 7f19895fcb92bffb7575e7583f1b25fc141a6f42..5da6fec9488035ff3ecce129491a23d3f70c25db 100644 (file)
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -48,7 +48,7 @@ DEPS_gnutls = nettle $(DEPS_nettle)
 endif
 
 .gnutls: gnutls
-       $(RECONF)
+       cd $< && automake
        cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF)
        cd $</lib && $(MAKE) install
        touch $@

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index 49d848cbe3c4c8206d31748df90e743c2cd07677..120a0a3b6ec4c871d446a33ec6bd16c415233403 100644 (file)
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -15,7 +15,7 @@ endif
        $(MOVE)
 
 .gpg-error: libgpg-error
-       $(RECONF)
+       cd $< && automake
        cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-nls --disable-shared --disable-languages
        cd $< && $(MAKE) install
        touch $@