Merge branch 'automake-am11-am12'

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index da723e8fcae037dacbdf6710aef521b3538c1460..7f3e2d99c4cd6c8689bb09f89c76f300b213a119 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -16,9 +16,13 @@ define(VERSION_ID,esyscmd([
        ( [ -n "$V" ] && echo "$V" || echo "??" ) | tr -d '\n';
 ]))
 
        ( [ -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 --
 
 # -- Initialisation --
 

-AC_PREREQ([2.67])
+AC_PREREQ([2.61])

 AC_INIT([ngIRCd], VERSION_ID,
        [ngircd-ml@ngircd.barton.de], [ngircd], [http://ngircd.barton.de/])
 
 AC_INIT([ngIRCd], VERSION_ID,
        [ngircd-ml@ngircd.barton.de], [ngircd], [http://ngircd.barton.de/])
 


@@ -26,7 +30,7 @@ AC_CONFIG_SRCDIR([src/ngircd/ngircd.c])
 AC_CONFIG_HEADER([src/config.h])
 AC_CANONICAL_HOST
 
 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])])
 
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])