Check for v6.2.4 or higher of ImageMagick, and document the requirement

(STR #2299)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@6357 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/doc/help/translation.html b/doc/help/translation.html
index f6ab76a03411877518e4adb2d179bf93cd9ab000..32057349539085adaab02677260fbf28a04f3ef2 100644 (file)
--- a/doc/help/translation.html
+++ b/doc/help/translation.html
@@ -103,6 +103,10 @@ vi buttons-ll_CC.txt
 tools/makebuttons ll_CC buttons-ll_CC.txt
 </PRE>
 
+<BLOCKQUOTE><B>Note:</B> The <VAR>tools/makebuttons</VAR> script
+requires at least version 6.2.4 of the ImageMagick software to
+work.</BLOCKQUOTE>
+
 <P>When you have created all of the button images, edit the
 <VAR>Makedefs</VAR> file and add the locale name to the
 <CODE>LANGUAGES</CODE> variable. You can then run "make

diff --git a/tools/makebuttons b/tools/makebuttons
index 03beae455c8ef3540e3c4cf99f2d11896ac6ffc9..5723ab42400b80fc184531abff184a237e8add67 100755 (executable)
--- a/tools/makebuttons
+++ b/tools/makebuttons
@@ -27,6 +27,7 @@
 
 #
 # This little script uses convert from ImageMagick to generate CUPS buttons.
+# It requires ImageMagick version 6.2.4 or higher.
 #
 # It can generate 20-pixel high one-line buttons and 40-pixel high two-line
 # buttons.
@@ -64,6 +65,9 @@ if test $# -lt 2; then
 elif test ! -d tools; then
        echo ERROR: You MUST run the makebuttons script from the main CUPS source directory!
        exit 1
+elif test "x`convert --help | grep extent`" = x; then
+       echo ERROR: This script requires ImageMagick 6.2.4 or higher.
+       exit 1
 else
        locale=$1
        list=$2
@@ -75,12 +79,6 @@ if test ! -f $list; then
 elif test ! -r $list; then
        echo "ERROR: $list: cannot read file."
        exit 1
-elif test x`which convert` = x; then
-       echo "ERROR: ImageMagick 'convert' command is not your PATH!"
-       exit 1
-elif test x`which identify` = x; then
-       echo "ERROR: ImageMagick 'identify' command is not your PATH!"
-       exit 1
 fi