[svn-commits] tilghman: branch 1.6.2 r267888 - /branches/1.6.2/makeopts.in

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jun  3 22:23:20 2010
New Revision: 267888

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=267888
Log:
Merge fail.

Modified:
    branches/1.6.2/makeopts.in

Modified: branches/1.6.2/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/makeopts.in?view=diff&rev=267888&r1=267887&r2=267888
==============================================================================
--- branches/1.6.2/makeopts.in (original)
+++ branches/1.6.2/makeopts.in Thu Jun  3 22:23:20 2010
@@ -151,8 +151,8 @@
 
 # ossaudio can optionally use ffmpeg, x11, sdl and sdl_image.
 # Because sdl_image in turn depends on sdl, we don't duplicate the include
-OSS_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@
-OSS_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@
+OSS_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @X11_INCLUDE@
+OSS_LIB=@OSS_LIB@ @FFMPEG_LIB@ @X11_LIB@
 
 PGSQL_INCLUDE=@PGSQL_INCLUDE@
 PGSQL_LIB=@PGSQL_LIB@
@@ -189,12 +189,6 @@
 
 X11_INCLUDE=@X11_INCLUDE@
 X11_LIB=@X11_LIB@
-
-SDL_INCLUDE=@SDL_INCLUDE@
-SDL_LIB=@SDL_LIB@
-
-SDL_IMAGE_INCLUDE=@SDL_IMAGE_INCLUDE@
-SDL_IMAGE_LIB=@SDL_IMAGE_LIB@
 
 SPANDSP_INCLUDE=@SPANDSP_INCLUDE@
 SPANDSP_LIB=@SPANDSP_LIB@