From: Alexander Traud <pabstraud@compuserve.com>
Date: Tue, 2 Jun 2020 11:24:11 +0000 (+0200)
Subject: pjproject_bundled: Honor --without-pjproject.
X-Git-Tag: 16.12.0-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a82965876285f32ea4e1e96fd875539ae50e77ad;p=thirdparty%2Fasterisk.git

pjproject_bundled: Honor --without-pjproject.

The previous change missed that 'make' uses 'PJPROJECT_BUNDLED' anyway.

ASTERISK-28929

Change-Id: I7ef0e78a06ea391b59d95b99d46bbed3fec4fed9
---

diff --git a/configure b/configure
index 49b0ea8342..f7172599cd 100755
--- a/configure
+++ b/configure
@@ -9057,6 +9057,10 @@ if test "${with_pjproject_bundled+set}" = set; then :
 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 33fa142449..562318c7b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -452,6 +452,10 @@ AC_ARG_WITH([pjproject-bundled],
 	      *) 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