dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

various minor fixes created while i worked on getting *every* Asterisk module to build on laptop in dev mode: 

remove weird pre-setting of LUA paths; they are not necessary; also use the proper path for including the files in pbx_lua.c

add searching for OpenAIS libraries in /usr/lib/openais if a path is not specified; not sure if this is really the optimal solution, but it works

make the compiler shut up about some ignored function results in pbx_gtkconsole; this module is badly coded anyway



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@126356 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
kpfleming 2008-06-29 16:19:29 +00:00
parent 8530e0fda8
commit 902b5c3e00
5 changed files with 3223 additions and 9195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12398
configure vendored
View File

File diff suppressed because it is too large Load Diff

4
configure.ac
View File

@ -1347,13 +1347,13 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
[${PWLIB_INCLUDE}], [${PWLIB_LIB}])
fi
LUA_INCLUDE="-I/usr/include/lua5.1"
LUA_LIB="-llua5.1"
AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h])
AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
AST_EXT_LIB_CHECK([SACLM], [SaClm], [saClmInitialize], [openais/saClm.h], [-L/usr/lib/openais])
AST_EXT_LIB_CHECK([SACLM], [SaClm], [saClmInitialize], [openais/saClm.h])
AST_EXT_LIB_CHECK([SAEVT], [SaEvt], [saEvtInitialize], [openais/saEvt.h], [-L/usr/lib/openais])
AST_EXT_LIB_CHECK([SAEVT], [SaEvt], [saEvtInitialize], [openais/saEvt.h])
AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])

2
pbx/Makefile
View File

@ -29,4 +29,6 @@ clean::
dundi-parser.o: dundi-parser.h
dundi-parser.o: ASTCFLAGS+=-I.
pbx_gtkconsole.o: ASTCFLAGS+=-Wno-strict-prototypes
$(if $(filter pbx_dundi,$(EMBEDDED_MODS)),modules.link,pbx_dundi.so): dundi-parser.o

8
pbx/pbx_gtkconsole.c
View File

@ -307,11 +307,13 @@ static int mod_update(void)
static void exit_now(GtkWidget *widget, gpointer data)
{
int res;
ast_loader_unregister(mod_update);
gtk_main_quit();
inuse--;
ast_update_use_count();
ast_unregister_verbose(verboser);
res = ast_unregister_verbose(verboser);
ast_unload_resource("pbx_gtkconsole", 0);
ast_verb(2, "GTK Console Monitor Exiting\n");
/* XXX Trying to quit after calling this makes asterisk segfault XXX */
@ -361,6 +363,8 @@ static int show_console(void)
GtkWidget *sw;
GtkWidget *bbox, *hbbox, *add, *removew, *reloadw;
char *modtitles[3] = { "Module", "Description", "Use Count" };
int res;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
statusbar = gtk_statusbar_new();
@ -465,7 +469,7 @@ static int show_console(void)
ast_pthread_create(&console_thread, NULL, consolethread, NULL);
/* XXX Okay, seriously fix me! XXX */
usleep(100000);
ast_register_verbose(verboser);
res = ast_register_verbose(verboser);
gtk_clist_freeze(GTK_CLIST(verb));
ast_loader_register(mod_update);
gtk_clist_thaw(GTK_CLIST(verb));

6
pbx/pbx_lua.c
View File

@ -41,9 +41,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/term.h"
#include "asterisk/paths.h"
#include <lua.h>
#include <lauxlib.h>
#include <lualib.h>
#include <lua5.1/lua.h>
#include <lua5.1/lauxlib.h>
#include <lua5.1/lualib.h>
static char *config = "extensions.lua";