[asterisk-commits] trunk r12011 - /trunk/res/Makefile
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Mar 6 03:46:38 MST 2006
Author: oej
Date: Mon Mar 6 04:46:36 2006
New Revision: 12011
URL: http://svn.digium.com/view/asterisk?rev=12011&view=rev
Log:
Issue #6628 - Disable res_snmp on incompatible platforms until
we have a resolution for the conflict. (Corydon's patch)
Modified:
trunk/res/Makefile
Modified: trunk/res/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/res/Makefile?rev=12011&r1=12010&r2=12011&view=diff
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Mon Mar 6 04:46:36 2006
@@ -30,6 +30,17 @@
OSPLIB:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a)
ifeq (${OSPLIB},)
MODS:=$(filter-out res_osp.so,$(MODS))
+endif
+
+# NETsnmp has some difficulties on some platforms (conflict with unload_module)
+# Until we figure out if the collission is version-specific or what to do
+# we have disabled res_snmp on OS/X and *BSD
+ifeq ($(OSARCH),Darwin)
+ MODS:=$(filter-out res_snmp.so,$(MODS))
+else
+ ifeq ($(findstring BSD,$(OSARCH)),BSD)
+ MODS:=$(filter-out res_snmp.so,$(MODS))
+ endif
endif
ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/net-snmp/net-snmp-config.h),)
More information about the asterisk-commits
mailing list