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 1039 by michael, Sat Dec 5 23:19:44 2009 UTC vs.
ircd-hybrid/trunk/configure.ac (file contents), Revision 1908 by michael, Sat Apr 27 21:25:11 2013 UTC

# Line 3 | Line 3
3  
4   AC_REVISION([$Id$])
5  
6 < AC_PREREQ(2.65)
7 < AC_INIT([ircd-hybrid], [7.3-rc1], [bugs@ircd-hybrid.org])
8 < AM_INIT_AUTOMAKE(1.11)
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
20  
21   # Initializing libtool.
22 + LT_CONFIG_LTDL_DIR([libltdl])
23   LT_INIT([dlopen disable-static])
24 < LTDL_INIT
24 > LTDL_INIT([recursive convenience])
25 > LIBTOOL="$LIBTOOL --silent"
26  
27   # Checks for libraries.
28   AX_CHECK_LIB_IPV4
# Line 30 | Line 32 | AX_CHECK_LIB_IPV6
32   AC_C_BIGENDIAN
33  
34   # Checks for library functions.
35 < AC_CHECK_FUNCS_ONCE(mmap     \
34 <                    strtok_r \
35 > AC_CHECK_FUNCS_ONCE(strtok_r \
36                      usleep   \
37                      strlcat  \
38                      strlcpy)
39  
40   # Checks for header files.
41   AC_CHECK_HEADERS_ONCE(crypt.h        \
41                      inttypes.h     \
42                      stdint.h       \
42                        sys/resource.h \
43                        sys/param.h    \
45                      errno.h        \
46                      sys/syslog.h   \
44                        types.h        \
45                        socket.h       \
46                        sys/wait.h     \
47 <                      wait.h         \
51 <                      link.h)
52 <
53 < # check for /dev/null so we can use it to hold evil fd's
54 < AC_MSG_CHECKING([for /dev/null])
55 < AS_IF([test -c /dev/null], [
56 <  AC_DEFINE(PATH_DEVNULL, "/dev/null",   [Path to /dev/null])
57 <  AC_MSG_RESULT([yes])], [
58 <  AC_DEFINE(PATH_DEVNULL, "devnull.log", [Path to /dev/null])
59 <  AC_MSG_RESULT([no - using devnull.log])])
60 <
47 >                      wait.h)
48  
49   AC_SEARCH_LIBS(crypt, crypt)
50  
51 <
52 < AC_ARG_WITH(zlib-path,
53 < AS_HELP_STRING([--with-zlib-path=DIR], [Path to libz.so for ziplinks support.]),
54 < [LDFLAGS="-L$withval $LDFLAGS"],)
55 <
56 < AC_ARG_ENABLE(zlib, AS_HELP_STRING([--disable-zlib],[Disable ziplinks support]),
57 < [zlib=$enableval],[zlib=yes])
58 <
59 < AS_IF([test "$zlib" = "yes"], [
60 <  AC_CHECK_HEADER(zlib.h, [AC_CHECK_LIB(z, zlibVersion,
61 <    [
75 <      LIBS="-lz $LIBS"
76 <      AC_DEFINE(HAVE_LIBZ, 1, [Define to 1 if zlib (-lz) is available.])
77 <    ], zlib=no)
78 <  ], zlib=no)
79 < ])
80 <
81 < AC_ARG_WITH(libpcre-path,
82 < AS_HELP_STRING([--with-libpcre-path=DIR], [Path to libpcre.so for PCRE support.]),
83 < [LDFLAGS="-L$withval $LDFLAGS"],)
84 <
85 < AC_ARG_ENABLE(libpcre, AS_HELP_STRING([--disable-libpcre],[Disable PCRE support]),
86 < [libpcre=$enableval],[libpcre=yes])
87 <
88 < AS_IF([test "$libpcre" = "yes"], [
89 <  AC_CHECK_HEADER(pcre.h, [AC_CHECK_LIB(pcre, pcre_study,
90 <    [
91 <      LIBS="-lpcre $LIBS"
92 <      AC_DEFINE(HAVE_LIBPCRE, 1, [Define to 1 if libpcre (-lpcre) is available.])
93 <    ], libpcre=no)
94 <  ], libpcre=no)
95 < ])
96 < AM_CONDITIONAL(ENABLE_PCRE, [test "$libpcre" = yes])
97 <
51 > AC_ARG_ENABLE(libpcre,
52 >  [AS_HELP_STRING([--disable-libpcre],[Disable PCRE support])], [],
53 >    [AC_CHECK_HEADER(pcre.h,
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,
# Line 146 | Line 110 | if test "$cf_enable_openssl" != "no"; th
110    dnl If we have a basedir defined, then everything is okay.  Otherwise,
111    dnl we have a problem.
112    if test ! -z "$cf_openssl_basedir"; then
149    LIBS="-lcrypto -lssl $LIBS"
113      AC_MSG_RESULT([$cf_openssl_basedir])
114      cf_enable_openssl="yes"
152    AC_DEFINE(HAVE_LIBCRYPTO, 1, [If we support ssl])
115    else
116      AC_MSG_RESULT([not found. Please check your path.])
117      cf_enable_openssl="no"
# Line 161 | Line 123 | else
123   fi
124  
125   AS_IF([test "$cf_enable_openssl" != "no"],
126 < [AC_MSG_CHECKING(for OpenSSL 0.9.7 or above)
127 <  AC_RUN_IFELSE(
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 >= 0x00907000));]]),
131 >    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x0090813f)); ]])],
132    [cf_openssl_version_ok=yes],
133    [cf_openssl_version_ok=no],
134    [cf_openssl_version_ok=no])
135  
136    AS_IF([test "$cf_openssl_version_ok" = "yes"],
137      [AC_MSG_RESULT(found)
138 <  
138 >
139      AC_CHECK_LIB(crypto, RSA_free)
140      AS_IF([test "$ac_cv_lib_crypto_RSA_free" = "yes"],
141 <      [AC_CHECK_FUNCS(EVP_bf_cfb           \
180 <                      EVP_cast5_cfb        \
181 <                      EVP_idea_cfb         \
182 <                      EVP_rc5_32_12_16_cfb \
183 <                      EVP_des_ede3_cfb     \
184 <                      EVP_des_cfb)])
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 "$cf_enable_openssl" = 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 196 | 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.])
210 <  AC_DEFINE([TOPIC_HEAP_SIZE], 256, [Size of the topic heap.])
211 <  AC_DEFINE([DBUF_HEAP_SIZE], 64, [Size of the dbuf heap.])
212 <  AC_DEFINE([AUTH_HEAP_SIZE], 128, [Size of the auth heap.])
213 <  AC_DEFINE([DNS_HEAP_SIZE], 128, [Size of the dns heap.])], [
214 <
215 <  AC_DEFINE([NICKNAMEHISTORYLENGTH], 15000, [Size of the WHOWAS array.])
216 <  AC_DEFINE([CHANNEL_HEAP_SIZE], 1024, [Size of the channel heap.])
217 <  AC_DEFINE([BAN_HEAP_SIZE], 1024, [Size of the ban heap.])
218 <  AC_DEFINE([CLIENT_HEAP_SIZE], 1024, [Size of the client heap.])
219 <  AC_DEFINE([LCLIENT_HEAP_SIZE], 512, [Size of the local client heap.])
220 <  AC_DEFINE([DNODE_HEAP_SIZE], 1024, [Size of the dlink_node heap.])
221 <  AC_DEFINE([TOPIC_HEAP_SIZE], 1024, [Size of the topic heap.])
222 <  AC_DEFINE([DBUF_HEAP_SIZE], 512, [Size of the dbuf heap.])
223 <  AC_DEFINE([AUTH_HEAP_SIZE], 512, [Size of the auth heap.])
224 <  AC_DEFINE([DNS_HEAP_SIZE], 512, [Size of the dns heap.])])
225 <
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.])
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
229 AX_ARG_WITH_NICKLEN
230 AX_ARG_WITH_TOPICLEN
231 AX_ARG_WITH_SYSLOG
232 AX_ARG_ENABLE_EFNET
170   AX_ARG_ENABLE_HALFOPS
171   AX_ARG_ENABLE_DEBUGGING
172   AX_ARG_ENABLE_WARNINGS
236 AX_ARG_ENABLE_SYSLOG
173  
174   AC_DEFINE_DIR([PREFIX],[prefix],[Set to prefix.])
175   AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Set to sysconfdir.])
# Line 243 | Line 179 | AC_DEFINE_DIR([LOCALSTATEDIR],[localstat
179  
180   AC_CONFIG_FILES(              \
181         Makefile               \
246       etc/Makefile           \
247       etc/example.conf       \
248       etc/example.conf.quick \
249       etc/example.efnet.conf \
250       servlink/Makefile      \
251       contrib/Makefile       \
252       contrib/help/Makefile  \
182         src/Makefile           \
183 <       messages/Makefile      \
183 >       libltdl/Makefile       \
184         modules/Makefile       \
185 <                         modules/core/Makefile  \
185 >       modules/core/Makefile  \
186         doc/Makefile           \
187         help/Makefile          \
188 <                         help/opers/Makefile            \
189 <                         help/users/Makefile    \
188 >       help/opers/Makefile    \
189 >       help/users/Makefile    \
190         tools/Makefile)
191  
192   AC_OUTPUT

Diff Legend

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