Mercurial > audlegacy-plugins
changeset 2778:28d9a2148cad
fixed plugins build order: filewriter needs to be built before icecast
| author | Andrew O. Shadoura <bugzilla@tut.by> |
|---|---|
| date | Fri, 13 Jun 2008 07:22:59 +0300 |
| parents | 3656fbfc63b6 |
| children | ada024f94eb4 |
| files | configure.ac src/icecast/Makefile |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Fri Jun 13 06:19:07 2008 +0300 +++ b/configure.ac Fri Jun 13 07:22:59 2008 +0300 @@ -306,8 +306,7 @@ if test "x$enable_icecast" = "xyes"; then PKG_CHECK_MODULES(SHOUT, [shout >= 2.0], [have_shout=yes - enable_filewriter=yes - OUTPUT_PLUGINS="$OUTPUT_PLUGINS icecast"], + enable_filewriter=yes], [have_shout=no] ) else @@ -1591,6 +1590,10 @@ AC_SUBST(FILEWRITER_CFLAGS) AC_SUBST(FILEWRITER_LIBS) +if test "x$have_shout" = "xyes"; then + OUTPUT_PLUGINS="$OUTPUT_PLUGINS icecast" +fi + dnl *** End of all plugin checks *** AC_SUBST(ARCH_DEFINES) @@ -1730,7 +1733,7 @@ echo " LIRC: $have_lirc" echo " AudioScrobbler Client: $scrobbler" echo " Upload to MTP device: $have_mtp_up" -echo " Bluetooth audio suport: $have_bluetooth" +echo " Bluetooth audio support: $have_bluetooth" echo " MacOS Dock Album Art plugin: $have_dockalbumart" echo echo " Effect"
--- a/src/icecast/Makefile Fri Jun 13 06:19:07 2008 +0300 +++ b/src/icecast/Makefile Fri Jun 13 07:22:59 2008 +0300 @@ -1,7 +1,7 @@ PLUGIN = icecast${PLUGIN_SUFFIX} -SRCS = icecast.c \ - ../filewriter/mp3.o \ +SRCS = icecast.c \ + ../filewriter/mp3.o \ ../filewriter/vorbis.o include ../../buildsys.mk