From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sat, 8 May 2010 02:41:48 +0000 (+0000)
Subject: Merged revisions 262048 via svnmerge from
X-Git-Tag: 1.6.2.9-rc1~2^2~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ae6347592321e26bc38c6d992e38e1c0e254483;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@262051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/configure b/configure
index 5bb80d958c..9d60669323 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 259851 .
+# From configure.ac Revision: 261916 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -39696,7 +39696,6 @@ if test "${USE_VPB}" != "no"; then
    { echo "$as_me:$LINENO: checking for vpb_open in -lvpb" >&5
 echo $ECHO_N "checking for vpb_open in -lvpb... $ECHO_C" >&6; }
    saved_libs="${LIBS}"
-   saved_cflags="${CFLAGS}"
    saved_cppflags="${CPPFLAGS}"
    if test "x${VPB_DIR}" != "x"; then
       if test -d ${VPB_DIR}/lib; then
@@ -39708,7 +39707,7 @@ echo $ECHO_N "checking for vpb_open in -lvpb... $ECHO_C" >&6; }
       CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include"
    fi
    LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb"
-   CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+   CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}"
    cat >conftest.$ac_ext <<_ACEOF
 
 	/* confdefs.h.  */
@@ -39761,7 +39760,6 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-   CFLAGS="${saved_cflags}"
    LIBS="${saved_libs}"
    CPPFLAGS="${saved_cppflags}"
    if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then
diff --git a/configure.ac b/configure.ac
index 583b255bb5..4b8051acb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1655,7 +1655,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
@@ -1667,7 +1666,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(
@@ -1681,7 +1680,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