Use epswrite if eps2write device is not available.

diff --git a/MagickCore/version.h b/MagickCore/version.h
index a9119389965d0733f2e21668c190b70d001a7a17..fe7fe54cfd3dad1405ce6948b3f5896505d4b6d5 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2015 ImageMagick Studio LLC"
-#define MagickSVNRevision  "17584:17590M"
+#define MagickSVNRevision  "17601:17619M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2015-01-07"
+#define MagickReleaseDate  "2015-01-09"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/configure b/configure
index e239aa66f044fc46d541c21d5241640c5df70ba6..f939aa8dc801dfb448f24749b75f23f51643a260 100755 (executable)
--- a/configure
+++ b/configure
@@ -4322,7 +4322,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=17584:17590M
+MAGICK_SVN_REVISION=17601:17619M
 
 
 # Substitute library versioning
@@ -35940,7 +35940,7 @@ $as_echo_n "checking for gs PS writing device... " >&6; }
     if $PSDelegate -q -dBATCH -sDEVICE=$GSPSDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
         :
     else
-        GSPSDevice=nodevice
+        GSPSDevice=pswrite
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSPSDevice" >&5
 $as_echo "$GSPSDevice" >&6; }
@@ -35951,7 +35951,7 @@ $as_echo_n "checking for gs EPS writing device... " >&6; }
     if $PSDelegate -q -dBATCH -sDEVICE=$GSEPSDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
         :
     else
-        GSEPSDevice=nodevice
+        GSEPSDevice=epswrite
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSEPSDevice" >&5
 $as_echo "$GSEPSDevice" >&6; }

diff --git a/configure.ac b/configure.ac
index 872dda22dedfc37ffdf5cabc7c453a9230d716d8..b98ec753bba9a1e5fb183916abb8ef513ce3cc03 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -3751,7 +3751,7 @@ if test $have_gs = 'yes'; then
     if $PSDelegate -q -dBATCH -sDEVICE=$GSPSDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
         :
     else
-        GSPSDevice=nodevice
+        GSPSDevice=pswrite
     fi
     AC_MSG_RESULT([$GSPSDevice])
 
@@ -3760,7 +3760,7 @@ if test $have_gs = 'yes'; then
     if $PSDelegate -q -dBATCH -sDEVICE=$GSEPSDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
         :
     else
-        GSEPSDevice=nodevice
+        GSEPSDevice=epswrite
     fi
     AC_MSG_RESULT([$GSEPSDevice])
 fi
@@ -4113,10 +4113,10 @@ AC_MSG_NOTICE([
 ==============================================================================
 ImageMagick is configured as follows. Please verify that this configuration
 matches your expectations.
-  
+
   Host system type: $host
   Build system type: $build
-  
+
                   Option                        Value
   ------------------------------------------------------------------------------
   Shared libraries  --enable-shared=$enable_shared             $libtool_build_shared_libs
@@ -4128,7 +4128,7 @@ matches your expectations.
                     --enable-hdri=$enable_hdri         $enable_hdri
 
   Install documentation:       $wantdocs
-  
+
   Delegate Library Configuration:
   BZLIB             --with-bzlib=$with_bzlib           $have_bzlib
   Autotrace         --with-autotrace=$with_autotrace           $have_autotrace
@@ -4161,24 +4161,24 @@ matches your expectations.
   X11               --with-x=$with_x                   $have_x
   XML               --with-xml=$with_xml               $have_xml
   ZLIB              --with-zlib=$with_zlib             $have_zlib
-  
+
   Delegate Program Configuration:
   GhostPCL          None                               $PCLDelegate ($PCLVersion)
   GhostXPS          None                               $XPSDelegate ($XPSVersion)
   Ghostscript       None                               $PSDelegate ($GSVersion)
-  
+
   Font Configuration:
   Apple fonts       --with-apple-font-dir=$with_apple_font_dir $result_apple_font_dir
   Dejavu fonts      --with-dejavu-font-dir=$with_dejavu_font_dir       $result_dejavu_font_dir
   Ghostscript fonts --with-gs-font-dir=$with_gs_font_dir       $result_ghostscript_font_dir
   Windows fonts     --with-windows-font-dir=$with_windows_font_dir     $result_windows_font_dir
-  
+
   X11 Configuration:
         X_CFLAGS        = $X_CFLAGS
         X_PRE_LIBS      = $X_PRE_LIBS
         X_LIBS          = $X_LIBS
         X_EXTRA_LIBS    = $X_EXTRA_LIBS
-  
+
   Options used to compile and link:
     PREFIX          = $PREFIX_DIR
     EXEC-PREFIX     = $EXEC_PREFIX_DIR