complete support for X11
authorLuigi Rizzo <rizzo@icir.org>
Wed, 21 Nov 2007 00:20:08 +0000 (00:20 +0000)
committerLuigi Rizzo <rizzo@icir.org>
Wed, 21 Nov 2007 00:20:08 +0000 (00:20 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89469 65c4cc65-6c06-0410-ace0-fbb531ad65f3

makeopts.in

index fd22a52..9454242 100644 (file)
@@ -120,11 +120,10 @@ OGG_LIB=@OGG_LIB@
 OSPTK_INCLUDE=@OSPTK_INCLUDE@
 OSPTK_LIB=@OSPTK_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@
+# ossaudio can optionally use ffmpeg, x11, sdl and sdl_image.
+# Because sdl_image in turn depends on sdl, we don't duplicate the include
+OSSAUDIO_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@
+OSSAUDIO_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@
 
 PGSQL_INCLUDE=@PGSQL_INCLUDE@
 PGSQL_LIB=@PGSQL_LIB@
@@ -150,6 +149,9 @@ RADIUS_LIB=@RADIUS_LIB@
 FFMPEG_INCLUDE=@FFMPEG_INCLUDE@
 FFMPEG_LIB=@FFMPEG_LIB@
 
+X11_INCLUDE=@X11_INCLUDE@
+X11_LIB=@X11_LIB@
+
 SDL_INCLUDE=@SDL_INCLUDE@
 SDL_LIB=@SDL_LIB@