Commit Diff
Diff:
a3f3a1097b41d96571c0606b7096aabeeccb8e70
8cfb9104419d3c00fbef3fe8639eb04f03d83f3d
Commit:
8cfb9104419d3c00fbef3fe8639eb04f03d83f3d
Tree:
0e6447693d035653bd309b0f12fb0e7077836005
Author:
Alexander Barton <alex@barton.de>
Committer:
Alexander Barton <alex@barton.de>
Date:
Mon Sep 24 18:28:02 2012 UTC
Message:
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
blob - 19900414b6c60c2f68888aba8dfe734a26aefc01
blob + bfa35421089ad977c92f055da2def29d86ae8d62
--- .gitignore
+++ .gitignore
@@ -9,6 +9,7 @@ build-stamp-ngircd*
config.log
config.status
configure
+configure.in
configure.lineno
cscope.out
debian
blob - 58f202c959cc7a8d42c9ede26453819e7751e15f
blob + b451b78b0447710a6915302a43be9573f67e59d5
--- Makefile.am
+++ Makefile.am
@@ -13,6 +13,8 @@ AUTOMAKE_OPTIONS = gnu
SUBDIRS = doc src man contrib
+EXTRA_DIST = autogen.sh configure.ng .mailmap
+
clean-local:
rm -f build-stamp*
rm -rf ngircd.dest
blob - cca200b2a452d02478224566f135fdf0b8ca4eed
blob + 47c476c79632ef5a3d02b6181b78b8a7905f40de
--- autogen.sh
+++ autogen.sh
@@ -16,6 +16,11 @@
# GNU autoconf. It tries to be smart in finding the correct/usable/available
# installed versions of these tools on your system.
#
+# In addition, it enables or disables the "de-ANSI-fication" support of GNU
+# automake, which is supported up to autoconf 1.11.x an has been removed
+# in automake 1.12 -- make sure to use a version of automake supporting it
+# when generating distribution archives!
+#
# The following strategy is used for each of aclocal, autoheader, automake,
# and autoconf: first, "tool" (the regular name of the tool, e. g. "autoconf"
# or "automake") is checked. If this fails, "tool<major><minor>" (for example
@@ -129,7 +134,7 @@ fi
# Try to detect the needed tools when no environment variable already
# specifies one:
-echo "Searching tools ..."
+echo "Searching for required tools ..."
[ -z "$ACLOCAL" ] && ACLOCAL=`Search aclocal 1`
[ "$VERBOSE" = "1" ] && echo " - ACLOCAL=$ACLOCAL"
[ -z "$AUTOHEADER" ] && AUTOHEADER=`Search autoheader 2`
@@ -139,9 +144,8 @@ echo "Searching tools ..."
[ -z "$AUTOCONF" ] && AUTOCONF=`Search autoconf 2`
[ "$VERBOSE" = "1" ] && echo " - AUTOCONF=$AUTOCONF"
-# Call ./configure when parameters have been passed to this script and
-# GO isn't already defined.
-[ -z "$GO" -a $# -gt 0 ] && GO=1
+[ $# -gt 0 ] && CONFIGURE_ARGS=" $@" || CONFIGURE_ARGS=""
+[ -z "$GO" -a -n "$CONFIGURE_ARGS" ] && GO=1
# Verify that all tools have been found
[ -z "$ACLOCAL" ] && Notfound aclocal
@@ -149,10 +153,37 @@ echo "Searching tools ..."
[ -z "$AUTOMAKE" ] && Notfound automake
[ -z "$AUTOCONF" ] && Notfound autoconf
+AM_VERSION=`$AUTOMAKE --version|head -n 1|egrep -o "([1-9]\.[0-9]+(\.[0-9]+)*)"`
+ifs=$IFS; IFS="."; set $AM_VERSION; IFS=$ifs
+AM_MAJOR="$1"; AM_MINOR="$2"; AM_PATCHLEVEL="$3"
+
+AM_MAKEFILES="src/ipaddr/Makefile.ng src/ngircd/Makefile.ng src/testsuite/Makefile.ng src/tool/Makefile.ng"
+
+if [ "$AM_MAJOR" -eq "1" -a "$AM_MINOR" -lt "12" ]; then
+ # automake < 1.12 => automatic de-ANSI-fication support available
+ echo "Enabling de-ANSI-fication support (automake $AM_VERSION) ..."
+ sed -e "s|^__ng_PROTOTYPES__|AM_C_PROTOTYPES|g" configure.ng >configure.in
+ DEANSI_START=""
+ DEANSI_END=""
+else
+ # automake >= 1.12 => no de-ANSI-fication support available
+ echo "Disabling de-ANSI-fication support (automake $AM_VERSION) ..."
+ sed -e "s|^__ng_PROTOTYPES__|AC_C_PROTOTYPES|g" configure.ng >configure.in
+ DEANSI_START="#"
+ DEANSI_END=" # disabled by ./autogen.sh script"
+fi
+sed -e "s|^__ng_Makefile_am_template__|${DEANSI_START}AUTOMAKE_OPTIONS = ansi2knr${DEANSI_END}|g" \
+ src/portab/Makefile.ng >src/portab/Makefile.am
+for makefile_ng in $AM_MAKEFILES; do
+ makefile_am=`echo "$makefile_ng" | sed -e "s|\.ng\$|\.am|g"`
+ sed -e "s|^__ng_Makefile_am_template__|${DEANSI_START}AUTOMAKE_OPTIONS = ../portab/ansi2knr${DEANSI_END}|g" \
+ $makefile_ng >$makefile_am
+done
+
export ACLOCAL AUTOHEADER AUTOMAKE AUTOCONF
# Generate files
-echo "Generating files ..."
+echo "Generating files using GNU $AUTOCONF and $AUTOMAKE ..."
Run $ACLOCAL && \
Run $AUTOCONF && \
Run $AUTOHEADER && \
@@ -164,8 +195,7 @@ if [ $? -eq 0 -a -x ./configure ]; then
NAME=`grep PACKAGE_STRING= configure | cut -d"'" -f2`
if [ "$GO" = "1" ]; then
[ -n "$PREFIX" ] && p=" --prefix=$PREFIX" || p=""
- [ -n "$*" ] && a=" $*" || a=""
- c="./configure${p}${a}"
+ c="./configure${p}${CONFIGURE_ARGS}"
echo "Okay, autogen.sh for $NAME done."
echo "Calling \"$c\" ..."
$c
blob - ac7c0cbd72879817c417487aaf076d4e2f5c98eb (mode 644)
blob + /dev/null
--- configure.in
+++ /dev/null
@@ -1,681 +0,0 @@
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2012 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
-# 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.
-#
-
-define(VERSION_ID,esyscmd(git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'|tr -d \\n))
-
-m4_ifdef([AM_SILENT_RULES],
- [m4_define([ng_color_tests], [color-tests])],
- [m4_define([ng_color_tests], [])])
-
-# -- Initialisation --
-
-AC_PREREQ([2.61])
-AC_INIT([ngIRCd], VERSION_ID,
- [ngircd-ml@ngircd.barton.de], [ngircd], [http://ngircd.barton.de/])
-
-AC_CONFIG_SRCDIR([src/ngircd/ngircd.c])
-AC_CONFIG_HEADER([src/config.h])
-AC_CANONICAL_HOST
-
-AM_INIT_AUTOMAKE([-Wall 1.10 ]ng_color_tests)
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-# -- Templates for config.h --
-
-AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled])
-AH_TEMPLATE([HAVE_sockaddr_in_len], [Define if sockaddr_in.sin_len exists])
-AH_TEMPLATE([HAVE_socklen_t], [Define if socklen_t exists])
-AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests])
-AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used])
-AH_TEMPLATE([PAM], [Define if PAM should be used])
-AH_TEMPLATE([SNIFFER], [Define if IRC sniffer should be enabled])
-AH_TEMPLATE([STRICT_RFC], [Define if ngIRCd should behave strict RFC compliant])
-AH_TEMPLATE([SYSLOG], [Define if syslog should be used for logging])
-AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used])
-AH_TEMPLATE([WANT_IPV6], [Define if IPV6 protocol should be enabled])
-AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled])
-
-AH_TEMPLATE([HOST_OS], [Target operating system name])
-AH_TEMPLATE([HOST_VENDOR], [Target system vendor])
-AH_TEMPLATE([HOST_CPU], [Target CPU name])
-
-# -- C Compiler --
-
-AC_PROG_CC
-AC_PROG_CC_STDC
-
-# -- Helper programs --
-
-AC_PROG_AWK
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-# -- Compiler Features --
-
-AC_C_CONST
-AC_C_INLINE
-AM_C_PROTOTYPES
-
-# -- Hard coded system and compiler dependencies/features/options ... --
-
-AC_DEFUN([GCC_STACK_PROTECT_CC],[
- ssp_cc=yes
- # we use -fstack-protector-all for the test to enfoce the use of the guard variable
- AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector])
- ssp_old_cflags="$CFLAGS"
- CFLAGS="$CFLAGS -fstack-protector-all"
- AC_TRY_LINK(,,, ssp_cc=no)
- echo $ssp_cc
- CFLAGS="$ssp_old_cflags"
- if test "X$ssp_cc" = "Xyes"; then
- CFLAGS="$CFLAGS -fstack-protector"
- AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
- fi
-])
-
-if test "$GCC" = "yes"; then
- # We are using the GNU C compiler. Good!
- CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes"
-
- GCC_STACK_PROTECT_CC
-fi
-
-case "$host_os" in
- hpux*)
- # This is HP/UX, we need to define _XOPEN_SOURCE_EXTENDED
- # (tested with HP/UX 11.11)
- CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- ;;
-esac
-
-# Add additional CFLAGS, eventually specified on the command line:
-test -n "$CFLAGS_ADD" && CFLAGS="$CFLAGS $CFLAGS_ADD"
-
-CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
-
-# -- Headers --
-
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_HEADER_TIME
-
-# Required header files
-AC_CHECK_HEADERS([ \
- fcntl.h netdb.h netinet/in.h netinet/in_systm.h stdlib.h string.h \
- strings.h sys/socket.h sys/time.h unistd.h \
- ],,AC_MSG_ERROR([required C header missing!]))
-
-# Optional header files
-AC_CHECK_HEADERS_ONCE([ \
- arpa/inet.h inttypes.h malloc.h netinet/ip.h stdbool.h stddef.h \
- stdint.h varargs.h \
- ])
-
-# -- Datatypes --
-
-AC_MSG_CHECKING(whether socklen_t exists)
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
- ],[
- socklen_t a, b;
- a = 2; b = 4; a += b;
- ],[
- AC_DEFINE(HAVE_socklen_t) AC_MSG_RESULT(yes)
- ],[
- AC_MSG_RESULT(no)
-])
-
-AC_TYPE_PID_T
-AC_TYPE_SIGNAL
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UID_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT8_T
-
-AC_CHECK_MEMBER([struct sockaddr_in.sin_len], AC_DEFINE(HAVE_sockaddr_in_len),,
- [#include <arpa/inet.h>])
-
-# -- Libraries --
-
-# memmove: A/UX libUTIL
-AC_SEARCH_LIBS([memmove], [UTIL], [], [
- AC_MSG_ERROR([unable to find the memmove() function])
-])
-# gethostbyname: Solaris libnsl
-AC_SEARCH_LIBS([gethostbyname], [nsl], [], [
- AC_MSG_ERROR([unable to find the gethostbyname() function])
-])
-# bind: SVR4 libsocket
-AC_SEARCH_LIBS([bind], [socket], [], [
- AC_MSG_ERROR([unable to find the bind() function])
-])
-
-# -- Functions --
-
-AC_FUNC_FORK
-AC_FUNC_STRFTIME
-
-# Required functions
-AC_CHECK_FUNCS([ \
- alarm dup2 endpwent gethostbyaddr gethostbyname gethostname \
- gettimeofday inet_ntoa memmove memset setsid socket strcasecmp \
- strchr strcspn strerror strncasecmp strrchr strspn strstr \
- ],,
- AC_MSG_ERROR([required function missing!]))
-
-# Optional functions
-AC_CHECK_FUNCS_ONCE([ \
- gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask \
- snprintf vsnprintf strdup strlcpy strlcat strtok_r waitpid])
-
-# -- Configuration options --
-
-# use syslog?
-
-x_syslog_on=no
-AC_ARG_WITH(syslog,
- AS_HELP_STRING([--without-syslog],
- [disable syslog (autodetected by default)]),
- [ if test "$withval" != "no"; then
- if test "$withval" != "yes"; then
- CFLAGS="-I$withval/include $CFLAGS"
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- fi
- AC_SEARCH_LIBS([syslog], [be], [x_syslog_on=yes], [
- AC_MSG_ERROR([Can't enable syslog!])
- ])
- fi
- ],
- [ AC_SEARCH_LIBS([syslog], [be], [x_syslog_on=yes])
- ]
-)
-if test "$x_syslog_on" = "yes"; then
- AC_DEFINE(SYSLOG, 1)
- AC_CHECK_HEADERS(syslog.h,,AC_MSG_ERROR([required C header missing!]))
-fi
-
-# use zlib compression?
-
-x_zlib_on=no
-AC_ARG_WITH(zlib,
- AS_HELP_STRING([--without-zlib],
- [disable zlib compression (autodetected by default)]),
- [ if test "$withval" != "no"; then
- if test "$withval" != "yes"; then
- CFLAGS="-I$withval/include $CFLAGS"
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- fi
- AC_CHECK_LIB(z, deflate)
- AC_CHECK_FUNCS(deflate, x_zlib_on=yes,
- AC_MSG_ERROR([Can't enable zlib!])
- )
- fi
- ],
- [ AC_CHECK_LIB(z, deflate)
- AC_CHECK_FUNCS(deflate, x_zlib_on=yes)
- ]
-)
-if test "$x_zlib_on" = "yes"; then
- AC_DEFINE(ZLIB, 1)
- AC_CHECK_HEADERS(zlib.h,,AC_MSG_ERROR([required C header missing!]))
-fi
-
-# detect which IO API to use:
-
-x_io_backend=none
-
-AC_ARG_WITH(select,
- AS_HELP_STRING([--without-select],
- [disable select IO support (autodetected by default)]),
- [ if test "$withval" != "no"; then
- if test "$withval" != "yes"; then
- CFLAGS="-I$withval/include $CFLAGS"
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- fi
- AC_CHECK_FUNCS(select, x_io_select=yes,
- AC_MSG_ERROR([Can't enable select IO support!])
- )
- fi
- ],
- [
- AC_CHECK_FUNCS(select, x_io_select=yes)
- ]
-)
-
-AC_ARG_WITH(poll,
- AS_HELP_STRING([--without-poll],
- [disable poll support (autodetected by default)]),
- [ if test "$withval" != "no"; then
- if test "$withval" != "yes"; then
- CFLAGS="-I$withval/include $CFLAGS"
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- fi
- AC_CHECK_FUNCS(poll, [
- AC_CHECK_HEADERS(poll.h,
- x_io_backend=poll\(\),
- AC_MSG_ERROR(
- [Can't enable poll IO support!])
- )
- ], [
- AC_MSG_ERROR([Can't enable poll IO support!])
- ])
- fi
- ],
- [
- AC_CHECK_FUNCS(poll, [
- AC_CHECK_HEADERS(poll.h, x_io_backend=poll\(\))
- ])
- ]
-)
-
-AC_ARG_WITH(devpoll,
- AS_HELP_STRING([--without-devpoll],
- [disable /dev/poll IO support (autodetected by default)]),
- [ if test "$withval" != "no"; then
- if test "$withval" != "yes"; then
- CFLAGS="-I$withval/include $CFLAGS"
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- fi
-
- AC_CHECK_HEADERS(sys/devpoll.h,,AC_MSG_ERROR([required C header missing!]))
- fi
- ],
- [
- AC_CHECK_HEADERS(sys/devpoll.h, x_io_backend=/dev/poll)
- ]
-)
-
-AC_ARG_WITH(epoll,
- AS_HELP_STRING([--without-epoll],
- [disable epoll IO support (autodetected by default)]),
- [ if test "$withval" != "no"; then
- if test "$withval" != "yes"; then
- CFLAGS="-I$withval/include $CFLAGS"
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- fi
- AC_CHECK_FUNCS(epoll_create, x_io_epoll=yes,
- AC_MSG_ERROR([Can't enable epoll IO support!])
- )
- fi
- ],
- [
- AC_CHECK_FUNCS(epoll_create, x_io_epoll=yes)
- ]
-)
-
-AC_ARG_WITH(kqueue,
- AS_HELP_STRING([--without-kqueue],
- [disable kqueue IO support (autodetected by default)]),
- [ if test "$withval" != "no"; then
- if test "$withval" != "yes"; then
- CFLAGS="-I$withval/include $CFLAGS"
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- fi
- AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\),
- AC_MSG_ERROR([Can't enable kqueue IO support!])
- )
- fi
- ],
- [
- AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\))
- ]
-)
-
-if test "$x_io_epoll" = "yes" -a "$x_io_select" = "yes"; then
- # when epoll() and select() are available, we'll use both!
- x_io_backend="epoll(), select()"
-else
- if test "$x_io_epoll" = "yes"; then
- # we prefere epoll() if it is available
- x_io_backend="epoll()"
- else
- if test "$x_io_select" = "yes" -a "$x_io_backend" = "none"; then
- # we'll use select, when available and no "better"
- # interface has been detected ...
- x_io_backend="select()"
- fi
- fi
-fi
-
-if test "$x_io_backend" = "none"; then
- AC_MSG_ERROR([No useable IO API activated/found!?])
-fi
-
-# use SSL?
-
-AC_ARG_WITH(openssl,
- AS_HELP_STRING([--with-openssl],
- [enable SSL support using OpenSSL]),
- [ if test "$withval" != "no"; then
- if test "$withval" != "yes"; then
- CFLAGS="-I$withval/include $CFLAGS"
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- fi
- AC_CHECK_LIB(crypto, BIO_s_mem)
- AC_CHECK_LIB(ssl, SSL_library_init)
- AC_CHECK_FUNCS(SSL_library_init, x_ssl_openssl=yes,
- AC_MSG_ERROR([Can't enable openssl])
- )
- fi
- ]
-)
-
-AC_ARG_WITH(gnutls,
- AS_HELP_STRING([--with-gnutls],
- [enable SSL support using gnutls]),
- [ if test "$withval" != "no"; then
- if test "$withval" != "yes"; then
- CFLAGS="-I$withval/include $CFLAGS"
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- fi
- AC_CHECK_LIB(gnutls, gnutls_global_init)
- AC_CHECK_FUNCS(gnutls_global_init, x_ssl_gnutls=yes,
- AC_MSG_ERROR([Can't enable gnutls])
- )
- fi
- ]
-)
-
-x_ssl_lib="no"
-if test "$x_ssl_gnutls" = "yes"; then
- if test "$x_ssl_openssl" = "yes";then
- AC_MSG_ERROR([Cannot enable both gnutls and openssl])
- fi
- x_ssl_lib=gnutls
-fi
-if test "$x_ssl_openssl" = "yes"; then
- x_ssl_lib=openssl
-fi
-
-# use TCP wrappers?
-
-x_tcpwrap_on=no
-AC_ARG_WITH(tcp-wrappers,
- AS_HELP_STRING([--with-tcp-wrappers],
- [enable TCP wrappers support]),
- [ if test "$withval" != "no"; then
- if test "$withval" != "yes"; then
- CFLAGS="-I$withval/include $CFLAGS"
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- fi
- AC_MSG_CHECKING(for hosts_access)
- LIBS="-lwrap $LIBS"
- AC_TRY_LINK([
-#include <tcpd.h>
-int allow_severity = 0;
-int deny_severity = 0;
- ],[
- tcpd_warn("link test");
- ],[
- AC_MSG_RESULT(yes)
- AC_DEFINE(TCPWRAP, 1)
- x_tcpwrap_on=yes
- ],[
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([Can't enable TCP wrappers!])
- ])
- fi
- ]
-)
-
-# do IDENT requests using libident?
-
-x_identauth_on=no
-AC_ARG_WITH(ident,
- AS_HELP_STRING([--with-ident],
- [enable "IDENT" ("AUTH") protocol support]),
- [ if test "$withval" != "no"; then
- if test "$withval" != "yes"; then
- CFLAGS="-I$withval/include $CFLAGS"
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- fi
- AC_CHECK_LIB(ident, ident_id)
- AC_CHECK_FUNCS(ident_id, x_identauth_on=yes,
- AC_MSG_ERROR([Can't enable IDENT support!])
- )
- fi
- ]
-)
-if test "$x_identauth_on" = "yes"; then
- AC_DEFINE(IDENTAUTH, 1)
- AC_CHECK_HEADERS(ident.h,,AC_MSG_ERROR([required C header missing!]))
-fi
-
-# compile in PAM support?
-
-x_pam_on=no
-AC_ARG_WITH(pam,
- AS_HELP_STRING([--with-pam],
- [enable user authentication using PAM]),
- [ if test "$withval" != "no"; then
- if test "$withval" != "yes"; then
- CFLAGS="-I$withval/include $CFLAGS"
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- fi
- AC_CHECK_LIB(pam, pam_authenticate)
- AC_CHECK_FUNCS(pam_authenticate, x_pam_on=yes,
- AC_MSG_ERROR([Can't enable PAM support!])
- )
- fi
- ]
-)
-if test "$x_pam_on" = "yes"; then
- AC_DEFINE(PAM, 1)
- AC_CHECK_HEADERS(security/pam_appl.h,pam_ok=yes)
- if test "$pam_ok" != "yes"; then
- AC_CHECK_HEADERS(pam/pam_appl.h,pam_ok=yes,
- AC_MSG_ERROR([required C header missing!]))
- fi
-fi
-
-# compile in IRC+ protocol support?
-
-x_ircplus_on=yes
-AC_ARG_ENABLE(ircplus,
- AS_HELP_STRING([--disable-ircplus],
- [disable IRC+ protocol]),
- if test "$enableval" = "no"; then x_ircplus_on=no; fi
-)
-if test "$x_ircplus_on" = "yes"; then
- AC_DEFINE(IRCPLUS, 1)
-fi
-
-# enable support for IPv6?
-x_ipv6_on=no
-AC_ARG_ENABLE(ipv6,
- AS_HELP_STRING([--enable-ipv6],
- [enable IPv6 protocol support]),
- if test "$enableval" = "yes"; then x_ipv6_on=yes; fi
-)
-if test "$x_ipv6_on" = "yes"; then
- # getaddrinfo() and getnameinfo() are optional when not compiling
- # with IPv6 support, but are required for IPv6 to work!
- AC_CHECK_FUNCS([ \
- getaddrinfo getnameinfo \
- ],,AC_MSG_ERROR([required function missing for IPv6 support!]))
- AC_DEFINE(WANT_IPV6, 1)
-fi
-
-# compile in IRC "sniffer"?
-
-x_sniffer_on=no; x_debug_on=no
-AC_ARG_ENABLE(sniffer,
- AS_HELP_STRING([--enable-sniffer],
- [enable IRC traffic sniffer (enables debug mode)]),
- if test "$enableval" = "yes"; then
- AC_DEFINE(SNIFFER, 1)
- x_sniffer_on=yes; x_debug_on=yes
- fi
-)
-
-# enable additional debugging code?
-
-AC_ARG_ENABLE(debug,
- AS_HELP_STRING([--enable-debug],
- [show additional debug output]),
- if test "$enableval" = "yes"; then x_debug_on=yes; fi
-)
-if test "$x_debug_on" = "yes"; then
- AC_DEFINE(DEBUG, 1)
- test "$GCC" = "yes" && CFLAGS="-pedantic $CFLAGS"
- AC_CHECK_FUNCS(mtrace)
-fi
-
-# enable "strict RFC rules"?
-
-x_strict_rfc_on=no
-AC_ARG_ENABLE(strict-rfc,
- AS_HELP_STRING([--enable-strict-rfc],
- [strict RFC conformance -- may break clients!]),
- if test "$enableval" = "yes"; then
- AC_DEFINE(STRICT_RFC, 1)
- x_strict_rfc_on=yes
- fi
-)
-
-# -- Definitions --
-
-AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu" )
-AC_DEFINE_UNQUOTED(HOST_VENDOR, "$host_vendor" )
-AC_DEFINE_UNQUOTED(HOST_OS, "$host_os" )
-
-# Add additional CFLAGS, eventually specified on the command line, but after
-# running this configure script. Useful for "-Werror" for example.
-test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
-
-# -- Generate files --
-
-AC_CONFIG_FILES([ \
- Makefile \
- contrib/Anope/Makefile \
- contrib/Debian/Makefile \
- contrib/MacOSX/Makefile \
- contrib/MacOSX/ngIRCd.pmdoc/Makefile \
- contrib/MacOSX/ngIRCd.xcodeproj/Makefile \
- contrib/Makefile \
- doc/Makefile \
- doc/src/Makefile \
- man/Makefile \
- src/ipaddr/Makefile \
- src/Makefile \
- src/ngircd/Makefile \
- src/portab/Makefile \
- src/testsuite/Makefile \
- src/tool/Makefile \
-])
-
-AC_OUTPUT
-
-type dpkg >/dev/null 2>&1
-if test $? -eq 0; then
- # Generate debian/ link if the dpkg command exists
- # (read: if we are running on a debian compatible system)
- echo "creating Debian-specific links ..."
- test -f debian/rules || ln -s contrib/Debian debian
-fi
-
-# -- Result --
-
-echo
-echo "ngIRCd $PACKAGE_VERSION has been configured with the following options:"
-echo
-
-# Someone please show me a better way :) [borrowed by OpenSSH]
-B=`eval echo ${bindir}` ; B=`eval echo ${B}`
-S=`eval echo ${sbindir}` ; S=`eval echo ${S}`
-C=`eval echo ${sysconfdir}` ; C=`eval echo ${C}`
-M=`eval echo ${mandir}` ; M=`eval echo ${M}`
-D=`eval echo ${docdir}` ; D=`eval echo ${D}`
-
-echo " Host: ${host}"
-echo " Compiler: ${CC}"
-test -n "$CFLAGS" && echo " Compiler flags: ${CFLAGS}"
-test -n "$CPPFLAGS" && echo " Preprocessor flags: ${CPPFLAGS}"
-test -n "$LDFLAGS" && echo " Linker flags: ${LDFLAGS}"
-test -n "$LIBS" && echo " Libraries: ${LIBS}"
-echo
-echo " 'ngircd' binary: $S"
-echo " Configuration file: $C"
-echo " Manual pages: $M"
-echo " Documentation: $D"
-echo
-
-echo $ECHO_N " Syslog support: $ECHO_C"
-test "$x_syslog_on" = "yes" \
- && echo $ECHO_N "yes $ECHO_C" \
- || echo $ECHO_N "no $ECHO_C"
-echo $ECHO_N " Enable debug code: $ECHO_C"
-test "$x_debug_on" = "yes" \
- && echo "yes" \
- || echo "no"
-
-echo $ECHO_N " zlib compression: $ECHO_C"
-test "$x_zlib_on" = "yes" \
- && echo $ECHO_N "yes $ECHO_C" \
- || echo $ECHO_N "no $ECHO_C"
-echo $ECHO_N " IRC sniffer: $ECHO_C"
-test "$x_sniffer_on" = "yes" \
- && echo "yes" \
- || echo "no"
-
-echo $ECHO_N " Use TCP Wrappers: $ECHO_C"
-test "$x_tcpwrap_on" = "yes" \
- && echo $ECHO_N "yes $ECHO_C" \
- || echo $ECHO_N "no $ECHO_C"
-echo $ECHO_N " Strict RFC mode: $ECHO_C"
-test "$x_strict_rfc_on" = "yes" \
- && echo "yes" \
- || echo "no"
-
-echo $ECHO_N " IDENT support: $ECHO_C"
-test "$x_identauth_on" = "yes" \
- && echo $ECHO_N "yes $ECHO_C" \
- || echo $ECHO_N "no $ECHO_C"
-echo $ECHO_N " IRC+ protocol: $ECHO_C"
-test "$x_ircplus_on" = "yes" \
- && echo "yes" \
- || echo "no"
-
-echo $ECHO_N " IPv6 protocol: $ECHO_C"
-test "$x_ipv6_on" = "yes" \
- && echo $ECHO_N "yes $ECHO_C" \
- || echo $ECHO_N "no $ECHO_C"
-echo $ECHO_N " I/O backend: $ECHO_C"
- echo "\"$x_io_backend\""
-
-echo $ECHO_N " PAM support: $ECHO_C"
-test "$x_pam_on" = "yes" \
- && echo $ECHO_N "yes $ECHO_C" \
- || echo $ECHO_N "no $ECHO_C"
-echo $ECHO_N " SSL support: $ECHO_C"
-echo "$x_ssl_lib"
-
-echo
-
-# -eof-
blob - /dev/null
blob + 7f3e2d99c4cd6c8689bb09f89c76f300b213a119 (mode 644)
--- /dev/null
+++ configure.ng
@@ -0,0 +1,694 @@
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001-2012 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
+# 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.
+#
+
+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.61])
+AC_INIT([ngIRCd], VERSION_ID,
+ [ngircd-ml@ngircd.barton.de], [ngircd], [http://ngircd.barton.de/])
+
+AC_CONFIG_SRCDIR([src/ngircd/ngircd.c])
+AC_CONFIG_HEADER([src/config.h])
+AC_CANONICAL_HOST
+
+AM_INIT_AUTOMAKE([-Wall 1.10 ]ng_color_tests)
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+# -- Templates for config.h --
+
+AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled])
+AH_TEMPLATE([HAVE_sockaddr_in_len], [Define if sockaddr_in.sin_len exists])
+AH_TEMPLATE([HAVE_socklen_t], [Define if socklen_t exists])
+AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests])
+AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used])
+AH_TEMPLATE([PAM], [Define if PAM should be used])
+AH_TEMPLATE([SNIFFER], [Define if IRC sniffer should be enabled])
+AH_TEMPLATE([STRICT_RFC], [Define if ngIRCd should behave strict RFC compliant])
+AH_TEMPLATE([SYSLOG], [Define if syslog should be used for logging])
+AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used])
+AH_TEMPLATE([WANT_IPV6], [Define if IPV6 protocol should be enabled])
+AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled])
+
+AH_TEMPLATE([HOST_OS], [Target operating system name])
+AH_TEMPLATE([HOST_VENDOR], [Target system vendor])
+AH_TEMPLATE([HOST_CPU], [Target CPU name])
+
+# -- C Compiler --
+
+AC_PROG_CC
+AC_PROG_CC_STDC
+
+# -- Helper programs --
+
+AC_PROG_AWK
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_RANLIB
+
+# -- Compiler Features --
+
+AC_C_CONST
+AC_C_INLINE
+__ng_PROTOTYPES__
+
+# -- Hard coded system and compiler dependencies/features/options ... --
+
+AC_DEFUN([GCC_STACK_PROTECT_CC],[
+ ssp_cc=yes
+ # we use -fstack-protector-all for the test to enfoce the use of the guard variable
+ AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector])
+ ssp_old_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS -fstack-protector-all"
+ AC_TRY_LINK(,,, ssp_cc=no)
+ echo $ssp_cc
+ CFLAGS="$ssp_old_cflags"
+ if test "X$ssp_cc" = "Xyes"; then
+ CFLAGS="$CFLAGS -fstack-protector"
+ AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
+ fi
+])
+
+if test "$GCC" = "yes"; then
+ # We are using the GNU C compiler. Good!
+ CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes"
+
+ GCC_STACK_PROTECT_CC
+fi
+
+case "$host_os" in
+ hpux*)
+ # This is HP/UX, we need to define _XOPEN_SOURCE_EXTENDED
+ # (tested with HP/UX 11.11)
+ CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ ;;
+esac
+
+# Add additional CFLAGS, eventually specified on the command line:
+test -n "$CFLAGS_ADD" && CFLAGS="$CFLAGS $CFLAGS_ADD"
+
+CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
+
+# -- Headers --
+
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_HEADER_TIME
+
+# Required header files
+AC_CHECK_HEADERS([ \
+ fcntl.h netdb.h netinet/in.h netinet/in_systm.h stdlib.h string.h \
+ strings.h sys/socket.h sys/time.h unistd.h \
+ ],,AC_MSG_ERROR([required C header missing!]))
+
+# Optional header files
+AC_CHECK_HEADERS_ONCE([ \
+ arpa/inet.h inttypes.h malloc.h netinet/ip.h stdbool.h stddef.h \
+ stdint.h varargs.h \
+ ])
+
+# -- Datatypes --
+
+AC_MSG_CHECKING(whether socklen_t exists)
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+ ],[
+ socklen_t a, b;
+ a = 2; b = 4; a += b;
+ ],[
+ AC_DEFINE(HAVE_socklen_t) AC_MSG_RESULT(yes)
+ ],[
+ AC_MSG_RESULT(no)
+])
+
+AC_TYPE_PID_T
+AC_TYPE_SIGNAL
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UID_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT8_T
+
+AC_CHECK_MEMBER([struct sockaddr_in.sin_len], AC_DEFINE(HAVE_sockaddr_in_len),,
+ [#include <arpa/inet.h>])
+
+# -- Libraries --
+
+# memmove: A/UX libUTIL
+AC_SEARCH_LIBS([memmove], [UTIL], [], [
+ AC_MSG_ERROR([unable to find the memmove() function])
+])
+# gethostbyname: Solaris libnsl
+AC_SEARCH_LIBS([gethostbyname], [nsl], [], [
+ AC_MSG_ERROR([unable to find the gethostbyname() function])
+])
+# bind: SVR4 libsocket
+AC_SEARCH_LIBS([bind], [socket], [], [
+ AC_MSG_ERROR([unable to find the bind() function])
+])
+
+# -- Functions --
+
+AC_FUNC_FORK
+AC_FUNC_STRFTIME
+
+# Required functions
+AC_CHECK_FUNCS([ \
+ alarm dup2 endpwent gethostbyaddr gethostbyname gethostname \
+ gettimeofday inet_ntoa memmove memset setsid socket strcasecmp \
+ strchr strcspn strerror strncasecmp strrchr strspn strstr \
+ ],,
+ AC_MSG_ERROR([required function missing!]))
+
+# Optional functions
+AC_CHECK_FUNCS_ONCE([ \
+ gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask \
+ snprintf vsnprintf strdup strlcpy strlcat strtok_r waitpid])
+
+# -- Configuration options --
+
+# use syslog?
+
+x_syslog_on=no
+AC_ARG_WITH(syslog,
+ AS_HELP_STRING([--without-syslog],
+ [disable syslog (autodetected by default)]),
+ [ if test "$withval" != "no"; then
+ if test "$withval" != "yes"; then
+ CFLAGS="-I$withval/include $CFLAGS"
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ fi
+ AC_SEARCH_LIBS([syslog], [be], [x_syslog_on=yes], [
+ AC_MSG_ERROR([Can't enable syslog!])
+ ])
+ fi
+ ],
+ [ AC_SEARCH_LIBS([syslog], [be], [x_syslog_on=yes])
+ ]
+)
+if test "$x_syslog_on" = "yes"; then
+ AC_DEFINE(SYSLOG, 1)
+ AC_CHECK_HEADERS(syslog.h,,AC_MSG_ERROR([required C header missing!]))
+fi
+
+# use zlib compression?
+
+x_zlib_on=no
+AC_ARG_WITH(zlib,
+ AS_HELP_STRING([--without-zlib],
+ [disable zlib compression (autodetected by default)]),
+ [ if test "$withval" != "no"; then
+ if test "$withval" != "yes"; then
+ CFLAGS="-I$withval/include $CFLAGS"
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ fi
+ AC_CHECK_LIB(z, deflate)
+ AC_CHECK_FUNCS(deflate, x_zlib_on=yes,
+ AC_MSG_ERROR([Can't enable zlib!])
+ )
+ fi
+ ],
+ [ AC_CHECK_LIB(z, deflate)
+ AC_CHECK_FUNCS(deflate, x_zlib_on=yes)
+ ]
+)
+if test "$x_zlib_on" = "yes"; then
+ AC_DEFINE(ZLIB, 1)
+ AC_CHECK_HEADERS(zlib.h,,AC_MSG_ERROR([required C header missing!]))
+fi
+
+# detect which IO API to use:
+
+x_io_backend=none
+
+AC_ARG_WITH(select,
+ AS_HELP_STRING([--without-select],
+ [disable select IO support (autodetected by default)]),
+ [ if test "$withval" != "no"; then
+ if test "$withval" != "yes"; then
+ CFLAGS="-I$withval/include $CFLAGS"
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ fi
+ AC_CHECK_FUNCS(select, x_io_select=yes,
+ AC_MSG_ERROR([Can't enable select IO support!])
+ )
+ fi
+ ],
+ [
+ AC_CHECK_FUNCS(select, x_io_select=yes)
+ ]
+)
+
+AC_ARG_WITH(poll,
+ AS_HELP_STRING([--without-poll],
+ [disable poll support (autodetected by default)]),
+ [ if test "$withval" != "no"; then
+ if test "$withval" != "yes"; then
+ CFLAGS="-I$withval/include $CFLAGS"
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ fi
+ AC_CHECK_FUNCS(poll, [
+ AC_CHECK_HEADERS(poll.h,
+ x_io_backend=poll\(\),
+ AC_MSG_ERROR(
+ [Can't enable poll IO support!])
+ )
+ ], [
+ AC_MSG_ERROR([Can't enable poll IO support!])
+ ])
+ fi
+ ],
+ [
+ AC_CHECK_FUNCS(poll, [
+ AC_CHECK_HEADERS(poll.h, x_io_backend=poll\(\))
+ ])
+ ]
+)
+
+AC_ARG_WITH(devpoll,
+ AS_HELP_STRING([--without-devpoll],
+ [disable /dev/poll IO support (autodetected by default)]),
+ [ if test "$withval" != "no"; then
+ if test "$withval" != "yes"; then
+ CFLAGS="-I$withval/include $CFLAGS"
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ fi
+
+ AC_CHECK_HEADERS(sys/devpoll.h,,AC_MSG_ERROR([required C header missing!]))
+ fi
+ ],
+ [
+ AC_CHECK_HEADERS(sys/devpoll.h, x_io_backend=/dev/poll)
+ ]
+)
+
+AC_ARG_WITH(epoll,
+ AS_HELP_STRING([--without-epoll],
+ [disable epoll IO support (autodetected by default)]),
+ [ if test "$withval" != "no"; then
+ if test "$withval" != "yes"; then
+ CFLAGS="-I$withval/include $CFLAGS"
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ fi
+ AC_CHECK_FUNCS(epoll_create, x_io_epoll=yes,
+ AC_MSG_ERROR([Can't enable epoll IO support!])
+ )
+ fi
+ ],
+ [
+ AC_CHECK_FUNCS(epoll_create, x_io_epoll=yes)
+ ]
+)
+
+AC_ARG_WITH(kqueue,
+ AS_HELP_STRING([--without-kqueue],
+ [disable kqueue IO support (autodetected by default)]),
+ [ if test "$withval" != "no"; then
+ if test "$withval" != "yes"; then
+ CFLAGS="-I$withval/include $CFLAGS"
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ fi
+ AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\),
+ AC_MSG_ERROR([Can't enable kqueue IO support!])
+ )
+ fi
+ ],
+ [
+ AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\))
+ ]
+)
+
+if test "$x_io_epoll" = "yes" -a "$x_io_select" = "yes"; then
+ # when epoll() and select() are available, we'll use both!
+ x_io_backend="epoll(), select()"
+else
+ if test "$x_io_epoll" = "yes"; then
+ # we prefere epoll() if it is available
+ x_io_backend="epoll()"
+ else
+ if test "$x_io_select" = "yes" -a "$x_io_backend" = "none"; then
+ # we'll use select, when available and no "better"
+ # interface has been detected ...
+ x_io_backend="select()"
+ fi
+ fi
+fi
+
+if test "$x_io_backend" = "none"; then
+ AC_MSG_ERROR([No useable IO API activated/found!?])
+fi
+
+# use SSL?
+
+AC_ARG_WITH(openssl,
+ AS_HELP_STRING([--with-openssl],
+ [enable SSL support using OpenSSL]),
+ [ if test "$withval" != "no"; then
+ if test "$withval" != "yes"; then
+ CFLAGS="-I$withval/include $CFLAGS"
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ fi
+ AC_CHECK_LIB(crypto, BIO_s_mem)
+ AC_CHECK_LIB(ssl, SSL_library_init)
+ AC_CHECK_FUNCS(SSL_library_init, x_ssl_openssl=yes,
+ AC_MSG_ERROR([Can't enable openssl])
+ )
+ fi
+ ]
+)
+
+AC_ARG_WITH(gnutls,
+ AS_HELP_STRING([--with-gnutls],
+ [enable SSL support using gnutls]),
+ [ if test "$withval" != "no"; then
+ if test "$withval" != "yes"; then
+ CFLAGS="-I$withval/include $CFLAGS"
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ fi
+ AC_CHECK_LIB(gnutls, gnutls_global_init)
+ AC_CHECK_FUNCS(gnutls_global_init, x_ssl_gnutls=yes,
+ AC_MSG_ERROR([Can't enable gnutls])
+ )
+ fi
+ ]
+)
+
+x_ssl_lib="no"
+if test "$x_ssl_gnutls" = "yes"; then
+ if test "$x_ssl_openssl" = "yes";then
+ AC_MSG_ERROR([Cannot enable both gnutls and openssl])
+ fi
+ x_ssl_lib=gnutls
+fi
+if test "$x_ssl_openssl" = "yes"; then
+ x_ssl_lib=openssl
+fi
+
+# use TCP wrappers?
+
+x_tcpwrap_on=no
+AC_ARG_WITH(tcp-wrappers,
+ AS_HELP_STRING([--with-tcp-wrappers],
+ [enable TCP wrappers support]),
+ [ if test "$withval" != "no"; then
+ if test "$withval" != "yes"; then
+ CFLAGS="-I$withval/include $CFLAGS"
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ fi
+ AC_MSG_CHECKING(for hosts_access)
+ LIBS="-lwrap $LIBS"
+ AC_TRY_LINK([
+#include <tcpd.h>
+int allow_severity = 0;
+int deny_severity = 0;
+ ],[
+ tcpd_warn("link test");
+ ],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(TCPWRAP, 1)
+ x_tcpwrap_on=yes
+ ],[
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([Can't enable TCP wrappers!])
+ ])
+ fi
+ ]
+)
+
+# do IDENT requests using libident?
+
+x_identauth_on=no
+AC_ARG_WITH(ident,
+ AS_HELP_STRING([--with-ident],
+ [enable "IDENT" ("AUTH") protocol support]),
+ [ if test "$withval" != "no"; then
+ if test "$withval" != "yes"; then
+ CFLAGS="-I$withval/include $CFLAGS"
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ fi
+ AC_CHECK_LIB(ident, ident_id)
+ AC_CHECK_FUNCS(ident_id, x_identauth_on=yes,
+ AC_MSG_ERROR([Can't enable IDENT support!])
+ )
+ fi
+ ]
+)
+if test "$x_identauth_on" = "yes"; then
+ AC_DEFINE(IDENTAUTH, 1)
+ AC_CHECK_HEADERS(ident.h,,AC_MSG_ERROR([required C header missing!]))
+fi
+
+# compile in PAM support?
+
+x_pam_on=no
+AC_ARG_WITH(pam,
+ AS_HELP_STRING([--with-pam],
+ [enable user authentication using PAM]),
+ [ if test "$withval" != "no"; then
+ if test "$withval" != "yes"; then
+ CFLAGS="-I$withval/include $CFLAGS"
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ fi
+ AC_CHECK_LIB(pam, pam_authenticate)
+ AC_CHECK_FUNCS(pam_authenticate, x_pam_on=yes,
+ AC_MSG_ERROR([Can't enable PAM support!])
+ )
+ fi
+ ]
+)
+if test "$x_pam_on" = "yes"; then
+ AC_DEFINE(PAM, 1)
+ AC_CHECK_HEADERS(security/pam_appl.h,pam_ok=yes)
+ if test "$pam_ok" != "yes"; then
+ AC_CHECK_HEADERS(pam/pam_appl.h,pam_ok=yes,
+ AC_MSG_ERROR([required C header missing!]))
+ fi
+fi
+
+# compile in IRC+ protocol support?
+
+x_ircplus_on=yes
+AC_ARG_ENABLE(ircplus,
+ AS_HELP_STRING([--disable-ircplus],
+ [disable IRC+ protocol]),
+ if test "$enableval" = "no"; then x_ircplus_on=no; fi
+)
+if test "$x_ircplus_on" = "yes"; then
+ AC_DEFINE(IRCPLUS, 1)
+fi
+
+# enable support for IPv6?
+x_ipv6_on=no
+AC_ARG_ENABLE(ipv6,
+ AS_HELP_STRING([--enable-ipv6],
+ [enable IPv6 protocol support]),
+ if test "$enableval" = "yes"; then x_ipv6_on=yes; fi
+)
+if test "$x_ipv6_on" = "yes"; then
+ # getaddrinfo() and getnameinfo() are optional when not compiling
+ # with IPv6 support, but are required for IPv6 to work!
+ AC_CHECK_FUNCS([ \
+ getaddrinfo getnameinfo \
+ ],,AC_MSG_ERROR([required function missing for IPv6 support!]))
+ AC_DEFINE(WANT_IPV6, 1)
+fi
+
+# compile in IRC "sniffer"?
+
+x_sniffer_on=no; x_debug_on=no
+AC_ARG_ENABLE(sniffer,
+ AS_HELP_STRING([--enable-sniffer],
+ [enable IRC traffic sniffer (enables debug mode)]),
+ if test "$enableval" = "yes"; then
+ AC_DEFINE(SNIFFER, 1)
+ x_sniffer_on=yes; x_debug_on=yes
+ fi
+)
+
+# enable additional debugging code?
+
+AC_ARG_ENABLE(debug,
+ AS_HELP_STRING([--enable-debug],
+ [show additional debug output]),
+ if test "$enableval" = "yes"; then x_debug_on=yes; fi
+)
+if test "$x_debug_on" = "yes"; then
+ AC_DEFINE(DEBUG, 1)
+ test "$GCC" = "yes" && CFLAGS="-pedantic $CFLAGS"
+ AC_CHECK_FUNCS(mtrace)
+fi
+
+# enable "strict RFC rules"?
+
+x_strict_rfc_on=no
+AC_ARG_ENABLE(strict-rfc,
+ AS_HELP_STRING([--enable-strict-rfc],
+ [strict RFC conformance -- may break clients!]),
+ if test "$enableval" = "yes"; then
+ AC_DEFINE(STRICT_RFC, 1)
+ x_strict_rfc_on=yes
+ fi
+)
+
+# -- Definitions --
+
+AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu" )
+AC_DEFINE_UNQUOTED(HOST_VENDOR, "$host_vendor" )
+AC_DEFINE_UNQUOTED(HOST_OS, "$host_os" )
+
+# Add additional CFLAGS, eventually specified on the command line, but after
+# running this configure script. Useful for "-Werror" for example.
+test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
+
+# -- Generate files --
+
+AC_CONFIG_FILES([ \
+ Makefile \
+ contrib/Anope/Makefile \
+ contrib/Debian/Makefile \
+ contrib/MacOSX/Makefile \
+ contrib/MacOSX/ngIRCd.pmdoc/Makefile \
+ contrib/MacOSX/ngIRCd.xcodeproj/Makefile \
+ contrib/Makefile \
+ doc/Makefile \
+ doc/src/Makefile \
+ man/Makefile \
+ src/ipaddr/Makefile \
+ src/Makefile \
+ src/ngircd/Makefile \
+ src/portab/Makefile \
+ src/testsuite/Makefile \
+ src/tool/Makefile \
+])
+
+AC_OUTPUT
+
+type dpkg >/dev/null 2>&1
+if test $? -eq 0; then
+ # Generate debian/ link if the dpkg command exists
+ # (read: if we are running on a debian compatible system)
+ echo "creating Debian-specific links ..."
+ test -f debian/rules || ln -s contrib/Debian debian
+fi
+
+# -- Result --
+
+echo
+echo "ngIRCd $PACKAGE_VERSION has been configured with the following options:"
+echo
+
+# Someone please show me a better way :) [borrowed by OpenSSH]
+B=`eval echo ${bindir}` ; B=`eval echo ${B}`
+S=`eval echo ${sbindir}` ; S=`eval echo ${S}`
+C=`eval echo ${sysconfdir}` ; C=`eval echo ${C}`
+M=`eval echo ${mandir}` ; M=`eval echo ${M}`
+D=`eval echo ${docdir}` ; D=`eval echo ${D}`
+
+echo " Host: ${host}"
+echo " Compiler: ${CC}"
+test -n "$CFLAGS" && echo " Compiler flags: ${CFLAGS}"
+test -n "$CPPFLAGS" && echo " Preprocessor flags: ${CPPFLAGS}"
+test -n "$LDFLAGS" && echo " Linker flags: ${LDFLAGS}"
+test -n "$LIBS" && echo " Libraries: ${LIBS}"
+echo
+echo " 'ngircd' binary: $S"
+echo " Configuration file: $C"
+echo " Manual pages: $M"
+echo " Documentation: $D"
+echo
+
+echo $ECHO_N " Syslog support: $ECHO_C"
+test "$x_syslog_on" = "yes" \
+ && echo $ECHO_N "yes $ECHO_C" \
+ || echo $ECHO_N "no $ECHO_C"
+echo $ECHO_N " Enable debug code: $ECHO_C"
+test "$x_debug_on" = "yes" \
+ && echo "yes" \
+ || echo "no"
+
+echo $ECHO_N " zlib compression: $ECHO_C"
+test "$x_zlib_on" = "yes" \
+ && echo $ECHO_N "yes $ECHO_C" \
+ || echo $ECHO_N "no $ECHO_C"
+echo $ECHO_N " IRC sniffer: $ECHO_C"
+test "$x_sniffer_on" = "yes" \
+ && echo "yes" \
+ || echo "no"
+
+echo $ECHO_N " Use TCP Wrappers: $ECHO_C"
+test "$x_tcpwrap_on" = "yes" \
+ && echo $ECHO_N "yes $ECHO_C" \
+ || echo $ECHO_N "no $ECHO_C"
+echo $ECHO_N " Strict RFC mode: $ECHO_C"
+test "$x_strict_rfc_on" = "yes" \
+ && echo "yes" \
+ || echo "no"
+
+echo $ECHO_N " IDENT support: $ECHO_C"
+test "$x_identauth_on" = "yes" \
+ && echo $ECHO_N "yes $ECHO_C" \
+ || echo $ECHO_N "no $ECHO_C"
+echo $ECHO_N " IRC+ protocol: $ECHO_C"
+test "$x_ircplus_on" = "yes" \
+ && echo "yes" \
+ || echo "no"
+
+echo $ECHO_N " IPv6 protocol: $ECHO_C"
+test "$x_ipv6_on" = "yes" \
+ && echo $ECHO_N "yes $ECHO_C" \
+ || echo $ECHO_N "no $ECHO_C"
+echo $ECHO_N " I/O backend: $ECHO_C"
+ echo "\"$x_io_backend\""
+
+echo $ECHO_N " PAM support: $ECHO_C"
+test "$x_pam_on" = "yes" \
+ && echo $ECHO_N "yes $ECHO_C" \
+ || echo $ECHO_N "no $ECHO_C"
+echo $ECHO_N " SSL support: $ECHO_C"
+echo "$x_ssl_lib"
+
+echo
+
+if ! grep "^AUTOMAKE_OPTIONS = ../portab/ansi2knr" 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!"
+ echo "(Most probably you want to use GNU automake 1.11.x for this purpose ...)"
+ echo
+fi
+
+# -eof-
blob - e898d64b9857e8ba0a5f8fd21c4ff626b07a068b (mode 644)
blob + /dev/null
--- src/ipaddr/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# ipaddr/Makefile.am
-# (c) 2008 Florian Westphal <fw@strlen.de>, public domain.
-#
-
-AUTOMAKE_OPTIONS = ../portab/ansi2knr
-
-AM_CPPFLAGS = -I$(srcdir)/../portab
-
-noinst_LIBRARIES = libngipaddr.a
-
-libngipaddr_a_SOURCES = ng_ipaddr.c
-
-noinst_HEADERS = ng_ipaddr.h
-
-maintainer-clean-local:
- rm -f Makefile Makefile.in
-
-# -eof-
blob - /dev/null
blob + 08a6d725b51930d1162342705fb6b5444f68a980 (mode 644)
--- /dev/null
+++ src/ipaddr/.gitignore
@@ -0,0 +1 @@
+Makefile.am
blob - /dev/null
blob + cea6899e9c5cca37289c4a83e199d420c175951d (mode 644)
--- /dev/null
+++ src/ipaddr/Makefile.ng
@@ -0,0 +1,21 @@
+#
+# ipaddr/Makefile.am
+# (c) 2008 Florian Westphal <fw@strlen.de>, public domain.
+#
+
+__ng_Makefile_am_template__
+
+EXTRA_DIST = Makefile.ng
+
+AM_CPPFLAGS = -I$(srcdir)/../portab
+
+noinst_LIBRARIES = libngipaddr.a
+
+libngipaddr_a_SOURCES = ng_ipaddr.c
+
+noinst_HEADERS = ng_ipaddr.h
+
+maintainer-clean-local:
+ rm -f Makefile Makefile.in
+
+# -eof-
blob - c25ba5e3426f430c39c09bf4ca00cafb9294ade6
blob + d1148bfb7adb9d19931b22b39fbcd81584ee7859
--- src/ngircd/.gitignore
+++ src/ngircd/.gitignore
@@ -1,3 +1,4 @@
+Makefile.am
check-help
check-version
ngircd
blob - b40913500c614e95c26dd0be4679f816ebdef651 (mode 644)
blob + /dev/null
--- src/ngircd/Makefile.am
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2012 Alexander Barton (alex@barton.de)
-#
-# 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
-
-AM_CPPFLAGS = -I$(srcdir)/../portab -I$(srcdir)/../tool -I$(srcdir)/../ipaddr
-
-LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN \
- -varuse -retvalother -emptyret -unrecog
-
-sbin_PROGRAMS = ngircd
-
-ngircd_SOURCES = \
- ngircd.c \
- array.c \
- channel.c \
- class.c \
- client.c \
- client-cap.c \
- conf.c \
- conn.c \
- conn-func.c \
- conn-ssl.c \
- conn-zip.c \
- hash.c \
- io.c \
- irc.c \
- irc-cap.c \
- irc-channel.c \
- irc-info.c \
- irc-login.c \
- irc-mode.c \
- irc-op.c \
- irc-oper.c \
- irc-server.c \
- irc-write.c \
- lists.c \
- log.c \
- login.c \
- match.c \
- numeric.c \
- op.c \
- pam.c \
- parse.c \
- proc.c \
- resolve.c \
- sighandlers.c
-
-ngircd_LDFLAGS = -L../portab -L../tool -L../ipaddr
-
-ngircd_LDADD = -lngportab -lngtool -lngipaddr
-
-noinst_HEADERS = \
- ngircd.h \
- array.h \
- channel.h \
- class.h \
- client.h \
- client-cap.h \
- conf.h \
- conf-ssl.h \
- conn.h \
- conn-func.h \
- conn-ssl.h \
- conn-zip.h \
- defines.h \
- hash.h \
- io.h \
- irc.h \
- irc-cap.h \
- irc-channel.h \
- irc-info.h \
- irc-login.h \
- irc-mode.h \
- irc-op.h \
- irc-oper.h \
- irc-server.h \
- irc-write.h \
- lists.h \
- log.h \
- login.h \
- match.h \
- messages.h \
- numeric.h \
- op.h \
- pam.h \
- parse.h \
- proc.h \
- resolve.h \
- sighandlers.h
-
-clean-local:
- rm -f check-version check-help lint.out
-
-maintainer-clean-local:
- rm -f Makefile Makefile.in
-
-check-version: Makefile
- echo "#!/bin/sh" > check-version
- echo "./ngircd --version | grep ngircd >/dev/null 2>&1" >>check-version
- chmod 755 check-version
-
-check-help: Makefile
- echo "#!/bin/sh" > check-help
- echo "./ngircd --help | grep help >/dev/null 2>&1" >>check-help
- chmod 755 check-help
-
-lint:
- @splint --version >/dev/null 2>&1 \
- || ( echo; echo "Error: \"splint\" not found!"; echo; exit 1 )
- @echo; warnings=0; files=0; \
- for f in *.c; do \
- echo "checking $$f ..."; \
- splint $$f $(LINTARGS) -I$(srcdir) -I$(srcdir)/.. \
- $(AM_CPPFLAGS) $(AM_CFLAGS) >lint.out 2>&1; \
- grep "no warnings" lint.out > /dev/null 2>&1; \
- if [ $$? -ne 0 ]; then \
- waswarning=1; \
- echo; grep -v "^Command Line: " lint.out; echo; \
- w=$$( grep "code warning" lint.out | $(AWK) "{ print \$$4 }" ); \
- [ "$$w" -gt 0 ] && warnings=`expr $$warnings + $$w`; \
- files=`expr $$files + 1`; \
- else \
- waswarning=0; \
- fi; \
- rm -f lint.out; \
- done; \
- [ $$waswarning -eq 0 ] && echo; \
- [ $$warnings -gt 0 ] \
- && echo "Result: $$warnings warning(s) in $$files file(s)!" \
- || echo "Result: no warnings found."; \
- echo; [ $$warnings -gt 0 ] && exit 1
-
-TESTS = check-version check-help
-
-# -eof-
blob - /dev/null
blob + 5c8533523b4430c7055d1b21e625331670c8950c (mode 644)
--- /dev/null
+++ src/ngircd/Makefile.ng
@@ -0,0 +1,146 @@
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001-2012 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
+# 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.
+#
+
+__ng_Makefile_am_template__
+
+EXTRA_DIST = Makefile.ng
+
+AM_CPPFLAGS = -I$(srcdir)/../portab -I$(srcdir)/../tool -I$(srcdir)/../ipaddr
+
+LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN \
+ -varuse -retvalother -emptyret -unrecog
+
+sbin_PROGRAMS = ngircd
+
+ngircd_SOURCES = \
+ ngircd.c \
+ array.c \
+ channel.c \
+ class.c \
+ client.c \
+ client-cap.c \
+ conf.c \
+ conn.c \
+ conn-func.c \
+ conn-ssl.c \
+ conn-zip.c \
+ hash.c \
+ io.c \
+ irc.c \
+ irc-cap.c \
+ irc-channel.c \
+ irc-info.c \
+ irc-login.c \
+ irc-mode.c \
+ irc-op.c \
+ irc-oper.c \
+ irc-server.c \
+ irc-write.c \
+ lists.c \
+ log.c \
+ login.c \
+ match.c \
+ numeric.c \
+ op.c \
+ pam.c \
+ parse.c \
+ proc.c \
+ resolve.c \
+ sighandlers.c
+
+ngircd_LDFLAGS = -L../portab -L../tool -L../ipaddr
+
+ngircd_LDADD = -lngportab -lngtool -lngipaddr
+
+noinst_HEADERS = \
+ ngircd.h \
+ array.h \
+ channel.h \
+ class.h \
+ client.h \
+ client-cap.h \
+ conf.h \
+ conf-ssl.h \
+ conn.h \
+ conn-func.h \
+ conn-ssl.h \
+ conn-zip.h \
+ defines.h \
+ hash.h \
+ io.h \
+ irc.h \
+ irc-cap.h \
+ irc-channel.h \
+ irc-info.h \
+ irc-login.h \
+ irc-mode.h \
+ irc-op.h \
+ irc-oper.h \
+ irc-server.h \
+ irc-write.h \
+ lists.h \
+ log.h \
+ login.h \
+ match.h \
+ messages.h \
+ numeric.h \
+ op.h \
+ pam.h \
+ parse.h \
+ proc.h \
+ resolve.h \
+ sighandlers.h
+
+clean-local:
+ rm -f check-version check-help lint.out
+
+maintainer-clean-local:
+ rm -f Makefile Makefile.in
+
+check-version: Makefile
+ echo "#!/bin/sh" > check-version
+ echo "./ngircd --version | grep ngircd >/dev/null 2>&1" >>check-version
+ chmod 755 check-version
+
+check-help: Makefile
+ echo "#!/bin/sh" > check-help
+ echo "./ngircd --help | grep help >/dev/null 2>&1" >>check-help
+ chmod 755 check-help
+
+lint:
+ @splint --version >/dev/null 2>&1 \
+ || ( echo; echo "Error: \"splint\" not found!"; echo; exit 1 )
+ @echo; warnings=0; files=0; \
+ for f in *.c; do \
+ echo "checking $$f ..."; \
+ splint $$f $(LINTARGS) -I$(srcdir) -I$(srcdir)/.. \
+ $(AM_CPPFLAGS) $(AM_CFLAGS) >lint.out 2>&1; \
+ grep "no warnings" lint.out > /dev/null 2>&1; \
+ if [ $$? -ne 0 ]; then \
+ waswarning=1; \
+ echo; grep -v "^Command Line: " lint.out; echo; \
+ w=$$( grep "code warning" lint.out | $(AWK) "{ print \$$4 }" ); \
+ [ "$$w" -gt 0 ] && warnings=`expr $$warnings + $$w`; \
+ files=`expr $$files + 1`; \
+ else \
+ waswarning=0; \
+ fi; \
+ rm -f lint.out; \
+ done; \
+ [ $$waswarning -eq 0 ] && echo; \
+ [ $$warnings -gt 0 ] \
+ && echo "Result: $$warnings warning(s) in $$files file(s)!" \
+ || echo "Result: no warnings found."; \
+ echo; [ $$warnings -gt 0 ] && exit 1
+
+TESTS = check-version check-help
+
+# -eof-
blob - 839a69fd918df3588412d3fb4bd767b566305603
blob + 9bac6ac1ad6c587487b2bd74aeff82e166af178f
--- src/portab/.gitignore
+++ src/portab/.gitignore
@@ -1 +1,2 @@
+Makefile.am
portabtest
blob - a57ea4959803aa160013f5f9c56020d8f0eab8a8 (mode 644)
blob + /dev/null
--- src/portab/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
-#
-# 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.
-#
-
-AUTOMAKE_OPTIONS = ansi2knr
-
-noinst_LIBRARIES = libngportab.a
-
-libngportab_a_SOURCES = strdup.c strlcpy.c strtok_r.c vsnprintf.c waitpid.c
-
-check_PROGRAMS = portabtest
-
-portabtest_SOURCES = portabtest.c
-
-portabtest_LDFLAGS = -L.
-
-portabtest_LDADD = -lngportab
-
-noinst_HEADERS = imp.h exp.h portab.h splint.h
-
-maintainer-clean-local:
- rm -f Makefile Makefile.in
-
-TESTS = portabtest
-
-# -eof-
blob - /dev/null
blob + e27980ee229be7616ca614e3fccb4b6fb27d7b9e (mode 644)
--- /dev/null
+++ src/portab/Makefile.ng
@@ -0,0 +1,35 @@
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001-2012 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
+# 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.
+#
+
+__ng_Makefile_am_template__
+
+EXTRA_DIST = Makefile.ng
+
+noinst_LIBRARIES = libngportab.a
+
+libngportab_a_SOURCES = strdup.c strlcpy.c strtok_r.c vsnprintf.c waitpid.c
+
+check_PROGRAMS = portabtest
+
+portabtest_SOURCES = portabtest.c
+
+portabtest_LDFLAGS = -L.
+
+portabtest_LDADD = -lngportab
+
+noinst_HEADERS = imp.h exp.h portab.h splint.h
+
+maintainer-clean-local:
+ rm -f Makefile Makefile.in
+
+TESTS = portabtest
+
+# -eof-
blob - 5884a486590f98b275cb7b52a1187349b377035e
blob + b33a08f4be74918b6160bf726acfa496d820561d
--- src/testsuite/.gitignore
+++ src/testsuite/.gitignore
@@ -1,3 +1,4 @@
+Makefile.am
T-ngircd1
T-ngircd2
channel-test
blob - 5a2a94124a1ea9a3bbf8afa2c93ac8bcd08234bd (mode 644)
blob + /dev/null
--- src/testsuite/Makefile.am
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2011 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.
-#
-
-AUTOMAKE_OPTIONS = ../portab/ansi2knr
-
-AM_CPPFLAGS = -I$(srcdir)/../portab
-
-EXTRA_DIST = \
- 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 \
- join-test.e kick-test.e message-test.e misc-test.e mode-test.e \
- opless-channel-test.e server-link-test.e who-test.e whois-test.e \
- stress-A.e stress-B.e \
- start-server1 stop-server1 ngircd-test1.conf \
- start-server2 stop-server2 ngircd-test2.conf
-
-all:
-
-clean-local:
- rm -rf logs tests *-test ngircd-test*.log procs.tmp \
- T-ngircd1 ngircd-test1.motd T-ngircd2 ngircd-test2.motd
-
-maintainer-clean-local:
- rm -f Makefile Makefile.in
-
-check_SCRIPTS = ngircd-TEST-Binary tests.sh
-
-ngircd-TEST-Binary:
- cp ../ngircd/ngircd T-ngircd1
- cp ../ngircd/ngircd T-ngircd2
- [ -f getpid.sh ] || ln -s $(srcdir)/getpid.sh .
-
-connect-test: tests.sh
- rm -f connect-test
- ln -s $(srcdir)/tests.sh connect-test
-
-channel-test: tests.sh
- rm -f channel-test
- ln -s $(srcdir)/tests.sh channel-test
-
-invite-test: tests.sh
- rm -f invite-test
- ln -s $(srcdir)/tests.sh invite-test
-
-join-test: tests.sh
- rm -f join-test
- ln -s $(srcdir)/tests.sh join-test
-
-kick-test: tests.sh
- rm -f kick-test
- ln -s $(srcdir)/tests.sh kick-test
-
-message-test: tests.sh
- rm -f message-test
- ln -s $(srcdir)/tests.sh message-test
-
-misc-test: tests.sh
- rm -f misc-test
- ln -s $(srcdir)/tests.sh misc-test
-
-mode-test: tests.sh
- rm -f mode-test
- ln -s $(srcdir)/tests.sh mode-test
-
-opless-channel-test: tests.sh
- rm -f opless-channel-test
- ln -s $(srcdir)/tests.sh opless-channel-test
-
-server-link-test: tests.sh
- rm -f server-link-test
- ln -s $(srcdir)/tests.sh server-link-test
-
-who-test: tests.sh
- rm -f who-test
- ln -s $(srcdir)/tests.sh who-test
-
-whois-test: tests.sh
- rm -f whois-test
- ln -s $(srcdir)/tests.sh whois-test
-
-TESTS = start-server1 \
- connect-test \
- start-server2 \
- channel-test \
- invite-test \
- join-test \
- kick-test \
- message-test \
- misc-test \
- mode-test \
- opless-channel-test \
- who-test \
- whois-test \
- server-link-test \
- stop-server2 \
- stress-server.sh \
- stop-server1
-
-# -eof-
blob - /dev/null
blob + b47ba0e51fb537813a1fc80067d61c9a33a5a923 (mode 644)
--- /dev/null
+++ src/testsuite/Makefile.ng
@@ -0,0 +1,109 @@
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001-2012 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
+# 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.
+#
+
+__ng_Makefile_am_template__
+
+AM_CPPFLAGS = -I$(srcdir)/../portab
+
+EXTRA_DIST = \
+ 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 \
+ join-test.e kick-test.e message-test.e misc-test.e mode-test.e \
+ opless-channel-test.e server-link-test.e who-test.e whois-test.e \
+ stress-A.e stress-B.e \
+ start-server1 stop-server1 ngircd-test1.conf \
+ start-server2 stop-server2 ngircd-test2.conf
+
+all:
+
+clean-local:
+ rm -rf logs tests *-test ngircd-test*.log procs.tmp \
+ T-ngircd1 ngircd-test1.motd T-ngircd2 ngircd-test2.motd
+
+maintainer-clean-local:
+ rm -f Makefile Makefile.in
+
+check_SCRIPTS = ngircd-TEST-Binary tests.sh
+
+ngircd-TEST-Binary:
+ cp ../ngircd/ngircd T-ngircd1
+ cp ../ngircd/ngircd T-ngircd2
+ [ -f getpid.sh ] || ln -s $(srcdir)/getpid.sh .
+
+connect-test: tests.sh
+ rm -f connect-test
+ ln -s $(srcdir)/tests.sh connect-test
+
+channel-test: tests.sh
+ rm -f channel-test
+ ln -s $(srcdir)/tests.sh channel-test
+
+invite-test: tests.sh
+ rm -f invite-test
+ ln -s $(srcdir)/tests.sh invite-test
+
+join-test: tests.sh
+ rm -f join-test
+ ln -s $(srcdir)/tests.sh join-test
+
+kick-test: tests.sh
+ rm -f kick-test
+ ln -s $(srcdir)/tests.sh kick-test
+
+message-test: tests.sh
+ rm -f message-test
+ ln -s $(srcdir)/tests.sh message-test
+
+misc-test: tests.sh
+ rm -f misc-test
+ ln -s $(srcdir)/tests.sh misc-test
+
+mode-test: tests.sh
+ rm -f mode-test
+ ln -s $(srcdir)/tests.sh mode-test
+
+opless-channel-test: tests.sh
+ rm -f opless-channel-test
+ ln -s $(srcdir)/tests.sh opless-channel-test
+
+server-link-test: tests.sh
+ rm -f server-link-test
+ ln -s $(srcdir)/tests.sh server-link-test
+
+who-test: tests.sh
+ rm -f who-test
+ ln -s $(srcdir)/tests.sh who-test
+
+whois-test: tests.sh
+ rm -f whois-test
+ ln -s $(srcdir)/tests.sh whois-test
+
+TESTS = start-server1 \
+ connect-test \
+ start-server2 \
+ channel-test \
+ invite-test \
+ join-test \
+ kick-test \
+ message-test \
+ misc-test \
+ mode-test \
+ opless-channel-test \
+ who-test \
+ whois-test \
+ server-link-test \
+ stop-server2 \
+ stress-server.sh \
+ stop-server1
+
+# -eof-
blob - a515b4d38aa72db0957371224e46ad16f98b6fcb (mode 644)
blob + /dev/null
--- src/tool/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2012 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
-# 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
-
-AM_CPPFLAGS = -I$(srcdir)/../portab
-
-noinst_LIBRARIES = libngtool.a
-
-libngtool_a_SOURCES = tool.c
-
-noinst_HEADERS = tool.h
-
-maintainer-clean-local:
- rm -f Makefile Makefile.in
-
-# -eof-
blob - /dev/null
blob + 08a6d725b51930d1162342705fb6b5444f68a980 (mode 644)
--- /dev/null
+++ src/tool/.gitignore
@@ -0,0 +1 @@
+Makefile.am
blob - /dev/null
blob + 460f1148c6aec913995dbae377f683ddd8e5a248 (mode 644)
--- /dev/null
+++ src/tool/Makefile.ng
@@ -0,0 +1,27 @@
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001-2012 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
+# 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.
+#
+
+__ng_Makefile_am_template__
+
+EXTRA_DIST = Makefile.ng
+
+AM_CPPFLAGS = -I$(srcdir)/../portab
+
+noinst_LIBRARIES = libngtool.a
+
+libngtool_a_SOURCES = tool.c
+
+noinst_HEADERS = tool.h
+
+maintainer-clean-local:
+ rm -f Makefile Makefile.in
+
+# -eof-
IRCNow