Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merged r541:543 from branches/stable-1.0: Speex include directory fix.
  • Loading branch information
icculus committed Apr 17, 2008
1 parent 09f47e8 commit 1e65303
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -2,6 +2,7 @@
* CHANGELOG.
*/

04172008 - Look for Speex includes in new directory.
04112008 - Check if Speex header has bogus data (CVE-2008-1686).
08062007 - Updated my email address. Added -fvisibility=hidden support.
07152007 - Minor correction in Timidity resampling code (Thanks, Sam!).
Expand Down
2 changes: 1 addition & 1 deletion configure.in
Expand Up @@ -296,7 +296,7 @@ AC_ARG_ENABLE(speex,
if test x$enable_speex = xyes; then
AC_CHECK_HEADER(ogg/ogg.h, have_ogg_hdr=yes)
AC_CHECK_LIB(ogg, ogg_sync_init, have_ogg_lib=yes)
AC_CHECK_HEADER(speex.h, have_speex_hdr=yes)
AC_CHECK_HEADER(speex/speex.h, have_speex_hdr=yes)
AC_CHECK_LIB(speex, speex_bits_init, have_speex_lib=yes)
if test "x$have_ogg_hdr" = "xyes" -a "x$have_ogg_lib" = "xyes" -a "x$have_speex_hdr" = "xyes" -a "x$have_speex_lib" = "xyes"; then
LIBS="$LIBS -logg -lspeex"
Expand Down
4 changes: 2 additions & 2 deletions decoders/speex.c
Expand Up @@ -51,8 +51,8 @@
#include <assert.h>

#include <ogg/ogg.h>
#include <speex.h>
#include <speex_header.h>
#include <speex/speex.h>
#include <speex/speex_header.h>

#include "SDL_sound.h"

Expand Down

0 comments on commit 1e65303

Please sign in to comment.