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

Comparing ircd-hybrid/trunk/configure.ac (file contents):
Revision 1660 by michael, Sat Nov 17 19:35:07 2012 UTC vs.
Revision 1908 by michael, Sat Apr 27 21:25:11 2013 UTC

# Line 4 | Line 4
4   AC_REVISION([$Id$])
5  
6   AC_PREREQ(2.69)
7 < AC_INIT([ircd-hybrid], [8.0.0], [bugs@ircd-hybrid.org])
8 < AM_INIT_AUTOMAKE(1.12.4)
7 > AC_INIT([ircd-hybrid], [TRUNK], [bugs@ircd-hybrid.org])
8 > AM_INIT_AUTOMAKE(1.13.1)
9   AM_MAINTAINER_MODE
10   AC_CONFIG_HEADER(config.h)
11   AC_CONFIG_SRCDIR(src/ircd.c)
# Line 32 | Line 32 | AX_CHECK_LIB_IPV6
32   AC_C_BIGENDIAN
33  
34   # Checks for library functions.
35 < AC_CHECK_FUNCS_ONCE(mmap     \
36 <                    strtok_r \
35 > AC_CHECK_FUNCS_ONCE(strtok_r \
36                      usleep   \
37                      strlcat  \
38                      strlcpy)
# Line 55 | Line 54 | AC_ARG_ENABLE(libpcre,
54        [AC_SEARCH_LIBS(pcre_study, pcre,
55          [AC_DEFINE(HAVE_LIBPCRE, 1, [Define to 1 if libpcre (-lpcre) is available.])])])], [])
56  
57 + AC_ARG_ENABLE(libGeoIP,
58 +  [AS_HELP_STRING([--disable-libgeoip],[Disable GeoIP support])], [],
59 +    [AC_CHECK_HEADER(GeoIP.h,
60 +      [AC_SEARCH_LIBS(GeoIP_id_by_ipnum_v6_gl, GeoIP,
61 +        [AC_DEFINE(HAVE_LIBGEOIP, 1, [Define to 1 if libGeoIP (-lGeoIP) is available.])])])], [])
62 +
63   dnl Openssl checks
64   AC_ARG_ENABLE(openssl,
65   [  --enable-openssl[=DIR]       Enable OpenSSL support (DIR optional).
# Line 118 | Line 123 | else
123   fi
124  
125   AS_IF([test "$cf_enable_openssl" != "no"],
126 < [AC_MSG_CHECKING(for OpenSSL 0.9.8 or above)
126 > [AC_MSG_CHECKING(for OpenSSL 0.9.8s or above)
127    AC_RUN_IFELSE([
128      AC_LANG_PROGRAM([
129      #include <openssl/opensslv.h>
130      #include <stdlib.h>],
131 <    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000)); ]])],
131 >    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x0090813f)); ]])],
132    [cf_openssl_version_ok=yes],
133    [cf_openssl_version_ok=no],
134    [cf_openssl_version_ok=no])
# Line 148 | Line 153 | AS_IF([test "$assert" = "no"],
153    [AC_DEFINE(NDEBUG, 1, [Define to disable assert() statements.])])
154  
155  
156 < AC_DEFINE([NICKNAMEHISTORYLENGTH], 16384, [Size of the WHOWAS array.])
156 > AC_DEFINE([NICKNAMEHISTORYLENGTH], 32768, [Size of the WHOWAS array.])
157   AC_DEFINE([MP_CHUNK_SIZE_CHANNEL], 64*1024, [Size of the channel mempool chunk.])
158   AC_DEFINE([MP_CHUNK_SIZE_MEMBER], 32*1024, [Size of the channel mempool chunk.])
159   AC_DEFINE([MP_CHUNK_SIZE_BAN], 16*1024, [Size of the ban mempool chunk.])
# Line 162 | Line 167 | AC_DEFINE([MP_CHUNK_SIZE_WATCH], 4*1024,
167  
168   # Argument processing.
169   AX_ARG_ENABLE_IOLOOP_MECHANISM
165 AX_ARG_WITH_NICKLEN
166 AX_ARG_WITH_TOPICLEN
170   AX_ARG_ENABLE_HALFOPS
171   AX_ARG_ENABLE_DEBUGGING
172   AX_ARG_ENABLE_WARNINGS
# Line 178 | Line 181 | AC_CONFIG_FILES(              \
181         Makefile               \
182         src/Makefile           \
183         libltdl/Makefile       \
181       messages/Makefile      \
184         modules/Makefile       \
185         modules/core/Makefile  \
186         doc/Makefile           \

Diff Legend

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