Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

bistromathic: beware of portability of readline

Browse Source 
Don't try to build bistromathic if we don't have readline.
Reported by Bruno Haible.
https://lists.gnu.org/r/bug-bison/2020-05/msg00028.html

* configure.ac (ENABLE_BISTROMATHIC): New.
* examples/c/bistromathic/local.mk: Use it.
* examples/c/bistromathic/bistromathic.test: Exit 77 for skip.
This commit is contained in:
Akim Demaille
2020-05-03 16:05:03 +02:00
parent da5c072a62
commit 160df220b1
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -331,6 +331,13 @@ AC_MSG_RESULT([$suppfile])
# Whether we cannot run the compiled bison. # Whether we cannot run the compiled bison.
AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
# Build bistromathic if we have the lib and both readline/readline.h
# and readline/history.h.
AM_CONDITIONAL([ENABLE_BISTROMATHIC],
[test "$gl_cv_lib_readline" != no &&
test "$ac_cv_header_readline_readline_h" = yes &&
test "$ac_cv_header_readline_history_h" = yes])
AM_MISSING_PROG([AUTOM4TE], [autom4te]) AM_MISSING_PROG([AUTOM4TE], [autom4te])
# Needed by tests/atlocal.in. # Needed by tests/atlocal.in.
AC_SUBST([GCC]) AC_SUBST([GCC])

2
examples/c/bistromathic/bistromathic.test
View File

@@ -35,7 +35,7 @@ if ! echo '1-1' | prog | grep '>' >/dev/null; then
elif ! echo '1-1' | prog | grep '1-1' >/dev/null; then elif ! echo '1-1' | prog | grep '1-1' >/dev/null; then
# OpenBSD 6.5. I don't want to spend time on this. # OpenBSD 6.5. I don't want to spend time on this.
echo "SKIP: this is not the GNU Readline we expect" echo "SKIP: this is not the GNU Readline we expect"
exit 0 exit 77
fi fi

23
examples/c/bistromathic/local.mk
View File

@@ -19,19 +19,22 @@ bistromathicdir = $(docdir)/%D%
## Bistromathics. ## ## Bistromathics. ##
## --------------- ## ## --------------- ##
check_PROGRAMS += %D%/bistromathic
TESTS += %D%/bistromathic.test
EXTRA_DIST += %D%/bistromathic.test
nodist_%C%_bistromathic_SOURCES = %D%/parse.y %D%/parse.h
%D%/parse.c: $(dependencies) %D%/parse.c: $(dependencies)
# Don't use gnulib's system headers. if ENABLE_BISTROMATHIC
%C%_bistromathic_CPPFLAGS = \ check_PROGRAMS += %D%/bistromathic
-DBISON_LOCALEDIR='"$(localdir)"' \ TESTS += %D%/bistromathic.test
-DLOCALEDIR='"$(localdir)"' \ nodist_%C%_bistromathic_SOURCES = %D%/parse.y
-I$(top_srcdir)/%D% -I$(top_builddir)/%D%
%C%_bistromathic_LDADD = -lm -lreadline $(LIBINTL)
# Don't use gnulib's system headers.
%C%_bistromathic_CPPFLAGS = \
-DBISON_LOCALEDIR='"$(localdir)"' \
-DLOCALEDIR='"$(localdir)"' \
-I$(top_srcdir)/%D% -I$(top_builddir)/%D%
%C%_bistromathic_LDADD = -lm $(LIBREADLINE) $(LIBINTL)
endif
EXTRA_DIST += %D%/bistromathic.test
dist_bistromathic_DATA = %D%/parse.y %D%/Makefile %D%/README.md dist_bistromathic_DATA = %D%/parse.y %D%/Makefile %D%/README.md
CLEANFILES += %D%/parse.[ch] %D%/parse.output CLEANFILES += %D%/parse.[ch] %D%/parse.output
CLEANDIRS += %D%/*.dSYM CLEANDIRS += %D%/*.dSYM