[asterisk-commits] russell: branch group/bindings r189853 - in /team/group/bindings: ./ contrib/...

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Apr 22 09:55:30 2009
New Revision: 189853

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189853
Log:
resolve, reset

Modified:
    team/group/bindings/   (props changed)
    team/group/bindings/configure
    team/group/bindings/configure.ac
    team/group/bindings/contrib/scripts/get_ilbc_source.sh

Propchange: team/group/bindings/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/bindings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/bindings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 22 09:55:30 2009
@@ -1,1 +1,1 @@
-/trunk:1-189786
+/trunk:1-189852

Modified: team/group/bindings/configure.ac
URL: http://svn.digium.com/svn-view/asterisk/team/group/bindings/configure.ac?view=diff&rev=189853&r1=189852&r2=189853
==============================================================================
--- team/group/bindings/configure.ac (original)
+++ team/group/bindings/configure.ac Wed Apr 22 09:55:30 2009
@@ -1605,7 +1605,9 @@
 # End Python Check
 #------------------------------------------------------------
 
-AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h]) 
+AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h], [-lm]) 
+# Some distributions (like SuSE) remove the 5.1 suffix.
+AST_EXT_LIB_CHECK([LUA], [lua], [luaL_register], [lua.h], [-lm]) 
 
 AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
 

Modified: team/group/bindings/contrib/scripts/get_ilbc_source.sh
URL: http://svn.digium.com/svn-view/asterisk/team/group/bindings/contrib/scripts/get_ilbc_source.sh?view=diff&rev=189853&r1=189852&r2=189853
==============================================================================
--- team/group/bindings/contrib/scripts/get_ilbc_source.sh (original)
+++ team/group/bindings/contrib/scripts/get_ilbc_source.sh Wed Apr 22 09:55:30 2009
@@ -22,7 +22,7 @@
 
 wget -P codecs/ilbc http://www.ietf.org/rfc/rfc3951.txt
 
-wget -q -O - http://www.ilbcfreeware.org/documentation/extract-cfile.awk | sed -e 's/\r//g' > codecs/ilbc/extract-cfile.awk
+wget -q -O - http://www.ilbcfreeware.org/documentation/extract-cfile.awk | tr -d '\r' > codecs/ilbc/extract-cfile.awk
 
 (cd codecs/ilbc && awk -f extract-cfile.awk rfc3951.txt)