diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-04 03:23:20 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-04 03:23:20 +0000 |
| commit | a691813702b502e7eae0908503908a1868f1e5d2 (patch) | |
| tree | bf44f3794c9ac14785ac91c626699c28dc44e760 /makeopts.in | |
| parent | b8581d6697ae0145ab731cdf214f3c38f5c8a00b (diff) | |
Merge fail.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@267888 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'makeopts.in')
| -rw-r--r-- | makeopts.in | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/makeopts.in b/makeopts.in index 19530ad9f..1be2f05e0 100644 --- 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@ |