From: Alexander Barton <alex@barton.de>
Date: Mon, 24 Sep 2012 18:28:02 +0000 (+0200)
Subject: Merge branch 'automake-am11-am12'
X-Git-Tag: rel-20-rc1~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cfb9104419d3c00fbef3fe8639eb04f03d83f3d;p=ngircd

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
---

8cfb9104419d3c00fbef3fe8639eb04f03d83f3d
diff --cc configure.ng
index ac7c0cbd,da723e8f..7f3e2d99
--- a/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 e898d64b,a376e25f..cea6899e
--- a/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 b4091350,8ee044d9..5c853352
--- a/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 5a2a9412,40076b46..b47ba0e5
--- a/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 a515b4d3,dc884206..460f1148
--- a/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