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

Comparing:
ircd-hybrid-8/acinclude.m4 (file contents), Revision 1374 by michael, Fri Apr 27 07:53:40 2012 UTC vs.
ircd-hybrid/trunk/acinclude.m4 (file contents), Revision 1736 by michael, Sun Jan 13 09:31:46 2013 UTC

# Line 2 | Line 2 | dnl Inspired by work Copyright (C) 2006
2   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_CHECK_FUNC(getaddrinfo, [], AC_SEARCH_LIBS(getaddrinfo, nsl))
6 +  AC_CHECK_FUNC(getnameinfo, [], AC_SEARCH_LIBS(getnameinfo, nsl))
7    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])
8    AC_CHECK_TYPES([struct sockaddr_in, struct sockaddr_storage, struct addrinfo],,,[#include <sys/types.h>
9     #include <sys/socket.h>
10     #include <netdb.h>
# Line 25 | Line 24 | AC_DEFUN([AX_ARG_ENABLE_IOLOOP_MECHANISM
24    AC_ARG_ENABLE([kqueue], [AS_HELP_STRING([--enable-kqueue], [Force kqueue usage.])], [desired_iopoll_mechanism="kqueue"])
25    AC_ARG_ENABLE([epoll],  [AS_HELP_STRING([--enable-epoll],  [Force epoll usage.])],  [desired_iopoll_mechanism="epoll"])
26    AC_ARG_ENABLE([devpoll],[AS_HELP_STRING([--enable-devpoll],[Force devpoll usage.])],[desired_iopoll_mechanism="devpoll"])
28 –  AC_ARG_ENABLE([rtsigio],[AS_HELP_STRING([--enable-rtsigio],[Force rtsigio usage.])],[desired_iopoll_mechanism="rtsigio"])
27    AC_ARG_ENABLE([poll],   [AS_HELP_STRING([--enable-poll],   [Force poll usage.])],   [desired_iopoll_mechanism="poll"])
28    AC_ARG_ENABLE([select], [AS_HELP_STRING([--enable-select], [Force select usage.])], [desired_iopoll_mechanism="select"])
29    dnl }}}
# Line 86 | Line 84 | _syscall1(int, epoll_create, int, size)
84      AC_DEFINE([HAVE_SYS_DEVPOLL_H],[1],[Define to 1 if you have the <sys/devpoll.h> header file.])
85    fi
86    dnl }}}
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([[
93 – #define _GNU_SOURCE
94 – #include <fcntl.h>
95 – static unsigned int have_f_setsig = 0;
96 –  ]], [[
97 – #ifdef F_SETSIG
98 –  have_f_setsig = 1;
99 – #endif
100 –  return have_f_setsig == 0;
101 –  ]])], [is_rtsigio_mechanism_available="yes"],[is_rtsigio_mechanism_available="no"])
102 –  dnl }}}
87    dnl {{{ check for poll mechanism support
88 <  iopoll_mechanism_poll=5
88 >  iopoll_mechanism_poll=4
89    AC_DEFINE_UNQUOTED([__IOPOLL_MECHANISM_POLL],[$iopoll_mechanism_poll],[poll mechanism])
90    AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([poll])],[is_poll_mechanism_available="yes"],[is_poll_mechanism_available="no"])
91    dnl }}}
92    dnl {{{ check for select mechanism support
93 <  iopoll_mechanism_select=6
93 >  iopoll_mechanism_select=5
94    AC_DEFINE_UNQUOTED([__IOPOLL_MECHANISM_SELECT],[$iopoll_mechanism_select],[select mechanism])
95    AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([select])],[is_select_mechanism_available="yes"],[is_select_mechanism_available="no"])
96    dnl }}}
97    dnl {{{ determine the optimal mechanism
98    optimal_iopoll_mechanism="none"
99 <  for mechanism in "kqueue" "epoll" "devpoll" "rtsigio" "poll" "select" ; do # order is important
99 >  for mechanism in "kqueue" "epoll" "devpoll" "poll" "select" ; do # order is important
100      eval "is_optimal_iopoll_mechanism_available=\$is_${mechanism}_mechanism_available"
101      if test "$is_optimal_iopoll_mechanism_available" = "yes" ; then
102        optimal_iopoll_mechanism="$mechanism"
# Line 153 | Line 137 | AC_DEFUN([AX_ARG_WITH_TOPICLEN],[
137   dnl {{{ ax_arg_with_nicklen
138   AC_DEFUN([AX_ARG_WITH_NICKLEN],[
139    AC_ARG_WITH([nicklen],[AS_HELP_STRING([--with-nicklen=<value>],[Set nickname length (default 9).])],[nicklen="$withval"],[nicklen="9"])
140 <  AC_DEFINE_UNQUOTED([NICKLEN],[($nicklen+1)],[Length of nicknames.])
157 < ])dnl }}}
158 < dnl {{{ ax_arg_enable_efnet
159 < AC_DEFUN([AX_ARG_ENABLE_EFNET],[
160 <  AC_ARG_ENABLE([efnet],[AS_HELP_STRING([--enable-efnet],[For IRCDs running on EFnet.])],[efnet="$enableval"],[efnet="no"])
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.])
164 <        else
165 <                use_efnet="no"
166 <  fi
167 <  AM_CONDITIONAL([EFNET],[test "$use_efnet" = "yes"])
140 >  AC_DEFINE_UNQUOTED([NICKLEN],[($nicklen)],[Length of nicknames.])
141   ])dnl }}}
142   dnl {{{ ax_arg_enable_halfops
143   AC_DEFUN([AX_ARG_ENABLE_HALFOPS],[
# Line 177 | Line 150 | dnl {{{ ax_arg_enable_debugging
150   AC_DEFUN([AX_ARG_ENABLE_DEBUGGING],[
151    AC_ARG_ENABLE([debugging],[AS_HELP_STRING([--enable-debugging],[Enable debugging.])],[debugging="$enableval"],[debugging="no"])
152    if test "$debugging" = "yes" ; then
180 –    AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging.])
153      CFLAGS="-Wall -g -O0"
182 –  else
183 –    AC_DEFINE([NDEBUG],[1],[Define to 1 to disable debugging.])
154    fi
155   ])dnl }}}
156   dnl {{{ ax_arg_enable_warnings

Comparing:
ircd-hybrid-8/acinclude.m4 (property svn:eol-style), Revision 1374 by michael, Fri Apr 27 07:53:40 2012 UTC vs.
ircd-hybrid/trunk/acinclude.m4 (property svn:eol-style), Revision 1736 by michael, Sun Jan 13 09:31:46 2013 UTC

# Line 0 | Line 1
1 + native

Diff Legend

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