support new version of OSP toolkit (issue #5168)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6653 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index fcb9d7686a5b4a974671d819b966bb47e420ec16..914f388c57e08c8c3ceaab8155b7b285d78b6e92 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -226,8 +226,12 @@ ifeq ($(PROC),ppc)
   ASTCFLAGS+=-fsigned-char
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
-  ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
+  ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp
+else
+  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+    ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
+  endif
 endif
 
 ifeq (${OSARCH},FreeBSD)

diff --git a/apps/Makefile b/apps/Makefile
index 1de3db955eb96324cb713efcb4f19cbe71a4e7ab..5bc26a91a0b23ba026bbd533d9a53402850150c9 100755 (executable)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -47,7 +47,7 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard
   APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
 APPS+=app_osplookup.so
 endif
 

diff --git a/res/Makefile b/res/Makefile
index 5804b217177aadb500b8e6bbedf215fa68652937..4386f05dbad4e5a9700cb6e0fe452dbca0365f89 100755 (executable)
--- a/res/Makefile
+++ b/res/Makefile
@@ -23,9 +23,14 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CR
   MODS+=res_odbc.so
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
   MODS+=res_osp.so
-  OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libosp.a
+  OSPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a
+else
+  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+    MODS+=res_osp.so
+    OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libosp.a
+  endif
 endif
 
 ifeq ($(findstring BSD,${OSARCH}),BSD)