diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-05-08 22:27:35 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-05-08 22:42:28 +0300 |
| commit | e523423777dd75acc59cf7b9e7466527d774a9f9 (patch) | |
| tree | 6d17e7553373fdfb6f32870902b75874c3f06aae /src | |
| parent | 79f6b2c923d1c2366b68a431756bde6e4a04ae86 (diff) | |
| download | grecs-e523423777dd75acc59cf7b9e7466527d774a9f9.tar.gz grecs-e523423777dd75acc59cf7b9e7466527d774a9f9.tar.bz2 | |
Various fixes.
* .gitignore: Add gitid.h
* Makefile.am: Build gitid.h.
* am/grecs.m4: Remove GRECS_VEROK_AT.
* build-aux/getopt.m4 (print_version_hook): New variable.
(print_version): Call print_version_hook, if defined.
* src/Make.am (INCLUDES): Update.
* src/grecs.h (grecs_version_info) <id>: New member.
* src/version.c (grecs_version): Initialize id.
* tests/Makefile.am: Remove GRECS_VEROK_AT.
* tests/testsuite.at: Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Make.am | 2 | ||||
| -rw-r--r-- | src/grecs.h | 1 | ||||
| -rw-r--r-- | src/version.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/Make.am b/src/Make.am index 50f9170..e415ada 100644 --- a/src/Make.am +++ b/src/Make.am @@ -32,12 +32,12 @@ GRECS_SRC = \ wordsplit.c noinst_HEADERS = yygrecs.h EXTRA_DIST=grecs-gram.h $(PP_SETUP_FILE) Make.am Make-inst.am Make-shared.am Make-static.am -INCLUDES = -I$(srcdir) @GRECS_INCLUDES@ +INCLUDES = -I$(srcdir) -I$(top_srcdir)/@GRECS_SUBDIR@ @GRECS_INCLUDES@ AM_YFLAGS = -dtv AM_LFLAGS = -d incdir=$(pkgdatadir)/$(VERSION)/include inc_DATA = $(PP_SETUP_FILE) diff --git a/src/grecs.h b/src/grecs.h index 8f0ddc6..decde1d 100644 --- a/src/grecs.h +++ b/src/grecs.h @@ -40,12 +40,13 @@ #define GRECS_VERSION_MAJOR 1 #define GRECS_VERSION_MINOR 0 struct grecs_version_info { const char *package; const char *version; + const char *id; int major; int minor; int patch; char *suffix; char *buffer; }; diff --git a/src/version.c b/src/version.c index 3e251d7..709e63e 100644 --- a/src/version.c +++ b/src/version.c @@ -17,14 +17,15 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif #include <grecs.h> #include <string.h> #include <ctype.h> +#include "gitid.h" -const char *grecs_version_string; +const char *grecs_vcs_id = "$Id: " GRECS_GIT_ID " $"; struct grecs_version_info * grecs_version_split(const char *vstr) { char *p; size_t len; @@ -111,12 +112,13 @@ grecs_version(void) #ifdef GRECS_VERSION_PATCHLEVEL pv->patch = GRECS_VERSION_PATCHLEVEL; #endif #ifdef GRECS_VERSION_SUFFIX pv->suffix = GRECS_VERSION_SUFFIX; #endif + pv->id = GRECS_GIT_ID; return pv; } int grecs_version_info_cmp(struct grecs_version_info *vx, struct grecs_version_info *vy, |