--- /usr/bin/automake	2006-11-05 16:49:04.000000000 +0900
+++ /tmp/automake	2006-11-10 08:24:16.000000000 +0900
@@ -55,8 +55,10 @@
 
 for v in ${vers} ; do
 	eval binary_${v/./_}="${0}-${v}"
+	if [[ -z $binary && -x "${0}-${v}" ]] ; then
+		binary="${0}-${v}"
+	fi
 done
-binary="${binary_1_10}"
 
 #
 # Check the WANT_AUTOMAKE setting
@@ -123,6 +125,12 @@
 #
 # Now try to run the binary
 #
+if [[ -z ${binary} ]] ; then
+	echo "am-wrapper: no automake executables found." >&2
+	echo "            Please try emerging a version of automake." >&2
+	exit 1
+fi
+
 if [ ! -x "${binary}" ] ; then
 	echo "am-wrapper: $binary is missing or not executable." >&2
 	echo "            Please try emerging the correct version of automake." >&2