--- configure.ac.orig 2006-08-21 14:56:08.000000000 -0700 +++ configure.ac 2019-12-26 11:18:09.000000000 -0700 @@ -792,77 +792,19 @@ # # Check for IMAGEMAGICK # -have_magick='no' -LIB_MAGICK='' if test "$with_magick" != 'no' then AS_MESSAGE([checking for ImageMagick support ......]) AC_CHECK_PROG(HAVE_MC, Magick-config, yes, no) - failed=0; - passed=0; - AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) -if test "$ARCH" = "intelnt" ; then - AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) - AC_MSG_CHECKING(if ImageMagick package is complete) - if test $passed -gt 0 - then - if test $failed -gt 0 - then - AC_MSG_RESULT(no -- some components failed test) - have_magick='no (failed tests)' - else - if test "$with_smagick" != 'no' - then - LIB_MAGICK='-lCORE_RL_magick_ -lCORE_RL_bzlib_ -lCORE_RL_coders_ -lCORE_RL_filters_ -lCORE_RL_jbig_ -lCORE_RL_jbig_ -lCORE_RL_jp2_ -lCORE_RL_jpeg_ -lCORE_RL_lcms_ -lCORE_RL_libxml_ -lCORE_RL_png_ -lCORE_RL_tiff_ -lCORE_RL_ttf_ -lCORE_RL_wand_ -lCORE_RL_wmf_ -lCORE_RL_zlib_' - else - LIB_MAGICK='-lCORE_RL_magick_' - fi - LIBS="$LIB_MAGICK $LIBS" - FMT_LIBS="$FMT_LIBS CORE_RL_magick_.lib" - AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries]) - AC_MSG_RESULT(yes) - have_magick='yes' - fi - else - AC_MSG_RESULT(no) - fi -dnl -- check for unix -else - -dnl The ImageMagick configuration can be collected with an ImageMagick -dnl routine. This allows us to simplify the configuration of all the -dnl format configuration libraries. - if test "$HAVE_MC" = "yes" ; then - LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`" - AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) - AC_MSG_CHECKING(if ImageMagick package is complete) - if test $passed -gt 0 - then - if test $failed -gt 0 - then - AC_MSG_RESULT(no -- some components failed test) - have_magick='no (failed tests)' - else -dnl CFLAGS="`Magick-config --cflags` $CFLAGS" CPPFLAGS="`Magick-config --cppflags` $CPPFLAGS" - LIB_MAGICK="$LIBS `Magick-config --ldflags` `Magick-config --libs`" -dnl UNIQUIFY will remove duplicate library tokens leaving the last instance. - AC_UTILS_UNIQUIFY($LIB_MAGICK, LIBS) - FMT_LIBS="$FMT_LIBS libMagick.a" + LIBS="$LIBS `Magick-config --ldflags` `Magick-config --libs`" AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries]) - AC_MSG_RESULT(yes) - have_magick='yes' - fi - else - AC_MSG_RESULT(no) - fi else AC_MSG_RESULT(no - Magick-config not found) fi fi -fi AC_LANG([C++]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a = true;]])],