summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Loeuillet <gstreamer@leroutier.net>2004-05-24 12:08:33 +0000
committerStéphane Loeuillet <gstreamer@leroutier.net>2004-05-24 12:08:33 +0000
commitfdd789a429f9657edf48d801f7704cdf5a1083ed (patch)
tree0c96e2013ef7198bbf33bb22db5782b1dc769a4b
parent8ab84441bb8c1e7e698eb152c13e64e6681638db (diff)
downloadgst-plugins-bad-fdd789a429f9657edf48d801f7704cdf5a1083ed.tar.gz
gst-plugins-bad-fdd789a429f9657edf48d801f7704cdf5a1083ed.tar.bz2
gst-plugins-bad-fdd789a429f9657edf48d801f7704cdf5a1083ed.zip
ext/Makefile.am: add rules to build shout2send (was removed by accident when this module was no more marked experimen...
Original commit message from CVS: * ext/Makefile.am: add rules to build shout2send (was removed by accident when this module was no more marked experimental/broken) * ext/shout2/gstshout2.c: * ext/shout2/gstshout2.h: adding a "connection problem" signal to shout2send (fixes #142954)
-rw-r--r--ChangeLog13
m---------common0
-rw-r--r--ext/Makefile.am19
3 files changed, 26 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f56e01df..ba7e86ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-05-24 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
+
+ * ext/Makefile.am:
+ add rules to build shout2send (was removed by accident
+ when this module was no more marked experimental/broken)
+
+2004-05-24 Zaheer Abbas Merali <zaheerabbas@merali.org>
+
+ * ext/shout2/gstshout2.c:
+ * ext/shout2/gstshout2.h:
+ adding a "connection problem" signal to shout2send
+ (fixes #142954)
+
2004-05-21 Thomas Vander Stichele <thomas at apestaart dot org>
* ext/kio/kioreceiver.cpp:
diff --git a/common b/common
-Subproject 5f51018de093a26d447de03e1ec6dd0377fc4c7
+Subproject 85747ad7d18dfc697845a457631f3877fda4690
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 821f87e6..3bf26e9e 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -262,18 +262,24 @@ else
SDL_DIR=
endif
-if USE_SIDPLAY
-SIDPLAY_DIR=sidplay
-else
-SIDDPLAY_DIR=
-endif
-
if USE_SHOUT
SHOUT_DIR=shout
else
SHOUT_DIR=
endif
+if USE_SHOUT2
+SHOUT2_DIR=shout2
+else
+SHOUT2_DIR=
+endif
+
+if USE_SIDPLAY
+SIDPLAY_DIR=sidplay
+else
+SIDDPLAY_DIR=
+endif
+
if USE_SMOOTHWAVE
SMOOTHWAVE_DIR=smoothwave
else
@@ -385,6 +391,7 @@ SUBDIRS=\
$(RAW1394_DIR) \
$(SDL_DIR) \
$(SHOUT_DIR) \
+ $(SHOUT2_DIR) \
$(SIDPLAY_DIR) \
$(SMOOTHWAVE_DIR) \
$(SNAPSHOT_DIR) \