[vlc-devel] commit: libshout-win32: patch Makefile.in instead of Makefile.am ( Pierre Ynard )

[git version control]

vlc | branch: 1.0-bugfix | Pierre Ynard <linkfanel at yahoo.fr> | Mon Jun 15 03:01:38 2009 +0200| [c1425ad2dded570db56be90b1c7f665879764308] | committer: Pierre Ynard 

libshout-win32: patch Makefile.in instead of Makefile.am

What is probably a libtool version mismatch prevents us from
easily rebootstrapping. To avoid that, we patch Makefile.in and
that's it.

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

 extras/contrib/src/Makefile                     |    1 -
 extras/contrib/src/Patches/libshout-win32.patch |   10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f796bcc..22ed470 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -835,7 +835,6 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_WIN32
 	patch -p0 < Patches/libshout-win32.patch
-	(cd $@; autoreconf && automake)
 endif
 
 .shout: libshout .theora .ogg .speex .vorbis
diff --git a/extras/contrib/src/Patches/libshout-win32.patch b/extras/contrib/src/Patches/libshout-win32.patch
index 18e3e24..1844274 100644
--- a/extras/contrib/src/Patches/libshout-win32.patch
+++ b/extras/contrib/src/Patches/libshout-win32.patch
@@ -11,14 +11,14 @@ diff -u libshout/include/shout/shout.h.in libshout-new/include/shout/shout.h.in
  
  #define SHOUTERR_SUCCESS	(0)
  #define SHOUTERR_INSANE		(-1)
---- libshout/Makefile.am	2006-01-31 01:42:43.000000000 +0000
-+++ libshout/Makefile.am.new	2007-04-16 11:42:06.022127500 +0100
-@@ -3,7 +3,7 @@
+--- libshout/Makefile.in	2009-06-15 02:28:13.000000000 +0200
++++ libshout/Makefile.in	2009-06-15 02:29:10.000000000 +0200
+@@ -246,7 +246,7 @@
+ target_alias = @target_alias@
  AUTOMAKE_OPTIONS = 1.6 foreign
  ACLOCAL_AMFLAGS = -I m4
- 
 -SUBDIRS = include src examples debian doc win32
 +SUBDIRS = include src doc win32
- 
  EXTRA_DIST = INSTALL m4/shout.m4 m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \
  	m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
+ 	m4/xiph_types.m4