...

diff --git a/configure b/configure
index 456df8e82e30088c9260693fd884f53032914f63..6788f7131cbf7bcb4c9b93390a75435d4c3fc2b9 100755 (executable)
--- a/configure
+++ b/configure
@@ -4550,7 +4550,7 @@ MAGICK_PATCHLEVEL_VERSION=24
 
 MAGICK_VERSION=7.0.7-24
 
-MAGICK_GIT_REVISION=23035:2dad3d6dc:20180223
+MAGICK_GIT_REVISION=23045:c671fd1ef:20180224
 
 
 # Substitute library versioning
@@ -36911,6 +36911,11 @@ if test "${ghostscript_font_dir}x" != 'x'; then
     result_ghostscript_font_dir=$ghostscript_font_dir
 fi
 
+result_urw_base35_font_dir='none'
+if test "${urw_base35_font_dir}x" != 'x'; then
+    result_urw_base35_font_dir=$urw_base35_font_dir
+fi
+
 result_windows_font_dir='none'
 if test "${windows_font_dir}x" != 'x'; then
     result_windows_font_dir=${windows_font_dir}
@@ -39889,7 +39894,7 @@ matches your expectations.
   FreeType          --with-freetype=$with_freetype             $have_freetype
   Ghostscript lib   --with-gslib=$with_gslib           $have_gslib
   Graphviz          --with-gvc=$with_gvc               $have_gvc
-  HEIC              --with-heic=$with_heic             $have_heic
+  HEIC              --with-heic=$with_heic    $have_heic
   JBIG              --with-jbig=$with_jbig             $have_jbig
   JPEG v1           --with-jpeg=$with_jpeg             $have_jpeg
   LCMS              --with-lcms=$with_lcms             $have_lcms
@@ -39903,7 +39908,7 @@ matches your expectations.
   PERL              --with-perl=$with_perl             $have_perl
   PNG               --with-png=$with_png               $have_png
   RAQM              --with-raqm=$with_raqm             $have_raqm
-  RAW               --with-raw=$with_raw               $have_raw
+  RAW               --with-raw=$with_raw    $have_raw
   RSVG              --with-rsvg=$with_rsvg             $have_rsvg
   TIFF              --with-tiff=$with_tiff             $have_tiff
   WEBP              --with-webp=$with_webp             $have_webp
@@ -39979,7 +39984,7 @@ matches your expectations.
   FreeType          --with-freetype=$with_freetype             $have_freetype
   Ghostscript lib   --with-gslib=$with_gslib           $have_gslib
   Graphviz          --with-gvc=$with_gvc               $have_gvc
-  HEIC              --with-heic=$with_heic             $have_heic
+  HEIC              --with-heic=$with_heic    $have_heic
   JBIG              --with-jbig=$with_jbig             $have_jbig
   JPEG v1           --with-jpeg=$with_jpeg             $have_jpeg
   LCMS              --with-lcms=$with_lcms             $have_lcms
@@ -39993,7 +39998,7 @@ matches your expectations.
   PERL              --with-perl=$with_perl             $have_perl
   PNG               --with-png=$with_png               $have_png
   RAQM              --with-raqm=$with_raqm             $have_raqm
-  RAW               --with-raw=$with_raw               $have_raw
+  RAW               --with-raw=$with_raw    $have_raw
   RSVG              --with-rsvg=$with_rsvg             $have_rsvg
   TIFF              --with-tiff=$with_tiff             $have_tiff
   WEBP              --with-webp=$with_webp             $have_webp

diff --git a/configure.ac b/configure.ac
index 37e4ea42aa4a1d22e90231aa770e767ff052038f..f3f374030b8fab24c4dded7b1e0f3a1ea8f6980b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ m4_define([magick_micro_version], [7])
 m4_define([magick_patchlevel_version], [24])
 m4_define([magick_version],
           [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])
-m4_define([magick_git_revision], esyscmd([sh -c "(gitversion.sh .) | tr -d '\n'"]))
+m4_define([magick_git_revision], esyscmd([sh -c "(gitversion.sh .) | awk '{ print \$1 }' | tr -d '\n'"]))
 m4_define([magick_tar_name],[ImageMagick])
 
 # ==============================================================================
@@ -3929,6 +3929,11 @@ if test "${ghostscript_font_dir}x" != 'x'; then
     result_ghostscript_font_dir=$ghostscript_font_dir
 fi
 
+result_urw_base35_font_dir='none'
+if test "${urw_base35_font_dir}x" != 'x'; then
+    result_urw_base35_font_dir=$urw_base35_font_dir
+fi
+
 result_windows_font_dir='none'
 if test "${windows_font_dir}x" != 'x'; then
     result_windows_font_dir=${windows_font_dir}
@@ -4021,7 +4026,7 @@ matches your expectations.
   FreeType          --with-freetype=$with_freetype             $have_freetype
   Ghostscript lib   --with-gslib=$with_gslib           $have_gslib
   Graphviz          --with-gvc=$with_gvc               $have_gvc
-  HEIC              --with-heic=$with_heic             $have_heic
+  HEIC              --with-heic=$with_heic    $have_heic
   JBIG              --with-jbig=$with_jbig             $have_jbig
   JPEG v1           --with-jpeg=$with_jpeg             $have_jpeg
   LCMS              --with-lcms=$with_lcms             $have_lcms
@@ -4035,7 +4040,7 @@ matches your expectations.
   PERL              --with-perl=$with_perl             $have_perl
   PNG               --with-png=$with_png               $have_png
   RAQM              --with-raqm=$with_raqm             $have_raqm
-  RAW               --with-raw=$with_raw               $have_raw
+  RAW               --with-raw=$with_raw    $have_raw
   RSVG              --with-rsvg=$with_rsvg             $have_rsvg
   TIFF              --with-tiff=$with_tiff             $have_tiff
   WEBP              --with-webp=$with_webp             $have_webp