26 files changed, 47 insertions, 111 deletions

diff --git a/.gitignore b/.gitignore
index 65bf18d..f1a51a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ core
 libtool
 m4
 stamp-h1
+gitid.h
diff --git a/Makefile.am b/Makefile.am
index 72619ec..0eb4b0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,39 @@
-SUBDIRS=src @GRECS_TESTDIR@ @GRECS_DOCDIR@
-EXTRA_DIST=@GRECS_BUILD_AUX@
+# This file is part of Grecs
+# Copyright (C) 2007, 2009-2011 Sergey Poznyakoff
+#
+# Grecs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Grecs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Grecs.  If not, see <http://www.gnu.org/licenses/>.
+
 ACLOCAL_AMFLAGS = -I am
+SUBDIRS=. src @GRECS_TESTDIR@ @GRECS_DOCDIR@
+EXTRA_DIST=@GRECS_BUILD_AUX@ gitid.h
+
+noinst_HEADERS = gitid.h
+BUILT_SOURCES = gitid.h
+
+.PHONY: gitid.h
+gitid.h:
+        @if test -d .git; then \
+           url=`git config --get remote.origin.url | sed 's|.*://||'`; \
+           if test "$$url" = "git.gnu.org.ua/gitroot/grecs.git"; then \
+              dirty=`git diff-index --name-only HEAD 2>/dev/null` || dirty=;\
+              test -n "$$dirty" && dirty="-dirty"; \
+              ID=`git log -1 --pretty='%H-%ct-%ae'`$$dirty;\
+              echo "#define GRECS_GIT_ID \"$$ID\"" > gitid.tmp; \
+              cmp gitid.tmp gitid.h >/dev/null 2>&1 || mv gitid.tmp gitid.h; \
+              rm -f gitid.tmp; \
+           fi; \
+        fi; 
 
 @GRECS_CHANGELOG@.PHONY: ChangeLog
 @GRECS_CHANGELOG@ChangeLog:
diff --git a/am/grecs.m4 b/am/grecs.m4
index e4f8671..8202903 100644
--- a/am/grecs.m4
+++ b/am/grecs.m4
@@ -149,14 +149,7 @@ AC_DEFUN([GRECS_SETUP],[
    ])
   _GRECS_IF_OPTION_SET([git2chg],[GRECS_BUILD_AUX="$GRECS_BUILD_AUX build-aux/git2chg.awk"])
   
-  # Make sure package versioning is compatible with version.at:
-  s=`echo $PACKAGE_VERSION | [sed 's/[0-9][0-9]*\.[0-9][0-9]*\(\.[0-9][0-9]\)\?\([^a-zA-Z_0-9].*\)\?//'`]
-  if test -z "$s"; then
-    GRECS_VEROK_AT=verok.at
-  fi
-
   AC_SUBST([GRECS_SRCDIR],$1)
-  AC_SUBST([GRECS_VEROK_AT])
   AC_SUBST([GRECS_BUILD_AUX])
   AC_SUBST([GRECS_INCLUDES])
   AC_SUBST([GRECS_TESTDIR])
diff --git a/build-aux/getopt.m4 b/build-aux/getopt.m4
index b63baaf..83a1e35 100644
--- a/build-aux/getopt.m4
+++ b/build-aux/getopt.m4
@@ -700,6 +700,8 @@ char *program_author[] = {
 format_authors(_getopt_get_option(authors))
 };>])
 
