better version of last patch

diff --git a/libs/openzap/configure.ac b/libs/openzap/configure.ac
index c2b9e0bd677521d878be66380ffe63a05de4ff71..d2c23c1091818c1586601e5f5f037e76350f2faa 100644 (file)
--- a/libs/openzap/configure.ac
+++ b/libs/openzap/configure.ac
@@ -107,7 +107,10 @@ case "$host" in
     ;;
 esac
 
+DEFAULT_INCLUDES="-I. -I./src/include -I$(srcdir)"
+
 AC_SUBST(SOLINK)
+AC_SUBST(DEFAULT_INCLUDES)
 AC_SUBST(DYNAMIC_LIB_EXTEN)
 
 AC_CHECK_LIB([dl], [dlopen])

diff --git a/libs/openzap/src/detect_dtmf.c b/libs/openzap/src/detect_dtmf.c
index ad582874a3b4b3e4c8e1ed0e9535132d3f9b541f..f73586adcb19bace9a2ce00af216a6fa43c37098 100644 (file)
--- a/libs/openzap/src/detect_dtmf.c
+++ b/libs/openzap/src/detect_dtmf.c
@@ -1,5 +1,5 @@
 //#include "openzap.h"
-#include "../openzap/src/include/libteletone_detect.h"
+#include "libteletone_detect.h"
 
 int main(int argc, char *argv[])
 {

diff --git a/libs/openzap/src/include/libteletone.h b/libs/openzap/src/include/libteletone.h
index 12b75d810978ac17f89ad67f486b8d4cedd00dbc..b54098c8ee7037c74a99b9115b6d581f54b1510d 100644 (file)
--- a/libs/openzap/src/include/libteletone.h
+++ b/libs/openzap/src/include/libteletone.h
@@ -136,8 +136,8 @@ typedef __int16 int16_t;
 #endif
 #endif
 
-#include "libteletone_generate.h"
-#include "libteletone_detect.h"
+#include <libteletone_generate.h>
+#include <libteletone_detect.h>
 
 #ifdef HAVE_STRING_H
 #include <string.h>

diff --git a/libs/openzap/src/libteletone_detect.c b/libs/openzap/src/libteletone_detect.c
index b0b93ad115573471d6bc4498c6bf1b5446076093..0436c259532f6c4027526f4d0816aeb420d18fad 100644 (file)
--- a/libs/openzap/src/libteletone_detect.c
+++ b/libs/openzap/src/libteletone_detect.c
@@ -57,7 +57,7 @@
  *
  */
 
-#include "../openzap/src/include/libteletone_detect.h"
+#include <libteletone_detect.h>
 
 #ifndef _MSC_VER
 #include <stdint.h>

diff --git a/libs/openzap/src/libteletone_generate.c b/libs/openzap/src/libteletone_generate.c
index 6cbde910fedc75d86e123867d2bf9798d5103e04..1d5d696af2ec780b51ca3f1f57356e3853557ed2 100644 (file)
--- a/libs/openzap/src/libteletone_generate.c
+++ b/libs/openzap/src/libteletone_generate.c
@@ -33,7 +33,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../openzap/src/include/libteletone.h"
+#include <libteletone.h>
 
 #define SMAX 32767
 #define SMIN -32768