pjproject-bundled: Use AST_DEVMODE for conditional compilation.

We previously allowed resample and g711 codecs to be built when
TEST_FRAMEWORK was enabled.  This could cause errors if the testsuite
was run without this option enabled.  Switch the build system to allow
those codecs to be built when --enable-dev-mode is used.  This removes a
chance for strange testsuite errors from use of an inadequate pjsua
binary.

Change-Id: Iee8a3613cdb711fa7e7d217c5a775a575907ae22

diff --git a/configure b/configure
index ea35a547309e8e6d1471ff8de39c5fdad38e788d..1f8f756cec48e9fa3da8dc3046f0a5ccc08ac0f3 100755 (executable)
--- a/configure
+++ b/configure
@@ -9385,7 +9385,7 @@ $as_echo "configuring" >&6; }
        fi
 
        export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP
-       export NOISY_BUILD
+       export NOISY_BUILD AST_DEVMODE
        ${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} \
                PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" \
                EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" \

diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile
index c1548c992ca2737b60595448375b0e72354a797c..c4782181fc587d07a5ce9961e8cb11e439617259 100644 (file)
--- a/third-party/pjproject/Makefile
+++ b/third-party/pjproject/Makefile
@@ -54,7 +54,7 @@ ifeq ($(SPECIAL_TARGETS),)
         include source/build.mak
         CF := $(filter-out -W%,$(CC_CFLAGS))
         CF := $(filter-out -I%,$(CF))
-        ifeq ($(findstring TEST_FRAMEWORK,$(MENUSELECT_CFLAGS)),TEST_FRAMEWORK)
+        ifeq ($(AST_DEVMODE),yes)
             apps := source/pjsip-apps/bin/pjsua-$(TARGET_NAME) source/pjsip-apps/bin/pjsystest-$(TARGET_NAME)
             TARGETS += $(apps)
             ifneq ($(PYTHONDEV_LIB),)

diff --git a/third-party/pjproject/Makefile.rules b/third-party/pjproject/Makefile.rules
index 6a48e866c7da263be61eec510cd58c21f1b9d9c7..e76a753e58610c541c7b65fc21b86381f08578e9 100644 (file)
--- a/third-party/pjproject/Makefile.rules
+++ b/third-party/pjproject/Makefile.rules
@@ -39,7 +39,7 @@ PJPROJECT_CONFIG_OPTS = $(PJPROJECT_CONFIGURE_OPTS) --prefix=/opt/pjproject \
        --without-external-pa \
        --without-external-srtp
 
-ifeq ($(findstring TEST_FRAMEWORK,$(MENUSELECT_CFLAGS)),)
+ifneq ($(AST_DEVMODE),yes)
     PJPROJECT_CONFIG_OPTS += --disable-resample --disable-g711-codec
 endif
 

diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4
index 94be9b83794e7468692aeef2aa811424b7d4a949..85417100e60e67ce78ab72db52a86b4c1649da37 100644 (file)
--- a/third-party/pjproject/configure.m4
+++ b/third-party/pjproject/configure.m4
@@ -73,7 +73,7 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
        fi
 
        export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP
-       export NOISY_BUILD
+       export NOISY_BUILD AST_DEVMODE
        ${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} \
                PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" \
                EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" \