autogen.sh: Enforce serial test harness on automake >=1.13

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index a3cab6aee2a77b31cc901aa92ca5795ea5b5e415..47c95990badac3a057b3469380ed011f93dcb870 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors
 #
 # 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
@@ -110,7 +110,7 @@ esac
 # Add additional CFLAGS, eventually specified on the command line:
 test -n "$CFLAGS_ADD" && CFLAGS="$CFLAGS $CFLAGS_ADD"
 
-CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
+CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"' -DDOCDIR='\"\$(docdir)\"'"
 
 # -- Headers --
 
@@ -164,11 +164,11 @@ AC_SEARCH_LIBS([memmove], [UTIL], [], [
        AC_MSG_ERROR([unable to find the memmove() function])
 ])
 # gethostbyname: Solaris libnsl
-AC_SEARCH_LIBS([gethostbyname], [nsl], [], [
+AC_SEARCH_LIBS([gethostbyname], [bind nsl network], [], [
        AC_MSG_ERROR([unable to find the gethostbyname() function])
 ])
 # bind: SVR4 libsocket
-AC_SEARCH_LIBS([bind], [socket], [], [
+AC_SEARCH_LIBS([bind], [socket network], [], [
        AC_MSG_ERROR([unable to find the bind() function])
 ])
 
@@ -604,7 +604,6 @@ test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
 
 AC_CONFIG_FILES([ \
        Makefile \
-       contrib/Anope/Makefile \
        contrib/Debian/Makefile \
        contrib/MacOSX/Makefile \
        contrib/MacOSX/ngIRCd.pmdoc/Makefile \
@@ -712,7 +711,8 @@ echo $ECHO_N "   libiconv support: $ECHO_C"
 
 echo
 
-if ! grep "^AUTOMAKE_OPTIONS = ../portab/ansi2knr" src/ngircd/Makefile.am >/dev/null 2>&1; then
+define(_automake_regex_,[[^AUTOMAKE_OPTIONS = [a-z .\-]*/portab/ansi2knr]])
+if ! grep "_automake_regex_" src/ngircd/Makefile.am >/dev/null 2>&1; then
        echo "WARNING:"
        echo "This GNU automake generated build system does not support \"de-ANSI-fication\","
        echo "therefore don't use it to generate \"official\" distribution archives!"