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 2480 by michael, Wed Oct 23 16:05:41 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 subdir-objects)
9   AM_MAINTAINER_MODE
10 + AC_CONFIG_MACRO_DIR([m4])
11   AC_CONFIG_HEADER(config.h)
12   AC_CONFIG_SRCDIR(src/ircd.c)
13  
14   # Checks for programs.
15   AC_PROG_CC_C99
16   AS_IF([test "$ac_cv_prog_cc_c99" = "no"],
17 <    [AC_MSG_ERROR([no C99 compiler found. Aborting.])])
17 >    [AC_MSG_ERROR([no suitable C99 compiler found. Aborting.])])
18   AC_PROG_YACC
19   AM_PROG_LEX
20   AC_PROG_INSTALL
21  
22   # Initializing libtool.
23 + LT_CONFIG_LTDL_DIR([libltdl])
24   LT_INIT([dlopen disable-static])
25 < LTDL_INIT
25 > LTDL_INIT([recursive convenience])
26 > LIBTOOL="$LIBTOOL --silent"
27  
28   # Checks for libraries.
29 + GCC_STACK_PROTECT_CC
30 +
31   AX_CHECK_LIB_IPV4
32   AX_CHECK_LIB_IPV6
33  
# Line 30 | Line 35 | AX_CHECK_LIB_IPV6
35   AC_C_BIGENDIAN
36  
37   # Checks for library functions.
38 < AC_CHECK_FUNCS_ONCE(mmap     \
34 <                    strtok_r \
38 > AC_CHECK_FUNCS_ONCE(strtok_r \
39                      usleep   \
40                      strlcat  \
41                      strlcpy)
42  
43   # Checks for header files.
44   AC_CHECK_HEADERS_ONCE(crypt.h        \
41                      inttypes.h     \
42                      stdint.h       \
45                        sys/resource.h \
46                        sys/param.h    \
45                      errno.h        \
46                      sys/syslog.h   \
47                        types.h        \
48                        socket.h       \
49                        sys/wait.h     \
50 <                      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 <
50 >                      wait.h)
51  
52   AC_SEARCH_LIBS(crypt, crypt)
53  
54 <
55 < AC_ARG_WITH(zlib-path,
56 < AS_HELP_STRING([--with-zlib-path=DIR], [Path to libz.so for ziplinks support.]),
57 < [LDFLAGS="-L$withval $LDFLAGS"],)
58 <
69 < AC_ARG_ENABLE(zlib, AS_HELP_STRING([--disable-zlib],[Disable ziplinks support]),
70 < [zlib=$enableval],[zlib=yes])
71 <
72 < AS_IF([test "$zlib" = "yes"], [
73 <  AC_CHECK_HEADER(zlib.h, [AC_CHECK_LIB(z, zlibVersion,
74 <    [
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 <
54 > AC_ARG_ENABLE(libgeoip,
55 >  [AS_HELP_STRING([--disable-libgeoip],[Disable GeoIP support])], [],
56 >    [AC_CHECK_HEADER(GeoIP.h,
57 >      [AC_SEARCH_LIBS(GeoIP_id_by_ipnum_v6_gl, GeoIP,
58 >        [AC_DEFINE(HAVE_LIBGEOIP, 1, [Define to 1 if libGeoIP (-lGeoIP) is available.])])])], [])
59  
60   dnl Openssl checks
61   AC_ARG_ENABLE(openssl,
# Line 146 | Line 107 | if test "$cf_enable_openssl" != "no"; th
107    dnl If we have a basedir defined, then everything is okay.  Otherwise,
108    dnl we have a problem.
109    if test ! -z "$cf_openssl_basedir"; then
149    LIBS="-lcrypto -lssl $LIBS"
110      AC_MSG_RESULT([$cf_openssl_basedir])
111      cf_enable_openssl="yes"
152    AC_DEFINE(HAVE_LIBCRYPTO, 1, [If we support ssl])
112    else
113      AC_MSG_RESULT([not found. Please check your path.])
114      cf_enable_openssl="no"
# Line 161 | Line 120 | else
120   fi
121  
122   AS_IF([test "$cf_enable_openssl" != "no"],
123 < [AC_MSG_CHECKING(for OpenSSL 0.9.7 or above)
124 <  AC_RUN_IFELSE(
123 > [AC_MSG_CHECKING(for OpenSSL 0.9.8 or above)
124 >  AC_RUN_IFELSE([
125      AC_LANG_PROGRAM([
126      #include <openssl/opensslv.h>
127      #include <stdlib.h>],
128 <    [[exit(!(OPENSSL_VERSION_NUMBER >= 0x00907000));]]),
128 >    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000)); ]])],
129    [cf_openssl_version_ok=yes],
130    [cf_openssl_version_ok=no],
131    [cf_openssl_version_ok=no])
132  
133    AS_IF([test "$cf_openssl_version_ok" = "yes"],
134      [AC_MSG_RESULT(found)
135 <  
135 >
136      AC_CHECK_LIB(crypto, RSA_free)
137      AS_IF([test "$ac_cv_lib_crypto_RSA_free" = "yes"],
138 <      [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)])
138 >      [AC_CHECK_LIB(ssl, SSL_connect)])
139      ],[AC_MSG_RESULT(no - OpenSSL support disabled)
140      cf_enable_openssl="no"])])
141  
142 < AM_CONDITIONAL(ENABLE_SSL, [test "$cf_enable_openssl" = yes])
142 > AM_CONDITIONAL(ENABLE_SSL, [test "$ac_cv_lib_ssl_SSL_connect" = yes])
143  
144  
145   AC_ARG_ENABLE(assert, AS_HELP_STRING([--enable-assert],
# Line 195 | Line 149 | AC_ARG_ENABLE(assert, AS_HELP_STRING([--
149   AS_IF([test "$assert" = "no"],
150    [AC_DEFINE(NDEBUG, 1, [Define to disable assert() statements.])])
151  
152 <
153 < AC_ARG_ENABLE(small-net, AS_HELP_STRING([--enable-small-net],
154 <                                        [Enable small network support.]),
155 < [small_net=$enableval], [small_net=no])
156 <
157 < AS_IF([test "$small_net" = "yes"], [
158 <  AC_DEFINE([NICKNAMEHISTORYLENGTH], 1500, [Size of the WHOWAS array.])
159 <  AC_DEFINE([CHANNEL_HEAP_SIZE], 256, [Size of the channel heap.])
160 <  AC_DEFINE([BAN_HEAP_SIZE], 128, [Size of the ban heap.])
161 <  AC_DEFINE([CLIENT_HEAP_SIZE], 256, [Size of the client heap.])
162 <  AC_DEFINE([LCLIENT_HEAP_SIZE], 128, [Size of the local client heap.])
163 <  AC_DEFINE([DNODE_HEAP_SIZE], 256, [Size of the dlink_node heap.])
164 <  AC_DEFINE([TOPIC_HEAP_SIZE], 256, [Size of the topic heap.])
165 <  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 <
152 > AC_DEFINE([NICKNAMEHISTORYLENGTH], 32768, [Size of the WHOWAS array.])
153 > AC_DEFINE([MP_CHUNK_SIZE_CHANNEL], 1024*1024, [Size of the channel mempool chunk.])
154 > AC_DEFINE([MP_CHUNK_SIZE_MEMBER], 2048*1024, [Size of the channel-member mempool chunk.])
155 > AC_DEFINE([MP_CHUNK_SIZE_BAN], 1024*1024, [Size of the ban mempool chunk.])
156 > AC_DEFINE([MP_CHUNK_SIZE_CLIENT], 1024*1024, [Size of the client mempool chunk.])
157 > AC_DEFINE([MP_CHUNK_SIZE_LCLIENT], 512*1024, [Size of the local client mempool chunk.])
158 > AC_DEFINE([MP_CHUNK_SIZE_DNODE], 32*1024, [Size of the dlink_node mempool chunk.])
159 > AC_DEFINE([MP_CHUNK_SIZE_DBUF], 512*1024, [Size of the dbuf mempool chunk.])
160 > AC_DEFINE([MP_CHUNK_SIZE_AUTH], 128*1024, [Size of the auth mempool chunk.])
161 > AC_DEFINE([MP_CHUNK_SIZE_DNS], 64*1024, [Size of the dns mempool chunk.])
162 > AC_DEFINE([MP_CHUNK_SIZE_WATCH], 8*1024, [Size of the watch mempool chunk.])
163 > AC_DEFINE([MP_CHUNK_SIZE_NAMEHOST], 64*1024, [Size of the namehost mempool chunk.])
164 > AC_DEFINE([MP_CHUNK_SIZE_USERHOST], 128*1024, [Size of the userhost mempool chunk.])
165 > AC_DEFINE([MP_CHUNK_SIZE_IP_ENTRY], 128*1024, [Size of the ip_entry mempool chunk.])
166  
167   # Argument processing.
168   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
169   AX_ARG_ENABLE_HALFOPS
170   AX_ARG_ENABLE_DEBUGGING
171   AX_ARG_ENABLE_WARNINGS
236 AX_ARG_ENABLE_SYSLOG
172  
173   AC_DEFINE_DIR([PREFIX],[prefix],[Set to prefix.])
174   AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Set to sysconfdir.])
# Line 243 | Line 178 | AC_DEFINE_DIR([LOCALSTATEDIR],[localstat
178  
179   AC_CONFIG_FILES(              \
180         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  \
181         src/Makefile           \
182 <       messages/Makefile      \
182 >       libltdl/Makefile       \
183         modules/Makefile       \
184 <                         modules/core/Makefile  \
184 >       modules/core/Makefile  \
185         doc/Makefile           \
186         help/Makefile          \
259                         help/opers/Makefile            \
260                         help/users/Makefile    \
187         tools/Makefile)
188  
189   AC_OUTPUT

Diff Legend

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