pjproject_bundled: fix cross-compilation with ssl libs

Asterisk makefiles auto-detect ssl library availability,
then they assume that pjproject makefiles will also autodetect
an ssl library at the same time, so they do not pass on the
autodetection result to pjproject.

This normally works, except the pjproject makefiles disables
autodetection when cross-compiling.

Fix by explicitly configuring pjproject to use ssl if we
have been told to use it or it was autodetected

ASTERISK-30424 #close

Change-Id: I8fe2999ea46710e21d1d55a1bed92769c6ebded9
pull/31/head
Nick French 2 years ago committed by Friendly Automation
parent fd95998b56
commit a71f86d1a1

6
configure vendored

@ -10093,12 +10093,16 @@ $as_echo "configuring" >&6; }
y|ye|yes) y|ye|yes)
# Not to mention SSL is the default in PJProject and means "autodetect". # Not to mention SSL is the default in PJProject and means "autodetect".
# In Asterisk, "./configure --with-ssl" means "must be present". # In Asterisk, "./configure --with-ssl" means "must be present".
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS}" PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl"
;; ;;
*) *)
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}" PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}"
;; ;;
esac esac
else
if test $PBX_OPENSSL -eq 1 ; then
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl"
fi
fi fi
# Determine if we're doing an out-of-tree build... # Determine if we're doing an out-of-tree build...

@ -74,12 +74,16 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
y|ye|yes) y|ye|yes)
# Not to mention SSL is the default in PJProject and means "autodetect". # Not to mention SSL is the default in PJProject and means "autodetect".
# In Asterisk, "./configure --with-ssl" means "must be present". # In Asterisk, "./configure --with-ssl" means "must be present".
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS}" PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl"
;; ;;
*) *)
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}" PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}"
;; ;;
esac esac
else
if test $PBX_OPENSSL -eq 1 ; then
PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl"
fi
fi fi
# Determine if we're doing an out-of-tree build... # Determine if we're doing an out-of-tree build...

Loading…
Cancel
Save