]> git.ipfire.org Git - thirdparty/asterisk.git/commit
build: Fix issues building pjproject
authorGeorge Joseph <gjoseph@digium.com>
Wed, 12 Jan 2022 17:12:01 +0000 (10:12 -0700)
committerJoshua Colp <jcolp@sangoma.com>
Mon, 17 Jan 2022 14:54:37 +0000 (08:54 -0600)
commitf41cce9c124e79729432f23cfddc816af2503285
tree33202183c86b67cf25e1d37f7a277db0cefe73ae
parenta611c07dd43f208cffafb75c8df094534b803f61
build: Fix issues building pjproject

The change to allow easier hacking on bundled pjproject created
a few issues:

* The new Makefile was trying to run the bundled make even if
  PJPROJECT_BUNDLED=no.  third-party/Makefile now checks for
  PJPROJECT_BUNDLED and JANSSON_BUNDLED and skips them if they
  are "no".

* When building with bundled, config_site.h was being copied
  only if a full make or a "make main" was done.  A "make res"
  would fail all the pjsip modules because they couldn't find
  config_site.h.  The Makefile now copies config_site.h and
  asterisk_malloc_debug.h into the pjproject source tree
  when it's "configure" is performed.  This is how it used
  to be before the big change.

ASTERISK-29858

Change-Id: I9427264fa3cb8b3f59a95e5f9693eac236a6f76d
third-party/Makefile
third-party/pjproject/Makefile