Mercurial > audlegacy-plugins
changeset 933:35ec41daad52 trunk
[svn] - allow AOSD to be forcefully enabled
| author | nenolod |
|---|---|
| date | Tue, 10 Apr 2007 14:43:25 -0700 |
| parents | a5752784d87b |
| children | d49227a584b0 |
| files | ChangeLog configure.ac |
| diffstat | 2 files changed, 29 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Apr 10 14:19:15 2007 -0700 +++ b/ChangeLog Tue Apr 10 14:43:25 2007 -0700 @@ -1,3 +1,11 @@ +2007-04-10 21:19:15 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [1992] + - chase audacious r4268 (patch by Joker). + + trunk/src/cue/cuesheet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + 2007-04-09 18:12:20 +0000 Ralf Ertzinger <ralf@skytale.net> revision [1990]
--- a/configure.ac Tue Apr 10 14:19:15 2007 -0700 +++ b/configure.ac Tue Apr 10 14:43:25 2007 -0700 @@ -384,7 +384,7 @@ AC_ARG_ENABLE(aosd, [ --disable-aosd disable Audacious OSD plugin (default=enabled)], [enable_aosd=$enableval], - [enable_aosd="yes"] + [enable_aosd="guess"] ) AC_ARG_ENABLE(aosd_xcomp, @@ -393,7 +393,7 @@ [enable_aosd_xcomp="yes"] ) -if test "x$enable_aosd" = "xyes"; then +if test "x$enable_aosd" = "xguess"; then have_aosd="yes" PKG_CHECK_MODULES(PANGO,[pango >= 1.14.7],, [have_aosd="no" @@ -421,10 +421,26 @@ else AC_MSG_RESULT([*** X Composite support for Audacious OSD plugin disabled per user request ***]) have_aosd_xcomp="no" - fi + fi else - AC_MSG_RESULT([*** Audacious OSD plugin disabled per user request ***]) - have_aosd="no" + if test "x$enable_aosd" = "xyes"; then + AC_MSG_RESULT([*** Audacious OSD plugin has been forcefully enabled ***]) + have_aosd="yes" + if test "x$enable_aosd_xcomp" = "xyes"; then + have_aosd_xcomp="yes" + PKG_CHECK_MODULES(XCOMPOSITE, xcomposite, + [AC_DEFINE([HAVE_XCOMPOSITE],[],[X Composite extension available])], + [have_aosd_xcomp="no" + AC_MSG_RESULT([*** X Composite extension not found, composite support for Audacious OSD will not be compiled ***])] + ) + else + AC_MSG_RESULT([*** X Composite support for Audacious OSD plugin disabled per user request ***]) + have_aosd_xcomp="no" + fi + else + AC_MSG_RESULT([*** Audacious OSD plugin disabled per user request ***]) + have_aosd="no" + fi fi if test "x$have_aosd" = "xyes"; then