Commit 380d2c8c authored by Pierre Ynard's avatar 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.
parent 1cfb626f
...@@ -843,7 +843,6 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz ...@@ -843,7 +843,6 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
ifdef HAVE_WIN32 ifdef HAVE_WIN32
patch -p0 < Patches/libshout-win32.patch patch -p0 < Patches/libshout-win32.patch
(cd $@; autoreconf && automake)
endif endif
.shout: libshout .theora .ogg .speex .vorbis .shout: libshout .theora .ogg .speex .vorbis
......
...@@ -11,14 +11,14 @@ diff -u libshout/include/shout/shout.h.in libshout-new/include/shout/shout.h.in ...@@ -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_SUCCESS (0)
#define SHOUTERR_INSANE (-1) #define SHOUTERR_INSANE (-1)
--- libshout/Makefile.am 2006-01-31 01:42:43.000000000 +0000 --- libshout/Makefile.in 2009-06-15 02:28:13.000000000 +0200
+++ libshout/Makefile.am.new 2007-04-16 11:42:06.022127500 +0100 +++ libshout/Makefile.in 2009-06-15 02:29:10.000000000 +0200
@@ -3,7 +3,7 @@ @@ -246,7 +246,7 @@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = 1.6 foreign AUTOMAKE_OPTIONS = 1.6 foreign
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = include src examples debian doc win32 -SUBDIRS = include src examples debian doc win32
+SUBDIRS = include src doc win32 +SUBDIRS = include src doc win32
EXTRA_DIST = INSTALL m4/shout.m4 m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \ 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/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
m4/xiph_types.m4
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment