Merge branch 'automake-am11-am12'

* automake-am11-am12:
  autogen.sh: detect automake version format a.b.c and a.b
  configure.ng: don't require GIT tree to detect version string
  Include .mailmap file in distribution archives
  Include all build-system files into distribution archives
  Change build system to support new and old GNU automake

diff --cc configure.ng
index ac7c0cbd72879817c417487aaf076d4e2f5c98eb,da723e8fcae037dacbdf6710aef521b3538c1460..7f3e2d99c4cd6c8689bb09f89c76f300b213a119
--- 1/configure.in
--- 2/configure.ng
+++ b/configure.ng
@@@ -9,15 -9,16 +9,20 @@@
  # Please read the file COPYING, README and AUTHORS for more information.
  #
  
- define(VERSION_ID,esyscmd(git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'|tr -d \\n))
+ define(VERSION_ID,esyscmd([
+       V=`git describe 2>/dev/null | sed -e 's/rel-//g' | sed -e 's/-/~/'`;
+       [ -z "$V" -a -r configure ] \
+               && V=`grep "PACKAGE_STRING=" configure | cut -d"'" -f2 | cut -d' ' -f2`
+       ( [ -n "$V" ] && echo "$V" || echo "??" ) | tr -d '\n';
+ ]))
  
 +m4_ifdef([AM_SILENT_RULES],
 +      [m4_define([ng_color_tests], [color-tests])],
 +      [m4_define([ng_color_tests], [])])
 +
  # -- Initialisation --
  
 -AC_PREREQ([2.67])
 +AC_PREREQ([2.61])
  AC_INIT([ngIRCd], VERSION_ID,
        [ngircd-ml@ngircd.barton.de], [ngircd], [http://ngircd.barton.de/])
  

diff --cc src/ipaddr/Makefile.ng
index e898d64b9857e8ba0a5f8fd21c4ff626b07a068b,a376e25fdb146bed494f6c5ce688adca99e1aaa7..cea6899e9c5cca37289c4a83e199d420c175951d
--- 1/src/ipaddr/Makefile.am
--- 2/src/ipaddr/Makefile.ng
+++ b/src/ipaddr/Makefile.ng
@@@ -3,9 -3,11 +3,11 @@@
  # (c) 2008 Florian Westphal <fw@strlen.de>, public domain.
  #
  
- AUTOMAKE_OPTIONS = ../portab/ansi2knr
+ __ng_Makefile_am_template__
+ 
+ EXTRA_DIST = Makefile.ng
  
 -INCLUDES = -I$(srcdir)/../portab
 +AM_CPPFLAGS = -I$(srcdir)/../portab
  
  noinst_LIBRARIES = libngipaddr.a
  

diff --cc src/ngircd/Makefile.ng
index b40913500c614e95c26dd0be4679f816ebdef651,8ee044d9e1ed4c95bd2a6d5e93746ee042c2ef27..5c8533523b4430c7055d1b21e625331670c8950c
--- 1/src/ngircd/Makefile.am
--- 2/src/ngircd/Makefile.ng
+++ b/src/ngircd/Makefile.ng
@@@ -9,9 -9,11 +9,11 @@@
  # Please read the file COPYING, README and AUTHORS for more information.
  #
  
- AUTOMAKE_OPTIONS = ../portab/ansi2knr
+ __ng_Makefile_am_template__
+ 
+ EXTRA_DIST = Makefile.ng
  
 -INCLUDES = -I$(srcdir)/../portab -I$(srcdir)/../tool -I$(srcdir)/../ipaddr
 +AM_CPPFLAGS = -I$(srcdir)/../portab -I$(srcdir)/../tool -I$(srcdir)/../ipaddr
  
  LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN \
   -varuse -retvalother -emptyret -unrecog

diff --cc src/testsuite/Makefile.ng
index 5a2a94124a1ea9a3bbf8afa2c93ac8bcd08234bd,40076b46022044a4239b136cbbd0db074069173c..b47ba0e51fb537813a1fc80067d61c9a33a5a923
--- 1/src/testsuite/Makefile.am
--- 2/src/testsuite/Makefile.ng
+++ b/src/testsuite/Makefile.ng
@@@ -1,21 -1,20 +1,20 @@@
  #
  # ngIRCd -- The Next Generation IRC Daemon
- # Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
+ # Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
  #
- # Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- # der GNU General Public License (GPL), wie von der Free Software Foundation
- # herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- # der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- # Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- # der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ # 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
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ # Please read the file COPYING, README and AUTHORS for more information.
  #
  
- AUTOMAKE_OPTIONS = ../portab/ansi2knr
+ __ng_Makefile_am_template__
  
 -INCLUDES = -I$(srcdir)/../portab
 +AM_CPPFLAGS = -I$(srcdir)/../portab
  
  EXTRA_DIST = \
-       README functions.inc getpid.sh \
+       Makefile.ng README functions.inc getpid.sh \
        start-server.sh stop-server.sh tests.sh stress-server.sh \
        test-loop.sh wait-tests.sh \
        channel-test.e connect-test.e check-idle.e invite-test.e \

diff --cc src/tool/Makefile.ng
index a515b4d38aa72db0957371224e46ad16f98b6fcb,dc88420636b7be4ccf5774fa7bb27b12ee540591..460f1148c6aec913995dbae377f683ddd8e5a248
--- 1/src/tool/Makefile.am
--- 2/src/tool/Makefile.ng
+++ b/src/tool/Makefile.ng
@@@ -9,9 -9,11 +9,11 @@@
  # Please read the file COPYING, README and AUTHORS for more information.
  #
  
- AUTOMAKE_OPTIONS = ../portab/ansi2knr
+ __ng_Makefile_am_template__
+ 
+ EXTRA_DIST = Makefile.ng
  
 -INCLUDES = -I$(srcdir)/../portab
 +AM_CPPFLAGS = -I$(srcdir)/../portab
  
  noinst_LIBRARIES = libngtool.a