=== modified file 'configure.ac'
--- configure.ac	2014-09-15 00:20:21 +0000
+++ configure.ac	2014-09-22 17:36:48 +0000
@@ -1099,16 +1099,25 @@
 
 ## Need makeinfo >= 4.7 (?) to build the manuals.
 if test "$MAKEINFO" != "no"; then
-  if test "$MAKEINFO" = "${am_missing_run}makeinfo"; then
-    MAKEINFO=makeinfo
+  for MAKEINFO_IMPLEMENTATION in makeinfo texi2any; do
+      if test "$MAKEINFO" = "${am_missing_run}${MAKEINFO_IMPLEMENTATION}"; then
+         MAKEINFO=${MAKEINFO_IMPLEMENTATION}
+      fi
+  done
+  MAKEINFO_VERSION=`($MAKEINFO --version) 2>/dev/null`;
+  MAKEINFO_CHECK=no;
+  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=yes;;
+      esac
+  done
+  if [ $MAKEINFO_CHECK != yes ]; then
+      MAKEINFO=no;
   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
 fi
 
 ## Makeinfo is unusual.  For a released Emacs, the manuals are