Skip to content

Commit 41565e6

Browse files
committed
Closes #61
1 parent fbaf12a commit 41565e6

File tree

3 files changed

+46
-0
lines changed

3 files changed

+46
-0
lines changed

Changelog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ HYPERMAIL VERSION 2.4.1:
66
============================
77

88
2020-06-12 Jose Kahan
9+
* configure.ac
10+
configure didn't signal an error if yacc was not installed
11+
912
* src/parse.c
1013
URLs were not detected and converted when they were preceeded by a :
1114
that was not attached to a valid URL like foo: https://example.com or :

configure

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,7 @@ LN_S
709709
INSTALL_DATA
710710
INSTALL_SCRIPT
711711
INSTALL_PROGRAM
712+
YACC_CHECK
712713
YFLAGS
713714
YACC
714715
CPP
@@ -3444,6 +3445,46 @@ fi
34443445
done
34453446
test -n "$YACC" || YACC="yacc"
34463447

3448+
# Extract the first word of "$YACC", so it can be a program name with args.
3449+
set dummy $YACC; ac_word=$2
3450+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3451+
$as_echo_n "checking for $ac_word... " >&6; }
3452+
if ${ac_cv_prog_YACC_CHECK+:} false; then :
3453+
$as_echo_n "(cached) " >&6
3454+
else
3455+
if test -n "$YACC_CHECK"; then
3456+
ac_cv_prog_YACC_CHECK="$YACC_CHECK" # Let the user override the test.
3457+
else
3458+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3459+
for as_dir in $PATH
3460+
do
3461+
IFS=$as_save_IFS
3462+
test -z "$as_dir" && as_dir=.
3463+
for ac_exec_ext in '' $ac_executable_extensions; do
3464+
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3465+
ac_cv_prog_YACC_CHECK="yes"
3466+
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3467+
break 2
3468+
fi
3469+
done
3470+
done
3471+
IFS=$as_save_IFS
3472+
3473+
fi
3474+
fi
3475+
YACC_CHECK=$ac_cv_prog_YACC_CHECK
3476+
if test -n "$YACC_CHECK"; then
3477+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC_CHECK" >&5
3478+
$as_echo "$YACC_CHECK" >&6; }
3479+
else
3480+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3481+
$as_echo "no" >&6; }
3482+
fi
3483+
3484+
3485+
if test x"$YACC_CHECK" != x"yes"; then :
3486+
as_fn_error $? "Please install either bison or yacc and run configure again" "$LINENO" 5
3487+
fi
34473488
# Find a good install program. We prefer a C program (faster),
34483489
# so one script is as good as another. But avoid the broken or
34493490
# incompatible versions:

configure.ac

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ dnl ===========================================================================
4646
AC_PROG_CC
4747
AC_PROG_CPP
4848
AC_PROG_YACC
49+
AC_CHECK_PROG(YACC_CHECK,$YACC,yes)
50+
AS_IF([test x"$YACC_CHECK" != x"yes"], [AC_MSG_ERROR([Please install either bison or yacc and run configure again])])
4951
AC_PROG_INSTALL
5052
AC_PROG_LN_S
5153
AC_PROG_MAKE_SET

0 commit comments

Comments
 (0)