ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/branches/8.2.x/configure.ac

Comparing:
ircd-hybrid-7.3/configure.ac (file contents), Revision 1111 by michael, Fri Nov 26 20:01:41 2010 UTC vs.
ircd-hybrid-8/configure.ac (file contents), Revision 1402 by michael, Wed May 9 18:42:45 2012 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], [8beta1], [bugs@ircd-hybrid.org])
8	>	AM_INIT_AUTOMAKE(1.12)
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 36 | Line 36 | AC_CHECK_FUNCS_ONCE(mmap     \
36		strtok_r \
37		usleep   \
38		strlcat  \
39	<	strlcpy  \
40	<	socketpair)
39	>	strlcpy)
40
41		# Checks for header files.
42		AC_CHECK_HEADERS_ONCE(crypt.h        \
44	–	inttypes.h     \
45	–	stdint.h       \
43		sys/resource.h \
44		sys/param.h    \
48	–	errno.h        \
49	–	sys/syslog.h   \
45		types.h        \
46		socket.h       \
47		sys/wait.h     \
48	<	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	<
48	>	wait.h)
49
50		AC_SEARCH_LIBS(crypt, crypt)
51
52	<
53	<	AC_ARG_WITH(zlib-path,
54	<	AS_HELP_STRING([--with-zlib-path=DIR], [Path to libz.so for ziplinks support.]),
55	<	[LDFLAGS="-L$withval $LDFLAGS"],)
56	<
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	<
52	>	AC_ARG_ENABLE(libpcre,
53	>	[AS_HELP_STRING([--disable-libpcre],[Disable PCRE support])], [],
54	>	[AC_CHECK_HEADER(pcre.h,
55	>	[AC_SEARCH_LIBS(pcre_study, pcre,
56	>	[AC_DEFINE(HAVE_LIBPCRE, 1, [Define to 1 if libpcre (-lpcre) is available.])])])], [])
57
58		dnl Openssl checks
59		AC_ARG_ENABLE(openssl,
#	Line 149 | Line 105 | if test "$cf_enable_openssl" != "no"; th
105		dnl If we have a basedir defined, then everything is okay.  Otherwise,
106		dnl we have a problem.
107		if test ! -z "$cf_openssl_basedir"; then
152	–	LIBS="-lcrypto -lssl $LIBS"
108		AC_MSG_RESULT([$cf_openssl_basedir])
109		cf_enable_openssl="yes"
155	–	AC_DEFINE(HAVE_LIBCRYPTO, 1, [If we support ssl])
110		else
111		AC_MSG_RESULT([not found. Please check your path.])
112		cf_enable_openssl="no"
#	Line 164 | Line 118 | else
118		fi
119
120		AS_IF([test "$cf_enable_openssl" != "no"],
121	<	[AC_MSG_CHECKING(for OpenSSL 0.9.7 or above)
121	>	[AC_MSG_CHECKING(for OpenSSL 0.9.8 or above)
122		AC_RUN_IFELSE([
123		AC_LANG_PROGRAM([
124		#include <openssl/opensslv.h>
125		#include <stdlib.h>],
126	<	[[ exit(!(OPENSSL_VERSION_NUMBER >= 0x00907000)); ]])],
126	>	[[ exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000)); ]])],
127		[cf_openssl_version_ok=yes],
128		[cf_openssl_version_ok=no],
129		[cf_openssl_version_ok=no])
#	Line 177 | Line 131 | AS_IF([test "$cf_enable_openssl" != "no"
131		AS_IF([test "$cf_openssl_version_ok" = "yes"],
132		[AC_MSG_RESULT(found)
133
134	<	AC_CHECK_LIB(crypto, RSA_free)
135	<	AS_IF([test "$ac_cv_lib_crypto_RSA_free" = "yes"],
136	<	[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)])
134	>	AC_CHECK_LIB(ssl, SSL_connect)
135	>	AS_IF([test "$ac_cv_lib_ssl_SSL_connect" = "yes"],
136	>	[AC_CHECK_LIB(crypto, RSA_free)])
137		],[AC_MSG_RESULT(no - OpenSSL support disabled)
138		cf_enable_openssl="no"])])
139
140	<	AM_CONDITIONAL(ENABLE_SSL, [test "$cf_enable_openssl" = yes])
140	>	AM_CONDITIONAL(ENABLE_SSL, [test "$ac_cv_lib_crypto_RSA_free" = yes])
141
142
143		AC_ARG_ENABLE(assert, AS_HELP_STRING([--enable-assert],
#	Line 204 | Line 153 | AC_ARG_ENABLE(small-net, AS_HELP_STRING(
153		[small_net=$enableval], [small_net=no])
154
155		AS_IF([test "$small_net" = "yes"], [
156	<	AC_DEFINE([NICKNAMEHISTORYLENGTH], 1500, [Size of the WHOWAS array.])
156	>	AC_DEFINE([NICKNAMEHISTORYLENGTH], 2048, [Size of the WHOWAS array.])
157		AC_DEFINE([CHANNEL_HEAP_SIZE], 256, [Size of the channel heap.])
158		AC_DEFINE([BAN_HEAP_SIZE], 128, [Size of the ban heap.])
159		AC_DEFINE([CLIENT_HEAP_SIZE], 256, [Size of the client heap.])
#	Line 215 | Line 164 | AS_IF([test "$small_net" = "yes"], [
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.])
167	>	AC_DEFINE([NICKNAMEHISTORYLENGTH], 16384, [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.])
#	Line 231 | Line 180 | AS_IF([test "$small_net" = "yes"], [
180		AX_ARG_ENABLE_IOLOOP_MECHANISM
181		AX_ARG_WITH_NICKLEN
182		AX_ARG_WITH_TOPICLEN
234	–	AX_ARG_WITH_SYSLOG
235	–	AX_ARG_ENABLE_EFNET
183		AX_ARG_ENABLE_HALFOPS
184		AX_ARG_ENABLE_DEBUGGING
185		AX_ARG_ENABLE_WARNINGS
239	–	AX_ARG_ENABLE_SYSLOG
186
187		AC_DEFINE_DIR([PREFIX],[prefix],[Set to prefix.])
188		AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Set to sysconfdir.])
#	Line 246 | Line 192 | AC_DEFINE_DIR([LOCALSTATEDIR],[localstat
192
193		AC_CONFIG_FILES(              \
194		Makefile               \
249	–	etc/Makefile           \
250	–	servlink/Makefile      \
195		contrib/Makefile       \
196		contrib/help/Makefile  \
197		src/Makefile           \

Diff Legend

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