2
1

imagemagick-6.6.4-8-use-xml2-config.patch 1.3 KB

12345678910111213141516171819202122232425262728293031
  1. Use the detected xml2-config script
  2. The AC_CHECK_PROG() macro allows to find the location of a particular
  3. program. In ImageMagick, it is used to find the location of
  4. xml2-config, and fills it into the xml2_config
  5. variable. Unfortunately, the check just below hardcodes `xml2-config
  6. --prefix`, without using the variable, which defeats the whole purpose
  7. of having AC_CHECK_PROG().
  8. So, let's use the ${xml2_config} variable instead. This allows to fix
  9. cross-compilation issues when a non-standard xml2-config location
  10. needs to be specified.
  11. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  12. ---
  13. configure.ac | 2 +-
  14. 1 file changed, 1 insertion(+), 1 deletion(-)
  15. Index: imagemagick-6.6.4-8/configure.ac
  16. ===================================================================
  17. --- imagemagick-6.6.4-8.orig/configure.ac
  18. +++ imagemagick-6.6.4-8/configure.ac
  19. @@ -2549,7 +2549,7 @@
  20. # Debian installs libxml headers under /usr/include/libxml2/libxml with
  21. # the shared library installed under /usr/lib, whereas the package
  22. # installs itself under $prefix/libxml and $prefix/lib.
  23. - xml2_prefix=`xml2-config --prefix`
  24. + xml2_prefix=`${xml2_config} --prefix`
  25. if test -d "${xml2_prefix}/include/libxml2"; then
  26. CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
  27. fi