From 84685930d5cfc7005f3414601230a23e28a18f59 Mon Sep 17 00:00:00 2001
From: Thomas Loimer <thomas.loimer@tuwien.ac.at>
Date: Tue, 5 Sep 2023 22:02:55 +0200
Subject: [PATCH 1/3] Enable error message for missing libraries

Move the check for missing libraries to a place where the queried
variables are set.
---
 configure.ac | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 035b9d7..47452c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,9 +95,6 @@ dnl AC_CHECK_PROG(XDG_MENU, [xdg-desktop-menu], [xdg-desktop-menu])
 AC_SEARCH_LIBS([pow], [m])dnl
 dnl AC_SEARCH_LIBS([deflate], [z])  # libz is not needed.
 AC_SEARCH_LIBS([FcInit], [fontconfig])
-AS_IF([test "x$ac_cv_search_pow" = xno \
-	|| test "x$ac_cv_search_png_read_info" = xno],
-    [AC_MSG_ERROR([Necessary libraries not found.])])
 
 
 # Checks for header files.
@@ -187,6 +184,10 @@ PostScript files. To disable calling ghostscript, set to the empty string,
 AC_SUBST([gsman])
 AM_SUBST_NOTMAKE([gsman])
 
+AS_IF([test "x$ac_cv_search_pow" = xno \
+	|| test "x$ac_cv_search_png_read_info" = xno],
+    [AC_MSG_ERROR([Necessary libraries not found.])])
+
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_BIGENDIAN
-- 
2.40.1

442eba98be21518423f2cf0a10d1fa5d6c7865ca'>commit</a><a href='/guix/diff/tests/cpio.scm?id=442eba98be21518423f2cf0a10d1fa5d6c7865ca'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/cpio.scm'>
<input type='hidden' name='id' value='442eba98be21518423f2cf0a10d1fa5d6c7865ca'/><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=442eba98be21518423f2cf0a10d1fa5d6c7865ca'>root</a>/<a href='/guix/log/tests?id=442eba98be21518423f2cf0a10d1fa5d6c7865ca'>tests</a>/<a href='/guix/log/tests/cpio.scm?id=442eba98be21518423f2cf0a10d1fa5d6c7865ca'>cpio.scm</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/tests/cpio.scm?id=442eba98be21518423f2cf0a10d1fa5d6c7865ca&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-04-15 22:36:42 +0200'>2024-04-15</span></td><td><a href='/guix/commit/tests/cpio.scm?id=54be7795b5cc2f6cad05f8649121372c9d5af806'>utils: Don’t re-export ‘call-with-temporary-output-file’.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/utils.scm: Remove re-export of ‘call-with-temporary-output-file’.
Autoload a number of modules.
* guix/download.scm, guix/import/hackage.scm,
guix/import/hexpm.scm, guix/import/opam.scm,
guix/import/pypi.scm, tests/cpio.scm, tests/egg.scm,
tests/opam.scm, tests/publish.scm, tests/store-database.scm,
tests/utils.scm: Adjust imports accordingly.

Change-Id: I3f5e94631397996a30be2ea4ff8b50a3371e8ee7
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-12-20 16:56:03 +0100'>2022-12-20</span></td><td><a href='/guix/commit/tests/cpio.scm?id=2880dc3046170e9129437caca586f13956d0d811'>cpio: Skip test on inode numbers that don't fit on 32 bits.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://issues.guix.gnu.org/60202&gt;.
Reported by Christopher Baines &lt;mail@cbaines.net&gt;.

* tests/cpio.scm (%test-file): New variable.
("file-&gt;cpio-header + write-cpio-header + read-cpio-header"): Use it.
Skip test when the inode number of %TEST-FILE is too big.
</span></span></td><td>Ludovic Courtès</td></tr>