<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8472">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: Instead of $PJPROJECT_LIBS with s, use $PJPROJECT_LIB everywhere.<br><br>In the script ./configure,<br>xyz_LIB is set by AST_PKG_CONFIG_CHECK and<br>xyz_LIBS is set by PKG_CHECK_MODULES within<br>AST_PKG_CONFIG_CHECK. Both are the same. In Asterisk normally the former and<br>only three times the latter was used. Let us use xyz_LIB without s, for<br>consistency with AST_EXT_LIB_CHECK. That eases understanding because now readers<br>do not have to know that xyz_LIB equals xyz_LIBS.<br><br>Change-Id: I7359860a5d730cdc784c2c48e501a082196434d3<br>---<br>M configure<br>M configure.ac<br>M main/Makefile<br>3 files changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/configure b/configure<br>index 2456b0c..20bfba7 100755<br>--- a/configure<br>+++ b/configure<br>@@ -24978,7 +24978,7 @@<br> $as_echo_n "(cached) " >&6<br> else<br> ac_check_lib_save_LIBS=$LIBS<br>-LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIBS $LIBS"<br>+LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"<br> cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br> /* end confdefs.h. */<br> <br>@@ -25019,7 +25019,7 @@<br> <br> # now check for the header.<br> if test "${AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_FOUND}" = "yes"; then<br>- PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_LIB="${pbxlibdir} -lpjsip $PJPROJECT_LIBS"<br>+ PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_LIB="${pbxlibdir} -lpjsip $PJPROJECT_LIB"<br> # if --with-PJSIP_DLG_CREATE_UAS_AND_INC_LOCK=DIR has been specified, use it.<br> if test "x${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_DIR}" != "x"; then<br> PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE="-I${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_DIR}/include"<br>@@ -25410,7 +25410,7 @@<br> $as_echo_n "(cached) " >&6<br> else<br> ac_check_lib_save_LIBS=$LIBS<br>-LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIBS $LIBS"<br>+LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"<br> cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br> /* end confdefs.h. */<br> <br>@@ -25451,7 +25451,7 @@<br> <br> # now check for the header.<br> if test "${AST_PJSIP_EXTERNAL_RESOLVER_FOUND}" = "yes"; then<br>- PJSIP_EXTERNAL_RESOLVER_LIB="${pbxlibdir} -lpjsip $PJPROJECT_LIBS"<br>+ PJSIP_EXTERNAL_RESOLVER_LIB="${pbxlibdir} -lpjsip $PJPROJECT_LIB"<br> # if --with-PJSIP_EXTERNAL_RESOLVER=DIR has been specified, use it.<br> if test "x${PJSIP_EXTERNAL_RESOLVER_DIR}" != "x"; then<br> PJSIP_EXTERNAL_RESOLVER_INCLUDE="-I${PJSIP_EXTERNAL_RESOLVER_DIR}/include"<br>diff --git a/configure.ac b/configure.ac<br>index 571987c..e2a25ad 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -2259,7 +2259,7 @@<br> if test "$PJPROJECT_BUNDLED" = "no" ; then<br> AST_PKG_CONFIG_CHECK([PJPROJECT], [libpjproject])<br> <br>- AST_EXT_LIB_CHECK([PJSIP_DLG_CREATE_UAS_AND_INC_LOCK], [pjsip], [pjsip_dlg_create_uas_and_inc_lock], [pjsip.h], [$PJPROJECT_LIBS], [$PJPROJECT_CFLAGS])<br>+ AST_EXT_LIB_CHECK([PJSIP_DLG_CREATE_UAS_AND_INC_LOCK], [pjsip], [pjsip_dlg_create_uas_and_inc_lock], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])<br> AST_EXT_LIB_CHECK([PJ_TRANSACTION_GRP_LOCK], [pjsip], [pjsip_tsx_create_uac2], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])<br> <br> saved_cppflags="${CPPFLAGS}"<br>@@ -2272,7 +2272,7 @@<br> <br> AST_EXT_LIB_CHECK([PJSIP_GET_DEST_INFO], [pjsip], [pjsip_get_dest_info], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])<br> AST_EXT_LIB_CHECK([PJ_SSL_CERT_LOAD_FROM_FILES2], [pj], [pj_ssl_cert_load_from_files2], [pjlib.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])<br>- AST_EXT_LIB_CHECK([PJSIP_EXTERNAL_RESOLVER], [pjsip], [pjsip_endpt_set_ext_resolver], [pjsip.h], [$PJPROJECT_LIBS], [$PJPROJECT_CFLAGS])<br>+ AST_EXT_LIB_CHECK([PJSIP_EXTERNAL_RESOLVER], [pjsip], [pjsip_endpt_set_ext_resolver], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])<br> <br> saved_cppflags="${CPPFLAGS}"<br> saved_libs="${LIBS}"<br>diff --git a/main/Makefile b/main/Makefile<br>index 63b65af..741ea39 100644<br>--- a/main/Makefile<br>+++ b/main/Makefile<br>@@ -297,7 +297,7 @@<br> # /lib or /usr/lib<br> $(ASTPJ_LIB): _ASTLDFLAGS+=-dynamiclib -install_name $(ASTLIBDIR)/$(ASTPJ_LIB) $(PJ_LDFLAGS)<br> $(ASTPJ_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS) -DAST_NOT_MODULE<br>-$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)<br>+$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIB) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)<br> $(ASTPJ_LIB): SOLINK=$(DYLINK)<br> <br> # Special rules for building a shared library (not a dynamically loadable module)<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8472">change 8472</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8472"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7359860a5d730cdc784c2c48e501a082196434d3 </div>
<div style="display:none"> Gerrit-Change-Number: 8472 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>