ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/acinclude.m4
(Generate patch)

Comparing:
ircd-hybrid-7.2/acinclude.m4 (file contents), Revision 1013 by michael, Sun Oct 18 14:26:49 2009 UTC vs.
ircd-hybrid/acinclude.m4 (file contents), Revision 1155 by michael, Tue Aug 9 20:27:45 2011 UTC

# Line 3 | Line 3 | dnl vim: set fdm=marker sw=2 ts=2 et si:
3   dnl {{{ ax_check_lib_ipv4
4   AC_DEFUN([AX_CHECK_LIB_IPV4],[
5    AC_SEARCH_LIBS([socket],[socket],,[AC_MSG_ERROR([socket library not found])])
6 +  AC_SEARCH_LIBS([inet_ntoa], [nsl])
7 +  AC_SEARCH_LIBS([inet_aton], [resolv])
8    AC_CHECK_FUNCS([inet_aton inet_ntop inet_pton])
9    AC_CHECK_TYPES([struct sockaddr_in, struct sockaddr_storage, struct addrinfo],,,[#include <sys/types.h>
10     #include <sys/socket.h>
# Line 13 | Line 15 | AC_DEFUN([AX_CHECK_LIB_IPV4],[
15   ])dnl }}}
16   dnl {{{ ax_check_lib_ipv6
17   AC_DEFUN([AX_CHECK_LIB_IPV6],[
18 <  AC_CHECK_TYPES([struct sockaddr_in6],,[AC_DEFINE([IPV6],[1],[Define to 1 if you have IPv6 support.])],,[#include <sys/types.h>
17 <   <sys/socket.h>])
18 >  AC_CHECK_TYPE([struct sockaddr_in6],[AC_DEFINE([IPV6],[1],[Define to 1 if you have IPv6 support.])],,[#include <netinet/in.h>])
19   ])dnl }}}
20   dnl {{{ ax_arg_enable_ioloop_mechanism (FIXME)
21   AC_DEFUN([AX_ARG_ENABLE_IOLOOP_MECHANISM],[
# Line 41 | Line 42 | AC_DEFUN([AX_ARG_ENABLE_IOLOOP_MECHANISM
42    dnl {{{ check for epoll oechanism support
43    iopoll_mechanism_epoll=2
44    AC_DEFINE_UNQUOTED([__IOPOLL_MECHANISM_EPOLL],[$iopoll_mechanism_epoll],[epoll mechanism])
45 <  AC_RUN_IFELSE([
45 >  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
46   #include <sys/epoll.h>
47   #include <sys/syscall.h>
48   #if defined(__stub_epoll_create) || defined(__stub___epoll_create) || defined(EPOLL_NEED_BODY)
# Line 70 | Line 71 | AC_DEFUN([AX_ARG_ENABLE_IOLOOP_MECHANISM
71   #endif
72   _syscall1(int, epoll_create, int, size)
73   #endif
74 < main() { return epoll_create(256) == -1 ? 1 : 0; }
75 <  ],[is_epoll_mechanism_available="yes"],[is_epoll_mechanism_available="no"])
74 > ]], [[ return epoll_create(256) == -1 ? 1 : 0 ]])],
75 >  [is_epoll_mechanism_available="yes"],[is_epoll_mechanism_available="no"])
76    dnl }}}
77    dnl {{{ check for devpoll mechanism support
78    iopoll_mechanism_devpoll=3
# Line 88 | Line 89 | main() { return epoll_create(256) == -1
89    dnl {{{ check for rtsigio mechanism support
90    iopoll_mechanism_rtsigio=4
91    AC_DEFINE_UNQUOTED([__IOPOLL_MECHANISM_RTSIGIO],[$iopoll_mechanism_rtsigio],[rtsigio mechanism])
92 <  AC_RUN_IFELSE([AC_LANG_PROGRAM([
92 >  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
93 > #define _GNU_SOURCE
94   #include <fcntl.h>
95 + static unsigned int have_f_setsig = 0;
96 +  ]], [[
97   #ifdef F_SETSIG
98 < main () { return 0; } /* F_SETSIG defined */
95 < #else
96 < main () { return 1; } /* F_SETSIG not defined */
98 >  have_f_setsig = 1;
99   #endif
100 <  ])],[is_rtsigio_mechanism_available="yes"],[is_rtsigio_mechanism_available="no"])
100 >  return have_f_setsig == 0;
101 >  ]])], [is_rtsigio_mechanism_available="yes"],[is_rtsigio_mechanism_available="no"])
102    dnl }}}
103    dnl {{{ check for poll mechanism support
104    iopoll_mechanism_poll=5
# Line 145 | Line 148 | main () { return 1; } /* F_SETSIG not de
148   dnl {{{ ax_arg_with_topiclen
149   AC_DEFUN([AX_ARG_WITH_TOPICLEN],[
150    AC_ARG_WITH([topiclen],[AC_HELP_STRING([--with-topiclen=<value>],[Set topic length (default 160).])],[topiclen="$withval"],[topiclen="160"])
151 <  AC_DEFINE_UNQUOTED([TOPICLEN],[($topiclen+1)],[Length of topics.])
151 >  AC_DEFINE_UNQUOTED([TOPICLEN],[($topiclen)],[Length of topics.])
152   ])dnl }}}
153   dnl {{{ ax_arg_with_nicklen
154   AC_DEFUN([AX_ARG_WITH_NICKLEN],[
# Line 158 | Line 161 | AC_DEFUN([AX_ARG_ENABLE_EFNET],[
161    if test "$efnet" = "yes" ; then
162                  use_efnet="yes"
163      AC_DEFINE([EFNET],[1],[Define to 1 if this server will be an EFnet server.])
161 –                AC_DEFINE([TS5_ONLY],[1],[If Defined to 1 server links to your network must have a minimum of TS5.])
164          else
165                  use_efnet="no"
166    fi
# Line 176 | Line 178 | AC_DEFUN([AX_ARG_ENABLE_DEBUGGING],[
178    AC_ARG_ENABLE([debugging],[AC_HELP_STRING([--enable-debugging],[Enable debugging.])],[debugging="$enableval"],[debugging="no"])
179    if test "$debugging" = "yes" ; then
180      AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging.])
181 <    CFLAGS="$CFLAGS -Wall -Werror -g -O0"
181 >    CFLAGS="-Wall -g -O0"
182    else
183      AC_DEFINE([NDEBUG],[1],[Define to 1 to disable debugging.])
184    fi

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)