=== modified file 'configure.ac'
--- configure.ac	2014-09-15 00:20:21 +0000
+++ configure.ac	2014-09-21 20:40:19 +0000
@@ -1102,13 +1102,20 @@
   if test "$MAKEINFO" = "${am_missing_run}makeinfo"; then
     MAKEINFO=makeinfo
   fi
-  case `($MAKEINFO --version) 2>/dev/null` in
-    'makeinfo (GNU texinfo) '4.[[7-9]]* | \
-    'makeinfo (GNU texinfo) '4.[[1-9][0-9]]* | \
-    'makeinfo (GNU texinfo) '[[5-9]]* | \
-    'makeinfo (GNU texinfo) '[[1-9][0-9]]* ) ;;
-    *) MAKEINFO=no;;
-  esac
+  MAKEINFO_VERSION=`($MAKEINFO --version) 2>/dev/null`;
+  declare -i MAKEINFO_CHECK=0;
+  for MAKEINFO_IMPLEMENTATION in makeinfo texi2any; do
+      case $MAKEINFO_VERSION in
+	  "$MAKEINFO_IMPLEMENTATION (GNU texinfo) "4.[7-9]* | \
+          "$MAKEINFO_IMPLEMENTATION (GNU texinfo) "4.[1-9][0-9]* | \
+	  "$MAKEINFO_IMPLEMENTATION (GNU texinfo) "[5-9]* | \
+	  "$MAKEINFO_IMPLEMENTATION (GNU texinfo) "[1-9][0-9]*  )
+	      MAKEINFO_CHECK=$MAKEINFO_CHECK+1;;
+      esac
+  done
+  if [ $MAKEINFO_CHECK -eq 0 ]; then
+      MAKEINFO=no;
+  fi
 fi
 
 ## Makeinfo is unusual.  For a released Emacs, the manuals are