Merged release 0.15.2 from branch 'v0.15.x'

Conflicts:

	NEWS
	configure.ac
This commit is contained in:
Max Kellermann
2009-08-15 21:18:38 +02:00
11 changed files with 157 additions and 71 deletions

View File

@@ -629,8 +629,7 @@ dnl audio output plugins
dnl
AC_ARG_ENABLE(alsa,
AS_HELP_STRING([--enable-alsa],
[disable ALSA support]),,
AS_HELP_STRING([--enable-alsa], [enable ALSA support]),,
enable_alsa=auto)
AC_ARG_ENABLE(ao,