From 4bce0a0e3cbe4d35a33d7325f1bca9dc4cfbd3e6 Mon Sep 17 00:00:00 2001
From: Dima Pasechnik <dima@pasechnik.info>
Date: Mon, 25 May 2020 11:14:42 +0100
Subject: [PATCH] fix issue #593

make check for makeinfo conditional on successful
check for install-info
---
 src/configure    | 15 ++++++++-------
 src/configure.ac | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/configure b/src/configure
index beca5e5ba..103f4102b 100755
--- a/src/configure
+++ b/src/configure
@@ -5304,8 +5304,8 @@ fi
     elif test "${enable_manual}" = "info"; then
       as_fn_error $? "Unable to build the manual: install-info not found." "$LINENO" 5
     fi
-  fi
-  # Extract the first word of "makeinfo", so it can be a program name with args.
+  else
+    # Extract the first word of "makeinfo", so it can be a program name with args.
 set dummy makeinfo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -5345,11 +5345,12 @@ $as_echo "no" >&6; }
 fi
 
 
-  if test "x${MAKEINFO}" = "x"; then
-    if test "${enable_manual}" = "auto"; then
-      enable_manual=no
-    else
-      as_fn_error $? "Unable to build the manual: makeinfo not found." "$LINENO" 5
+    if test "x${MAKEINFO}" = "x"; then
+      if test "${enable_manual}" = "auto"; then
+        enable_manual=no
+      else
+        as_fn_error $? "Unable to build the manual: makeinfo not found." "$LINENO" 5
+      fi
     fi
   fi
 fi
diff --git a/src/configure.ac b/src/configure.ac
index 0184a1820..4e615408e 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -359,13 +359,14 @@ if test "${enable_manual}" != "no"; then
     elif test "${enable_manual}" = "info"; then
       AC_MSG_ERROR([Unable to build the manual: install-info not found.])
     fi
-  fi
-  AC_PATH_PROG([MAKEINFO], [makeinfo], [])
-  if test "x${MAKEINFO}" = "x"; then
-    if test "${enable_manual}" = "auto"; then
-      enable_manual=no
-    else
-      AC_MSG_ERROR([Unable to build the manual: makeinfo not found.])
+  else
+    AC_PATH_PROG([MAKEINFO], [makeinfo], [])
+    if test "x${MAKEINFO}" = "x"; then
+      if test "${enable_manual}" = "auto"; then
+        enable_manual=no
+      else
+        AC_MSG_ERROR([Unable to build the manual: makeinfo not found.])
+      fi
     fi
   fi
 fi