vlc | branch: master | Rafaël Carré <[email protected]> | Tue Nov 22 22:06:38 
2011 -0500| [82947e7f69cb4e95f1b965f908cd9a3fbff161b8] | committer: Rafaël Carré

contrib: fix gnutls / gpg-error build on OSX

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=82947e7f69cb4e95f1b965f908cd9a3fbff161b8
---

 contrib/TODO                    |    3 ---
 contrib/src/gnutls/rules.mak    |    2 +-
 contrib/src/gpg-error/rules.mak |    2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/contrib/TODO b/contrib/TODO
index 5b17fc9..e17cc0b 100644
--- 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 7f19895..5da6fec 100644
--- 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 49d848c..120a0a3 100644
--- 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 $@

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to