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): 1c597cf1857a2f5fe4ced0f01d'>refslogtreecommitdiff
path: root/gnu/packages/wget.scm
AgeCommit message (Expand)Author
2021-10-12Merge remote-tracking branch 'origin/master' into core-updates-frozen.Mathieu Othacehe
2021-10-03gnu: wget2: Update to 2.0.0....* gnu/packages/wget.scm (wget2): Update to 2.0.0. Efraim Flashner
2021-06-06Merge branch 'master' into core-updates... Conflicts: gnu/local.mk gnu/packages/algebra.scm gnu/packages/bioinformatics.scm gnu/packages/curl.scm gnu/packages/docbook.scm gnu/packages/emacs-xyz.scm gnu/packages/maths.scm gnu/packages/plotutils.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/radio.scm gnu/packages/readline.scm gnu/packages/tls.scm gnu/packages/xml.scm gnu/packages/xorg.scm Marius Bakke
2021-06-05gnu: wgetpaste: Update to 2.32....* gnu/packages/wget.scm (wgetpaste): Update to 2.32. [source]: Remove patch. * gnu/packages/patches/wgetpaste-update-bpaste.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Tobias Geerinckx-Rice
2021-06-05gnu: wgetpaste: Build from Git....* gnu/packages/wget.scm (wgetpaste)[source]: Use GIT-FETCH and GIT-FILE-NAME. Tobias Geerinckx-Rice
2021-06-05gnu: wgetpaste: Don't install LICENSE file twice....* gnu/packages/wget.scm (wgetpaste)[arguments]: Leave LICENSE file installation to the aptly-named 'install-license-files default phase. Tobias Geerinckx-Rice
2021-05-22gnu: wget: Update to 1.21.1....* gnu/packages/wget.scm (wget): Update to 1.21.1. Marius Bakke