aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2005-02-02 10:27:24 +0000
committerAvuton Olrich <avuton@gmail.com>2005-02-02 10:27:24 +0000
commit004c9394f7b278e731e48ea2ab6fb3d6555bf85f (patch)
tree543fb075e86dd934fc7e0d79201ea94ded7bd846
parent2debf9924ae3761451a2d8496756a4bdfef390c8 (diff)
downloadmpd-004c9394f7b278e731e48ea2ab6fb3d6555bf85f.tar.gz
mpd-004c9394f7b278e731e48ea2ab6fb3d6555bf85f.tar.xz
mpd-004c9394f7b278e731e48ea2ab6fb3d6555bf85f.zip
- Clarify MPC to musepack (MPC) as not to confuse new MPD customers
- Error on no audio output target - Allow to compile without oss (should be able to compile with any one audio output target) - TODO update git-svn-id: https://svn.musicpd.org/mpd/trunk@2930 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--TODO3
-rw-r--r--configure.ac14
2 files changed, 10 insertions, 7 deletions
diff --git a/TODO b/TODO
index 3fcc08d4a..76eb5eebf 100644
--- a/TODO
+++ b/TODO
@@ -32,9 +32,6 @@
*) failing to read/write db
*) stat'ing errors for music and playlist directory
-*) make libao optional during configure, but check that some form of audioOutput
- is enabled (either oss, shout, or ao)
-
*) Cleanup Config File Code
*) Handle mp1 and mp2 files (including mp2's that are disguised as mp3's with
diff --git a/configure.ac b/configure.ac
index 8df774124..700aeab27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ AC_ARG_ENABLE(mp3,[ --disable-mp3 disable mp3 support],,enable_mp3=yes)
AC_ARG_ENABLE(aac,[ --disable-aac disable AAC support],,enable_aac=yes)
AC_ARG_ENABLE(audiofile,[ --disable-audiofile disable audiofile support, disables wave support],,enable_audiofile=yes)
AC_ARG_ENABLE(mod,[ --enable-mod enable MOD support],enable_mod=yes,)
-AC_ARG_ENABLE(mpc,[ --disable-mpc disable MPC support],,enable_mpc=yes)
+AC_ARG_ENABLE(mpc,[ --disable-mpc disable musepack (MPC) support],,enable_mpc=yes)
AC_ARG_ENABLE(id3,[ --disable-id3 disable id3 support],,enable_id3=yes)
AC_ARG_ENABLE(mpd_mad,[ --enable-mpd-mad use mpd libmad],use_mpd_mad=yes,)
AC_ARG_ENABLE(mpd_id3tag,[ --enable-mpd-id3tag use mpd libid3tag],use_mpd_id3tag=yes,)
@@ -115,7 +115,13 @@ if test x$enable_shout = xyes; then
XIPH_PATH_SHOUT([AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]) MPD_LIBS="$MPD_LIBS $SHOUT_LIBS" MPD_CFLAGS="$MPD_CFLAGS $SHOUT_CFLAGS"], enable_shout=no)
fi
-AC_CHECK_HEADER(sys/soundcard.h,[enable_oss=yes;AC_DEFINE(HAVE_OSS,1,[Define to enable OSS])],[AC_MSG_WARN(Soundcard headers not found -- disabling OSS support);enable_oss=no])
+if test x$enable_oss = xyes; then
+ AC_CHECK_HEADER(sys/soundcard.h,[enable_oss=yes;AC_DEFINE(HAVE_OSS,1,[Define to enable OSS])],[AC_MSG_WARN(Soundcard headers not found -- disabling OSS support);enable_oss=no])
+fi
+
+if test x$enable_ao = xno && test x$enable_oss = xno && test x$enable_shout = xno; then
+ AC_MSG_ERROR("Cannot compile without an output target")
+fi
if test x$enable_alsa = xyes; then
AM_PATH_ALSA(0.9.0, , enable_alsa=no)
@@ -619,9 +625,9 @@ else
fi
if test x$enable_mpc = xyes; then
- echo "MPC support ...................enabled"
+ echo "musepack (MPC) support ........enabled"
else
- echo "MPC support ...................disabled"
+ echo "musepack (MPC) support ........disabled"
fi
if test x$enable_mod = xyes; then