Changed libsng_isdn and libsng_ss7 include paths

diff --git a/libs/freetdm/Makefile.am b/libs/freetdm/Makefile.am
index ef63120dfb8b8f0666e30c61185066d080fd9e25..b4eb76d6fdf396b0174cad22a2d424db795c4a3b 100644 (file)
--- a/libs/freetdm/Makefile.am
+++ b/libs/freetdm/Makefile.am
@@ -40,14 +40,6 @@ library_includedir = $(prefix)/include
 
 INCS  = -I$(FT_SRCDIR)/$(SRC)/include -I$(FT_SRCDIR)/$(SRC)/include/private
 
-if HAVE_SNG_SS7
-INCS += -I/usr/include/sng_ss7
-endif 
-
-if HAVE_SNG_ISDN
-INCS += -I/usr/include/sng_isdn
-endif 
-
 # we needed to separate CFLAGS in FTDM_COMPAT_CFLAGS and FTDM_CFLAGS due to -c99 which causes problems with wanpipe headers
 FTDM_COMPAT_CFLAGS = $(INCS) -DFTDM_CONFIG_DIR=\"@confdir@\" -DFTDM_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_COMPAT_CFLAGS@ @DEFS@
 FTDM_CFLAGS = $(INCS) -DFTDM_CONFIG_DIR=\"@confdir@\" -DFTDM_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_CFLAGS@ @DEFS@

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
index 7559fec675b48ae0e1d2071267605670920e7717..08adc6ef6bff35b9edd50cc17985a9d5b0f249d6 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
@@ -49,7 +49,7 @@
 #include "private/ftdm_core.h"
 #include "ftmod_sangoma_isdn_user.h"
 
-#include <sng_isdn.h>
+#include <sng_isdn/sng_isdn.h>
 
 /* Theoretical limit for MAX_SPANS_PER_NFAS_LINK is 31,
    but set to 8 for now to save some memory */

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 11ff2318bb76127488c4d0eb6eac08d20c673368..10160aa47bafaf319a84bee0aba4af076272c200 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -45,7 +45,7 @@
 
 #include "private/ftdm_core.h"
 
-#include "sng_ss7.h"
+#include "sng_ss7/sng_ss7.h"
 
 /******************************************************************************/