From: Alexander Traud <pabstraud@compuserve.com>
Date: Mon, 30 Jul 2018 11:05:34 +0000 (+0200)
Subject: pjproject_bundled: Find shared libraries in root --with-ssl=PATH.
X-Git-Tag: 13.23.0-rc1~33^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d880fac93ad3a4bb8ecf963fcf6fd305b0dab44;p=thirdparty%2Fasterisk.git

pjproject_bundled: Find shared libraries in root --with-ssl=PATH.

The script configure from Teluu expects shared libraries (.so) in a subfolder
called 'lib', when --with-xyz=PATH is specified. However for OpenSSL, the
default location is the root of the source folder = PATH. Furthermore, Asterisk
supports both, 'lib' and root. For consistency and because Asterisk is using
(only) OpenSSL in PJProject, it is enhanced to support both locations, just
like Asterisk.

ASTERISK-27995

Change-Id: I8eb916a88b6b8c22e29bb40bee8faaca6c73406f
---

diff --git a/third-party/pjproject/patches/0000-configure-ssl-library-path.patch b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch
new file mode 100644
index 0000000000..0ec0e7a0e3
--- /dev/null
+++ b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch
@@ -0,0 +1,18 @@
+--- a/aconfigure.ac	(PJSIP 2.7.2)
++++ b/aconfigure.ac	(working copy)
+@@ -1571 +1571,5 @@
+-                    LDFLAGS="$LDFLAGS -L$with_ssl/lib"
++                    if test -d $with_ssl/lib; then
++                        LDFLAGS="$LDFLAGS -L$with_ssl/lib"
++                    else
++                        LDFLAGS="$LDFLAGS -L$with_ssl"
++                    fi
+--- a/aconfigure	(PJSIP 2.7.2)
++++ b/aconfigure	(working copy)
+@@ -7884 +7884,5 @@
+-                    LDFLAGS="$LDFLAGS -L$with_ssl/lib"
++                    if test -d $with_ssl/lib; then
++                        LDFLAGS="$LDFLAGS -L$with_ssl/lib"
++                    else
++                        LDFLAGS="$LDFLAGS -L$with_ssl"
++                    fi