# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: cschol2112@gmail.com-20101001021447-7im3exf3jxezlv3c
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk/
# testament_sha1: e040846506896569ffaca49ec27f40c58ff3db36
# timestamp: 2010-09-30 20:15:38 -0600
# base_revision_id: larsi@gnus.org-20100927205335-oiuk2p3qjp93s9p2
# 
# Begin patch
=== modified file 'nt/configure.bat'
--- nt/configure.bat	2010-09-22 23:14:00 +0000
+++ nt/configure.bat	2010-10-01 02:14:47 +0000
@@ -113,6 +113,7 @@
 if "%1" == "--without-gif" goto withoutgif
 if "%1" == "--without-tiff" goto withouttiff
 if "%1" == "--without-xpm" goto withoutxpm
+if "%1" == "--without-imagemagick" goto withoutimagemagick
 if "%1" == "--with-svg" goto withsvg
 if "%1" == "--distfiles" goto distfiles
 if "%1" == "" goto checkutils
@@ -135,6 +136,7 @@
 echo.   --without-gif           do not use GIF library even if it is installed
 echo.   --without-tiff          do not use TIFF library even if it is installed
 echo.   --without-xpm           do not use XPM library even if it is installed
+echo.   --without-imagemagick   do not use ImageMagick library even if it is installed
 echo.   --with-svg              use the RSVG library (experimental)
 echo.   --distfiles             path to files for make dist, e.g. libXpm.dll
 goto end
@@ -254,6 +256,16 @@
 shift
 goto again
 
+rem ----------------------------------------------------------------------
+
+:withoutimagemagick
+set imagemagicksupport=N
+set HAVE_IMAGEMAGICK=
+shift
+goto again
+
+rem ----------------------------------------------------------------------
+
 :withsvg
 shift
 set svgsupport=Y
@@ -561,6 +573,32 @@
 :xpmDone
 rm -f junk.c junk.obj
 
+if (%imagemagicksupport%) == (N) goto imagemagickDone
+
+echo Checking for ImageMagick...
+rem The following #define is needed to compile without error
+echo #define _NO_OLDNAMES >>junk.c
+echo #include "wand/MagickWand.h" >>junk.c
+echo main (){} >>junk.c
+rem   -o option is ignored with cl, but allows result to be consistent.
+echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log
+%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log
+if exist junk.obj goto haveImagemagick
+
+echo ...wand/MagickWand.h not found, building without ImageMagick support.
+echo The failed program was: >>config.log
+type junk.c >>config.log
+
+set HAVE_IMAGEMAGICK=
+goto :imagemagickDone
+
+:haveImagemagick
+echo ...ImageMagick headers available, building with ImageMagick support.
+set HAVE_IMAGEMAGICK=1
+
+:imagemagickDone
+rm -f junk.c junk.obj
+
 if not (%svgsupport%) == (Y) goto :svgDone
 echo Checking for librsvg...
 echo #include "librsvg/rsvg.h" >junk.c
@@ -656,6 +694,7 @@
 if not "(%HAVE_GIF%)" == "()" echo #define HAVE_GIF 1 >>config.tmp
 if not "(%HAVE_TIFF%)" == "()" echo #define HAVE_TIFF 1 >>config.tmp
 if not "(%HAVE_XPM%)" == "()" echo #define HAVE_XPM 1 >>config.tmp
+if not "(%HAVE_IMAGEMAGICK%)" == "()" echo #define HAVE_IMAGEMAGICK 1 >>config.tmp
 if "(%HAVE_RSVG%)" == "(1)" echo #define HAVE_RSVG 1 >>config.tmp
 
 echo /* End of settings from configure.bat.  */ >>config.tmp
@@ -739,12 +778,18 @@
  echo   Install libtiff development files or use --without-tiff
 
 :checkgif
-if not "(%HAVE_GIF%)" == "()" goto checkdistfiles
+if not "(%HAVE_GIF%)" == "()" goto checkimagemagick
 if (%gifsupport%) == (N) goto checkdistfiles
  set libsOK=0
  echo GIF support is missing.
  echo   Install giflib or libungif development files or use --without-gif
 
+:checkimagemagick
+if not "(%HAVE_IMAGEMAGICK%)" == "()" goto checkdistfiles
+ set libsOK=0
+ echo ImageMagick support is missing.
+ echo   Install ImageMagick development files or use --without-imagemagick
+
 :checkdistfiles
 if "(%HAVE_DISTFILES%)" == "()" goto donelibchecks
 if (%distFilesOk%) == (1) goto donelibchecks

# Begin bundle
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