diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rwxr-xr-x | configure | 85 |
2 files changed, 46 insertions, 47 deletions
@@ -93,12 +93,6 @@ OBJS := $(DBG_OBJS) $(OPT_OBJS) TXR := ./$(PROG) -ifneq ($(yacc_is_newer_bison),) -YACC_FLAGS := -Wno-yacc -Wno-deprecated -else -YACC_FLAGS := -endif - .SUFFIXES: MAKEFLAGS += --no-builtin-rules @@ -293,7 +287,7 @@ y.tab.c: $(top_srcdir)parser.y if [ -e y.tab.h ]; then mv y.tab.h y.tab.h.old ; fi) $(call SH,rm -f y.tab.c) $(call SH, \ - if $(TXR_YACC) $(YACC_FLAGS) -v -d $< ; then \ + if $(TXR_YACC) -v -d $< ; then \ chmod a-w y.tab.c ; \ if cmp -s y.tab.h y.tab.h.old ; then \ mv y.tab.h.old y.tab.h ; \ @@ -1698,54 +1698,59 @@ rm -f lex.yy.c printf '"%s"\n' "$lexname" -printf "Checking for yacc program ... " +if [ $maintainer ] ; then + printf "Checking for yacc program ... " + + if [ -z "$yacc_given" -a -z "$yaccname_given" ] ; then + for yaccname in '$(YACC)' "yacc" "byacc" "bison -y" "" ; do + yaccpath=$($make yaccname="$yaccname" conftest.yacc) + if command -v $yaccpath > /dev/null ; then + break; + fi + done -if [ -z "$yacc_given" -a -z "$yaccname_given" ] ; then - for yaccname in '$(YACC)' "yacc" "byacc" "bison -y" "" ; do - yaccpath=$($make yaccname="$yaccname" conftest.yacc) - if command -v $yaccpath > /dev/null ; then - break; + if [ -z "$yaccname" ] ; then + printf "not found\n" + exit 1 fi - done - - if [ -z "$yaccname" ] ; then - printf "not found\n" - exit 1 - fi - printf '"%s" (path "%s")\n' "$yaccname" "$yaccpath" -else - yaccpath=$($make conftest.yacc) - case $yaccpath in - *bison ) - printf "error\n\n" - printf "GNU Bison needs -y to behave like yacc\n\n" - printf "This needs to be specified in the --yaccname or --yacc option\n\n" - exit 1 - ;; - * ) - if ! command -v $yaccpath > /dev/null ; then - printf "not found\n\n" + printf '"%s" (path "%s")\n' "$yaccname" "$yaccpath" + else + yaccpath=$($make conftest.yacc) + case $yaccpath in + *bison ) + printf "error\n\n" + printf "GNU Bison needs -y to behave like yacc\n\n" + printf "This needs to be specified in the --yaccname or --yacc option\n\n" exit 1 - fi - printf "given\n" - ;; - esac -fi + ;; + * ) + if ! command -v $yaccpath > /dev/null ; then + printf "not found\n\n" + exit 1 + fi + printf "given\n" + ;; + esac + fi -printf "Checking if yacc program is GNU Bison ... " + printf "Checking if yacc program is GNU Bison ... " -gen_config_make + gen_config_make -bison_version="$($make conftest.yacc-version | grep -E '[Bb]ison')" || true + bison_version="$($make conftest.yacc-version | grep -E '[Bb]ison')" || true -if [ -n "$bison_version" ] ; then - set -- $bison_version - printf "yes (%s)\n" "$4" - save_ifs=$IFS ; IFS=. ; set -- $4 ; IFS=$save_ifs - [ $1 -ge 3 ] && yacc_is_newer_bison=y -else - printf "no\n" + if [ -n "$bison_version" ] ; then + set -- $bison_version + printf "yes (%s)\n" "$4" + save_ifs=$IFS ; IFS=. ; set -- $4 ; IFS=$save_ifs + if [ "$1.$2" != "2.5" ] ; then + echo "GNU Bison 2.5 is required" + exit 1 + fi + else + printf "no\n" + fi fi # |