kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a configure issue with PJSIP transaction group lock detection.

Browse Source 
The configure check did not use the provided paths for pjproject
if provided when looking for transaction group lock support.
........

Merged revisions 403160 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403161 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2013-11-26 22:34:08 +00:00
parent ed48377994
commit c321b1f454
3 changed files with 6 additions and 6 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: 400770 . # From configure.ac Revision: 402865 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for asterisk trunk. # Generated by GNU Autoconf 2.69 for asterisk trunk.
# #
@@ -10156,8 +10156,8 @@ fi
PJ_TRANSACTION_GRP_LOCK_DESCRIP="PJSIP Transaction Group Lock Support" PJ_TRANSACTION_GRP_LOCK_DESCRIP="PJSIP Transaction Group Lock Support"
PJ_TRANSACTION_GRP_LOCK_OPTION=pjsip
PJ_TRANSACTION_GRP_LOCK_DIR=${pjsip_DIR} PJ_TRANSACTION_GRP_LOCK_DIR=${PJPROJECT_DIR}
PBX_PJ_TRANSACTION_GRP_LOCK=0 PBX_PJ_TRANSACTION_GRP_LOCK=0

2
configure.ac
View File

@@ -433,7 +433,7 @@ AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss])
AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres]) AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
AST_EXT_LIB_SETUP([PJPROJECT], [PJPROJECT], [pjproject]) AST_EXT_LIB_SETUP([PJPROJECT], [PJPROJECT], [pjproject])
AST_EXT_LIB_SETUP([POPT], [popt], [popt]) AST_EXT_LIB_SETUP([POPT], [popt], [popt])
AST_EXT_LIB_SETUP_OPTIONAL([PJ_TRANSACTION_GRP_LOCK], [PJSIP Transaction Group Lock Support], [pjsip]) AST_EXT_LIB_SETUP_OPTIONAL([PJ_TRANSACTION_GRP_LOCK], [PJSIP Transaction Group Lock Support], [PJPROJECT], [pjsip])
AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio]) AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri]) AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
AST_EXT_LIB_SETUP_OPTIONAL([PRI_L2_PERSISTENCE], [ISDN Layer 2 persistence option], [PRI], [pri]) AST_EXT_LIB_SETUP_OPTIONAL([PRI_L2_PERSISTENCE], [ISDN Layer 2 persistence option], [PRI], [pri])

4
include/asterisk/autoconfig.h.in
View File

@@ -569,8 +569,8 @@
/* Define if your system has the PJPROJECT libraries. */ /* Define if your system has the PJPROJECT libraries. */
#undef HAVE_PJPROJECT #undef HAVE_PJPROJECT
/* Define to 1 if pjsip has the PJSIP Transaction Group Lock Support feature. /* Define to 1 if PJPROJECT has the PJSIP Transaction Group Lock Support
*/ feature. */
#undef HAVE_PJ_TRANSACTION_GRP_LOCK #undef HAVE_PJ_TRANSACTION_GRP_LOCK
/* Define to 1 if your system defines IP_PKTINFO. */ /* Define to 1 if your system defines IP_PKTINFO. */