Merge branch 'automake-am11-am12'

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index 25654f9cfbdfc78d2ef74de059a64cfeeb8e355f..7f3e2d99c4cd6c8689bb09f89c76f300b213a119 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -9,11 +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/])
 
@@ -21,7 +30,7 @@ AC_CONFIG_SRCDIR([src/ngircd/ngircd.c])
 AC_CONFIG_HEADER([src/config.h])
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.11])
+AM_INIT_AUTOMAKE([-Wall 1.10 ]ng_color_tests)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])