X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=configure.in;h=5e334963975a660c92d95c7790054614aa5e9049;hp=be03945d004d91eee075310c9173b61f684cec68;hb=25dd193e9b49b38db39cf549f94df4ba11812fe9;hpb=4b83a23d9d3aa4644dc497f14eaca2bd7f1cc347 diff --git a/configure.in b/configure.in index be03945d..5e334963 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2008 Alexander Barton +# Copyright (c)2001-2010 Alexander Barton # # 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 @@ -9,15 +9,19 @@ # 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)) + # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 13) +AC_INIT(ngircd, VERSION_ID) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) AM_CONFIG_HEADER(src/config.h) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + # -- Templates for config.h -- AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled]) @@ -29,8 +33,9 @@ AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled]) AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used]) AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used]) AH_TEMPLATE([WANT_IPV6], [Define if IPV6 protocol should be enabled]) -AH_TEMPLATE([ZEROCONF], [Define if support for Zeroconf should be included]) AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests]) +AH_TEMPLATE([PAM], [Define if PAM should be used]) +AH_TEMPLATE([HAVE_sockaddr_in_len], [Define if sockaddr_in.sin_len exists]) AH_TEMPLATE([TARGET_OS], [Target operating system name]) AH_TEMPLATE([TARGET_VENDOR], [Target system vendor]) @@ -39,6 +44,8 @@ AH_TEMPLATE([TARGET_CPU], [Target CPU name]) # -- C Compiler -- AC_PROG_CC +AC_PROG_CC_STDC +AC_C_PROTOTYPES # -- Helper programs -- @@ -71,7 +78,6 @@ AC_DEFUN([GCC_STACK_PROTECT_CC],[ fi ]) - if test "$GCC" = "yes"; then # We are using the GNU C compiler. Good! CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes" @@ -99,11 +105,24 @@ AC_HEADER_TIME AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([ \ - ctype.h errno.h fcntl.h netdb.h netinet/in.h stdlib.h string.h \ - strings.h sys/socket.h sys/time.h unistd.h \ + ctype.h errno.h 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!])) -AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdbool.h stddef.h varargs.h]) +AC_CHECK_HEADERS([ \ + arpa/inet.h ctype.h malloc.h netinet/ip.h stdbool.h stddef.h varargs.h \ + ],[],[],[[ + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + #ifdef HAVE_NETINET_IN_H + #include + #endif + ]] +) # -- Datatypes -- @@ -123,12 +142,16 @@ AC_TRY_COMPILE([ AC_TYPE_SIGNAL AC_TYPE_SIZE_T +AC_CHECK_MEMBER([struct sockaddr_in.sin_len], AC_DEFINE(HAVE_sockaddr_in_len),, + [#include ]) # -- Libraries -- +# A/UX needs this. AC_CHECK_LIB(UTIL,memmove) +# needed on solaris. GNU libc also has a libnsl, but we do not need it. +AC_SEARCH_LIBS(gethostbyname,nsl) AC_CHECK_LIB(socket,bind) -AC_CHECK_LIB(nsl,gethostent) # -- Functions -- @@ -139,7 +162,8 @@ AC_CHECK_FUNCS([ \ bind gethostbyaddr gethostbyname gethostname inet_ntoa \ setsid setsockopt socket strcasecmp waitpid],,AC_MSG_ERROR([required function missing!])) -AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strdup strlcpy strlcat strtok_r) +AC_CHECK_FUNCS(getaddrinfo getnameinfo inet_aton sigaction sigprocmask snprintf \ + vsnprintf strdup strlcpy strlcat strtok_r) # -- Configuration options -- @@ -313,7 +337,7 @@ fi AC_ARG_WITH(openssl, [ --with-openssl enable SSL support using OpenSSL], - [ if test "$withval" = "yes"; then + [ if test "$withval" != "no"; then if test "$withval" != "yes"; then CFLAGS="-I$withval/include $CFLAGS" CPPFLAGS="-I$withval/include $CPPFLAGS" @@ -330,7 +354,7 @@ AC_ARG_WITH(openssl, AC_ARG_WITH(gnutls, [ --with-gnutls enable SSL support using gnutls], - [ if test "$withval" = "yes"; then + [ if test "$withval" != "no"; then if test "$withval" != "yes"; then CFLAGS="-I$withval/include $CFLAGS" CPPFLAGS="-I$withval/include $CPPFLAGS" @@ -386,77 +410,54 @@ int deny_severity = 0; ] ) -# include support for "zeroconf"? +# do IDENT requests using libident? -x_zeroconf_on=no -AC_ARG_WITH(zeroconf, - [ --with-zeroconf enable support for "Zeroconf"], +x_identauth_on=no +AC_ARG_WITH(ident, + [ --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_FUNCS(DNSServiceRegistrationCreate, x_zeroconf_on=osx, - [ - AC_CHECK_LIB(pthread, pthread_mutexattr_init) - AC_CHECK_LIB(howl, sw_discovery_init) - AC_CHECK_FUNCS(sw_discovery_init, \ - x_zeroconf_on=howl, \ - AC_MSG_ERROR([Can't enable Zeroconf!])) - ]) + 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_zeroconf_on" = "osx"; then - AC_CHECK_HEADERS([DNSServiceDiscovery/DNSServiceDiscovery.h \ - mach/port.h],,AC_MSG_ERROR([required C header missing!])) - AC_DEFINE(ZEROCONF, 1) -fi -if test "$x_zeroconf_on" = "howl"; then - for dir in /usr/local/include /usr/local/include/howl* \ - /usr/include /usr/include/howl* \ - /usr/local/include/avahi* /usr/include/avahi*; do - test -d "$dir" || continue - AC_MSG_CHECKING([for Howl headers in $dir]) - if test -f "$dir/rendezvous/rendezvous.h"; then - if test "$dir" != "/usr/local/include" -a \ - "$dir" != "/usr/include"; then - CFLAGS="-I$dir $CFLAGS" - CPPFLAGS="-I$dir $CPPFLAGS" - fi - AC_MSG_RESULT(yes) - break - else - AC_MSG_RESULT(no) - fi - done - AC_CHECK_HEADERS([rendezvous/rendezvous.h],, \ - AC_MSG_ERROR([required C header missing!])) - AC_DEFINE(ZEROCONF, 1) +if test "$x_identauth_on" = "yes"; then + AC_DEFINE(IDENTAUTH, 1) + AC_CHECK_HEADERS(ident.h,,AC_MSG_ERROR([required C header missing!])) fi -# do IDENT requests using libident? +# compile in PAM support? -x_identauth_on=no -AC_ARG_WITH(ident, - [ --with-ident enable "IDENT" ("AUTH") protocol support], +x_pam_on=no +AC_ARG_WITH(pam, + [ --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(ident, ident_id) - AC_CHECK_FUNCS(ident_id, x_identauth_on=yes, - AC_MSG_ERROR([Can't enable IDENT support!]) + 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_identauth_on" = "yes"; then - AC_DEFINE(IDENTAUTH, 1) - AC_CHECK_HEADERS(ident.h,,AC_MSG_ERROR([required C header missing!])) +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? @@ -477,6 +478,8 @@ AC_ARG_ENABLE(ipv6, 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!])) @@ -566,7 +569,7 @@ 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 ${datadir}/doc/${PACKAGE}` ; D=`eval echo ${D}` +D=`eval echo ${docdir}` ; D=`eval echo ${D}` echo " Target: ${target}" test "$target" != "$host" && echo " Host: ${host}" @@ -609,33 +612,26 @@ test "$x_strict_rfc_on" = "yes" \ && echo "yes" \ || echo "no" -echo $ECHO_N " Zeroconf support: $ECHO_C" -case "$x_zeroconf_on" in - osx) - echo $ECHO_N "Apple $ECHO_C" - ;; - howl) - echo $ECHO_N "Howl $ECHO_C" - ;; - *) - echo $ECHO_N "no $ECHO_C" - ;; -esac +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 " IDENT support: $ECHO_C" -test "$x_identauth_on" = "yes" \ +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 " IPv6 protocol: $ECHO_C" -echo $ECHO_N "$x_ipv6_on $ECHO_C" - +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"