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
This commit is contained in:
Alexander Traud 2018-07-30 13:05:34 +02:00
parent 9fcb3aeb07
commit 1c7c867ce0
1 changed files with 18 additions and 0 deletions

View File

@ -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