--- ChangeLog | 4 ++++ bootstrap | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog index f62ded0..3ec2a71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-09-15 Guillaume Lazzara z@lrde.epita.fr

+ * bootstrap: Fix minimum required version for convert. + +2011-09-15 Guillaume Lazzara z@lrde.epita.fr + * configure.ac: Handle both GraphicsMagick and ImageMagick.

2011-09-15 Guillaume Lazzara z@lrde.epita.fr diff --git a/bootstrap b/bootstrap index 6a68272..481a93e 100755 --- a/bootstrap +++ b/bootstrap @@ -154,7 +154,11 @@ export LIBTOOLIZE=$libtoolize require $libtoolize 1.5.22

require doxygen 1.5.6 -require convert 6.3.7 +# We used to require `convert' from ImageMagick 6.3.7, but `convert' +# from GraphicsMagick 1.3.12 is also fine. Use that later revision +# number even if ImageMagick is actually used so as to be compatible +# with both implementations. +require convert 1.3.12 -version require hevea 1.10 -version