[Asterisk-code-review] Make --with-pjproject-bundled the default for Asterisk 15 (asterisk[master])

[George Joseph]

George Joseph has uploaded this change for review. ( https://gerrit.asterisk.org/6175


Change subject: Make --with-pjproject-bundled the default for Asterisk 15
......................................................................

Make --with-pjproject-bundled the default for Asterisk 15

'--with-pjproject-bundled' is now the default when running
./configure. It can be disabled with '--without-pjproject-bundled'.

ASTERISK-27189

Change-Id: Ifa9783fddf44aafadb060c9feba713dfa81d38ce
---
M CHANGES
M UPGRADE-15.txt
M configure
M configure.ac
4 files changed, 11 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/75/6175/1

diff --git a/CHANGES b/CHANGES
index 67d33c9..8b00248 100644
--- a/CHANGES
+++ b/CHANGES
@@ -34,6 +34,11 @@
    queue position has improved since the last time that we annouced their
    position. This default is no.
 
+Build System
+------------------
+ * '--with-pjproject-bundled' is now the default when running ./configure
+   It can be disabled with '--without-pjproject-bundled'.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 14.6.0 to Asterisk 14.7.0 ------------
 ------------------------------------------------------------------------------
diff --git a/UPGRADE-15.txt b/UPGRADE-15.txt
index 4ebe400..2e5eb1c 100644
--- a/UPGRADE-15.txt
+++ b/UPGRADE-15.txt
@@ -33,6 +33,10 @@
    ARI. As a result, the 'DataGet' AMI action as well as the 'data get'
    CLI command have been removed.
 
+Build System:
+ - '--with-pjproject-bundled' is now the default when running ./configure
+   It can be disabled with '--without-pjproject-bundled'.
+
 From 14.6.0 to 14.7.0:
 
 Core:
diff --git a/configure b/configure
index a6ebe00..4792edb 100755
--- a/configure
+++ b/configure
@@ -9254,7 +9254,7 @@
 	CFLAGS="$save_CFLAGS"
 
 
-PJPROJECT_BUNDLED=no
+PJPROJECT_BUNDLED=yes
 
 
 
diff --git a/configure.ac b/configure.ac
index ccd6936..f3149a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -424,7 +424,7 @@
 AST_CHECK_RAII()
 AST_CHECK_STRSEP_ARRAY_BOUNDS()
 
-PJPROJECT_BUNDLED=no
+PJPROJECT_BUNDLED=yes
 AH_TEMPLATE(m4_bpatsubst([[HAVE_PJPROJECT_BUNDLED]], [(.*)]), [Define to 1 when using the bundled pjproject.])
 
 AC_ARG_WITH([pjproject-bundled],

-- 
To view, visit https://gerrit.asterisk.org/6175
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa9783fddf44aafadb060c9feba713dfa81d38ce
Gerrit-Change-Number: 6175
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20170808/1ae6022b/attachment.html>