2
1
Эх сурвалжийг харах

libpjsip: fix ssl support

Currently, ssl support is implicitely disabled in the initial configure
options. This overrides the check for openssl below.

libpjsip is also currently only compatible with libopenssl. Change
the check to LIBOPENSSL instead of openssl, and depend on libopenssl.

Signed-off-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Adam Duskett 7 жил өмнө
parent
commit
9e479e65dc

+ 2 - 3
package/libpjsip/libpjsip.mk

@@ -50,7 +50,6 @@ LIBPJSIP_CONF_OPTS = \
 	--disable-openh264 \
 	--disable-openh264 \
 	--disable-libyuv \
 	--disable-libyuv \
 	--disable-ipp \
 	--disable-ipp \
-	--disable-ssl \
 	--disable-silk \
 	--disable-silk \
 	--with-external-srtp
 	--with-external-srtp
 
 
@@ -59,8 +58,8 @@ LIBPJSIP_CONF_OPTS = \
 # so we want to use it.
 # so we want to use it.
 LIBPJSIP_CONF_OPTS += --enable-epoll
 LIBPJSIP_CONF_OPTS += --enable-epoll
 
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LIBPJSIP_DEPENDENCIES += openssl
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
+LIBPJSIP_DEPENDENCIES += libopenssl
 LIBPJSIP_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
 LIBPJSIP_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
 else
 else
 LIBPJSIP_CONF_OPTS += --disable-ssl
 LIBPJSIP_CONF_OPTS += --disable-ssl