X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=configure.in;h=f3dbd7275cd4b437d0e98e59056db607bfa92d34;hp=d2acc146e035ce934ed75cbba8495f4234ee472c;hb=9d348d00d9eda2aede0ea9052bcc34cd070d3b5a;hpb=3b7428087910a79cf7d332206470efb59182a22f diff --git a/configure.in b/configure.in index d2acc146..f3dbd727 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2010 Alexander Barton +# Copyright (c)2001-2011 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 @@ -9,10 +9,12 @@ # 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, 17~rc1) +AC_INIT(ngircd, VERSION_ID) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) @@ -31,7 +33,6 @@ 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]) @@ -43,6 +44,7 @@ AH_TEMPLATE([TARGET_CPU], [Target CPU name]) # -- C Compiler -- AC_PROG_CC +AC_PROG_CC_STDC AC_C_PROTOTYPES # -- Helper programs -- @@ -158,10 +160,12 @@ AC_FUNC_STRFTIME AC_CHECK_FUNCS([ \ bind gethostbyaddr gethostbyname gethostname inet_ntoa \ - setsid setsockopt socket strcasecmp waitpid],,AC_MSG_ERROR([required function missing!])) + setsid setsockopt socket strcasecmp waitpid],, + AC_MSG_ERROR([required function missing!])) -AC_CHECK_FUNCS(getaddrinfo getnameinfo inet_aton isdigit sigaction sigprocmask snprintf \ - vsnprintf strdup strlcpy strlcat strtok_r) +AC_CHECK_FUNCS([ \ + gai_strerror getaddrinfo getnameinfo inet_aton sigaction \ + sigprocmask snprintf vsnprintf strdup strlcpy strlcat strtok_r]) # -- Configuration options -- @@ -248,13 +252,22 @@ AC_ARG_WITH(poll, CPPFLAGS="-I$withval/include $CPPFLAGS" LDFLAGS="-L$withval/lib $LDFLAGS" fi - AC_CHECK_FUNCS(poll, x_io_backend=poll\(\), - AC_MSG_ERROR([Can't enable poll IO support!]) + 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, x_io_backend=poll\(\)) + AC_CHECK_FUNCS(poll, + AC_CHECK_HEADERS(poll.h, x_io_backend=poll\(\)) + ) ] ) @@ -408,56 +421,6 @@ int deny_severity = 0; ] ) -# include support for "zeroconf"? - -x_zeroconf_on=no -AC_ARG_WITH(zeroconf, - [ --with-zeroconf enable support for "Zeroconf"], - [ 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!])) - ]) - 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) -fi - # do IDENT requests using libident? x_identauth_on=no @@ -592,6 +555,7 @@ AC_OUTPUT([ \ src/testsuite/Makefile \ man/Makefile \ contrib/Makefile \ + contrib/Anope/Makefile \ contrib/Debian/Makefile \ contrib/MacOSX/Makefile \ contrib/MacOSX/ngIRCd.xcodeproj/Makefile \ @@ -660,42 +624,29 @@ 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" -test "$x_ipv6_on" = "yes" \ +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 $ECHO_N " PAM support: $ECHO_C" -test "$x_pam_on" = "yes" \ - && echo "yes" \ - || echo "no" - echo # -eof-