From 9b09ff673954c459218e2c664386286ca68aae51 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 24 Jul 2021 23:55:26 +0200
Subject: [PATCH] gnu: esmtp: Always assume that -lesmtp will work.

libesmtp 1.1.0 removed the libesmtp-config helper in favour of pkg-config.
This does not use that (I lack the chops and the patience).  Assume that
the build environment has everything set up for us, which is true on Guix.
---
 configure.ac | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9252ec2..7ccf71a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,15 +32,8 @@ then
 	AC_CHECK_HEADER(libesmtp.h, ,[AC_MSG_ERROR([libesmtp.h not found in $with_libesmtp])])
 fi    
 AC_MSG_CHECKING(for libESMTP)
-if libesmtp-config --version > /dev/null 2>&1
-then
-	AC_MSG_RESULT(yes)
-	CFLAGS="$CFLAGS `libesmtp-config --cflags`"
-	LIBS="$LIBS `libesmtp-config --libs`"
-else
-	AC_MSG_RESULT(no)
-	AC_MSG_ERROR(libESMTP library not found)
-fi
+AC_MSG_RESULT(assumed)
+LIBS="$LIBS -lesmtp"
 
 jrf_FUNC_GETOPT
 
-- 
2.32.0

s/?id=284f8508bebcae510261c7c223dc28f9badf87ce'>refs</a><a class='active' href='/guix/log/etc/substitutes'>log</a><a href='/guix/tree/etc/substitutes?id=284f8508bebcae510261c7c223dc28f9badf87ce'>tree</a><a href='/guix/commit/etc/substitutes?id=284f8508bebcae510261c7c223dc28f9badf87ce'>commit</a><a href='/guix/diff/etc/substitutes?id=284f8508bebcae510261c7c223dc28f9badf87ce'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/etc/substitutes'>
<input type='hidden' name='id' value='284f8508bebcae510261c7c223dc28f9badf87ce'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=284f8508bebcae510261c7c223dc28f9badf87ce'>root</a>/<a href='/guix/log/etc?id=284f8508bebcae510261c7c223dc28f9badf87ce'>etc</a>/<a href='/guix/log/etc/substitutes?id=284f8508bebcae510261c7c223dc28f9badf87ce'>substitutes</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/substitutes?id=284f8508bebcae510261c7c223dc28f9badf87ce&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-06-07 11:31:17 +0100'>2021-06-07</span></td><td><a href='/guix/commit/etc/substitutes?id=26499816a973b3aab9aaf8e13b909d0bde4e2dd5'>etc: Add "bordeaux.guix.gnu.org.pub" public key file.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/substitutes/bordeaux.guix.gnu.org.pub: New file.
* Makefile.am (dist_pkgdata_DATA): Add it.
* guix/self.scm (miscellaneous-files): Add
"share/guix/bordeaux.guix.gnu.org.pub".
</span></span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2020-07-10 00:11:00 +0200'>2020-07-10</span></td><td><a href='/guix/commit/etc/substitutes?id=d283bb960f927dd5f7bb8b96bc697221e4e8ad39'>maint: Remove traces of "berlin.guixsd.org".</a><span class='msg-avail'>...<span class='msg-tooltip'>The guixsd.org domain is no longer advertised since before in 1.0.0
release in May 2019.

* etc/substitutes/berlin.guixsd.org.pub: Rename to...
* etc/substitutes/berlin.guix.gnu.org.pub: ... this.
* etc/substitutes/ci.guix.gnu.org.pub,
etc/substitutes/ci.guix.info.pub: Adjust accordingly.
* gnu/services/base.scm (%default-authorized-guix-keys): Likewise.
* guix/build/download-nar.scm (urls-for-item): Likewise.
* guix/self.scm (miscellaneous-files): Likewise.
* Makefile.am (dist_pkgdata_DATA): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>