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

Comparing:
ircd-hybrid-8/configure.ac (file contents), Revision 1349 by michael, Wed Apr 11 18:45:51 2012 UTC vs.
ircd-hybrid/branches/8.1.x/configure.ac (file contents), Revision 1867 by michael, Thu Apr 25 18:01:53 2013 UTC

# Line 3 | Line 3
3  
4   AC_REVISION([$Id$])
5  
6 < AC_PREREQ(2.68)
7 < AC_INIT([ircd-hybrid], [8beta1], [bugs@ircd-hybrid.org])
8 < AM_INIT_AUTOMAKE(1.11.4)
6 > AC_PREREQ(2.69)
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 131 | Line 136 | AS_IF([test "$cf_enable_openssl" != "no"
136    AS_IF([test "$cf_openssl_version_ok" = "yes"],
137      [AC_MSG_RESULT(found)
138  
139 <    AC_CHECK_LIB(ssl, SSL_connect)
140 <    AS_IF([test "$ac_cv_lib_ssl_SSL_connect" = "yes"],
141 <      [AC_CHECK_LIB(crypto, RSA_free)])
139 >    AC_CHECK_LIB(crypto, RSA_free)
140 >    AS_IF([test "$ac_cv_lib_crypto_RSA_free" = "yes"],
141 >      [AC_CHECK_LIB(ssl, SSL_connect)])
142      ],[AC_MSG_RESULT(no - OpenSSL support disabled)
143      cf_enable_openssl="no"])])
144  
145 < AM_CONDITIONAL(ENABLE_SSL, [test "$ac_cv_lib_crypto_RSA_free" = yes])
145 > AM_CONDITIONAL(ENABLE_SSL, [test "$ac_cv_lib_ssl_SSL_connect" = yes])
146  
147  
148   AC_ARG_ENABLE(assert, AS_HELP_STRING([--enable-assert],
# Line 148 | Line 153 | AS_IF([test "$assert" = "no"],
153    [AC_DEFINE(NDEBUG, 1, [Define to disable assert() statements.])])
154  
155  
156 < AC_ARG_ENABLE(small-net, AS_HELP_STRING([--enable-small-net],
157 <                                        [Enable small network support.]),
158 < [small_net=$enableval], [small_net=no])
159 <
160 < AS_IF([test "$small_net" = "yes"], [
161 <  AC_DEFINE([NICKNAMEHISTORYLENGTH], 1500, [Size of the WHOWAS array.])
162 <  AC_DEFINE([CHANNEL_HEAP_SIZE], 256, [Size of the channel heap.])
163 <  AC_DEFINE([BAN_HEAP_SIZE], 128, [Size of the ban heap.])
164 <  AC_DEFINE([CLIENT_HEAP_SIZE], 256, [Size of the client heap.])
165 <  AC_DEFINE([LCLIENT_HEAP_SIZE], 128, [Size of the local client heap.])
166 <  AC_DEFINE([DNODE_HEAP_SIZE], 256, [Size of the dlink_node heap.])
162 <  AC_DEFINE([TOPIC_HEAP_SIZE], 256, [Size of the topic heap.])
163 <  AC_DEFINE([DBUF_HEAP_SIZE], 64, [Size of the dbuf heap.])
164 <  AC_DEFINE([AUTH_HEAP_SIZE], 128, [Size of the auth heap.])
165 <  AC_DEFINE([DNS_HEAP_SIZE], 128, [Size of the dns heap.])], [
166 <
167 <  AC_DEFINE([NICKNAMEHISTORYLENGTH], 15000, [Size of the WHOWAS array.])
168 <  AC_DEFINE([CHANNEL_HEAP_SIZE], 1024, [Size of the channel heap.])
169 <  AC_DEFINE([BAN_HEAP_SIZE], 1024, [Size of the ban heap.])
170 <  AC_DEFINE([CLIENT_HEAP_SIZE], 1024, [Size of the client heap.])
171 <  AC_DEFINE([LCLIENT_HEAP_SIZE], 512, [Size of the local client heap.])
172 <  AC_DEFINE([DNODE_HEAP_SIZE], 1024, [Size of the dlink_node heap.])
173 <  AC_DEFINE([TOPIC_HEAP_SIZE], 1024, [Size of the topic heap.])
174 <  AC_DEFINE([DBUF_HEAP_SIZE], 512, [Size of the dbuf heap.])
175 <  AC_DEFINE([AUTH_HEAP_SIZE], 512, [Size of the auth heap.])
176 <  AC_DEFINE([DNS_HEAP_SIZE], 512, [Size of the dns heap.])])
177 <
156 > AC_DEFINE([NICKNAMEHISTORYLENGTH], 16384, [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.])
160 > AC_DEFINE([MP_CHUNK_SIZE_CLIENT], 256*1024, [Size of the client mempool chunk.])
161 > AC_DEFINE([MP_CHUNK_SIZE_LCLIENT], 128*1024, [Size of the local client mempool chunk.])
162 > AC_DEFINE([MP_CHUNK_SIZE_DNODE], 8*1024, [Size of the dlink_node mempool chunk.])
163 > AC_DEFINE([MP_CHUNK_SIZE_DBUF], 512*1024, [Size of the dbuf mempool chunk.])
164 > AC_DEFINE([MP_CHUNK_SIZE_AUTH], 32*1024, [Size of the auth mempool chunk.])
165 > AC_DEFINE([MP_CHUNK_SIZE_DNS], 16*1024, [Size of the dns mempool chunk.])
166 > AC_DEFINE([MP_CHUNK_SIZE_WATCH], 4*1024, [Size of the watch mempool chunk.])
167  
168   # Argument processing.
169   AX_ARG_ENABLE_IOLOOP_MECHANISM
181 – AX_ARG_WITH_NICKLEN
182 – AX_ARG_WITH_TOPICLEN
183 – AX_ARG_ENABLE_EFNET
170   AX_ARG_ENABLE_HALFOPS
171   AX_ARG_ENABLE_DEBUGGING
172   AX_ARG_ENABLE_WARNINGS
# Line 193 | Line 179 | AC_DEFINE_DIR([LOCALSTATEDIR],[localstat
179  
180   AC_CONFIG_FILES(              \
181         Makefile               \
196 –       contrib/Makefile       \
197 –       contrib/help/Makefile  \
182         src/Makefile           \
183         libltdl/Makefile       \
200 –       messages/Makefile      \
184         modules/Makefile       \
185         modules/core/Makefile  \
186         doc/Makefile           \

Diff Legend

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