[Asterisk-cvs] asterisk/res Makefile,1.25,1.26

[kpfleming]

Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv3474/res

Modified Files:
	Makefile 
Log Message:
find OSP toolkit library properly


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/res/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile	16 Oct 2005 03:10:33 -0000	1.25
+++ Makefile	28 Oct 2005 23:53:07 -0000	1.26
@@ -27,13 +27,23 @@
   MODS+=res_crypto.so
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a),)
   MODS+=res_osp.so
-  OSPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a
+  OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a
 else
-  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a),)
     MODS+=res_osp.so
-    OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libosp.a
+    OSPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a
+  endif
+endif
+
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosp.a),)
+  MODS+=res_osp.so
+  OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libosp.a
+else
+  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libosp.a),)
+    MODS+=res_osp.so
+    OSPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libosp.a
   endif
 endif