[svn-commits] rizzo: trunk r89455 - /trunk/makeopts.in

[SVN commits to the Digium repositories]

Author: rizzo
Date: Tue Nov 20 11:11:12 2007
New Revision: 89455

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89455
Log:
prepare to support console_video

Modified:
    trunk/makeopts.in

Modified: trunk/makeopts.in
URL: http://svn.digium.com/view/asterisk/trunk/makeopts.in?view=diff&rev=89455&r1=89454&r2=89455
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Tue Nov 20 11:11:12 2007
@@ -120,8 +120,11 @@
 OSPTK_INCLUDE=@OSPTK_INCLUDE@
 OSPTK_LIB=@OSPTK_LIB@
 
-OSSAUDIO_INCLUDE=@OSS_INCLUDE@
-OSSAUDIO_LIB=@OSS_LIB@
+# ossaudio can optionally use ffmpeg, x11, sdl and sdl_image
+# because sdl_image in turn depends on sdl, we don't duplicate the include
+# XXX x11 not yet integrated.
+OSSAUDIO_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@
+OSSAUDIO_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@
 
 PGSQL_INCLUDE=@PGSQL_INCLUDE@
 PGSQL_LIB=@PGSQL_LIB@