Merge fail.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@267888 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/makeopts.in b/makeopts.in
index 19530ad9f9c41f49f045283a5462e3dc18061dd2..1be2f05e071f33c78e75f1be2654710f30f4bde5 100644 (file)
--- a/makeopts.in
+++ b/makeopts.in
@@ -151,8 +151,8 @@ 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
-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@
@@ -190,12 +190,6 @@ FFMPEG_LIB=@FFMPEG_LIB@
 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@