prepare to support console_video

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago · 6abfd9ac9b
parent 6938f4b2b0
commit 6abfd9ac9b
1 changed files with 5 additions and 2 deletions
--- a/makeopts.in
+++ b/makeopts.in
@ -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@