diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-08 02:41:48 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-08 02:41:48 +0000 |
| commit | 274fd2b1f0f9b26c714ce1183fd6012702b93f82 (patch) | |
| tree | abd74546f8ff1e485ff13af792f1972f0b8d8b73 /configure | |
| parent | edf0a80ec16429fc8c68fb809644733634698901 (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.2@262051 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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 |