From: Rafaël Carré <funman@videolan.org>
Date: Wed, 23 Nov 2011 04:23:59 +0000 (-0500)
Subject: contrib: gpg-error: skip automake
X-Git-Tag: 1.3.0-git~168
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a16ccb7c096b784d0fde169759a71ff538e3fe90;p=vlc

contrib: gpg-error: skip automake
---

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index 120a0a3b6e..92cfe099f1 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -15,7 +15,6 @@ endif
 	$(MOVE)
 
 .gpg-error: libgpg-error
-	cd $< && automake
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-nls --disable-shared --disable-languages
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/gpg-error/windres-make.patch b/contrib/src/gpg-error/windres-make.patch
index b26387100d..53ddbecf1b 100644
--- a/contrib/src/gpg-error/windres-make.patch
+++ b/contrib/src/gpg-error/windres-make.patch
@@ -9,3 +9,14 @@
  LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
  
  SUFFIXES = .rc .lo
+--- libgpg-error/src/Makefile.in.orig	2011-11-22 23:23:14.450340031 -0500
++++ libgpg-error/src/Makefile.in	2011-11-22 23:23:20.650370779 -0500
+@@ -306,7 +306,7 @@
+ @HAVE_W32_SYSTEM_FALSE@arch_sources = 
+ @HAVE_W32_SYSTEM_TRUE@arch_sources = w32-gettext.c
+ @HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-@HAVE_W32_SYSTEM_TRUE@            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
++@HAVE_W32_SYSTEM_TRUE@            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS)
+ 
+ @HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
+ @HAVE_W32_SYSTEM_TRUE@SUFFIXES = .rc .lo