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.2/configure.ac (file contents):
Revision 911 by stu, Sun Nov 4 23:21:51 2007 UTC vs.
Revision 912 by michael, Wed Nov 7 22:47:44 2007 UTC

#	Line 3 | Line 3
3
4		AC_PREREQ(2.59)
5		AC_INIT([ircd-hybrid],[7.2.4])
6	<	AM_INIT_AUTOMAKE([ircd-hybrid],[7.2.4])
7	<	AC_CONFIG_HEADERS([include/setup.h])
6	>	AM_INIT_AUTOMAKE
7		AM_MAINTAINER_MODE
8	+	AC_CONFIG_HEADER(config.h)
9	+	AC_CONFIG_SRCDIR(src/ircd.c)
10
11		#ltdl stuff
11	–	AC_LIBTOOL_DLOPEN
12		AC_LIBLTDL_CONVENIENCE
13		AC_SUBST(INCLTDL)
14		AC_SUBST(LIBLTDL)
15	+	AC_LIBTOOL_DLOPEN
16	+	AM_DISABLE_STATIC
17	+	AM_ENABLE_SHARED
18
19		# Checks for programs.
17	–	AC_PROG_INSTALL
18	–	AC_GNU_SOURCE
20		AC_PROG_CC
21	<	AC_PROG_RANLIB
21	>	AC_PROG_YACC
22	>	AM_PROG_LEX
23	>	AC_PROG_INSTALL
24		AC_PROG_LIBTOOL
25		LIBTOOL="$LIBTOOL --silent"
23	–	AM_PROG_LEX
24	–	AC_PROG_YACC
25	–	AC_PROG_AWK
26	–	AC_PROG_EGREP
27	–	AC_PATH_PROG([TAIL],[tail])
26
27		# Checks for libraries.
30	–	AX_CHECK_LIB_OPENSSL
28		AX_CHECK_LIB_IPV4
29		AX_CHECK_LIB_IPV6
30		AX_CHECK_LIB_CRYPT
#	Line 38 | Line 35 | AC_CHECK_HEADERS([sys/resource.h]) # ick
35		# Checks for typedefs, structures, and compiler characteristics.
36		AC_C_CONST
37		AC_C_INLINE
41	–	AC_C_VOLATILE
38		AC_C_BIGENDIAN
39
40	+	AC_CHECK_SIZEOF(int64_t)
41	+	AC_CHECK_SIZEOF(long long)
42	+
43	+	if test "$ac_cv_sizeof_int64_t" = 8; then
44	+	AC_CHECK_TYPE(uint64_t)
45	+	AC_CHECK_TYPE(int64_t)
46	+	elif test "$ac_cv_sizeof_long_long" = 8; then
47	+	AC_CHECK_TYPE(uint64_t, unsigned long long)
48	+	AC_CHECK_TYPE(int64_t, long long)
49	+	else
50	+	AC_MSG_ERROR([Your system doesn't appear to have 64 bit integers.  Aborting.])
51	+	fi
52	+
53	+
54		# Checks for library functions.
55	<	AC_CHECK_FUNC([snprintf],[AC_DEFINE([HAVE_SNPRINTF],[1],[Define to 1 if you have the snprintf() function.])])
56	<	AC_CHECK_FUNC([vsnprintf],[AC_DEFINE([HAVE_VSNPRINTF],[1],[Define to 1 if you have the vsnprintf() function.])])
57	<	AC_CHECK_FUNC([lrand48],[AC_DEFINE([HAVE_LRAND48],[1],[Define to 1 if you have the lrand48() function.])])
58	<	AC_CHECK_FUNC([srand48],[AC_DEFINE([HAVE_LRAND48],[1],[Define to 1 if you have the srand48() function.])])
59	<	AC_CHECK_FUNC([mmap],[AC_DEFINE([HAVE_MMAP],[1],[Define to 1 if you have the mmap() function.])])
60	<	AC_CHECK_FUNC([strtok_r],[AC_DEFINE([HAVE_STRTOK_R],[1],[Define to 1 if you have the strtok_r() function.])])
61	<	AC_CHECK_FUNC([usleep],[AC_DEFINE([HAVE_USLEEP],[1],[Define to 1 if you have the usleep() function.])])
62	<	AC_CHECK_FUNC([strlcat],[AC_DEFINE([HAVE_STRLCAT],[1],[Define to 1 if you have the strlcat() function.])])
63	<	AC_CHECK_FUNC([strlcpy],[AC_DEFINE([HAVE_STRLCPY],[1],[Define to 1 if you have the strlcpy() function.])])
64	<	AC_CHECK_FUNC([basename],[AC_DEFINE([HAVE_BASENAME],[1],[Define to 1 if you have the basename() function.])])
55	>	AC_CHECK_FUNCS_ONCE(snprintf,  \
56	>	vsnprintf, \
57	>	lrand48,   \
58	>	srand48,   \
59	>	mmap,      \
60	>	strtok_r,  \
61	>	usleep,    \
62	>	strlcat,   \
63	>	strlcpy,   \
64	>	basename)
65	>
66	>	AC_CHECK_HEADERS_ONCE(crypt.h        \
67	>	inttypes.h     \
68	>	stdint.h       \
69	>	sys/resource.h \
70	>	sys/param.h    \
71	>	errno.h        \
72	>	sys/syslog.h   \
73	>	stddef.h       \
74	>	libgen.h       \
75	>	sys/wait.h     \
76	>	wait.h         \
77	>	link.h)
78	>
79	>	dnl Openssl checks
80	>	AC_ARG_ENABLE(openssl,
81	>	[  --enable-openssl[=DIR]       Enable OpenSSL support (DIR optional).
82	>	--disable-openssl            Disable OpenSSL support. ],
83	>	[ cf_enable_openssl=$enableval ],
84	>	[ cf_enable_openssl="auto" ])
85	>	AC_MSG_CHECKING(for OpenSSL)
86	>	if test "$cf_enable_openssl" != "no"; then
87	>	cf_openssl_basedir=""
88	>	if test "$cf_enable_openssl" != "auto" &&
89	>	test "$cf_enable_openssl" != "yes"; then
90	>	dnl Support for --enable-openssl=/some/place
91	>	cf_openssl_basedir="${cf_enable_openssl}"
92	>	else
93	>	dnl Do the auto-probe here.  Check some common directory paths.
94	>	for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/lib /usr/lib/ssl\
95	>	/opt /opt/openssl /usr/local/openssl; do
96	>	if test -f "${dirs}/include/openssl/opensslv.h"; then
97	>	cf_openssl_basedir="${dirs}"
98	>	break
99	>	fi
100	>	done
101	>	unset dirs
102	>	fi
103	>
104	>	dnl Now check cf_openssl_found to see if we found anything.
105	>	if test ! -z "$cf_openssl_basedir"; then
106	>	if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h"; then
107	>	CPPFLAGS="-I${cf_openssl_basedir}/include $CPPFLAGS"
108	>	LDFLAGS="-L${cf_openssl_basedir}/lib $LDFLAGS"
109	>	else
110	>	dnl OpenSSL wasn't found in the directory specified.  Naughty
111	>	dnl administrator...
112	>	cf_openssl_basedir=""
113	>	fi
114	>	else
115	>	dnl Check for stock FreeBSD 4.x and 5.x systems, since their files
116	>	dnl are in /usr/include and /usr/lib.  In this case, we don't want to
117	>	dnl change INCLUDES or LIBS, but still want to enable OpenSSL.
118	>	dnl We can't do this check above, because some people want two versions
119	>	dnl of OpenSSL installed (stock FreeBSD 4.x/5.x and /usr/local/ssl)
120	>	dnl and they want /usr/local/ssl to have preference.
121	>	if test -f "/usr/include/openssl/opensslv.h"; then
122	>	cf_openssl_basedir="/usr"
123	>	fi
124	>	fi
125	>
126	>	dnl If we have a basedir defined, then everything is okay.  Otherwise,
127	>	dnl we have a problem.
128	>	if test ! -z "$cf_openssl_basedir"; then
129	>	LIBS="-lcrypto -lssl $LIBS"
130	>	AC_MSG_RESULT($cf_openssl_basedir)
131	>	cf_enable_openssl="yes"
132	>	AC_DEFINE(HAVE_LIBCRYPTO)
133	>	else
134	>	AC_MSG_RESULT(not found.  Please check your path.)
135	>	cf_enable_openssl="no"
136	>	fi
137	>	unset cf_openssl_basedir
138	>	else
139	>	dnl If --disable-openssl was specified
140	>	AC_MSG_RESULT(disabled)
141	>	fi
142	>	AM_CONDITIONAL(ENABLE_SSL, [test x"$cf_enable_openssl" = xyes])
143	>
144
145		# Argument processing.
146		AX_ARG_ENABLE_IOLOOP_MECHANISM
58	–	AX_ARG_DISABLE_BLOCK_ALLOC
59	–	AX_ARG_DISABLE_SHARED_MODULES
147		AX_ARG_WITH_NICKLEN
148		AX_ARG_WITH_USERLEN
149		AX_ARG_WITH_HOSTLEN
#	Line 77 | Line 164 | AX_ARG_ENABLE_EFNET
164		AX_ARG_ENABLE_HALFOPS
165		AX_ARG_ENABLE_DEBUGGING
166		AX_ARG_ENABLE_WARNINGS
80	–	AX_ARG_ENABLE_EFENCE
167		AX_ARG_ENABLE_SYSLOG
168
169		AC_DEFINE_DIR([PREFIX],[prefix],[Set to prefix.])
#	Line 92 | Line 178 | AC_CONFIG_FILES(               \
178		etc/Makefile            \
179		etc/example.conf        \
180		etc/example.conf.quick  \
181	+	etc/example.efnet.conf  \
182		servlink/Makefile       \
183		contrib/Makefile        \
184		contrib/help/Makefile   \
#	Line 103 | Line 190 | AC_CONFIG_FILES(               \
190		help/Makefile           \
191		help/opers/Makefile             \
192		help/users/Makefile     \
106	–	include/Makefile        \
193		lib/Makefile            \
194		lib/pcre/Makefile
195		)

Diff Legend

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