sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix --without-magick

Browse Source 
it didn't interact well with the new magickload/magicksave flags, thanks
Alex

see https://github.com/jcupitt/libvips/issues/862
This commit is contained in:
John Cupitt 2018-01-24 09:28:02 +00:00
parent 67bacdb118
commit 799b1e4910
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure.ac
View File

@ -598,6 +598,11 @@ if test x"$with_magick" != x"no"; then
) )
] ]
) )
else
with_magick=no
magick6=no
magick_version=none
with_magickpackage=none
fi fi
if test x"$magick6" = x"yes"; then if test x"$magick6" = x"yes"; then
@ -670,17 +675,24 @@ fi
AC_ARG_ENABLE([magickload], AC_ARG_ENABLE([magickload],
AS_HELP_STRING([--disable-magickload], AS_HELP_STRING([--disable-magickload],
[disable libMagic load (default: enabled)])) [disable libMagic load (default: enabled)]))
if test x"$enable_magickload" != x"no"; then
AC_DEFINE(ENABLE_MAGICKLOAD,1,[define to enable load with libMagick])
enable_magickload=yes
fi
AC_ARG_ENABLE([magicksave], AC_ARG_ENABLE([magicksave],
AS_HELP_STRING([--disable-magicksave], AS_HELP_STRING([--disable-magicksave],
[disable libMagic save (default: enabled)])) [disable libMagic save (default: enabled)]))
if test x"$enable_magicksave" != x"no"; then
if test x"$with_magick" != x"no"; then
if test x"$enable_magickload" != x"no"; then
AC_DEFINE(ENABLE_MAGICKLOAD,1,[define to enable load with libMagick])
enable_magickload=yes
fi
if test x"$enable_magicksave" != x"no"; then
AC_DEFINE(ENABLE_MAGICKSAVE,1,[define to enable save with libMagick]) AC_DEFINE(ENABLE_MAGICKSAVE,1,[define to enable save with libMagick])
enable_magicksave=yes enable_magicksave=yes
fi
else
enable_magickload=no
enable_magicksave=no
fi fi
# orc # orc