[asterisk-commits] tilghman: branch 1.6.0 r262049 - in /branches/1.6.0: ./ configure configure.ac
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri May 7 21:41:33 CDT 2010
Author: tilghman
Date: Fri May 7 21:41:29 2010
New Revision: 262049
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=262049
Log:
Merged revisions 262048 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r262048 | tilghman | 2010-05-07 21:40:01 -0500 (Fri, 07 May 2010) | 2 lines
Use CPPFLAGS to pass PTHREAD_CFLAGS for vpb only
........
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/configure
branches/1.6.0/configure.ac
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configure.ac?view=diff&rev=262049&r1=262048&r2=262049
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Fri May 7 21:41:29 2010
@@ -1564,7 +1564,6 @@
if test "${USE_VPB}" != "no"; then
AC_MSG_CHECKING(for vpb_open in -lvpb)
saved_libs="${LIBS}"
- saved_cflags="${CFLAGS}"
saved_cppflags="${CPPFLAGS}"
if test "x${VPB_DIR}" != "x"; then
if test -d ${VPB_DIR}/lib; then
@@ -1576,7 +1575,7 @@
CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include"
fi
LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}"
AC_LINK_IFELSE(
[
AC_LANG_PROGRAM(
@@ -1590,7 +1589,6 @@
ac_cv_lib_vpb_vpb_open="no"
]
)
- CFLAGS="${saved_cflags}"
LIBS="${saved_libs}"
CPPFLAGS="${saved_cppflags}"
if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then
More information about the asterisk-commits
mailing list