people interpreting .m4's make me laugh with wild abandonment

Original commit message from CVS:
people interpreting .m4's make me laugh with wild abandonment

diff --git a/configure.ac b/configure.ac
index aab4f77..e8edc8d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -720,8 +720,10 @@ GST_CHECK_FEATURE(SHOUT, [shout plug-in], icecastsend, [
 
 dnl *** shout2 *** 
 translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT2, true)
-GST_CHECK_FEATURE(SHOUT, [shout2 plug-in], shout2send, [
-  AM_PATH_SHOUT2([USE_SHOUT2="true" [, USE_SHOUT2="false"]])
+GST_CHECK_FEATURE(SHOUT2, [shout2 plug-in], shout2send, [
+  AM_PATH_SHOUT2(HAVE_SHOUT2="true", HAVE_SHOUT2="false")
+  AC_SUBST(SHOUT2_CFLAGS)
+  AC_SUBST(SHOUT2_LIBS)
 ])
 
 dnl *** sidplay ***
@@ -928,6 +930,8 @@ AC_CONFIG_FILES(
 Makefile
 gstreamer-libs.pc
 gstreamer-libs-uninstalled.pc
+gstreamer-play.pc
+gstreamer-play-uninstalled.pc
 gst-plugins.spec
 gst/Makefile
 gst/ac3parse/Makefile

diff --git a/ext/shout2/Makefile.am b/ext/shout2/Makefile.am
index 258b716..8b2944d 100644 (file)
--- a/ext/shout2/Makefile.am
+++ b/ext/shout2/Makefile.am
@@ -3,7 +3,7 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstshout2.la
 
 libgstshout2_la_SOURCES = gstshout2.c 
-libgstshout2_la_CFLAGS = $(GST_CFLAGS)
+libgstshout2_la_CFLAGS = $(SHOUT2_CFLAGS) $(GST_CFLAGS)
 libgstshout2_la_LIBADD = $(SHOUT2_LIBS) $(GST_LIBS)
 libgstshout2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)