gm tweaks

configure.in

@@ -352,7 +352,7 @@ AC_ARG_WITH([magick],
   AS_HELP_STRING([--without-magick], [build without libMagic (default: test)]))
 AC_ARG_WITH([magickpackage], 
   AS_HELP_STRING([--with-magickpackage], 
-    [magickpackage to use (default: MagickWand, ImageMagick)]))
+    [magickpackage to use (default: MagickWand, ImageMagick; try GraphicsMagick to build against gm instead)]))
 
 # recent versions of ImageMagick have split parts of the library off to
 # MagickWand, so by default we test for that first
@@ -739,6 +739,7 @@ accelerate loops with orc: 		$with_orc
 ICC profile support with lcms: 		$with_lcms (version $with_lcms_ver)
 file import with OpenEXR: 		$with_OpenEXR
 file import with OpenSlide:		$with_openslide
+  (requires openslide-3.2.0 or later)
 file import with matio: 		$with_matio
 file import with cfitsio: 		$with_cfitsio
 text rendering with pangoft2: 		$with_pangoft2

libvips/foreign/magick2vips.c

@@ -231,16 +231,11 @@ parse_header( Read *read )
 
 #ifdef DEBUG
 	printf( "parse_header: filename = %s\n", read->filename );
-	printf( "GetImageChannelDepth(DefaultChannels) = %ld\n",
-		GetImageChannelDepth( image, DefaultChannels, 
-		&image->exception ) );
-	printf( "GetImageChannelDepth(AllChannels) = %ld\n",
+	printf( "GetImageChannelDepth(AllChannels) = %d\n",
 		GetImageChannelDepth( image, AllChannels, &image->exception ) );
 	printf( "GetImageDepth() = %ld\n",
 		GetImageDepth( image, &image->exception ) );
-	printf( "image->depth = %lu\n", image->depth );
-	printf( "GetImageQuantumDepth(MagickFalse) = %ld\n",
-		GetImageQuantumDepth( image, MagickFalse ) );
+	printf( "image->depth = %u\n", image->depth );
 	printf( "GetImageType() = %d\n",
 		GetImageType( image, &image->exception ) );
 	printf( "IsGrayImage() = %d\n",

libvips/foreign/magickload.c

@@ -33,8 +33,8 @@
  */
 
 /*
-#define DEBUG
  */
+#define DEBUG
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>