shout: Other approach.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 199a2fceb1f212a135ce6646d56fdcfdceb660c0..72110bde1d8a99fdd8452770ce3d00933965c8ea 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -684,6 +684,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_WIN32
        patch -p0 < Patches/libshout-win32.patch
+       (cd $@; aclocal && automake)
 endif
   
 .shout: libshout .theora .ogg

diff --git a/extras/contrib/src/Patches/libshout-win32.patch b/extras/contrib/src/Patches/libshout-win32.patch
index ad8c3acedb4f43ef15a94025c0a5b42f05ccbb6f..f5782fc45f820d9d0cee92767b45914e38a00447 100644 (file)
--- a/extras/contrib/src/Patches/libshout-win32.patch
+++ b/extras/contrib/src/Patches/libshout-win32.patch
@@ -11,3 +11,15 @@ diff -u libshout/include/shout/shout.h.in libshout-new/include/shout/shout.h.in
  
  #define SHOUTERR_SUCCESS      (0)
  #define SHOUTERR_INSANE               (-1)
+diff -u libshout-orig/Makefile.am libshout/Makefile.am
+--- libshout-orig/Makefile.am  2005-02-19 19:36:49.000000000 +0000
++++ libshout/Makefile.am       2006-03-12 21:54:51.000000000 +0000
+@@ -3,7 +3,7 @@
+ AUTOMAKE_OPTIONS = 1.6 foreign
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = include src examples debian doc win32
++SUBDIRS = include src 
+ 
+ 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 \