+void (*print_version_hook)(FILE *stream);
+
 void
 print_version(const char *program_version, FILE *stream)
 {
@@ -729,6 +731,8 @@ dnl directives between the lines.
 dnl **************************************************************************
   fputs (_("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\nThis is free software: you are free to change and redistribute it.\nThere is NO WARRANTY, to the extent permitted by law.\n\n"),
          stream);
+  if (print_version_hook)
+    print_version_hook (stream);
 _getopt_if_option_set([<authors>],[<
   width = strlen (written_by);
   fputs (written_by, stream);
diff --git a/doc/GRECS_SETUP.3 b/doc/GRECS_SETUP.3
index af0f8e0..c24399e 100644
--- a/doc/GRECS_SETUP.3
+++ b/doc/GRECS_SETUP.3
@@ -13,10 +13,8 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Grecs.  If not, see <http://www.gnu.org/licenses/>.
-.\" This file is part of SLB. 
-.\" Copyright (C) 2011 Sergey Poznyakoff
 .\"
-.TH GRECS_SETUP 3 "May 5, 2011" "GRECS" "Grecs User Reference"
+.TH GRECS_SETUP 3 "May 8, 2011" "GRECS" "Grecs User Reference"
 .SH NAME
 GRECS_SETUP \- Initialize \fBgrecs\fR submodule.
 .SH SYNOPSIS
diff --git a/doc/grecs_asprintf.3 b/doc/grecs_asprintf.3
index 73be7f0..daa7f83 100644
--- a/doc/grecs_asprintf.3
+++ b/doc/grecs_asprintf.3
@@ -13,8 +13,6 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Grecs.  If not, see <http://www.gnu.org/licenses/>.
-.\" This file is part of SLB. 
-.\" Copyright (C) 2011 Sergey Poznyakoff
 .\"
 .TH GRECS_ASPRINTF 3 "May 4, 2011" "GRECS" "Grecs User Reference"
 .SH NAME
diff --git a/doc/grecs_config.5 b/doc/grecs_config.5
index 579875b..e4ad4f3 100644
--- a/doc/grecs_config.5
+++ b/doc/grecs_config.5
@@ -13,8 +13,6 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Grecs.  If not, see <http://www.gnu.org/licenses/>.
-.\" This file is part of SLB. 
-.\" Copyright (C) 2011 Sergey Poznyakoff
 .\"
 .TH GRECS_CONFIG 3 "May 4, 2011" "GRECS" "Grecs User Reference"
 .SH NAME
diff --git a/doc/grecs_error.3 b/doc/grecs_error.3
index d747d9a..4f82dc5 100644
--- a/doc/grecs_error.3
+++ b/doc/grecs_error.3
@@ -13,8 +13,6 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Grecs.  If not, see <http://www.gnu.org/licenses/>.
-.\" This file is part of SLB. 
-.\" Copyright (C) 2011 Sergey Poznyakoff
 .\"
 .TH GRECS_ERROR 3 "May 4, 2011" "GRECS" "Grecs User Reference"
 .SH NAME
diff --git a/doc/grecs_format_locus.3 b/doc/grecs_format_locus.3
index 90ffa03..a7743f1 100644
--- a/doc/grecs_format_locus.3
+++ b/doc/grecs_format_locus.3
@@ -13,8 +13,6 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Grecs.  If not, see <http://www.gnu.org/licenses/>.
-.\" This file is part of SLB. 
-.\" Copyright (C) 2011 Sergey Poznyakoff
 .\"
 .TH GRECS_FORMAT_LOCUS 3 "May 4, 2011" "GRECS" "Grecs User Reference"
 .SH NAME
diff --git a/doc/grecs_format_node.3 b/doc/grecs_format_node.3
index 76cebec..095a494 100644
--- a/doc/grecs_format_node.3
+++ b/doc/grecs_format_node.3
@@ -13,8 +13,6 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Grecs.  If not, see <http://www.gnu.org/licenses/>.
-.\" This file is part of SLB. 
-.\" Copyright (C) 2011 Sergey Poznyakoff
 .\"
 .TH GRECS_FORMAT_NODE 3 "May 4, 2011" "GRECS" "Grecs User Reference"
 .SH NAME
diff --git a/doc/grecs_format_node_path.3 b/doc/grecs_format_node_path.3
index 2f8cff6..bf119e7 100644
--- a/doc/grecs_format_node_path.3
+++ b/doc/grecs_format_node_path.3
@@ -13,8 +13,6 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Grecs.  If not, see <http://www.gnu.org/licenses/>.
-.\" This file is part of SLB. 
-.\" Copyright (C) 2011 Sergey Poznyakoff
 .\"