Lines 106-113
AC_DEFUN(STEPMAKE_OPTIONAL_REQUIRED, [
Link Here
|
106 |
AC_DEFUN(STEPMAKE_CHECK_SEARCH_RESULT, [ |
106 |
AC_DEFUN(STEPMAKE_CHECK_SEARCH_RESULT, [ |
107 |
r="`eval echo '$'"$1"`" |
107 |
r="`eval echo '$'"$1"`" |
108 |
if test -n "$r" \ |
108 |
if test -n "$r" \ |
109 |
-a "$r" != "error" \ |
109 |
&& test "$r" != "error" \ |
110 |
-a "$r" != "no" \ |
110 |
&& test "$r" != "no" \ |
111 |
&& expr '`eval echo '$'"$1"`' : '.*\(echo\)' > /dev/null; then |
111 |
&& expr '`eval echo '$'"$1"`' : '.*\(echo\)' > /dev/null; then |
112 |
true |
112 |
true |
113 |
else |
113 |
else |
Lines 149-155
AC_DEFUN(STEPMAKE_BISON, [
Link Here
|
149 |
STEPMAKE_PROGS(BISON, bison, $1) |
149 |
STEPMAKE_PROGS(BISON, bison, $1) |
150 |
|
150 |
|
151 |
# urg. should test functionality rather than version. |
151 |
# urg. should test functionality rather than version. |
152 |
if test "$BISON" = "bison" -a -n "$2"; then |
152 |
if test "$BISON" = "bison" && test -n "$2"; then |
153 |
STEPMAKE_CHECK_VERSION(BISON, $1, $2) |
153 |
STEPMAKE_CHECK_VERSION(BISON, $1, $2) |
154 |
fi |
154 |
fi |
155 |
]) |
155 |
]) |
Lines 620-626
AC_DEFUN(STEPMAKE_PROGS, [
Link Here
|
620 |
AC_CHECK_PROGS($1, $2, no) |
620 |
AC_CHECK_PROGS($1, $2, no) |
621 |
STEPMAKE_OPTIONAL_REQUIRED($1, $2, $3) |
621 |
STEPMAKE_OPTIONAL_REQUIRED($1, $2, $3) |
622 |
if test $? -eq 0; then |
622 |
if test $? -eq 0; then |
623 |
if test -n "$4" -o -n "$5"; then |
623 |
if test -n "$4" || test -n "$5"; then |
624 |
STEPMAKE_CHECK_VERSION($1, $3, $4, $5) |
624 |
STEPMAKE_CHECK_VERSION($1, $3, $4, $5) |
625 |
fi |
625 |
fi |
626 |
fi |
626 |
fi |
Lines 720-726
AC_DEFUN(STEPMAKE_TEXMF, [
Link Here
|
720 |
num=`STEPMAKE_NUMERIC_VERSION($ver)` |
720 |
num=`STEPMAKE_NUMERIC_VERSION($ver)` |
721 |
# Avoid buggy metapost versions: 1.600 <= x < 1.803 |
721 |
# Avoid buggy metapost versions: 1.600 <= x < 1.803 |
722 |
if test "$num" -ge "1600000" \ |
722 |
if test "$num" -ge "1600000" \ |
723 |
-a "$num" -lt "1803000"; then |
723 |
&& test "$num" -lt "1803000"; then |
724 |
STEPMAKE_ADD_ENTRY($1, |
724 |
STEPMAKE_ADD_ENTRY($1, |
725 |
["mpost (due to a bug in metapost, versions 1.600 <= x < 1.803 are not supported; installed: $ver)"]) |
725 |
["mpost (due to a bug in metapost, versions 1.600 <= x < 1.803 are not supported; installed: $ver)"]) |
726 |
fi |
726 |
fi |
727 |
- |
|
|
728 |
overflow |
727 |
overflow |
729 |
https://bugs.gentoo.org/913928#c13 |
728 |
https://bugs.gentoo.org/913928#c13 |
730 |
-- |
|
|
731 |
aclocal.m4 | 14 +++++++++++--- |
729 |
aclocal.m4 | 14 +++++++++++--- |
732 |
1 file changed, 11 insertions(+), 3 deletions(-) |
730 |
1 file changed, 11 insertions(+), 3 deletions(-) |