diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-23 01:50:55 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-23 01:50:55 +0000 |
commit | 265f81cb5dfd65e174caaf7fb18a40b2683b814e (patch) | |
tree | 7a170571d4f0fe3f1da900cbd12cee0f9cc7dc16 /res | |
parent | c28707b6f17345b45ed0f75891763368f4180e01 (diff) |
add basic autoconf support for res_snmp
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35607 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/Makefile | 19 | ||||
-rw-r--r-- | res/res_snmp.c | 1 |
2 files changed, 2 insertions, 18 deletions
diff --git a/res/Makefile b/res/Makefile index c8781ed1c..fdfd1e074 100644 --- a/res/Makefile +++ b/res/Makefile @@ -23,23 +23,6 @@ ifeq ($(OSARCH),FreeBSD) SELECTED_MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc"; fi),$(SELECTED_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) - SELECTED_MODS:=$(filter-out res_snmp,$(SELECTED_MODS)) -else - ifeq ($(findstring BSD,$(OSARCH)),BSD) - SELECTED_MODS:=$(filter-out res_snmp,$(SELECTED_MODS)) - endif -endif - -ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/net-snmp/net-snmp-config.h),) - SELECTED_MODS:=$(filter-out res_snmp,$(SELECTED_MODS)) -else - SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs) -endif - MODS:=$(patsubst %,%.so,$(SELECTED_MODS)) all: $(MODS) @@ -97,7 +80,7 @@ res_config_odbc.o: res_config_odbc.c $(CC) -c -o $@ $(CFLAGS) $(ODBC_INCLUDE) $< res_snmp.so: res_snmp.o snmp/agent.o - $(CC) $(SOLINK) $(SNMP_LDFLAGS) -o $@ $< snmp/agent.o $(SNMP_LDLIBS) + $(CC) $(SOLINK) -o $@ $< snmp/agent.o $(NETSNMP_LIBS) res_config_pgsql.so: res_config_pgsql.o $(CC) $(SOLINK) -o $@ $< $(PGSQL_LIB) diff --git a/res/res_snmp.c b/res/res_snmp.c index 5fb48d5d4..bacc43962 100644 --- a/res/res_snmp.c +++ b/res/res_snmp.c @@ -15,6 +15,7 @@ */ /*** MODULEINFO + <depend>netsnmp</depend> <defaultenabled>no</defaultenabled> ***/ |