Fix a configure issue with PJSIP transaction group lock detection.

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

diff --git a/configure b/configure
index 9e414e1e00571306af155e021e7c91fed221f975..30ec6b586cd24c01e2b4f8823d35700ea2638a02 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 400770 .
+# From configure.ac Revision: 402865 .
 # Guess values for system-dependent variables and create Makefiles.
 # 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_DIR=${pjsip_DIR}
+PJ_TRANSACTION_GRP_LOCK_OPTION=pjsip
+PJ_TRANSACTION_GRP_LOCK_DIR=${PJPROJECT_DIR}
 
 PBX_PJ_TRANSACTION_GRP_LOCK=0
 

diff --git a/configure.ac b/configure.ac
index 75b13fb9b4f42650540e9c6fbccd404876493045..918c7970bcf752e7bcad49cb1b085d67a9744bd0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -433,7 +433,7 @@ AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss])
 AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
 AST_EXT_LIB_SETUP([PJPROJECT], [PJPROJECT], [pjproject])
 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([PRI], [ISDN PRI], [pri])
 AST_EXT_LIB_SETUP_OPTIONAL([PRI_L2_PERSISTENCE], [ISDN Layer 2 persistence option], [PRI], [pri])

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 31d8efc9a8303e8627e38558f1d19bd16e002035..3f9eb55dc904092c3e93a15c66e1a30bd78ffa30 100644 (file)
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -569,8 +569,8 @@
 /* Define if your system has the PJPROJECT libraries. */
 #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
 
 /* Define to 1 if your system defines IP_PKTINFO. */