From 0a4dffe6f85775df4c96223ebdb832c324cfe1a7 Mon Sep 17 00:00:00 2001 From: Alexander Traud Date: Tue, 2 Jun 2020 13:24:11 +0200 Subject: [PATCH] pjproject_bundled: Honor --without-pjproject. The previous change missed that 'make' uses 'PJPROJECT_BUNDLED' anyway. ASTERISK-28929 Change-Id: I7ef0e78a06ea391b59d95b99d46bbed3fec4fed9 --- configure | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/configure b/configure index f7947974de..6ab81b4eb4 100755 --- a/configure +++ b/configure @@ -9065,6 +9065,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 1ae50a6fa8..0fe37b05e3 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