sfos/ecl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix issue #593

Browse source 
make check for makeinfo conditional on successful
check for install-info
This commit is contained in:
Dima Pasechnik 2020-05-25 11:14:42 +01:00
parent d7f4637ef5
commit 4bce0a0e3c
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/configure vendored
View file

@ -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

15
src/configure.ac
View file

@ -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