[asterisk-commits] russell: branch 1.6.0 r108741 - in /branches/1.6.0: ./ acinclude.m4 configure

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Mar 14 12:05:47 CDT 2008


Author: russell
Date: Fri Mar 14 12:05:47 2008
New Revision: 108741

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

........
r108740 | russell | 2008-03-14 12:05:11 -0500 (Fri, 14 Mar 2008) | 5 lines

Do a link test in AST_EXT_TOOL_CHECK() to ensure we have all the required libs
reported by the tool.

(closes issue #12067, reported by Juggie, patched by me)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/acinclude.m4
    branches/1.6.0/configure

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

Modified: branches/1.6.0/acinclude.m4
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/acinclude.m4?view=diff&rev=108741&r1=108740&r2=108741
==============================================================================
--- branches/1.6.0/acinclude.m4 (original)
+++ branches/1.6.0/acinclude.m4 Fri Mar 14 12:05:47 2008
@@ -230,7 +230,10 @@
 		fi
 		CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
 
-		AC_COMPILE_IFELSE(
+		saved_ldflags="${LDFLAGS}"
+		LDFLAGS="${$1_LIB}"
+
+		AC_LINK_IFELSE(
 		    [ AC_LANG_PROGRAM( [ $5 ],
 				       [ $6; ]
 				       )],
@@ -240,6 +243,7 @@
 		    []
 		)
 		CPPFLAGS="${saved_cppflags}"
+		LDFLAGS="${saved_ldflags}"
 	    else
 		PBX_$1=1
 		AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])




More information about the asterisk-commits mailing list