[asterisk-commits] tilghman: branch 1.6.1 r192134 - in /branches/1.6.1: ./ autoconf/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon May  4 13:44:58 2009
New Revision: 192134

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=192134
Log:
Merged revisions 192132 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r192132 | tilghman | 2009-05-04 13:42:56 -0500 (Mon, 04 May 2009) | 6 lines
  
  Pass libraries in LIBS, not LDFLAGS.
  (closes issue #14671)
   Reported by: Chainsaw
   Patches: 
         asterisk-1.6.0.6-toolcheck-libs-not-ldflags.patch uploaded by Chainsaw (license 723)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/autoconf/ast_ext_tool_check.m4

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

Modified: branches/1.6.1/autoconf/ast_ext_tool_check.m4
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/autoconf/ast_ext_tool_check.m4?view=diff&rev=192134&r1=192133&r2=192134
==============================================================================
--- branches/1.6.1/autoconf/ast_ext_tool_check.m4 (original)
+++ branches/1.6.1/autoconf/ast_ext_tool_check.m4 Mon May  4 13:44:58 2009
@@ -20,8 +20,8 @@
 		fi
 		CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
 
-		saved_ldflags="${LDFLAGS}"
-		LDFLAGS="${$1_LIB}"
+		saved_libs="${LIBS}"
+		LIBS="${$1_LIB}"
 
 		AC_LINK_IFELSE(
 		    [ AC_LANG_PROGRAM( [ $5 ],
@@ -33,7 +33,7 @@
 		    []
 		)
 		CPPFLAGS="${saved_cppflags}"
-		LDFLAGS="${saved_ldflags}"
+		LIBS="${saved_libs}"
 	    else
 		PBX_$1=1
 		AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])