[asterisk-commits] rizzo: trunk r89469 - /trunk/makeopts.in

[SVN commits to the Asterisk project]

Author: rizzo
Date: Tue Nov 20 18:20:08 2007
New Revision: 89469

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89469
Log:
complete support for X11


Modified:
    trunk/makeopts.in

Modified: trunk/makeopts.in
URL: http://svn.digium.com/view/asterisk/trunk/makeopts.in?view=diff&rev=89469&r1=89468&r2=89469
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Tue Nov 20 18:20:08 2007
@@ -120,11 +120,10 @@
 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@
@@ -149,6 +148,9 @@
 
 FFMPEG_INCLUDE=@FFMPEG_INCLUDE@
 FFMPEG_LIB=@FFMPEG_LIB@
+
+X11_INCLUDE=@X11_INCLUDE@
+X11_LIB=@X11_LIB@
 
 SDL_INCLUDE=@SDL_INCLUDE@
 SDL_LIB=@SDL_LIB@