ext/Makefile.am: add rules to build shout2send (was removed by accident when this...

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)

diff --git a/ChangeLog b/ChangeLog
index f56e01d..ba7e86b 100644 (file)
--- 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
index 5f51018..85747ad 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 5f51018de093a26d447de03e1ec6dd0377fc4c77
+Subproject commit 85747ad7d18dfc697845a457631f3877fda46906

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 821f87e..3bf26e9 100644 (file)
--- 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) \