Index: tools/makebuttons
===================================================================
--- tools/makebuttons	(revision 6355)
+++ tools/makebuttons	(working copy)
@@ -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 @@
 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 @@
 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
 
 
Index: doc/help/translation.html
===================================================================
--- doc/help/translation.html	(revision 6355)
+++ doc/help/translation.html	(working copy)
@@ -103,6 +103,10 @@
 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