Have configure build version string instead of relying on ANSI string

concatentation.

diff --git a/acconfig.h b/acconfig.h
index d8b432aad887d2adf2550ac67e95f05a67aceb1d..0218c127b5827e23e8f1b60ae0bf3e4db09c4381 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -8,6 +8,9 @@
 /* Version of package.  */
 #undef VERSION
 
 /* Version of package.  */
 #undef VERSION
 

+/* Version string.  */
+#undef VERSION_STRING
+

 /* Define if the compiler understands prototypes.  */
 #undef PROTOTYPES
 
 /* Define if the compiler understands prototypes.  */
 #undef PROTOTYPES
 

diff --git a/configure.in b/configure.in
index cd30268125de7fed0d4175a8f6fed93bff1b88c3..3b810f8859ece9eb9a0d43f5151f10cd300263ef 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -39,6 +39,7 @@ AM_GNU_GETTEXT
 # the ANSI2KNR-filtering rules.
 LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
 
 # the ANSI2KNR-filtering rules.
 LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
 

+AC_DEFINE_UNQUOTED(VERSION_STRING, "GNU Bison version ${VERSION}")

 XPFILE="${datadir}/bison.simple"
 BISON_DEFINE_FILE(XPFILE, XPFILE)
 XPFILE1="${datadir}/bison.hairy"
 XPFILE="${datadir}/bison.simple"
 BISON_DEFINE_FILE(XPFILE, XPFILE)
 XPFILE1="${datadir}/bison.hairy"

diff --git a/src/Makefile.am b/src/Makefile.am
index 2284284a347255024146031d27c572540db9ff4c..71b8759c617500486d34e7e49ce78e50191cadb3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,7 @@ bin_PROGRAMS = bison
 
 bison_SOURCES = LR0.c allocate.c closure.c conflicts.c derives.c       \
     files.c getargs.c gram.c lalr.c lex.c main.c nullable.c output.c   \
 
 bison_SOURCES = LR0.c allocate.c closure.c conflicts.c derives.c       \
     files.c getargs.c gram.c lalr.c lex.c main.c nullable.c output.c   \

-    print.c reader.c reduce.c symtab.c warshall.c version.c getopt.c   \
-    getopt1.c
+    print.c reader.c reduce.c symtab.c warshall.c getopt.c getopt1.c

 
 EXTRA_bison_SOURCES = vmsgetargs.c
 
 
 EXTRA_bison_SOURCES = vmsgetargs.c
 

diff --git a/src/getargs.c b/src/getargs.c
index e337a54b081843a15e064727c172a1924fb1e15d..ee1a03a7ea8bb8f011d68375f8c48269ac6be178 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -39,7 +39,6 @@ void usage PARAMS((FILE *));
 void getargs PARAMS((int, char *[]));
 
 extern char *program_name;
 void getargs PARAMS((int, char *[]));
 
 extern char *program_name;

-extern char *version_string;

 
 extern void warns PARAMS((char *, char *));    /* main.c */
 
 
 extern void warns PARAMS((char *, char *));    /* main.c */
 


@@ -108,7 +107,7 @@ getargs (int argc, char *argv[])
          exit (0);
 
        case 'V':
          exit (0);
 
        case 'V':

-         printf ("%s", version_string);
+         printf ("%s\n", VERSION_STRING);

          exit (0);
          
        case 'v':
          exit (0);
          
        case 'v':

diff --git a/src/reader.c b/src/reader.c
index 54f034009138fb6cfda0d6b26380a56ed648db61..e67a11891793478e0c550a7e264f1293f6f92a95 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -136,8 +136,6 @@ static bucket *undeftoken;
 /* Nonzero if any action or guard uses the @n construct.  */
 static int yylsp_needed;
 
 /* Nonzero if any action or guard uses the @n construct.  */
 static int yylsp_needed;
 

-extern char *version_string;
-

 
 static void
 skip_to_char (int target)
 
 static void
 skip_to_char (int target)


@@ -209,7 +207,7 @@ reader (void)
                infile);
   else
     fprintf(ftable, "\n/*  A Bison parser, made from %s\n", infile);
                infile);
   else
     fprintf(ftable, "\n/*  A Bison parser, made from %s\n", infile);

-  fprintf(ftable, " by  %s  */\n\n", version_string);
+  fprintf(ftable, "    by %s  */\n\n", VERSION_STRING);

   fprintf(ftable, "#define YYBISON 1  /* Identify Bison output.  */\n\n");
   read_declarations();
   /* start writing the guard and action files, if they are needed.  */
   fprintf(ftable, "#define YYBISON 1  /* Identify Bison output.  */\n\n");
   read_declarations();
   /* start writing the guard and action files, if they are needed.  */

diff --git a/src/version.c b/src/version.c
deleted file mode 100644 (file)
index 61596f9..0000000
--- a/src/version.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-char *version_string = "GNU Bison version " VERSION "\n";