* src/files.c (compute_output_file_names): s/would be both named/

/would both be named/.
Reported by Jim Meyering.
* tests/output.at (Clashing Output Files): Adjust.

diff --git a/ChangeLog b/ChangeLog
index e36808f4b9c2a5539269a127b7720905978cf666..4a0601bd667167eb3729ab642536ade004a0929b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-12  Akim Demaille  <akim@epita.fr>
+
+       * src/files.c (compute_output_file_names): s/would be both named/
+       /would both be named/.
+       Reported by Jim Meyering.
+       * tests/output.at (Clashing Output Files): Adjust.
+

 2002-03-12  Akim Demaille  <akim@epita.fr>
 
        Version 1.34.
 2002-03-12  Akim Demaille  <akim@epita.fr>
 
        Version 1.34.

diff --git a/Makefile.in b/Makefile.in
index 269a4e892312bd98415226cb29cc314695599559..ce3100789d7b14889dd72957b095619d50b7b10e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -140,8 +140,8 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
        install-exec-recursive installdirs-recursive install-recursive \
        uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \
        install-exec-recursive installdirs-recursive install-recursive \
        uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \

-       Makefile.am Makefile.in NEWS THANKS aclocal.m4 config.hin \
-       configure configure.in
+       Makefile.am Makefile.in NEWS README-alpha THANKS aclocal.m4 \
+       config.hin configure configure.in

 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive

diff --git a/NEWS b/NEWS
index d1fa0affaf7f90490ca281348446e64975a2a887..f2c94ad222339ff22b5384f26b962461623402f2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,15 +1,17 @@
 Bison News
 ----------
 
 Bison News
 ----------
 

+Changes in version 1.34a:
+\f

 Changes in version 1.34, 2002-03-12:
 
 * File name clashes are detected
   $ bison foo.y -d -o foo.x
 Changes in version 1.34, 2002-03-12:
 
 * File name clashes are detected
   $ bison foo.y -d -o foo.x

-  fatal error: header and parser would be both named `foo.x'
+  fatal error: header and parser would both be named `foo.x'

 
 

-* A missing `;' ending a rule triggers a warning
+* A missing `;' at the end of a rule triggers a warning

   In accordance with POSIX, and in agreement with other
   In accordance with POSIX, and in agreement with other

-  Yacc implementations, Bison will mandate this semicolon in a near
+  Yacc implementations, Bison will mandate this semicolon in the near

   future.  This eases the implementation of a Bison parser of Bison
   grammars by making this grammar LALR(1) instead of LR(2).  To
   facilitate the transition, this release introduces a warning.
   future.  This eases the implementation of a Bison parser of Bison
   grammars by making this grammar LALR(1) instead of LR(2).  To
   facilitate the transition, this release introduces a warning.

diff --git a/configure b/configure
index 35e9069b7c613491dc95b80dbc9ee342c58d9b6e..d995ffed061828fc0e4149a15ec8ecf499b9fe32 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.52i for GNU Bison 1.34.
+# Generated by GNU Autoconf 2.53a for GNU Bison 1.34a.

 #
 # Report bugs to <bug-bison@gnu.org>.
 #
 #
 # Report bugs to <bug-bison@gnu.org>.
 #


@@ -8,7 +8,6 @@
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.

-

 if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else
 if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else


@@ -16,6 +15,7 @@ else
 fi
 
 
 fi
 
 

+

 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##


@@ -256,8 +256,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='GNU Bison'
 PACKAGE_TARNAME='bison'
 # Identity of this package.
 PACKAGE_NAME='GNU Bison'
 PACKAGE_TARNAME='bison'

-PACKAGE_VERSION='1.34'
-PACKAGE_STRING='GNU Bison 1.34'
+PACKAGE_VERSION='1.34a'
+PACKAGE_STRING='GNU Bison 1.34a'

 PACKAGE_BUGREPORT='bug-bison@gnu.org'
 
 # Factoring default headers for most tests.
 PACKAGE_BUGREPORT='bug-bison@gnu.org'
 
 # Factoring default headers for most tests.


@@ -647,7 +647,7 @@ do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;

-    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2

    { (exit 1); exit 1; }; };;
   esac
 done
    { (exit 1); exit 1; }; };;
   esac
 done


@@ -659,18 +659,19 @@ do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* ) ;;
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* ) ;;

-    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2

    { (exit 1); exit 1; }; };;
   esac
 done
 
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
    { (exit 1); exit 1; }; };;
   esac
 done
 
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.

+# FIXME: To remove some day.

 build=$build_alias
 host=$host_alias
 target=$target_alias
 
 build=$build_alias
 host=$host_alias
 target=$target_alias
 

