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 948 by michael, Tue Jul 21 17:34:06 2009 UTC vs.
ircd-hybrid-8/acinclude.m4 (file contents), Revision 1374 by michael, Fri Apr 27 07:53:40 2012 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],[
22    dnl {{{ allow the user to specify desired mechanism
23    desired_iopoll_mechanism="none"
24    dnl FIXME need to handle arguments a bit better (see ac_arg_disable_block_alloc)
25 <  AC_ARG_ENABLE([kqueue], [AC_HELP_STRING([--enable-kqueue], [Force kqueue usage.])], [desired_iopoll_mechanism="kqueue"])
26 <  AC_ARG_ENABLE([epoll],  [AC_HELP_STRING([--enable-epoll],  [Force epoll usage.])],  [desired_iopoll_mechanism="epoll"])
27 <  AC_ARG_ENABLE([devpoll],[AC_HELP_STRING([--enable-devpoll],[Force devpoll usage.])],[desired_iopoll_mechanism="devpoll"])
28 <  AC_ARG_ENABLE([rtsigio],[AC_HELP_STRING([--enable-rtsigio],[Force rtsigio usage.])],[desired_iopoll_mechanism="rtsigio"])
29 <  AC_ARG_ENABLE([poll],   [AC_HELP_STRING([--enable-poll],   [Force poll usage.])],   [desired_iopoll_mechanism="poll"])
30 <  AC_ARG_ENABLE([select], [AC_HELP_STRING([--enable-select], [Force select usage.])], [desired_iopoll_mechanism="select"])
25 >  AC_ARG_ENABLE([kqueue], [AS_HELP_STRING([--enable-kqueue], [Force kqueue usage.])], [desired_iopoll_mechanism="kqueue"])
26 >  AC_ARG_ENABLE([epoll],  [AS_HELP_STRING([--enable-epoll],  [Force epoll usage.])],  [desired_iopoll_mechanism="epoll"])
27 >  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"])
29 >  AC_ARG_ENABLE([poll],   [AS_HELP_STRING([--enable-poll],   [Force poll usage.])],   [desired_iopoll_mechanism="poll"])
30 >  AC_ARG_ENABLE([select], [AS_HELP_STRING([--enable-select], [Force select usage.])], [desired_iopoll_mechanism="select"])
31    dnl }}}
32    dnl {{{ preamble
33    AC_MSG_CHECKING([for optimal/desired iopoll 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 144 | Line 147 | main () { return 1; } /* F_SETSIG not de
147   ])dnl }}}
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.])
150 >  AC_ARG_WITH([topiclen],[AS_HELP_STRING([--with-topiclen=<value>],[Set topic length (default 160).])],[topiclen="$withval"],[topiclen="160"])
151 >  AC_DEFINE_UNQUOTED([TOPICLEN],[($topiclen)],[Length of topics.])
152   ])dnl }}}
153   dnl {{{ ax_arg_with_nicklen
154   AC_DEFUN([AX_ARG_WITH_NICKLEN],[
155 <  AC_ARG_WITH([nicklen],[AC_HELP_STRING([--with-nicklen=<value>],[Set nickname length (default 9).])],[nicklen="$withval"],[nicklen="9"])
155 >  AC_ARG_WITH([nicklen],[AS_HELP_STRING([--with-nicklen=<value>],[Set nickname length (default 9).])],[nicklen="$withval"],[nicklen="9"])
156    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],[AC_HELP_STRING([--enable-efnet],[For IRCDs running on EFnet.])],[efnet="$enableval"],[efnet="no"])
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.])
161 –                AC_DEFINE([TS5_ONLY],[1],[If Defined to 1 server links to your network must have a minimum of TS5.])
164          else
163 –                AC_DEFINE([INVARIANTS],[1],[Miscellaneous sanity checks for the IRCd. Makes it slightly slower])
165                  use_efnet="no"
166    fi
167    AM_CONDITIONAL([EFNET],[test "$use_efnet" = "yes"])
168   ])dnl }}}
169   dnl {{{ ax_arg_enable_halfops
170   AC_DEFUN([AX_ARG_ENABLE_HALFOPS],[
171 <  AC_ARG_ENABLE([halfops],[AC_HELP_STRING([--enable-halfops],[Enable halfops support.])],[halfops="$enableval"],[halfops="no"])
171 >  AC_ARG_ENABLE([halfops],[AS_HELP_STRING([--enable-halfops],[Enable halfops support.])],[halfops="$enableval"],[halfops="no"])
172    if test "$halfops" = "yes" ; then
173      AC_DEFINE([HALFOPS],[1],[Define to 1 if you want halfops support.])
174    fi
175   ])dnl }}}
176   dnl {{{ ax_arg_enable_debugging
177   AC_DEFUN([AX_ARG_ENABLE_DEBUGGING],[
178 <  AC_ARG_ENABLE([debugging],[AC_HELP_STRING([--enable-debugging],[Enable debugging.])],[debugging="$enableval"],[debugging="no"])
178 >  AC_ARG_ENABLE([debugging],[AS_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
185   ])dnl }}}
186   dnl {{{ ax_arg_enable_warnings
187   AC_DEFUN([AX_ARG_ENABLE_WARNINGS],[
188 <  AC_ARG_ENABLE([warnings],[AC_HELP_STRING([--enable-warnings],[Enable compiler warnings.])],[warnings="$enableval"],[warnings="no"])
188 >  AC_ARG_ENABLE([warnings],[AS_HELP_STRING([--enable-warnings],[Enable compiler warnings.])],[warnings="$enableval"],[warnings="no"])
189    if test "$warnings" = "yes" ; then
190 <    CFLAGS="-Wall -Wcast-qual -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wredundant-decls -Wshadow -Wwrite-strings -Wno-unused"
190 >    CFLAGS="-Wall -Wextra -Wno-unused -Wcast-qual -Wcast-align -Wbad-function-cast -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wredundant-decls -Wshadow -Wwrite-strings -Wundef"
191    fi
192   ])dnl }}}
192 – dnl {{{ ax_arg_enable_syslog
193 – AC_DEFUN([AX_ARG_ENABLE_SYSLOG],[
194 –  AC_CHECK_HEADERS([syslog.h sys/syslog.h])
195 –  AC_ARG_ENABLE([syslog],[AC_HELP_STRING([--enable-syslog="EVENTS"],[Enable syslog for events: users oper (space separated in quotes; default: disabled).])],[syslog="$enableval"],[syslog="no"])
196 –  if test "$enableval" != "no" ; then
197 –    for option in $enableval ; do
198 –      case "$option" in
199 –        users) AC_DEFINE([SYSLOG_USERS],[1],[Send user log stuff to syslog.]) ;;
200 –        oper) AC_DEFINE([SYSLOG_OPER],[1],[Send oper log stuff to syslog.]) ;;
201 –        yes) : ;;
202 –        *) AC_MSG_ERROR([invalid value for --enable-syslog: $option]) ;;
203 –      esac
204 –    done
205 –    AC_DEFINE([USE_SYSLOG],[1],[Define to 1 if you want to use syslog.])
206 –  fi
207 – ])dnl }}}
208 – dnl {{{ ax_arg_with_syslog_facility
209 – AC_DEFUN([AX_ARG_WITH_SYSLOG],[
210 –  AC_ARG_WITH([syslog-facility],[AC_HELP_STRING([--with-syslog-facility=LOG],[Define the syslog facility to use (default: LOG_LOCAL4)])],[syslog_facility="$withval"],[syslog_facility="LOG_LOCAL4"])
211 –  AC_DEFINE_UNQUOTED([LOG_FACILITY],[$syslog_facility],[Set to syslog facility to use.])
212 – ])dnl }}}
193   dnl {{{ ac_define_dir
194   dnl http://autoconf-archive.cryp.to/ac_define_dir.html
195   AC_DEFUN([AC_DEFINE_DIR], [

Diff Legend

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