# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1208454969 0
# Node ID a116d8f628a005ea69cb3fdae96aff71a97c359d
# Parent  8f93b3ff2d3858456679b0ec04a3f5c7462d01de
Merged r541:543 from branches/stable-1.0: Speex include directory fix.

diff -r 8f93b3ff2d38 -r a116d8f628a0 CHANGELOG
--- a/CHANGELOG	Thu Apr 17 17:43:02 2008 +0000
+++ b/CHANGELOG	Thu Apr 17 17:56:09 2008 +0000
@@ -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!).
diff -r 8f93b3ff2d38 -r a116d8f628a0 configure.in
--- a/configure.in	Thu Apr 17 17:43:02 2008 +0000
+++ b/configure.in	Thu Apr 17 17:56:09 2008 +0000
@@ -296,7 +296,7 @@
 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"
diff -r 8f93b3ff2d38 -r a116d8f628a0 decoders/speex.c
--- a/decoders/speex.c	Thu Apr 17 17:43:02 2008 +0000
+++ b/decoders/speex.c	Thu Apr 17 17:56:09 2008 +0000
@@ -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"