[prev in list] [next in list] [prev in thread] [next in thread] 

List:       graphicsmagick-commit
Subject:    [GM-commit] GraphicsMagick: Fix typo which caused the --without-lzma option ...
From:       GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date:       2012-06-15 1:07:13
Message-ID: hg.59c46db9aa2e.1339722433.-1602079902 () blade ! simplesystems ! org
[Download RAW message or body]

changeset 59c46db9aa2e in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=59c46db9aa2e
                
summary: Fix typo which caused the --without-lzma option to be handled incorrectly.

diffstat:

 ChangeLog                              |  6 ++++++
 VisualMagick/installer/inc/version.isx |  4 ++--
 configure                              |  7 ++++---
 configure.ac                           |  4 ++--
 magick/version.h                       |  4 ++--
 www/Changelog.html                     |  8 ++++++++
 6 files changed, 24 insertions(+), 9 deletions(-)

diffs (98 lines):

diff -r 6e3c70c010cb -r 59c46db9aa2e ChangeLog
--- a/ChangeLog	Sun Jun 10 11:06:52 2012 -0500
+++ b/ChangeLog	Thu Jun 14 20:06:59 2012 -0500
@@ -1,3 +1,9 @@
+2012-06-14  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+	* configure.ac: Fix typo which caused the --without-lzma option to
+	be handled incorrectly.  Resolves SourceForge issue 3535309
+	"graphicsmagick from 1.3.13 to 1.3.15 has broken lzma support".
+
 2012-06-09  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
 	* tests/rwfile.c (main): Verify that we can 'ping' the file using
diff -r 6e3c70c010cb -r 59c46db9aa2e VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sun Jun 10 11:06:52 2012 -0500
+++ b/VisualMagick/installer/inc/version.isx	Thu Jun 14 20:06:59 2012 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020120609"
-#define public MagickPackageReleaseDate "snapshot-20120609"
+#define public MagickPackageVersionAddendum ".020120614"
+#define public MagickPackageReleaseDate "snapshot-20120614"
diff -r 6e3c70c010cb -r 59c46db9aa2e configure
--- a/configure	Sun Jun 10 11:06:52 2012 -0500
+++ b/configure	Thu Jun 14 20:06:59 2012 -0500
@@ -1080,6 +1080,7 @@
 with_jp2
 with_lcms
 with_lcms2
+with_lzma
 with_png
 with_tiff
 with_trio
@@ -20029,9 +20030,9 @@
 
 # Disable LZMA (lzma library)
 
-# Check whether --with-bzlib was given.
-if test "${with_bzlib+set}" = set; then :
-  withval=$with_bzlib; with_lzma=$withval
+# Check whether --with-lzma was given.
+if test "${with_lzma+set}" = set; then :
+  withval=$with_lzma; with_lzma=$withval
 else
   with_lzma='yes'
 fi
diff -r 6e3c70c010cb -r 59c46db9aa2e configure.ac
--- a/configure.ac	Sun Jun 10 11:06:52 2012 -0500
+++ b/configure.ac	Thu Jun 14 20:06:59 2012 -0500
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2011 GraphicsMagick Group
+# Copyright (C) 2003-2012 GraphicsMagick Group
 # Copyright (C) 2002 ImageMagick Studio
 # Copyright (C) 1998, 1999 E. I. du Pont de Nemours and Company
 #
@@ -694,7 +694,7 @@
 fi
 
 # Disable LZMA (lzma library)
-AC_ARG_WITH(bzlib,
+AC_ARG_WITH(lzma,
 	      [  --without-lzma          disable LZMA support],
 	      [with_lzma=$withval],
 	      [with_lzma='yes'])
diff -r 6e3c70c010cb -r 59c46db9aa2e magick/version.h
--- a/magick/version.h	Sun Jun 10 11:06:52 2012 -0500
+++ b/magick/version.h	Thu Jun 14 20:06:59 2012 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x110800
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 11,8,0
-#define MagickChangeDate   "20120609"
-#define MagickReleaseDate  "snapshot-20120609"
+#define MagickChangeDate   "20120614"
+#define MagickReleaseDate  "snapshot-20120614"
 	
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 6e3c70c010cb -r 59c46db9aa2e www/Changelog.html
--- a/www/Changelog.html	Sun Jun 10 11:06:52 2012 -0500
+++ b/www/Changelog.html	Thu Jun 14 20:06:59 2012 -0500
@@ -36,6 +36,14 @@
 <div class="document">
 
 
+<p>2012-06-14  Bob Friesenhahn  &lt;<a class="reference external" \
href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#6 \
4;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 +<blockquote>
+<ul class="simple">
+<li>configure.ac: Fix typo which caused the --without-lzma option to
+be handled incorrectly.  Resolves SourceForge issue 3535309
+&quot;graphicsmagick from 1.3.13 to 1.3.15 has broken lzma support&quot;.</li>
+</ul>
+</blockquote>
 <p>2012-06-09  Bob Friesenhahn  &lt;<a class="reference external" \
href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#6 \
4;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
  <blockquote>
 <ul class="simple">

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit


[prev in list] [next in list] [prev in thread] [next in thread]