[svn-commits] kpfleming: branch 1.6.0 r126363 - in /branches/1.6.0: ./ pbx/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Sun Jun 29 12:02:25 2008
New Revision: 126363

URL: http://svn.digium.com/view/asterisk?view=rev&rev=126363
Log:
Merged revisions 126356 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r126356 | kpfleming | 2008-06-29 09:19:29 -0700 (Sun, 29 Jun 2008) | 9 lines

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

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


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configure
    branches/1.6.0/configure.ac
    branches/1.6.0/pbx/Makefile
    branches/1.6.0/pbx/pbx_gtkconsole.c
    branches/1.6.0/pbx/pbx_lua.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=126363&r1=126362&r2=126363
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Sun Jun 29 12:02:25 2008
@@ -1343,8 +1343,6 @@
 		[${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])

Modified: branches/1.6.0/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/Makefile?view=diff&rev=126363&r1=126362&r2=126363
==============================================================================
--- branches/1.6.0/pbx/Makefile (original)
+++ branches/1.6.0/pbx/Makefile Sun Jun 29 12:02:25 2008
@@ -29,4 +29,6 @@
 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

Modified: branches/1.6.0/pbx/pbx_gtkconsole.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/pbx_gtkconsole.c?view=diff&rev=126363&r1=126362&r2=126363
==============================================================================
--- branches/1.6.0/pbx/pbx_gtkconsole.c (original)
+++ branches/1.6.0/pbx/pbx_gtkconsole.c Sun Jun 29 12:02:25 2008
@@ -307,11 +307,13 @@
 
 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 @@
 	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 @@
 	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));

Modified: branches/1.6.0/pbx/pbx_lua.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/pbx_lua.c?view=diff&rev=126363&r1=126362&r2=126363
==============================================================================
--- branches/1.6.0/pbx/pbx_lua.c (original)
+++ branches/1.6.0/pbx/pbx_lua.c Sun Jun 29 12:02:25 2008
@@ -41,9 +41,9 @@
 #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";