kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 00:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use CPPFLAGS to pass PTHREAD_CFLAGS for vpb only

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@262048 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-05-08 02:40:01 +00:00
parent dd3343c33d
commit 49b292babf
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 259848 . # From configure.ac Revision: 261913 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6. # Generated by GNU Autoconf 2.61 for asterisk 1.6.
# #
@@ -44659,7 +44659,6 @@ if test "${USE_VPB}" != "no"; then
{ echo "$as_me:$LINENO: checking for vpb_open in -lvpb" >&5 { echo "$as_me:$LINENO: checking for vpb_open in -lvpb" >&5
echo $ECHO_N "checking for vpb_open in -lvpb... $ECHO_C" >&6; } echo $ECHO_N "checking for vpb_open in -lvpb... $ECHO_C" >&6; }
saved_libs="${LIBS}" saved_libs="${LIBS}"
saved_cflags="${CFLAGS}"
saved_cppflags="${CPPFLAGS}" saved_cppflags="${CPPFLAGS}"
if test "x${VPB_DIR}" != "x"; then if test "x${VPB_DIR}" != "x"; then
if test -d ${VPB_DIR}/lib; then if test -d ${VPB_DIR}/lib; then
@@ -44671,7 +44670,7 @@ echo $ECHO_N "checking for vpb_open in -lvpb... $ECHO_C" >&6; }
CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include" CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include"
fi fi
LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb" LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS" CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
@@ -44724,7 +44723,6 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
CFLAGS="${saved_cflags}"
LIBS="${saved_libs}" LIBS="${saved_libs}"
CPPFLAGS="${saved_cppflags}" CPPFLAGS="${saved_cppflags}"
if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then

4
configure.ac
View File

@@ -1730,7 +1730,6 @@ AC_LANG_PUSH(C++)
if test "${USE_VPB}" != "no"; then if test "${USE_VPB}" != "no"; then
AC_MSG_CHECKING(for vpb_open in -lvpb) AC_MSG_CHECKING(for vpb_open in -lvpb)
saved_libs="${LIBS}" saved_libs="${LIBS}"
saved_cflags="${CFLAGS}"
saved_cppflags="${CPPFLAGS}" saved_cppflags="${CPPFLAGS}"
if test "x${VPB_DIR}" != "x"; then if test "x${VPB_DIR}" != "x"; then
if test -d ${VPB_DIR}/lib; then if test -d ${VPB_DIR}/lib; then
@@ -1742,7 +1741,7 @@ if test "${USE_VPB}" != "no"; then
CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include" CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include"
fi fi
LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb" LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS" CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}"
AC_LINK_IFELSE( AC_LINK_IFELSE(
[ [
AC_LANG_PROGRAM( AC_LANG_PROGRAM(
@@ -1756,7 +1755,6 @@ if test "${USE_VPB}" != "no"; then
ac_cv_lib_vpb_vpb_open="no" ac_cv_lib_vpb_vpb_open="no"
] ]
) )
CFLAGS="${saved_cflags}"
LIBS="${saved_libs}" LIBS="${saved_libs}"
CPPFLAGS="${saved_cppflags}" CPPFLAGS="${saved_cppflags}"
if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then