Use MagickCore-config if available #149
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Since the earth was cooling and Xastir used ImageMagick, we've used the existence of the script "Magick-config" to conclude whether ImageMagick was installed or not, and if it was, we used this script to get Magick to tell us what CFLAGS, LDFLAGS, and LIBS to use to build with Magick support. Magick 6 deprecated this script in favor of one called MagickCore-config. It works exactly like the older one did and in ImageMagick 6 returns exactly the same values for all requested flags. Magick 7 deleted the old script. We now first look for MagickCore-config and set MAGIC_BIN to that path if we find it. If we don't find it, we look for Magick-config and set MAGIC_BIN to that path if we find it. This commit closes Xastir#147. It does not in fact allow Magick 7 to work with Xastir, but that's another issue (Xastir#148). This one had to be cleared before we could even start on the harder one.
godfreja
approved these changes
Jul 16, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since the earth was cooling and Xastir used ImageMagick, we've used
the existence of the script "Magick-config" to conclude whether
ImageMagick was installed or not, and if it was, we used this script
to get Magick to tell us what CFLAGS, LDFLAGS, and LIBS to use to
build with Magick support.
Magick 6 deprecated this script in favor of one called
MagickCore-config. It works exactly like the older one did and in
ImageMagick 6 returns exactly the same values for all requested flags.
Magick 7 deleted the old script.
We now first look for MagickCore-config and
set MAGIC_BIN to that path if we find it. If we don't find it, we
look for Magick-config and set MAGIC_BIN to that path if we find it.
This commit closes #147.
It does not in fact allow Magick 7 to work with Xastir, but that's
another issue (#148). This one had to be cleared before we could even
start on the harder one.