comparison configure.ac @ 933:35ec41daad52 trunk

[svn] - allow AOSD to be forcefully enabled
author nenolod
date Tue, 10 Apr 2007 14:43:25 -0700
parents 2f742d127b3e
children d7a6fd179cd2
comparison
equal deleted inserted replaced
932:a5752784d87b 933:35ec41daad52
382 dnl *** Audacious OSD plugin (pangocairo-based) 382 dnl *** Audacious OSD plugin (pangocairo-based)
383 383
384 AC_ARG_ENABLE(aosd, 384 AC_ARG_ENABLE(aosd,
385 [ --disable-aosd disable Audacious OSD plugin (default=enabled)], 385 [ --disable-aosd disable Audacious OSD plugin (default=enabled)],
386 [enable_aosd=$enableval], 386 [enable_aosd=$enableval],
387 [enable_aosd="yes"] 387 [enable_aosd="guess"]
388 ) 388 )
389 389
390 AC_ARG_ENABLE(aosd_xcomp, 390 AC_ARG_ENABLE(aosd_xcomp,
391 [ --disable-aosd-xcomp disable Audacious OSD X Composite Support (default=enabled)], 391 [ --disable-aosd-xcomp disable Audacious OSD X Composite Support (default=enabled)],
392 [enable_aosd_xcomp=$enableval], 392 [enable_aosd_xcomp=$enableval],
393 [enable_aosd_xcomp="yes"] 393 [enable_aosd_xcomp="yes"]
394 ) 394 )
395 395
396 if test "x$enable_aosd" = "xyes"; then 396 if test "x$enable_aosd" = "xguess"; then
397 have_aosd="yes" 397 have_aosd="yes"
398 PKG_CHECK_MODULES(PANGO,[pango >= 1.14.7],, 398 PKG_CHECK_MODULES(PANGO,[pango >= 1.14.7],,
399 [have_aosd="no" 399 [have_aosd="no"
400 AC_MSG_RESULT([*** pango >= 1.14.7 is required for Audacious OSD plugin ***])] 400 AC_MSG_RESULT([*** pango >= 1.14.7 is required for Audacious OSD plugin ***])]
401 ) 401 )
419 AC_MSG_RESULT([*** X Composite extension not found, composite support for Audacious OSD will not be compiled ***])] 419 AC_MSG_RESULT([*** X Composite extension not found, composite support for Audacious OSD will not be compiled ***])]
420 ) 420 )
421 else 421 else
422 AC_MSG_RESULT([*** X Composite support for Audacious OSD plugin disabled per user request ***]) 422 AC_MSG_RESULT([*** X Composite support for Audacious OSD plugin disabled per user request ***])
423 have_aosd_xcomp="no" 423 have_aosd_xcomp="no"
424 fi 424 fi
425 else 425 else
426 AC_MSG_RESULT([*** Audacious OSD plugin disabled per user request ***]) 426 if test "x$enable_aosd" = "xyes"; then
427 have_aosd="no" 427 AC_MSG_RESULT([*** Audacious OSD plugin has been forcefully enabled ***])
428 have_aosd="yes"
429 if test "x$enable_aosd_xcomp" = "xyes"; then
430 have_aosd_xcomp="yes"
431 PKG_CHECK_MODULES(XCOMPOSITE, xcomposite,
432 [AC_DEFINE([HAVE_XCOMPOSITE],[],[X Composite extension available])],
433 [have_aosd_xcomp="no"
434 AC_MSG_RESULT([*** X Composite extension not found, composite support for Audacious OSD will not be compiled ***])]
435 )
436 else
437 AC_MSG_RESULT([*** X Composite support for Audacious OSD plugin disabled per user request ***])
438 have_aosd_xcomp="no"
439 fi
440 else
441 AC_MSG_RESULT([*** Audacious OSD plugin disabled per user request ***])
442 have_aosd="no"
443 fi
428 fi 444 fi
429 445
430 if test "x$have_aosd" = "xyes"; then 446 if test "x$have_aosd" = "xyes"; then
431 GENERAL_PLUGINS="$GENERAL_PLUGINS aosd" 447 GENERAL_PLUGINS="$GENERAL_PLUGINS aosd"
432 fi 448 fi