diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2002-10-29 15:36:33 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2002-10-29 15:36:33 +0000 |
| commit | 37d7c4307762aceb977c6577c0151dfc97ab8f96 (patch) | |
| tree | 498fc4327d4faa3bce29e4d13408465cb1a8934d | |
| parent | f0fbc30d0cdcd5dabdf300fc4b49d1e490f1fce4 (diff) | |
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
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | ext/shout2/Makefile.am | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index aab4f773..e8edc8d1 100644 --- 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 258b7160..8b2944dd 100644 --- 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) |