prepare to support console_video
authorLuigi Rizzo <rizzo@icir.org>
Tue, 20 Nov 2007 17:11:12 +0000 (17:11 +0000)
committerLuigi Rizzo <rizzo@icir.org>
Tue, 20 Nov 2007 17:11:12 +0000 (17:11 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89455 65c4cc65-6c06-0410-ace0-fbb531ad65f3

makeopts.in

index 70c4846..fd22a52 100644 (file)
@@ -120,8 +120,11 @@ OGG_LIB=@OGG_LIB@
 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@