-# FIXME: should be removed in autoconf 3.0.
+# FIXME: To remove some day.

 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe


@@ -760,7 +761,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF

-\`configure' configures GNU Bison 1.34 to adapt to many kinds of systems.
+\`configure' configures GNU Bison 1.34a to adapt to many kinds of systems.

 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 


@@ -820,13 +821,13 @@ Program names:
 
 System types:
   --build=BUILD     configure for building on BUILD [guessed]
 
 System types:
   --build=BUILD     configure for building on BUILD [guessed]

-  --host=HOST       build programs to run on HOST [BUILD]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]

 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in

-     short | recursive ) echo "Configuration of GNU Bison 1.34:";;
+     short | recursive ) echo "Configuration of GNU Bison 1.34a:";;

    esac
   cat <<\_ACEOF
 
    esac
   cat <<\_ACEOF
 


@@ -921,8 +922,8 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF

-GNU Bison configure 1.34
-generated by GNU Autoconf 2.52i
+GNU Bison configure 1.34a
+generated by GNU Autoconf 2.53a

 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.


@@ -936,8 +937,8 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 

-It was created by GNU Bison $as_me 1.34, which was
-generated by GNU Autoconf 2.52i.  Invocation command line was
+It was created by GNU Bison $as_me 1.34a, which was
+generated by GNU Autoconf 2.53a.  Invocation command line was

 
   $ $0 $@
 
 
   $ $0 $@
 


@@ -1253,8 +1254,8 @@ am__api_version="1.5c"
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.

-echo "$as_me:$LINENO: checking for a BSD compatible install" >&5
-echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6

 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1469,7 +1470,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=bison
 
 # Define the identity of the package.
  PACKAGE=bison

- VERSION=1.34
+ VERSION=1.34a

 
 
 cat >>confdefs.h <<_ACEOF
 
 
 cat >>confdefs.h <<_ACEOF


@@ -1925,8 +1926,8 @@ fi
 fi
 
 
 fi
 
 

-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable cc found in \$PATH" >&5
-echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}

    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.


@@ -2052,8 +2053,8 @@ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 echo "$as_me:$LINENO: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
 echo "$as_me:$LINENO: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 

-echo "$as_me:$LINENO: checking for executable suffix" >&5
-echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6

 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?


@@ -2073,8 +2074,8 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
   esac
 done
 else

-  { { echo "$as_me:$LINENO: error: cannot compute EXEEXT: cannot compile and link" >&5
-echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}

    { (exit 1); exit 1; }; }
 fi
 
    { (exit 1); exit 1; }; }
 fi
 


@@ -2085,8 +2086,8 @@ echo "${ECHO_T}$ac_cv_exeext" >&6
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT

-echo "$as_me:$LINENO: checking for object suffix" >&5
-echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6

 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -2124,8 +2125,8 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-{ { echo "$as_me:$LINENO: error: cannot compute OBJEXT: cannot compile" >&5
-echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}

    { (exit 1); exit 1; }; }
 fi
 
    { (exit 1); exit 1; }; }
 fi
 


@@ -2996,8 +2997,8 @@ echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the
     { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;};;
   no:yes )
     { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;};;
   no:yes )

-    { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled." >&5
-echo "$as_me: WARNING: minix/config.h: present but cannot be compiled." >&2;}
+    { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}

     { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
     { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5


@@ -4143,8 +4144,8 @@ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the pre
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled." >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5


@@ -4669,8 +4670,8 @@ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the pre
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled." >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5


@@ -6059,8 +6060,8 @@ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the pre
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled." >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5


@@ -6374,8 +6375,8 @@ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the pre
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled." >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5


@@ -6703,8 +6704,8 @@ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the pre
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled." >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5


@@ -7312,8 +7313,8 @@ test -z "$ac_cv_build_alias" &&
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||

-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}

    { (exit 1); exit 1; }; }
 
 fi
    { (exit 1); exit 1; }; }
 
 fi


@@ -7551,8 +7552,8 @@ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the pre
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled." >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5


@@ -7958,8 +7959,8 @@ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the pre
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   no:yes )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled." >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5


@@ -8510,8 +8511,8 @@ echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the prep
     { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};;
   no:yes )
     { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};;
   no:yes )

-    { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled." >&5
-echo "$as_me: WARNING: libintl.h: present but cannot be compiled." >&2;}
+    { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}

     { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
     { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
 echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5


@@ -9472,8 +9473,8 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
 } >&5
 cat >&5 <<_CSEOF
 

-This file was extended by GNU Bison $as_me 1.34, which was
-generated by GNU Autoconf 2.52i.  Invocation command line was
+This file was extended by GNU Bison $as_me 1.34a, which was
+generated by GNU Autoconf 2.53a.  Invocation command line was

 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS


@@ -9534,8 +9535,8 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\

-GNU Bison config.status 1.34
-configured by $0, generated by GNU Autoconf 2.52i,
+GNU Bison config.status 1.34a
+configured by $0, generated by GNU Autoconf 2.53a,

   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001

diff --git a/configure.in b/configure.in
index e79f0d50c6e0532c50dc2acda32b1818f55d31a7..41fd6a953e232ed4e7218721b17e1d8e1354774d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,10 +20,10 @@
 # We need a recent Autoconf to run a recent Autotest.
 AC_PREREQ(2.52g)
 
 # We need a recent Autoconf to run a recent Autotest.
 AC_PREREQ(2.52g)
 

-AC_INIT([GNU Bison], [1.34], [bug-bison@gnu.org])
+AC_INIT([GNU Bison], [1.34a], [bug-bison@gnu.org])

 AC_CONFIG_AUX_DIR(config)
 
 AC_CONFIG_AUX_DIR(config)
 

-AM_INIT_AUTOMAKE([bison], [1.34])
+AM_INIT_AUTOMAKE([bison], [1.34a])

 AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.
 AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.

diff --git a/doc/version.texi b/doc/version.texi
index ccb5c01a13cf8e74537e61884a8e6587442bf596..578df7b841bf529f9c5196b96cf98f08cc97b128 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 25 February 2002
 @set UPDATED-MONTH February 2002
 @set UPDATED 25 February 2002
 @set UPDATED-MONTH February 2002

-@set EDITION 1.34
-@set VERSION 1.34
+@set EDITION 1.34a
+@set VERSION 1.34a

diff --git a/po/de.po b/po/de.po
index 927183ae2c3fb4f6780814a304f42abcdb72603f..e93c021230161591e7bb1fdb5e54b909a130d45b 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33b\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33b\n"

-"POT-Creation-Date: 2002-03-04 19:13+0100\n"
+"POT-Creation-Date: 2002-03-12 17:53+0100\n"

 "PO-Revision-Date: 2002-03-05 10:42:19+0100\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"
 "PO-Revision-Date: 2002-03-05 10:42:19+0100\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"

diff --git a/po/es.po b/po/es.po
index 33535df94bf0da400bc99927179d04f6ba57f838..fa43d8bdc1e1b27a7007a466b5a500d9d6e4f002 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"

-"POT-Creation-Date: 2002-03-04 19:13+0100\n"
+"POT-Creation-Date: 2002-03-12 17:53+0100\n"

 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"

diff --git a/po/et.po b/po/et.po
index de524e496e288146bfbef0e31c034a257e6f297d..ae975d56d0476b217d27919b79263dff49aeb99e 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33b\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33b\n"

-"POT-Creation-Date: 2002-03-04 19:13+0100\n"
+"POT-Creation-Date: 2002-03-12 17:53+0100\n"

 "PO-Revision-Date: 2002-03-05 16:27+0200\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "PO-Revision-Date: 2002-03-05 16:27+0200\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"

diff --git a/po/fr.po b/po/fr.po
index de6467e574e518609669950e3c306df4e9995bbd..54411f469e744bb14af8df1222ca0c621038f237 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.33b\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.33b\n"

-"POT-Creation-Date: 2002-03-04 19:13+0100\n"
+"POT-Creation-Date: 2002-03-12 17:53+0100\n"

 "PO-Revision-Date: 2002-03-12 16:49+0100\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "PO-Revision-Date: 2002-03-12 16:49+0100\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"

diff --git a/po/it.po b/po/it.po
index c2d3c0cbdb516d0a5d5d05f6cc271dff3aa73a02..ff0f4bd2311e48b787098e98fff83262e56eaeb4 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.31\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.31\n"

-"POT-Creation-Date: 2002-03-04 19:13+0100\n"
+"POT-Creation-Date: 2002-03-12 17:53+0100\n"

 "PO-Revision-Date: 2002-01-23 14:16+0100\n"
 "Last-Translator: Paolo Bonzini <bonzini@gnu.org>\n"
 "Language-Team: Italian <it@li.org>\n"
 "PO-Revision-Date: 2002-01-23 14:16+0100\n"
 "Last-Translator: Paolo Bonzini <bonzini@gnu.org>\n"
 "Language-Team: Italian <it@li.org>\n"

diff --git a/po/ja.po b/po/ja.po
index 63a7b1cf82798338651f4db4403f024695430f25..5575f12203ae553fb41cfeb2e9c263e268955921 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.30f\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.30f\n"

-"POT-Creation-Date: 2002-03-04 19:13+0100\n"
+"POT-Creation-Date: 2002-03-12 17:53+0100\n"

 "PO-Revision-Date: 2001-12-10 15:59+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "PO-Revision-Date: 2001-12-10 15:59+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"

diff --git a/po/nl.po b/po/nl.po
index e93621dc51088db0ade2261b85e7399e497e4e41..ca1280ff2afa95fd06f03fba8cf6d202d80a2ceb 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.32\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.32\n"

-"POT-Creation-Date: 2002-03-04 19:13+0100\n"
+"POT-Creation-Date: 2002-03-12 17:53+0100\n"

 "PO-Revision-Date: 2002-02-01 18:46+0000\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@pandora.be>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
 "PO-Revision-Date: 2002-02-01 18:46+0000\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@pandora.be>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"

diff --git a/po/ru.po b/po/ru.po
index 1f99ca55416baa1b4064c2905dc6b8b13ba7ad1a..1deb5080c86a358edc2d8830ce82efb7227ee130 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.32\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.32\n"

-"POT-Creation-Date: 2002-03-04 19:13+0100\n"
+"POT-Creation-Date: 2002-03-12 17:53+0100\n"

 "PO-Revision-Date: 2002-01-25 12:19+0300\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "PO-Revision-Date: 2002-01-25 12:19+0300\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"

diff --git a/po/sv.po b/po/sv.po
index 77903db03a585325e448ab8122b4e88c7913bf8c..443f1b5f62d80c7d904eaaf6cd701c4de4cd8e27 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33b\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33b\n"

-"POT-Creation-Date: 2002-03-04 19:13+0100\n"
+"POT-Creation-Date: 2002-03-12 17:53+0100\n"

 "PO-Revision-Date: 2002-03-05 10:18+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "PO-Revision-Date: 2002-03-05 10:18+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"

diff --git a/po/tr.po b/po/tr.po
index e5b6b15d8b1819729acdf2666800481dff0354e9..7dc01d88ace59f2eeacb413096776d17b7b4aaf7 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33b\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33b\n"

-"POT-Creation-Date: 2002-03-04 19:13+0100\n"
+"POT-Creation-Date: 2002-03-12 17:53+0100\n"

 "PO-Revision-Date: 2002-03-05 14:30GMT +02:00\n"
 "Last-Translator: Altuð Bayram <altugbayram_2000@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "PO-Revision-Date: 2002-03-05 14:30GMT +02:00\n"
 "Last-Translator: Altuð Bayram <altugbayram_2000@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"

diff --git a/src/files.c b/src/files.c
index a7061d32237fe68f83c0c97630c6bc13885f83e4..7c7c39cd6781b1e35001cf24d86e71d0aa087bec 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -456,7 +456,7 @@ compute_output_file_names (void)
       else
        parser_filename = stringappend (full_base_name, src_extension);
       if (!strcmp (spec_defines_file, parser_filename))
       else
        parser_filename = stringappend (full_base_name, src_extension);
       if (!strcmp (spec_defines_file, parser_filename))

-       fatal ("header and parser would be both named %s",
+       fatal ("header and parser would both be named %s",

               quote (parser_filename));
     }
 
               quote (parser_filename));
     }
 

diff --git a/tests/output.at b/tests/output.at
index a1ac99477e324b1fb49ac4ff9943905fdf9b9d3e..532bc5513a9d164966ea3824521cf91d2918e2a0 100644 (file)
--- a/tests/output.at
+++ b/tests/output.at
@@ -1,5 +1,5 @@
 # Checking the output filenames.                    -*- Autotest -*-
 # Checking the output filenames.                    -*- Autotest -*-

-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright 2000, 2001, 2002 Free Software Foundation, Inc.

 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -84,12 +84,12 @@ AT_CHECK_OUTPUT([foo.yy], [],
 
 # Be sure to reject cases where the parser and the header would have
 # the same name.
 
 # Be sure to reject cases where the parser and the header would have
 # the same name.

-AT_SETUP([Clashing Output Files.])
+AT_SETUP([Clashing Output Files])

 AT_DATA([foo.y],
 [[%% foo: {};
 ]])
 
 AT_CHECK([bison -do foo.x foo.y], [1], [],
 AT_DATA([foo.y],
 [[%% foo: {};
 ]])
 
 AT_CHECK([bison -do foo.x foo.y], [1], [],

-         [foo.y:2: fatal error: header and parser would be both named `foo.x'
+         [foo.y:2: fatal error: header and parser would both be named `foo.x'

 ])
 AT_CLEANUP
 ])
 AT_CLEANUP