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-8/configure.ac (file contents), Revision 1304 by michael, Fri Mar 23 12:03:56 2012 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.68)
7 > AC_INIT([ircd-hybrid], [8beta1], [bugs@ircd-hybrid.org])
8 > AM_INIT_AUTOMAKE(1.11.3)
9   AM_MAINTAINER_MODE
10   AC_CONFIG_HEADER(config.h)
11   AC_CONFIG_SRCDIR(src/ircd.c)
# Line 19 | Line 19 | 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 34 | Line 36 | AC_CHECK_FUNCS_ONCE(mmap     \
36                      strtok_r \
37                      usleep   \
38                      strlcat  \
39 <                    strlcpy)
39 >                    strlcpy  \
40 >                    socketpair)
41  
42   # Checks for header files.
43   AC_CHECK_HEADERS_ONCE(crypt.h        \
# Line 62 | Line 65 | AS_IF([test -c /dev/null], [
65   AC_SEARCH_LIBS(crypt, crypt)
66  
67  
65 – AC_ARG_WITH(zlib-path,
66 – AS_HELP_STRING([--with-zlib-path=DIR], [Path to libz.so for ziplinks support.]),
67 – [LDFLAGS="-L$withval $LDFLAGS"],)
68 –
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 –
68   AC_ARG_WITH(libpcre-path,
69   AS_HELP_STRING([--with-libpcre-path=DIR], [Path to libpcre.so for PCRE support.]),
70   [LDFLAGS="-L$withval $LDFLAGS"],)
# Line 146 | Line 133 | if test "$cf_enable_openssl" != "no"; th
133    dnl If we have a basedir defined, then everything is okay.  Otherwise,
134    dnl we have a problem.
135    if test ! -z "$cf_openssl_basedir"; then
149 –    LIBS="-lcrypto -lssl $LIBS"
136      AC_MSG_RESULT([$cf_openssl_basedir])
137      cf_enable_openssl="yes"
152 –    AC_DEFINE(HAVE_LIBCRYPTO, 1, [If we support ssl])
138    else
139      AC_MSG_RESULT([not found. Please check your path.])
140      cf_enable_openssl="no"
# Line 161 | Line 146 | else
146   fi
147  
148   AS_IF([test "$cf_enable_openssl" != "no"],
149 < [AC_MSG_CHECKING(for OpenSSL 0.9.7 or above)
150 <  AC_RUN_IFELSE(
149 > [AC_MSG_CHECKING(for OpenSSL 0.9.8 or above)
150 >  AC_RUN_IFELSE([
151      AC_LANG_PROGRAM([
152      #include <openssl/opensslv.h>
153      #include <stdlib.h>],
154 <    [[exit(!(OPENSSL_VERSION_NUMBER >= 0x00907000));]]),
154 >    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000)); ]])],
155    [cf_openssl_version_ok=yes],
156    [cf_openssl_version_ok=no],
157    [cf_openssl_version_ok=no])
158  
159    AS_IF([test "$cf_openssl_version_ok" = "yes"],
160      [AC_MSG_RESULT(found)
161 <  
162 <    AC_CHECK_LIB(crypto, RSA_free)
163 <    AS_IF([test "$ac_cv_lib_crypto_RSA_free" = "yes"],
164 <      [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)])
161 >
162 >    AC_CHECK_LIB(ssl, SSL_connect)
163 >    AS_IF([test "$ac_cv_lib_ssl_SSL_connect" = "yes"],
164 >      [AC_CHECK_LIB(crypto, RSA_free)])
165      ],[AC_MSG_RESULT(no - OpenSSL support disabled)
166      cf_enable_openssl="no"])])
167  
168 < AM_CONDITIONAL(ENABLE_SSL, [test "$cf_enable_openssl" = yes])
168 > AM_CONDITIONAL(ENABLE_SSL, [test "$ac_cv_lib_crypto_RSA_free" = yes])
169  
170  
171   AC_ARG_ENABLE(assert, AS_HELP_STRING([--enable-assert],
# Line 228 | Line 208 | AS_IF([test "$small_net" = "yes"], [
208   AX_ARG_ENABLE_IOLOOP_MECHANISM
209   AX_ARG_WITH_NICKLEN
210   AX_ARG_WITH_TOPICLEN
231 – AX_ARG_WITH_SYSLOG
211   AX_ARG_ENABLE_EFNET
212   AX_ARG_ENABLE_HALFOPS
213   AX_ARG_ENABLE_DEBUGGING
214   AX_ARG_ENABLE_WARNINGS
236 – AX_ARG_ENABLE_SYSLOG
215  
216   AC_DEFINE_DIR([PREFIX],[prefix],[Set to prefix.])
217   AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Set to sysconfdir.])
# Line 244 | Line 222 | AC_DEFINE_DIR([LOCALSTATEDIR],[localstat
222   AC_CONFIG_FILES(              \
223         Makefile               \
224         etc/Makefile           \
247 –       etc/example.conf       \
248 –       etc/example.conf.quick \
249 –       etc/example.efnet.conf \
250 –       servlink/Makefile      \
225         contrib/Makefile       \
226         contrib/help/Makefile  \
227         src/Makefile           \
228 +       libltdl/Makefile       \
229         messages/Makefile      \
230         modules/Makefile       \
231 <                         modules/core/Makefile  \
231 >       modules/core/Makefile  \
232         doc/Makefile           \
233         help/Makefile          \
234 <                         help/opers/Makefile            \
235 <                         help/users/Makefile    \
234 >       help/opers/Makefile    \
235 >       help/users/Makefile    \
236         tools/Makefile)
237  
238   AC_OUTPUT

Diff Legend

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