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 49b0ea83425cfd8a1ef8e16a2c1e9b43d3393b59..f7172599cdace74b01f4a8b6439776af490a9c84 100755 (executable)
--- 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 33fa1424490b22a0ba0695ee3fa8397b3630ca97..562318c7b9b182217de95e5a21a65e040f6cd3c7 100644 (file)
--- 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