diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-08 02:41:29 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-08 02:41:29 +0000 |
commit | 8fb4e6b830c4f0afbc8a3b643a09598674fb295d (patch) | |
tree | ec6a6c3107450cb99c72a2871b78fca50df94516 /configure.ac | |
parent | 6289edf8e0624580ac7fc6c32cd4aefa08bffc2b (diff) |
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
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@262049 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 73b7f6f59..36aa0d5cd 100644 --- a/configure.ac +++ b/configure.ac @@ -1564,7 +1564,6 @@ AC_LANG_PUSH(C++) 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 @@ if test "${USE_VPB}" != "no"; then 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 @@ if test "${USE_VPB}" != "no"; then 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 |