[asterisk-commits] tilghman: branch 1.6.2 r265748 - in /branches/1.6.2: ./ include/asterisk/ pbx/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue May 25 19:33:49 2010
New Revision: 265748

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

........
  r265747 | tilghman | 2010-05-25 19:29:40 -0500 (Tue, 25 May 2010) | 8 lines
  
  Use configure to determine the prefixes and include directories properly.
  
  This ensures cross-platform compatibility, even among Linux distributions,
  which don't always put headers in the same place.
  
  (closes issue #17391)
   Reported by: loloski
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/configure
    branches/1.6.2/configure.ac
    branches/1.6.2/include/asterisk/autoconfig.h.in
    branches/1.6.2/pbx/pbx_lua.c

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

Modified: branches/1.6.2/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configure.ac?view=diff&rev=265748&r1=265747&r2=265748
==============================================================================
--- branches/1.6.2/configure.ac (original)
+++ branches/1.6.2/configure.ac Tue May 25 19:33:49 2010
@@ -1560,7 +1560,11 @@
 
 AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h], [-lm]) 
 if test "x${PBX_LUA}" = "x1" ; then
-	AC_DEFINE_UNQUOTED([LUA51_PREFIX], [1], [Define to 1 if lua is found with a lua5.1 prefix])
+	if test x"${LUA_DIR}" = x; then
+		LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"
+	else
+		LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"
+	fi
 fi
 	
 # Some distributions (like SuSE) remove the 5.1 suffix.

Modified: branches/1.6.2/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/include/asterisk/autoconfig.h.in?view=diff&rev=265748&r1=265747&r2=265748
==============================================================================
--- branches/1.6.2/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.2/include/asterisk/autoconfig.h.in Tue May 25 19:33:49 2010
@@ -908,9 +908,6 @@
 /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
    slash. */
 #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
-
-/* Define to 1 if lua is found with a lua5.1 prefix */
-#undef LUA51_PREFIX
 
 /* Build chan_misdn for mISDN 1.2 or later. */
 #undef MISDN_1_2

Modified: branches/1.6.2/pbx/pbx_lua.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/pbx/pbx_lua.c?view=diff&rev=265748&r1=265747&r2=265748
==============================================================================
--- branches/1.6.2/pbx/pbx_lua.c (original)
+++ branches/1.6.2/pbx/pbx_lua.c Tue May 25 19:33:49 2010
@@ -42,15 +42,9 @@
 #include "asterisk/paths.h"
 #include "asterisk/hashtab.h"
 
-#ifdef LUA51_PREFIX
-#include <lua5.1/lua.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
-#else
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#endif
 
 static char *config = "extensions.lua";
 static char *registrar = "pbx_lua";