pjproject_bundled: Repair ./configure --with-ssl=PATH.
authorAlexander Traud <pabstraud@compuserve.com>
Tue, 29 May 2018 14:31:53 +0000 (16:31 +0200)
committerGeorge Joseph <gjoseph@digium.com>
Wed, 18 Jul 2018 18:56:03 +0000 (13:56 -0500)
Previously, Asterisk did not tell its bundled PJProject about this configure
parameter. Therefore, PJProject used the platform provided OpenSSL always.

ASTERISK-27880

Change-Id: Iea545aec854dd0e2c061c69bb118a76ce56c5dc6

configure
third-party/pjproject/configure.m4

index 984f53b..088a142 100755 (executable)
--- a/configure
+++ b/configure
@@ -9213,6 +9213,23 @@ $as_echo "configuring" >&6; }
        if test "$host" != "$this_host" ; then
                PJPROJECT_CONFIGURE_OPTS+=" --host=$host"
        fi
+       # This was a copy of the autoconf generated code from the root ./configure.
+       # Hopefully, when you read this, the code is still the same.
+       if test "${with_ssl+set}" = set; then :
+               case $with_ssl in
+               n|no)
+               PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"
+               ;;
+               y|ye|yes)
+               # This is the default value in PJProject and means "autodetect".
+               # In Asterisk, "./configure --with-ssl" means "must be present".
+               PJPROJECT_CONFIGURE_OPTS+=" --enable-ssl"
+               ;;
+               *)
+               PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"
+               ;;
+               esac
+       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
index 9b70e09..ecdd138 100644 (file)
@@ -54,6 +54,23 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
        if test "$host" != "$this_host" ; then
                PJPROJECT_CONFIGURE_OPTS+=" --host=$host"
        fi
+       # This was a copy of the autoconf generated code from the root ./configure.
+       # Hopefully, when you read this, the code is still the same.
+       if test "${with_ssl+set}" = set; then :
+               case $with_ssl in
+               n|no)
+               PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"
+               ;;
+               y|ye|yes)
+               # This is the default value in PJProject and means "autodetect".
+               # In Asterisk, "./configure --with-ssl" means "must be present".
+               PJPROJECT_CONFIGURE_OPTS+=" --enable-ssl"
+               ;;
+               *)
+               PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"
+               ;;
+               esac
+       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