[Asterisk-code-review] pjproject_bundled: Honor --without-pjproject. (asterisk[13])
Friendly Automation
asteriskteam at digium.com
Fri Jun 5 09:50:54 CDT 2020
Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/14481 )
Change subject: pjproject_bundled: Honor --without-pjproject.
......................................................................
pjproject_bundled: Honor --without-pjproject.
The previous change missed that 'make' uses 'PJPROJECT_BUNDLED' anyway.
ASTERISK-28929
Change-Id: I7ef0e78a06ea391b59d95b99d46bbed3fec4fed9
---
M configure
M configure.ac
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
diff --git a/configure b/configure
index ee546e0..273cd86 100755
--- a/configure
+++ b/configure
@@ -9034,6 +9034,10 @@
fi
+if test "${with_pjproject}" == "no" || test "${with_pjproject}" == "n" ; then
+ PJPROJECT_BUNDLED=no
+fi
+
if test "$JANSSON_BUNDLED" = "yes" ; then
diff --git a/configure.ac b/configure.ac
index 4225342..2c3af3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -453,6 +453,10 @@
*) PJPROJECT_BUNDLED=yes ;;
esac])
+if test "${with_pjproject}" == "no" || test "${with_pjproject}" == "n" ; then
+ PJPROJECT_BUNDLED=no
+fi
+
THIRD_PARTY_CONFIGURE()
# AST_EXT_LIB_SETUP is used to tell configure to handle variables for
--
To view, visit https://gerrit.asterisk.org/c/asterisk/+/14481
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Change-Id: I7ef0e78a06ea391b59d95b99d46bbed3fec4fed9
Gerrit-Change-Number: 14481
Gerrit-PatchSet: 2
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20200605/0cce291f/attachment.html>
More information about the asterisk-code-review
mailing list