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 ee546e03c73e337d7a33caffbd4c853efd842fd6..273cd86341e74c8622009ba94eb7a3384a2bc9e4 100755 (executable)
--- a/configure
+++ b/configure
@@ -9034,6 +9034,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 4225342b0cf64e73e5e444e08957aad9746b4a2d..2c3af3bc1dfbe4530dfb89ba9e7e20ccdc7a3786 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -453,6 +453,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