From: Akim Demaille Date: Fri, 21 Sep 2001 16:28:06 +0000 (+0000) Subject: Version 1.29a. X-Git-Tag: BISON-1_29a~4 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/2a4426474d14f65fc3962ccd91da60e1e825d241 Version 1.29a. * Makefile.maint, config/config.guess, config/config.sub, * config/missing: Update from masters. --- diff --git a/ChangeLog b/ChangeLog index 35b0d8be..2af8cdaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-09-21 Akim Demaille + + Version 1.29a. + * Makefile.maint, config/config.guess, config/config.sub, + * config/missing: Update from masters. + 2001-09-21 Akim Demaille * tests/Makefile.am (package.m4): Move to... diff --git a/Makefile.maint b/Makefile.maint index 0e6a5085..cedb9de3 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -135,9 +135,8 @@ update: wget-update cvs-update po-update ## Sanity checks. ## ## --------------- ## -# Checks that don't require cvs. -# Run `changelog-check' as previous test may reveal problems requiring -# new ChangeLog entries. +# Checks that don't require cvs. Run `changelog-check' last as +# previous test may reveal problems requiring new ChangeLog entries. local-check: po-check copyright-check writable-files changelog-check changelog-check: @@ -223,6 +222,7 @@ cvs-dist: local-check cvs-check maintainer-distcheck null_AM_MAKEFLAGS = \ ACLOCAL=false \ AUTOCONF=false \ + AUTOM4TE=false \ AUTOMAKE=false \ AUTOHEADER=false \ MAKEINFO=false diff --git a/config/config.guess b/config/config.guess index dff9e481..cec14aab 100755 --- a/config/config.guess +++ b/config/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -timestamp='2001-09-04' +timestamp='2001-09-13' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -127,7 +127,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # Netbsd (nbsd) targets should (where applicable) match one or + # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old @@ -144,6 +144,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in macppc) machine=powerpc-apple ;; hp3[0-9][05]) machine=m68k-hp ;; ibmrt|romp-ibm) machine=romp-ibm ;; + sparc*) machine=`uname -p`-unknown ;; *) machine=${UNAME_MACHINE}-unknown ;; esac # The Operating System including object format, if it has switched @@ -172,6 +173,45 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mipseb-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -247,30 +287,9 @@ EOF Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; @@ -333,12 +352,6 @@ EOF aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - sparc*:NetBSD:*) - echo `uname -p`-unknown-netbsd${UNAME_RELEASE} - exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -365,18 +378,6 @@ EOF *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -664,9 +665,6 @@ EOF parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; - hppa*:OpenBSD:*:*) - echo hppa-unknown-openbsd - exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -718,9 +716,6 @@ EOF FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -733,9 +728,6 @@ EOF *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit 0 ;; diff --git a/config/config.sub b/config/config.sub index 34778490..838237e9 100755 --- a/config/config.sub +++ b/config/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -timestamp='2001-09-04' +timestamp='2001-09-14' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -280,6 +280,7 @@ case $basic_machine in | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alphapca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armv*-* \ + | avr-* \ | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c54x-* \ | clipper-* | cray2-* | cydra-* \ @@ -294,8 +295,8 @@ case $basic_machine in | m88110-* | m88k-* | mcore-* \ | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \ - | mipsle-* | mipstx39-* | mipstx39el-* \ + | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ + | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ diff --git a/config/missing b/config/missing index 0a7fb5a2..3199d495 100755 --- a/config/missing +++ b/config/missing @@ -78,7 +78,7 @@ Supported PROGRAM values: ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.3 - GNU automake" + echo "missing 0.4 - GNU automake" ;; -*) @@ -88,6 +88,11 @@ Supported PROGRAM values: ;; aclocal) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want @@ -97,6 +102,11 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; autoconf) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -106,6 +116,11 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; autoheader) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -125,6 +140,11 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; automake) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. @@ -135,6 +155,34 @@ WARNING: \`$1' is missing on your system. You should only need it if while read f; do touch "$f"; done ;; + autom4te) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is needed, and you do not seem to have it handy on your + system. You might have modified some files without having the + proper tools for further handling them. + You can get \`$1Help2man' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + bison|yacc) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if @@ -189,6 +237,11 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; help2man) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified a dependency of a manual page. You may need the diff --git a/po/de.po b/po/de.po index fa015074..c5bb6538 100644 --- a/po/de.po +++ b/po/de.po @@ -800,14 +800,6 @@ msgstr "" msgid "'" msgstr "" -#, fuzzy -#~ msgid "multiple %%header_extension declarations" -#~ msgstr "erneute %union Definition" - -#, fuzzy -#~ msgid "multiple %%source_extension declarations" -#~ msgstr "erneute %union Definition" - #~ msgid "" #~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n" #~ " [--debug] [--defines] [--fixed-output-files] [--no-lines]\n" @@ -842,6 +834,9 @@ msgstr "" #~ msgid "unterminated comment in `%{' definition" #~ msgstr "unbeendeter Kommentar in »%{« Definition" +#~ msgid "multiple %union declarations" +#~ msgstr "erneute %union Definition" + #~ msgid "unterminated comment at end of file" #~ msgstr "unbeendeter Kommentar am Dateiende" diff --git a/po/es.po b/po/es.po index d4945c14..62d60918 100644 --- a/po/es.po +++ b/po/es.po @@ -935,14 +935,6 @@ msgstr "" msgid "'" msgstr "" -#, fuzzy -#~ msgid "multiple %%header_extension declarations" -#~ msgstr "declaraciones múltiples de %union" - -#, fuzzy -#~ msgid "multiple %%source_extension declarations" -#~ msgstr "declaraciones múltiples de %union" - # ¿Por qué no lo pones en mayúsculas? Al fin y al cabo, eso es lo que # haces luego con "FDERIVES" que traduces como "FDERIVACIONES", ... - # cll @@ -1039,6 +1031,9 @@ msgstr "" #~ msgid "unterminated comment in `%{' definition" #~ msgstr "comentario sin terminar en la definición `%{'" +#~ msgid "multiple %union declarations" +#~ msgstr "declaraciones múltiples de %union" + #~ msgid "unterminated comment at end of file" #~ msgstr "comentario sin terminar al final del fichero" diff --git a/po/ja.po b/po/ja.po index aa4e0985..205537cf 100644 --- a/po/ja.po +++ b/po/ja.po @@ -802,14 +802,6 @@ msgstr "" msgid "'" msgstr "" -#, fuzzy -#~ msgid "multiple %%header_extension declarations" -#~ msgstr "Ê£¿ô¤Î %union Àë¸À¤Ç¤¹" - -#, fuzzy -#~ msgid "multiple %%source_extension declarations" -#~ msgstr "Ê£¿ô¤Î %union Àë¸À¤Ç¤¹" - #~ msgid "" #~ "\n" #~ "\n" @@ -890,6 +882,9 @@ msgstr "" #~ msgid "unterminated comment in `%{' definition" #~ msgstr "`%{' ÄêµÁ ¤ËÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤¬¤¢¤ê¤Þ¤¹" +#~ msgid "multiple %union declarations" +#~ msgstr "Ê£¿ô¤Î %union Àë¸À¤Ç¤¹" + #~ msgid "unterminated comment at end of file" #~ msgstr "¥Õ¥¡¥¤¥ëËöÈø¤ËÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤¬¤¢¤ê¤Þ¤¹" diff --git a/po/nl.po b/po/nl.po index 984d6ff7..bd91f051 100644 --- a/po/nl.po +++ b/po/nl.po @@ -805,14 +805,6 @@ msgstr "" msgid "'" msgstr "" -#, fuzzy -#~ msgid "multiple %%header_extension declarations" -#~ msgstr "meerdere %union declaraties" - -#, fuzzy -#~ msgid "multiple %%source_extension declarations" -#~ msgstr "meerdere %union declaraties" - #~ msgid "" #~ "\n" #~ "\n" @@ -892,6 +884,9 @@ msgstr "" #~ msgid "unterminated comment in `%{' definition" #~ msgstr "niet getermineerd commentaar in `%{' definitie" +#~ msgid "multiple %union declarations" +#~ msgstr "meerdere %union declaraties" + #~ msgid "unterminated comment at end of file" #~ msgstr "niet getermineerd commentaar aan einde van bestand" diff --git a/po/ru.gmo b/po/ru.gmo index 3fadf282..f11876cc 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index 97308e69..2c7a4b0e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,12 +1,12 @@ # ðÅÒÅ×ÏÄ ÓÏÏÂÝÅÎÉÊ bison. # Copyright (C) 1999 Free Software Foundation, Inc. -# Dmitry S. Sivachenko , 1999,2000. +# Dmitry S. Sivachenko , 1999,2000,2001. # msgid "" msgstr "" -"Project-Id-Version: bison 1.28d\n" +"Project-Id-Version: bison 1.29\n" "POT-Creation-Date: 2001-09-19 09:44+0200\n" -"PO-Revision-Date: 2001-08-31 18:28+04:00\n" +"PO-Revision-Date: 2001-09-09 13:49+04:00\n" "Last-Translator: Dmitry S. Sivachenko \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -799,17 +799,5 @@ msgstr "'" #~ msgid "multiple %%source_extension declarations" #~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%source_extension" -#~ msgid "unterminated comment at end of file" -#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ËÏÎÃÅ ÆÁÊÌÁ" - -#~ msgid "unmatched close-brace (`}')" -#~ msgstr "ÎÅÐÁÒÎÁÑ ÚÁËÒÙ×ÁÀÝÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')" - #~ msgid "@%s is invalid" #~ msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s" - -#~ msgid "unmatched right brace (`}')" -#~ msgstr "ÎÅÐÁÒÎÁÑ ÐÒÁ×ÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')" - -#~ msgid "ill-formed %type declaration" -#~ msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %type"