kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 06:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fail.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@267888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-06-04 03:23:20 +00:00
parent f5297544fc
commit 8b45031158
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
makeopts.in
View File

@@ -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@