diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-01 17:22:47 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-01 17:22:47 +0000 |
| commit | f591c4add5e6c5fd5503759f492facb60b9a8bdb (patch) | |
| tree | ef7b37217fb31614e1cffc6b1730584f45317c94 /res | |
| parent | 2198289d03c636a2a927a773d4c0ed01a4acb489 (diff) | |
make the AIS checking a little more generic, and have a more useful configure script command line option for OpenAIS
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@127017 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/Makefile | 2 | ||||
| -rw-r--r-- | res/ais/ais.h | 12 | ||||
| -rw-r--r-- | res/res_ais.c | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/res/Makefile b/res/Makefile index a7ba0833f..ecde5ad00 100644 --- a/res/Makefile +++ b/res/Makefile @@ -35,6 +35,8 @@ ael/ael_lex.o: ASTCFLAGS+=-I. -Iael -Wno-unused ael/ael.tab.o: ael/ael.tab.c ael/ael.tab.h ../include/asterisk/ael_structs.h ael/ael.tab.o: ASTCFLAGS+=-I. -Iael -DYYENABLE_NLS=0 +ais/clm.o ais/evt.o: ASTCFLAGS+=${AIS_INCLUDE} + $(if $(filter res_ais,$(EMBEDDED_MODS)),modules.link,res_ais.so): ais/clm.o ais/evt.o $(if $(filter res_snmp,$(EMBEDDED_MODS)),modules.link,res_snmp.so): snmp/agent.o diff --git a/res/ais/ais.h b/res/ais/ais.h index 2c4c18a87..6aaeadf15 100644 --- a/res/ais/ais.h +++ b/res/ais/ais.h @@ -25,12 +25,12 @@ * \arg http://www.openais.org/ */ -#ifndef AST_AIS_H -#define AST_AIS_H +#ifndef RES_AIS_AIS_H +#define RES_AIS_AIS_H -#include <openais/saAis.h> -#include <openais/saClm.h> -#include <openais/saEvt.h> +#include <saAis.h> +#include <saClm.h> +#include <saEvt.h> extern SaVersionT ais_version; @@ -45,4 +45,4 @@ int ast_ais_evt_unload_module(void); const char *ais_err2str(SaAisErrorT error); -#endif /* AST_AIS_H */ +#endif /* RES_AIS_AIS_H */ diff --git a/res/res_ais.c b/res/res_ais.c index 884eb0d23..865f42458 100644 --- a/res/res_ais.c +++ b/res/res_ais.c @@ -29,8 +29,7 @@ */ /*** MODULEINFO - <depend>SaClm</depend> - <depend>SaEvt</depend> + <depend>ais</depend> ***/ #include "asterisk.h" |