diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | pbx/Makefile | 2 | ||||
| -rw-r--r-- | pbx/pbx_gtkconsole.c | 8 | ||||
| -rw-r--r-- | pbx/pbx_lua.c | 6 |
5 files changed, 12 insertions, 10 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 123332 . +# From configure.ac Revision: 125146 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -41541,8 +41541,6 @@ _ACEOF fi -LUA_INCLUDE="-I/usr/include/lua5.1" -LUA_LIB="-llua5.1" if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then pbxlibdir="" diff --git a/configure.ac b/configure.ac index 514b07ada..d44384896 100644 --- a/configure.ac +++ b/configure.ac @@ -1343,8 +1343,6 @@ 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]) diff --git a/pbx/Makefile b/pbx/Makefile index 731057b1d..368f6f15a 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -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 diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c index a12e139bb..b7846d3ba 100644 --- a/pbx/pbx_gtkconsole.c +++ b/pbx/pbx_gtkconsole.c @@ -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)); diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c index 6302ac655..704d811de 100644 --- a/pbx/pbx_lua.c +++ b/pbx/pbx_lua.c @@ -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"; |