Merge branch 'master' into 4.next

[users/jgh/exim.git] / doc / doc-txt / openssl.txt

diff --git a/doc/doc-txt/openssl.txt b/doc/doc-txt/openssl.txt
index fc2aab0649eebc0cb09e97111de14a5fdb2473b1..95ceccc0bfcd873dcf2b465b8056db93d4db545b 100644 (file)
--- a/doc/doc-txt/openssl.txt
+++ b/doc/doc-txt/openssl.txt
@@ -36,8 +36,9 @@ Extract the current source of OpenSSL.  Change into that directory.
 This assumes that `/opt/openssl` is not in use.  If it is, pick
 something else.  `/opt/exim/openssl` perhaps.
 
-    ./config --prefix=/opt/openssl --openssldir=/etc/ssl
-    enable-ssl-trace
+    ./config --prefix=/opt/openssl --openssldir=/etc/ssl  \
+        -L/opt/openssl/lib -Wl,-R/opt/openssl/lib         \
+        enable-ssl-trace
     make
     make install
 
@@ -50,9 +51,9 @@ the relevant directory into the rpath stamped into the binary:
 
     SUPPORT_TLS=yes
     USE_OPENSSL_PC=openssl
-    EXTRALIBS_EXIM=-ldl -Wl,-rpath,/opt/openssl/lib
+    LDFLAGS=-ldl -Wl,-rpath,/opt/openssl/lib
 
-The -ldl is needed by OpenSSL 1.1+ on Linux and is not needed on most
+The -ldl is needed by OpenSSL 1.0.2+ on Linux and is not needed on most
 other platforms.
 
 Then tell pkg-config how to find the configuration files for your new
@@ -62,6 +63,9 @@ OpenSSL install, and build Exim:
     make
     sudo make install
 
+(From Exim 4.89, you can put that `PKG_CONFIG_PATH` directly into
+ your `Local/Makefile` file.)
+
 
 Confirming
 ----------
@@ -86,6 +90,11 @@ If the `chrpath` package is installed, then:
 
 will show the DT_RPATH stamped into the binary.
 
+Your `binutils` package should come with `readelf`, so an alternative
+is to run:
+
+    readelf -d $(which exim) | grep RPATH
+
 
 Very Advanced
 -------------