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

installed headers

10 files changed, 54 insertions, 11 deletions

diff --git a/include/speex/speex.h b/include/speex/speex.h
index 82ba016..5fc38c7 100644
--- a/include/speex/speex.h
+++ b/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" {
diff --git a/include/speex/speex_buffer.h b/include/speex/speex_buffer.h
index df56f5f..59632b3 100644
--- a/include/speex/speex_buffer.h
+++ b/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" {
diff --git a/include/speex/speex_callbacks.h b/include/speex/speex_callbacks.h
index 6f450b3..42bc9c3 100644
--- a/include/speex/speex_callbacks.h
+++ b/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" {
diff --git a/include/speex/speex_echo.h b/include/speex/speex_echo.h
index 53bcd28..c01688b 100644
--- a/include/speex/speex_echo.h
+++ b/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" {
diff --git a/include/speex/speex_header.h b/include/speex/speex_header.h
index f85b249..dfd1ce6 100644
--- a/include/speex/speex_header.h
+++ b/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" {
diff --git a/include/speex/speex_jitter.h b/include/speex/speex_jitter.h
index d68674b..977916b 100644
--- a/include/speex/speex_jitter.h
+++ b/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" {
diff --git a/include/speex/speex_preprocess.h b/include/speex/speex_preprocess.h
index f8eef2c..2730595 100644
--- a/include/speex/speex_preprocess.h
+++ b/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" {
diff --git a/include/speex/speex_resampler.h b/include/speex/speex_resampler.h
index 54eef8d..eb51d42 100644
--- a/include/speex/speex_resampler.h
+++ b/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 */
 
diff --git a/include/speex/speex_stereo.h b/include/speex/speex_stereo.h
index a259713..6eb6c12 100644
--- a/include/speex/speex_stereo.h
+++ b/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" {
diff --git a/include/speex/speex_types.h b/include/speex/speex_types.h
index 852fed8..59bb5b4 100644
--- a/include/speex/speex_types.h
+++ b/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