Do not assume the SDL_image and SLD_mixer libraries are installed at the same
prefix reported by sdl-config, but instead get flags from the pkg-config files
installed with these libraries.

--- a/SConscript	2011-12-24 15:46:47.000000000 -0600
+++ b/SConscript	2014-06-12 21:20:45.702668330 -0500
@@ -199,7 +199,13 @@
                 self.fatal_error += "  * library 'png' not found\n"
 
     def configure_sdl(self):
-        if self.conf.CheckMyProgram('sdl-config'):
+        if self.conf.CheckMyProgram('pkg-config'):
+            self.conf.env.ParseConfig("pkg-config --cflags --libs sdl")
+            for sdllib in ['image', 'mixer']:
+                self.conf.env.ParseConfig("pkg-config --cflags --libs SDL_%s" % sdllib)
+                if not self.conf.CheckSDLLib(sdllib):
+                    self.fatal_error += "  * SDL library '%s' not found\n" % sdllib
+        elif self.conf.CheckMyProgram('sdl-config'):
             self.conf.env.ParseConfig("sdl-config  --cflags --libs | sed 's/-I/-isystem/g'")
             for sdllib in ['image', 'mixer']:
                 if not self.conf.CheckSDLLib(sdllib):
'>summary</a><a href='/guix/refs/?id=99406d9b684ec60384dc29d850905dd517fb9790'>refs</a><a href='/guix/log/gnu/tests/singularity.scm'>log</a><a href='/guix/tree/gnu/tests/singularity.scm?id=99406d9b684ec60384dc29d850905dd517fb9790'>tree</a><a class='active' href='/guix/commit/gnu/tests/singularity.scm?id=99406d9b684ec60384dc29d850905dd517fb9790'>commit</a><a href='/guix/diff/gnu/tests/singularity.scm?id=99406d9b684ec60384dc29d850905dd517fb9790'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/singularity.scm'>
<input type='hidden' name='id' value='99406d9b684ec60384dc29d850905dd517fb9790'/><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/commit/?id=99406d9b684ec60384dc29d850905dd517fb9790'>root</a>/<a href='/guix/commit/gnu?id=99406d9b684ec60384dc29d850905dd517fb9790'>gnu</a>/<a href='/guix/commit/gnu/tests?id=99406d9b684ec60384dc29d850905dd517fb9790'>tests</a>/<a href='/guix/commit/gnu/tests/singularity.scm?id=99406d9b684ec60384dc29d850905dd517fb9790'>singularity.scm</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='99406d9b684ec60384dc29d850905dd517fb9790'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Marius Bakke &lt;mbakke@fastmail.com&gt;</td><td class='right'>2020-01-20 18:11:38 +0100</td></tr>
<tr><th>committer</th><td>Marius Bakke &lt;mbakke@fastmail.com&gt;</td><td class='right'>2020-01-21 23:17:20 +0100</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/tests/singularity.scm?id=99406d9b684ec60384dc29d850905dd517fb9790'>99406d9b684ec60384dc29d850905dd517fb9790</a> (<a href='/guix/patch/gnu/tests/singularity.scm?id=99406d9b684ec60384dc29d850905dd517fb9790'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=99406d9b684ec60384dc29d850905dd517fb9790'>82f14b6a4fd9caa4c740d47e7311ff2e3df824a9</a> /<a href='/guix/tree/gnu/tests/singularity.scm?id=99406d9b684ec60384dc29d850905dd517fb9790'>gnu/tests/singularity.scm</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/tests/singularity.scm?id=84fd5d6feb7e234a32965a80dfdd66cfe0f4aea3'>84fd5d6feb7e234a32965a80dfdd66cfe0f4aea3</a> (<a href='/guix/diff/gnu/tests/singularity.scm?id=99406d9b684ec60384dc29d850905dd517fb9790&amp;id2=84fd5d6feb7e234a32965a80dfdd66cfe0f4aea3'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-99406d9b684ec60384dc29d850905dd517fb9790.tar.gz'>guix-99406d9b684ec60384dc29d850905dd517fb9790.tar.gz</a><br/><a href='/guix/snapshot/guix-99406d9b684ec60384dc29d850905dd517fb9790.zip'>guix-99406d9b684ec60384dc29d850905dd517fb9790.zip</a><br/></td></tr></table>
<div class='commit-subject'>gnu: ghostscript: Fix CVE-2019-14869.</div><div class='commit-msg'>* gnu/packages/patches/ghostscript-CVE-2019-14869.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/ghostscript.scm (ghostscript)[source](patches): Add it.
</div><div class='diffstat-header'><a href='/guix/diff/?id=99406d9b684ec60384dc29d850905dd517fb9790'>Diffstat</a> (limited to 'gnu/tests/singularity.scm')</div><table summary='diffstat' class='diffstat'></table><div class='diffstat-summary'>0 files changed, 0 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td></td></tr></table></div> <!-- class=content -->
                         <div class=footer>generated by
                             <a href="https://git.zx2c4.com/cgit/about/">
                                 cgit
                             </a>
                         </div>
                        </div> <!-- id=cgit -->
</body>
</html>