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.1@262050 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 0af3e9fc7824a0c6959874e787ab240e5f7f1279..a327623120039ab141ec342a3b6abfd6775d6b8e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 259850 .
+# From configure.ac Revision: 261915 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -37323,7 +37323,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
@@ -37335,7 +37334,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.  */
@@ -37388,7 +37387,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 7da3577ba610e9804ad6cae4d2511b67357e6e1c..036f01dad582a6db9c2f16b81124bf13ac65a267 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1580,7 +1580,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
@@ -1592,7 +1591,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(
@@ -1606,7 +1605,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