From 7e6a8985adde2af36313e3abe5883d6f0aaa2e81 Mon Sep 17 00:00:00 2001
From: Phil Pennock <pdp@exim.org>
Date: Sat, 18 Feb 2012 09:22:27 -0500
Subject: [PATCH] Document pkg-config for TLS

---
 doc/doc-docbook/spec.xfpt | 21 ++++++++++++++++++++-
 doc/doc-txt/ChangeLog     |  3 +++
 doc/doc-txt/NewStuff      |  3 ++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 46a92dee9..8afccbf1d 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -1868,6 +1868,14 @@ SUPPORT_TLS=yes
 TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
 TLS_INCLUDE=-I/usr/local/openssl/include/
 .endd
+.new
+.cindex "pkg-config" "OpenSSL"
+If you have &'pkg-config'& available, then instead you can just use:
+.code
+SUPPORT_TLS=yes
+USE_OPENSSL_PC=openssl
+.endd
+.wen
 .cindex "USE_GNUTLS"
 If GnuTLS is installed, you should set
 .code
@@ -1883,6 +1891,16 @@ USE_GNUTLS=yes
 TLS_LIBS=-L/usr/gnu/lib -lgnutls -ltasn1 -lgcrypt
 TLS_INCLUDE=-I/usr/gnu/include
 .endd
+.new
+.cindex "pkg-config" "GnuTLS"
+If you have &'pkg-config'& available, then instead you can just use:
+.code
+SUPPORT_TLS=yes
+USE_GNUTLS=yes
+USE_GNUTLS_PC=gnutls
+.endd
+.wen
+
 You do not need to set TLS_INCLUDE if the relevant directory is already
 specified in INCLUDE. Details of how to configure Exim to make use of TLS are
 given in chapter &<<CHAPTLS>>&.
@@ -2111,7 +2129,8 @@ binary, attempts to configure Exim to use it cause run time configuration
 errors.
 
 .new
-.cindex "pkg-config" "specifying"
+.cindex "pkg-config" "lookups"
+.cindex "pkg-config" "authenticators"
 Many systems now use a tool called &'pkg-config'& to encapsulate information
 about how to compile against a library; Exim has some initial support for
 being able to use pkg-config for lookups and authenticators.  For any given
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index aa11372cb..699da323c 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -25,6 +25,9 @@ PP/04 Local/Makefile support for (AUTH|LOOKUP)_*_PC=foo to use
 PP/05 Swapped $auth1/$auth2 for gsasl GSSAPI mechanism, to be more consistent
       with rest of GSASL and with heimdal_gssapi.
 
+PP/06 Local/Makefile support for USE_(GNUTLS|OPENSSL)_PC=foo to use
+      `pkg-config foo` for cflags/libs for the TLS implementation.
+
 
 Exim version 4.77
 -----------------
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 1e5629c2b..487ce30b3 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -26,7 +26,8 @@ Version 4.78
  3. The "pkg-config" system can now be used when building Exim to reference
     cflags and library information for lookups and authenticators, rather
     than having to update "CFLAGS", "AUTH_LIBS", "LOOKUP_INCLUDE" and
-    "LOOKUP_LIBS" directly.
+    "LOOKUP_LIBS" directly.  Similarly for handling the TLS library support
+    without adjusting "TLS_INCLUDE" and "TLS_LIBS".
 
 
 Version 4.77
-- 
2.25.1