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

Comparing:
ircd-hybrid-7.3/configure.ac (file contents), Revision 1111 by michael, Fri Nov 26 20:01:41 2010 UTC vs.
ircd-hybrid/trunk/configure.ac (file contents), Revision 2318 by michael, Fri Jun 21 17:47:52 2013 UTC

# Line 3 | Line 3
3  
4   AC_REVISION([$Id$])
5  
6 < AC_PREREQ(2.68)
7 < AC_INIT([ircd-hybrid], [7.3-rc1], [bugs@ircd-hybrid.org])
8 < AM_INIT_AUTOMAKE(1.11.1)
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 13 | Line 13 | AC_CONFIG_SRCDIR(src/ircd.c)
13   # Checks for programs.
14   AC_PROG_CC_C99
15   AS_IF([test "$ac_cv_prog_cc_c99" = "no"],
16 <    [AC_MSG_ERROR([no C99 compiler found. Aborting.])])
16 >    [AC_MSG_ERROR([no suitable C99 compiler found. Aborting.])])
17   AC_PROG_YACC
18   AM_PROG_LEX
19   AC_PROG_INSTALL
# Line 24 | Line 24 | LT_INIT([dlopen disable-static])
24   LTDL_INIT([recursive convenience])
25   LIBTOOL="$LIBTOOL --silent"
26  
27 + AC_CHECK_SIZEOF(short)
28 + AC_CHECK_SIZEOF(int)
29 + AC_CHECK_SIZEOF(long)
30 + AC_CHECK_SIZEOF(void *)
31 + AC_CHECK_SIZEOF(int64_t)
32 + AC_CHECK_SIZEOF(long long)
33 +
34 + if test "$ac_cv_sizeof_int" = 2 ; then
35 +  AC_CHECK_TYPE(int16_t, int)
36 +  AC_CHECK_TYPE(uint16_t, unsigned int)
37 + elif test "$ac_cv_sizeof_short" = 2 ; then
38 +  AC_CHECK_TYPE(int16_t, short)
39 +  AC_CHECK_TYPE(uint16_t, unsigned short)
40 + else
41 +  AC_MSG_ERROR([Cannot find a type with size of 16 bits])
42 + fi
43 + if test "$ac_cv_sizeof_int" = 4 ; then
44 +  AC_CHECK_TYPE(int32_t, int)
45 +  AC_CHECK_TYPE(uint32_t, unsigned int)
46 + elif test "$ac_cv_sizeof_short" = 4 ; then
47 +  AC_CHECK_TYPE(int32_t, short)
48 +  AC_CHECK_TYPE(uint32_t, unsigned short)
49 + elif test "$ac_cv_sizeof_long" = 4 ; then
50 +  AC_CHECK_TYPE(int32_t, long)
51 +  AC_CHECK_TYPE(uint32_t, unsigned long)
52 + else
53 +  AC_MSG_ERROR([Cannot find a type with size of 32 bits])
54 + fi
55 + if test "$ac_cv_sizeof_int64_t" = 8 ; then
56 +  AC_CHECK_TYPE(int64_t)
57 +  AC_CHECK_TYPE(uint64_t)
58 + elif test "$ac_cv_sizeof_long_long" = 8 ; then
59 +  AC_CHECK_TYPE(int64_t, long long)
60 +  AC_CHECK_TYPE(uint64_t, unsigned long long)
61 + else
62 +  AC_MSG_ERROR([Cannot find a type with size of 64 bits])
63 + fi
64 +
65 +
66   # Checks for libraries.
67   AX_CHECK_LIB_IPV4
68   AX_CHECK_LIB_IPV6
# Line 32 | Line 71 | AX_CHECK_LIB_IPV6
71   AC_C_BIGENDIAN
72  
73   # Checks for library functions.
74 < AC_CHECK_FUNCS_ONCE(mmap     \
36 <                    strtok_r \
74 > AC_CHECK_FUNCS_ONCE(strtok_r \
75                      usleep   \
76                      strlcat  \
77 <                    strlcpy  \
40 <                    socketpair)
77 >                    strlcpy)
78  
79   # Checks for header files.
80   AC_CHECK_HEADERS_ONCE(crypt.h        \
44 –                      inttypes.h     \
45 –                      stdint.h       \
81                        sys/resource.h \
82                        sys/param.h    \
48 –                      errno.h        \
49 –                      sys/syslog.h   \
83                        types.h        \
84                        socket.h       \
85                        sys/wait.h     \
86 <                      wait.h         \
54 <                      link.h)
55 <
56 < # check for /dev/null so we can use it to hold evil fd's
57 < AC_MSG_CHECKING([for /dev/null])
58 < AS_IF([test -c /dev/null], [
59 <  AC_DEFINE(PATH_DEVNULL, "/dev/null",   [Path to /dev/null])
60 <  AC_MSG_RESULT([yes])], [
61 <  AC_DEFINE(PATH_DEVNULL, "devnull.log", [Path to /dev/null])
62 <  AC_MSG_RESULT([no - using devnull.log])])
63 <
86 >                      wait.h)
87  
88   AC_SEARCH_LIBS(crypt, crypt)
89  
90 <
91 < AC_ARG_WITH(zlib-path,
92 < AS_HELP_STRING([--with-zlib-path=DIR], [Path to libz.so for ziplinks support.]),
93 < [LDFLAGS="-L$withval $LDFLAGS"],)
94 <
72 < AC_ARG_ENABLE(zlib, AS_HELP_STRING([--disable-zlib],[Disable ziplinks support]),
73 < [zlib=$enableval],[zlib=yes])
74 <
75 < AS_IF([test "$zlib" = "yes"], [
76 <  AC_CHECK_HEADER(zlib.h, [AC_CHECK_LIB(z, zlibVersion,
77 <    [
78 <      LIBS="-lz $LIBS"
79 <      AC_DEFINE(HAVE_LIBZ, 1, [Define to 1 if zlib (-lz) is available.])
80 <    ], zlib=no)
81 <  ], zlib=no)
82 < ])
83 <
84 < AC_ARG_WITH(libpcre-path,
85 < AS_HELP_STRING([--with-libpcre-path=DIR], [Path to libpcre.so for PCRE support.]),
86 < [LDFLAGS="-L$withval $LDFLAGS"],)
87 <
88 < AC_ARG_ENABLE(libpcre, AS_HELP_STRING([--disable-libpcre],[Disable PCRE support]),
89 < [libpcre=$enableval],[libpcre=yes])
90 <
91 < AS_IF([test "$libpcre" = "yes"], [
92 <  AC_CHECK_HEADER(pcre.h, [AC_CHECK_LIB(pcre, pcre_study,
93 <    [
94 <      LIBS="-lpcre $LIBS"
95 <      AC_DEFINE(HAVE_LIBPCRE, 1, [Define to 1 if libpcre (-lpcre) is available.])
96 <    ], libpcre=no)
97 <  ], libpcre=no)
98 < ])
99 < AM_CONDITIONAL(ENABLE_PCRE, [test "$libpcre" = yes])
100 <
90 > AC_ARG_ENABLE(libGeoIP,
91 >  [AS_HELP_STRING([--disable-libgeoip],[Disable GeoIP support])], [],
92 >    [AC_CHECK_HEADER(GeoIP.h,
93 >      [AC_SEARCH_LIBS(GeoIP_id_by_ipnum_v6_gl, GeoIP,
94 >        [AC_DEFINE(HAVE_LIBGEOIP, 1, [Define to 1 if libGeoIP (-lGeoIP) is available.])])])], [])
95  
96   dnl Openssl checks
97   AC_ARG_ENABLE(openssl,
# Line 149 | Line 143 | if test "$cf_enable_openssl" != "no"; th
143    dnl If we have a basedir defined, then everything is okay.  Otherwise,
144    dnl we have a problem.
145    if test ! -z "$cf_openssl_basedir"; then
152 –    LIBS="-lcrypto -lssl $LIBS"
146      AC_MSG_RESULT([$cf_openssl_basedir])
147      cf_enable_openssl="yes"
155 –    AC_DEFINE(HAVE_LIBCRYPTO, 1, [If we support ssl])
148    else
149      AC_MSG_RESULT([not found. Please check your path.])
150      cf_enable_openssl="no"
# Line 164 | Line 156 | else
156   fi
157  
158   AS_IF([test "$cf_enable_openssl" != "no"],
159 < [AC_MSG_CHECKING(for OpenSSL 0.9.7 or above)
159 > [AC_MSG_CHECKING(for OpenSSL 0.9.8 or above)
160    AC_RUN_IFELSE([
161      AC_LANG_PROGRAM([
162      #include <openssl/opensslv.h>
163      #include <stdlib.h>],
164 <    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x00907000)); ]])],
164 >    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000)); ]])],
165    [cf_openssl_version_ok=yes],
166    [cf_openssl_version_ok=no],
167    [cf_openssl_version_ok=no])
# Line 179 | Line 171 | AS_IF([test "$cf_enable_openssl" != "no"
171  
172      AC_CHECK_LIB(crypto, RSA_free)
173      AS_IF([test "$ac_cv_lib_crypto_RSA_free" = "yes"],
174 <      [AC_CHECK_FUNCS(EVP_bf_cfb           \
183 <                      EVP_cast5_cfb        \
184 <                      EVP_idea_cfb         \
185 <                      EVP_rc5_32_12_16_cfb \
186 <                      EVP_des_ede3_cfb     \
187 <                      EVP_des_cfb)])
174 >      [AC_CHECK_LIB(ssl, SSL_connect)])
175      ],[AC_MSG_RESULT(no - OpenSSL support disabled)
176      cf_enable_openssl="no"])])
177  
178 < AM_CONDITIONAL(ENABLE_SSL, [test "$cf_enable_openssl" = yes])
178 > AM_CONDITIONAL(ENABLE_SSL, [test "$ac_cv_lib_ssl_SSL_connect" = yes])
179  
180  
181   AC_ARG_ENABLE(assert, AS_HELP_STRING([--enable-assert],
# Line 198 | Line 185 | AC_ARG_ENABLE(assert, AS_HELP_STRING([--
185   AS_IF([test "$assert" = "no"],
186    [AC_DEFINE(NDEBUG, 1, [Define to disable assert() statements.])])
187  
188 <
189 < AC_ARG_ENABLE(small-net, AS_HELP_STRING([--enable-small-net],
190 <                                        [Enable small network support.]),
191 < [small_net=$enableval], [small_net=no])
192 <
193 < AS_IF([test "$small_net" = "yes"], [
194 <  AC_DEFINE([NICKNAMEHISTORYLENGTH], 1500, [Size of the WHOWAS array.])
195 <  AC_DEFINE([CHANNEL_HEAP_SIZE], 256, [Size of the channel heap.])
196 <  AC_DEFINE([BAN_HEAP_SIZE], 128, [Size of the ban heap.])
197 <  AC_DEFINE([CLIENT_HEAP_SIZE], 256, [Size of the client heap.])
198 <  AC_DEFINE([LCLIENT_HEAP_SIZE], 128, [Size of the local client heap.])
199 <  AC_DEFINE([DNODE_HEAP_SIZE], 256, [Size of the dlink_node heap.])
200 <  AC_DEFINE([TOPIC_HEAP_SIZE], 256, [Size of the topic heap.])
201 <  AC_DEFINE([DBUF_HEAP_SIZE], 64, [Size of the dbuf heap.])
215 <  AC_DEFINE([AUTH_HEAP_SIZE], 128, [Size of the auth heap.])
216 <  AC_DEFINE([DNS_HEAP_SIZE], 128, [Size of the dns heap.])], [
217 <
218 <  AC_DEFINE([NICKNAMEHISTORYLENGTH], 15000, [Size of the WHOWAS array.])
219 <  AC_DEFINE([CHANNEL_HEAP_SIZE], 1024, [Size of the channel heap.])
220 <  AC_DEFINE([BAN_HEAP_SIZE], 1024, [Size of the ban heap.])
221 <  AC_DEFINE([CLIENT_HEAP_SIZE], 1024, [Size of the client heap.])
222 <  AC_DEFINE([LCLIENT_HEAP_SIZE], 512, [Size of the local client heap.])
223 <  AC_DEFINE([DNODE_HEAP_SIZE], 1024, [Size of the dlink_node heap.])
224 <  AC_DEFINE([TOPIC_HEAP_SIZE], 1024, [Size of the topic heap.])
225 <  AC_DEFINE([DBUF_HEAP_SIZE], 512, [Size of the dbuf heap.])
226 <  AC_DEFINE([AUTH_HEAP_SIZE], 512, [Size of the auth heap.])
227 <  AC_DEFINE([DNS_HEAP_SIZE], 512, [Size of the dns heap.])])
228 <
188 > AC_DEFINE([NICKNAMEHISTORYLENGTH], 32768, [Size of the WHOWAS array.])
189 > AC_DEFINE([MP_CHUNK_SIZE_CHANNEL], 1024*1024, [Size of the channel mempool chunk.])
190 > AC_DEFINE([MP_CHUNK_SIZE_MEMBER], 2048*1024, [Size of the channel-member mempool chunk.])
191 > AC_DEFINE([MP_CHUNK_SIZE_BAN], 1024*1024, [Size of the ban mempool chunk.])
192 > AC_DEFINE([MP_CHUNK_SIZE_CLIENT], 1024*1024, [Size of the client mempool chunk.])
193 > AC_DEFINE([MP_CHUNK_SIZE_LCLIENT], 512*1024, [Size of the local client mempool chunk.])
194 > AC_DEFINE([MP_CHUNK_SIZE_DNODE], 32*1024, [Size of the dlink_node mempool chunk.])
195 > AC_DEFINE([MP_CHUNK_SIZE_DBUF], 512*1024, [Size of the dbuf mempool chunk.])
196 > AC_DEFINE([MP_CHUNK_SIZE_AUTH], 128*1024, [Size of the auth mempool chunk.])
197 > AC_DEFINE([MP_CHUNK_SIZE_DNS], 64*1024, [Size of the dns mempool chunk.])
198 > AC_DEFINE([MP_CHUNK_SIZE_WATCH], 8*1024, [Size of the watch mempool chunk.])
199 > AC_DEFINE([MP_CHUNK_SIZE_NAMEHOST], 64*1024, [Size of the namehost mempool chunk.])
200 > AC_DEFINE([MP_CHUNK_SIZE_USERHOST], 128*1024, [Size of the userhost mempool chunk.])
201 > AC_DEFINE([MP_CHUNK_SIZE_IP_ENTRY], 128*1024, [Size of the ip_entry mempool chunk.])
202  
203   # Argument processing.
204   AX_ARG_ENABLE_IOLOOP_MECHANISM
232 – AX_ARG_WITH_NICKLEN
233 – AX_ARG_WITH_TOPICLEN
234 – AX_ARG_WITH_SYSLOG
235 – AX_ARG_ENABLE_EFNET
205   AX_ARG_ENABLE_HALFOPS
206   AX_ARG_ENABLE_DEBUGGING
207   AX_ARG_ENABLE_WARNINGS
239 – AX_ARG_ENABLE_SYSLOG
208  
209   AC_DEFINE_DIR([PREFIX],[prefix],[Set to prefix.])
210   AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Set to sysconfdir.])
# Line 246 | Line 214 | AC_DEFINE_DIR([LOCALSTATEDIR],[localstat
214  
215   AC_CONFIG_FILES(              \
216         Makefile               \
249 –       etc/Makefile           \
250 –       servlink/Makefile      \
251 –       contrib/Makefile       \
252 –       contrib/help/Makefile  \
217         src/Makefile           \
218         libltdl/Makefile       \
255 –       messages/Makefile      \
219         modules/Makefile       \
220         modules/core/Makefile  \
221         doc/Makefile           \
222         help/Makefile          \
260 –       help/opers/Makefile    \
261 –       help/users/Makefile    \
223         tools/Makefile)
224  
225   AC_OUTPUT

Diff Legend

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