Sorting out #include "" from #include <> and using relative paths for including

installed headers

configure.ac

@@ -273,6 +273,8 @@ fi
 AC_SUBST(SIZE16)
 AC_SUBST(SIZE32)
 
+AC_DEFINE([_BUILD_SPEEX], [], [Defined only when Speex itself is build built])
+
 AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec
            include/Makefile include/speex/Makefile speex.pc speexdsp.pc
            win32/Makefile win32/libspeex/Makefile win32/speexenc/Makefile

include/speex/speex.h

@@ -40,8 +40,13 @@
  *  @{
  */
 
-#include "speex/speex_bits.h"
-#include "speex/speex_types.h"
+#ifdef _BUILD_SPEEX
+# include "speex_types.h"
+# include "speex_bits.h"
+#else
+# include <speex/speex_types.h>
+# include <speex/speex_bits.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/speex/speex_buffer.h

@@ -34,7 +34,11 @@
 #ifndef SPEEX_BUFFER_H
 #define SPEEX_BUFFER_H
 
-#include "speex/speex_types.h"
+#ifdef _BUILD_SPEEX
+# include "speex_types.h"
+#else
+# include <speex/speex_types.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/speex/speex_callbacks.h

@@ -39,7 +39,11 @@
  *  @{
  */
 
-#include "speex.h"
+#ifdef _BUILD_SPEEX
+# include "speex.h"
+#else
+# include <speex/speex.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/speex/speex_echo.h

@@ -37,7 +37,11 @@
  *  This is the acoustic echo canceller module.
  *  @{
  */
-#include "speex/speex_types.h"
+#ifdef _BUILD_SPEEX
+# include "speex_types.h"
+#else
+# include <speex/speex_types.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/speex/speex_header.h

@@ -41,7 +41,11 @@
  *  @{
  */
 
-#include "speex/speex_types.h"
+#ifdef _BUILD_SPEEX
+# include "speex_types.h"
+#else
+# include <speex/speex_types.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/speex/speex_jitter.h

@@ -41,7 +41,11 @@
  *  @{
  */
 
-#include "speex/speex_types.h"
+#ifdef _BUILD_SPEEX
+# include "speex_types.h"
+#else
+# include <speex/speex_types.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/speex/speex_preprocess.h

@@ -43,7 +43,11 @@
  *  @{
  */
 
-#include "speex/speex_types.h"
+#ifdef _BUILD_SPEEX
+# include "speex_types.h"
+#else
+# include <speex/speex_types.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/speex/speex_resampler.h

@@ -84,7 +84,11 @@
       
 #else /* OUTSIDE_SPEEX */
 
-#include "speex/speex_types.h"
+#ifdef _BUILD_SPEEX
+# include "speex_types.h"
+#else
+# include <speex/speex_types.h>
+#endif
 
 #endif /* OUTSIDE_SPEEX */
 

include/speex/speex_stereo.h

@@ -39,8 +39,14 @@
  *  @{
  */
 
-#include "speex/speex_types.h"
-#include "speex/speex_bits.h"
+#ifdef _BUILD_SPEEX
+# include "speex_types.h"
+# include "speex_bits.h"
+#else
+# include <speex/speex_types.h>
+# include <speex/speex_bits.h>
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {

include/speex/speex_types.h

@@ -119,7 +119,11 @@
 
 #else
 
+# ifdef _BUILD_SPEEX
+#  include "include/speex/speex_config_types.h"
+#else
 #  include <speex/speex_config_types.h>
+#endif
 
 #endif
 

libspeex/Makefile.am

@@ -4,7 +4,7 @@
 
 EXTRA_DIST=echo_diagnostic.m
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
+INCLUDES = -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
 
 lib_LTLIBRARIES = libspeex.la libspeexdsp.la
 

libspeex/arch.h

@@ -75,7 +75,7 @@
 #endif
 
 #ifndef OUTSIDE_SPEEX
-#include "speex/speex_types.h"
+#include "../include/speex/speex_types.h"
 #endif
 
 #define ABS(x) ((x) < 0 ? (-(x)) : (x))      /**< Absolute integer value. */

libspeex/bits.c

@@ -36,7 +36,7 @@
 #include "config.h"
 #endif
 
-#include <speex/speex_bits.h>
+#include "../include/speex/speex_bits.h"
 #include "arch.h"
 #include "os_support.h"
 

libspeex/buffer.c

@@ -38,7 +38,7 @@
 
 #include "os_support.h"
 #include "arch.h"
-#include <speex/speex_buffer.h>
+#include "../include/speex/speex_buffer.h"
 
 struct SpeexBuffer_ {
    char *data;

libspeex/cb_search.h

@@ -35,7 +35,7 @@
 #ifndef CB_SEARCH_H
 #define CB_SEARCH_H
 
-#include <speex/speex_bits.h>
+#include "../include/speex/speex_bits.h"
 #include "arch.h"
 
 /** Split codebook parameters. */

libspeex/jitter.c

@@ -55,9 +55,9 @@ TODO:
 
 
 #include "arch.h"
-#include <speex/speex.h>
-#include <speex/speex_bits.h>
-#include <speex/speex_jitter.h>
+#include "../include/speex/speex.h"
+#include "../include/speex/speex_bits.h"
+#include "../include/speex/speex_jitter.h"
 #include "os_support.h"
 
 #ifndef NULL

libspeex/ltp.c

@@ -38,7 +38,7 @@
 #include "ltp.h"
 #include "stack_alloc.h"
 #include "filters.h"
-#include <speex/speex_bits.h>
+#include "../include/speex/speex_bits.h"
 #include "math_approx.h"
 #include "os_support.h"
 

libspeex/ltp.h

@@ -32,7 +32,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include <speex/speex_bits.h>
+#include "../include/speex/speex_bits.h"
 #include "arch.h"
 
 /** LTP parameters. */

libspeex/mdf.c

@@ -42,7 +42,7 @@
    
    Valin, J.-M., On Adjusting the Learning Rate in Frequency Domain Echo 
    Cancellation With Double-Talk. IEEE Transactions on Audio,
-   Speech and Language Processing, Vol. 15, No. 3, pp. 1030-1034, 2007.
+   Speech and Language Processing, V<ol. 15, No. 3, pp. 1030-1034, 2007.
    http://people.xiph.org/~jm/papers/valin_taslp2006.pdf
    
    There is no explicit double-talk detection, but a continuous variation
@@ -70,7 +70,7 @@
 #endif
 
 #include "arch.h"
-#include "speex/speex_echo.h"
+#include "../include/speex/speex_echo.h"
 #include "fftwrap.h"
 #include "pseudofloat.h"
 #include "math_approx.h"

libspeex/modes.h

@@ -36,8 +36,8 @@
 #ifndef MODES_H
 #define MODES_H
 
-#include <speex/speex.h>
-#include <speex/speex_bits.h>
+#include "../include/speex/speex.h"
+#include "../include/speex/speex_bits.h"
 #include "arch.h"
 
 #define NB_SUBMODES 16

libspeex/nb_celp.c

@@ -43,12 +43,12 @@
 #include "filters.h"
 #include "stack_alloc.h"
 #include "vq.h"
-#include <speex/speex_bits.h>
+#include "../include/speex/speex_bits.h"
 #include "vbr.h"
 #include "arch.h"
 #include "math_approx.h"
 #include "os_support.h"
-#include <speex/speex_callbacks.h>
+#include "../include/speex/speex_callbacks.h"
 
 #ifdef VORBIS_PSYCHO
 #include "vorbis_psy.h"

libspeex/nb_celp.h

@@ -37,8 +37,8 @@
 #define NB_CELP_H
 
 #include "modes.h"
-#include <speex/speex_bits.h>
-#include <speex/speex_callbacks.h>
+#include "../include/speex/speex_bits.h"
+#include "../include/speex/speex_callbacks.h"
 #include "vbr.h"
 #include "filters.h"
 

libspeex/preprocess.c

@@ -60,8 +60,8 @@
 #endif
 
 #include <math.h>
-#include "speex/speex_preprocess.h"
-#include "speex/speex_echo.h"
+#include "../include/speex/speex_preprocess.h"
+#include "../include/speex/speex_echo.h"
 #include "arch.h"
 #include "fftwrap.h"
 #include "filterbank.h"

libspeex/quant_lsp.h

@@ -35,7 +35,7 @@
 #ifndef QUANT_LSP_H
 #define QUANT_LSP_H
 
-#include <speex/speex_bits.h>
+#include "../include/speex/speex_bits.h"
 #include "arch.h"
 
 #define MAX_LSP_SIZE 20

libspeex/resample.c

@@ -70,7 +70,7 @@ static void speex_free (void *ptr) {free(ptr);}
 #include "arch.h"
 #else /* OUTSIDE_SPEEX */
                
-#include "speex/speex_resampler.h"
+#include "../include/speex/speex_resampler.h"
 #include "arch.h"
 #include "os_support.h"
 #endif /* OUTSIDE_SPEEX */

libspeex/sb_celp.h

@@ -37,7 +37,7 @@
 #define SB_CELP_H
 
 #include "modes.h"
-#include <speex/speex_bits.h>
+#include "../include/speex/speex_bits.h"
 #include "nb_celp.h"
 
 /**Structure representing the full state of the sub-band encoder*/

libspeex/scal.c

@@ -44,7 +44,7 @@ The algorithm implemented here is described in:
 #include "config.h"
 #endif
 
-#include "speex/speex_echo.h"
+#include "../include/speex/speex_echo.h"
 #include "vorbis_psy.h"
 #include "arch.h"
 #include "os_support.h"

libspeex/speex_callbacks.c

@@ -36,7 +36,7 @@
 #include "config.h"
 #endif
 
-#include <speex/speex_callbacks.h>
+#include "../include/speex/speex_callbacks.h"
 #include "arch.h"
 #include "os_support.h"
 

libspeex/speex_header.c

@@ -36,8 +36,8 @@
 #endif
 
 #include "arch.h"
-#include <speex/speex_header.h>
-#include <speex/speex.h>
+#include "../include/speex/speex_header.h"
+#include "../include/speex/speex.h"
 #include "os_support.h"
 
 #ifndef NULL

libspeex/stereo.c

@@ -33,8 +33,8 @@
 #include "config.h"
 #endif
 
-#include <speex/speex_stereo.h>
-#include <speex/speex_callbacks.h>
+#include "../include/speex/speex_stereo.h"
+#include "../include/speex/speex_callbacks.h"
 #include "math_approx.h"
 #include "vq.h"
 #include <math.h>

libspeex/testdenoise.c

@@ -2,7 +2,7 @@
 #include "config.h"
 #endif
 
-#include <speex/speex_preprocess.h>
+#include "../include/speex/speex_preprocess.h"
 #include <stdio.h>
 
 #define NN 160

libspeex/testecho.c

@@ -7,8 +7,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "speex/speex_echo.h"
-#include "speex/speex_preprocess.h"
+#include "../include/speex/speex_echo.h"
+#include "../include/speex/speex_preprocess.h"
 
 
 #define NN 128

libspeex/testenc.c

@@ -2,10 +2,10 @@
 #include "config.h"
 #endif
 
-#include <speex/speex.h>
+#include "../include/speex/speex.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <speex/speex_callbacks.h>
+#include "../include/speex/speex_callbacks.h"
 
 #ifdef FIXED_DEBUG
 extern long long spx_mips;

libspeex/testenc_uwb.c

@@ -2,10 +2,10 @@
 #include "config.h"
 #endif
 
-#include <speex/speex.h>
+#include "../include/speex/speex.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <speex/speex_callbacks.h>
+#include "../include/speex/speex_callbacks.h"
 
 #ifdef FIXED_DEBUG
 extern long long spx_mips;

libspeex/testenc_wb.c

@@ -2,10 +2,10 @@
 #include "config.h"
 #endif
 
-#include <speex/speex.h>
+#include "../include/speex/speex.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <speex/speex_callbacks.h>
+#include "../include/speex/speex_callbacks.h"
 
 #ifdef FIXED_DEBUG
 extern long long spx_mips;

libspeex/testjitter.c

@@ -2,7 +2,7 @@
 #include "config.h"
 #endif
 
-#include <speex/speex_jitter.h>
+#include "../include/speex/speex_jitter.h"
 #include <stdio.h>
 
 union jbpdata {

libspeex/testresample.c

@@ -35,7 +35,7 @@
 #endif
 
 #include <stdio.h>
-#include "speex/speex_resampler.h"
+#include "../include/speex/speex_resampler.h"
 #include <math.h>
 #include <stdlib.h>
 

src/Makefile.am

@@ -5,7 +5,7 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@
+INCLUDES = -I$(top_builddir) @OGG_CFLAGS@
 
 man_MANS = speexenc.1 speexdec.1
 

src/speexdec.c

@@ -46,7 +46,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <speex/speex.h>
+#include "../include/speex/speex.h"
 #include <ogg/ogg.h>
 
 #if defined WIN32 || defined _WIN32
@@ -81,9 +81,9 @@
 
 #include <string.h>
 #include "wav_io.h"
-#include <speex/speex_header.h>
-#include <speex/speex_stereo.h>
-#include <speex/speex_callbacks.h>
+#include "../include/speex/speex_header.h"
+#include "../include/speex/speex_stereo.h"
+#include "../include/speex/speex_callbacks.h"
 
 #define MAX_FRAME_SIZE 2000
 

src/speexenc.c

@@ -47,12 +47,12 @@
 #include <string.h>
 #include <time.h>
 
-#include <speex/speex.h>
+#include "../include/speex/speex.h"
 #include <ogg/ogg.h>
 #include "wav_io.h"
-#include <speex/speex_header.h>
-#include <speex/speex_stereo.h>
-#include <speex/speex_preprocess.h>
+#include "../include/speex/speex_header.h"
+#include "../include/speex/speex_stereo.h"
+#include "../include/speex/speex_preprocess.h"
 
 #if defined WIN32 || defined _WIN32
 /* We need the following two to set stdout to binary */

src/wav_io.c

@@ -36,7 +36,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "speex/speex_types.h"
+#include "../include/speex/speex_types.h"
 #include "wav_io.h"
 
 

src/wav_io.h

@@ -33,7 +33,7 @@
 #define WAV_IO_H
 
 #include <stdio.h>
-#include "speex/speex_types.h"
+#include "../include/speex/speex_types.h"
 
 #if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) )
 #define le_short(s) ((short) ((unsigned short) (s) << 8) | ((unsigned short) (s) >> 8))