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 1111 by michael, Fri Nov 26 20:01:41 2010 UTC vs.
ircd-hybrid-8/configure.ac (file contents), Revision 1348 by michael, Wed Apr 11 17:04:22 2012 UTC

# Line 4 | Line 4
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)
7 > AC_INIT([ircd-hybrid], [8beta1], [bugs@ircd-hybrid.org])
8 > AM_INIT_AUTOMAKE(1.11.4)
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  
68 AC_ARG_WITH(zlib-path,
69 AS_HELP_STRING([--with-zlib-path=DIR], [Path to libz.so for ziplinks support.]),
70 [LDFLAGS="-L$withval $LDFLAGS"],)
71
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
53   AC_ARG_WITH(libpcre-path,
54   AS_HELP_STRING([--with-libpcre-path=DIR], [Path to libpcre.so for PCRE support.]),
55   [LDFLAGS="-L$withval $LDFLAGS"],)
# Line 149 | Line 118 | if test "$cf_enable_openssl" != "no"; th
118    dnl If we have a basedir defined, then everything is okay.  Otherwise,
119    dnl we have a problem.
120    if test ! -z "$cf_openssl_basedir"; then
152    LIBS="-lcrypto -lssl $LIBS"
121      AC_MSG_RESULT([$cf_openssl_basedir])
122      cf_enable_openssl="yes"
155    AC_DEFINE(HAVE_LIBCRYPTO, 1, [If we support ssl])
123    else
124      AC_MSG_RESULT([not found. Please check your path.])
125      cf_enable_openssl="no"
# Line 164 | Line 131 | else
131   fi
132  
133   AS_IF([test "$cf_enable_openssl" != "no"],
134 < [AC_MSG_CHECKING(for OpenSSL 0.9.7 or above)
134 > [AC_MSG_CHECKING(for OpenSSL 0.9.8 or above)
135    AC_RUN_IFELSE([
136      AC_LANG_PROGRAM([
137      #include <openssl/opensslv.h>
138      #include <stdlib.h>],
139 <    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x00907000)); ]])],
139 >    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000)); ]])],
140    [cf_openssl_version_ok=yes],
141    [cf_openssl_version_ok=no],
142    [cf_openssl_version_ok=no])
# Line 177 | Line 144 | AS_IF([test "$cf_enable_openssl" != "no"
144    AS_IF([test "$cf_openssl_version_ok" = "yes"],
145      [AC_MSG_RESULT(found)
146  
147 <    AC_CHECK_LIB(crypto, RSA_free)
148 <    AS_IF([test "$ac_cv_lib_crypto_RSA_free" = "yes"],
149 <      [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)])
147 >    AC_CHECK_LIB(ssl, SSL_connect)
148 >    AS_IF([test "$ac_cv_lib_ssl_SSL_connect" = "yes"],
149 >      [AC_CHECK_LIB(crypto, RSA_free)])
150      ],[AC_MSG_RESULT(no - OpenSSL support disabled)
151      cf_enable_openssl="no"])])
152  
153 < AM_CONDITIONAL(ENABLE_SSL, [test "$cf_enable_openssl" = yes])
153 > AM_CONDITIONAL(ENABLE_SSL, [test "$ac_cv_lib_crypto_RSA_free" = yes])
154  
155  
156   AC_ARG_ENABLE(assert, AS_HELP_STRING([--enable-assert],
# Line 231 | Line 193 | AS_IF([test "$small_net" = "yes"], [
193   AX_ARG_ENABLE_IOLOOP_MECHANISM
194   AX_ARG_WITH_NICKLEN
195   AX_ARG_WITH_TOPICLEN
234 AX_ARG_WITH_SYSLOG
196   AX_ARG_ENABLE_EFNET
197   AX_ARG_ENABLE_HALFOPS
198   AX_ARG_ENABLE_DEBUGGING
199   AX_ARG_ENABLE_WARNINGS
239 AX_ARG_ENABLE_SYSLOG
200  
201   AC_DEFINE_DIR([PREFIX],[prefix],[Set to prefix.])
202   AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Set to sysconfdir.])
# Line 246 | Line 206 | AC_DEFINE_DIR([LOCALSTATEDIR],[localstat
206  
207   AC_CONFIG_FILES(              \
208         Makefile               \
249       etc/Makefile           \
250       servlink/Makefile      \
209         contrib/Makefile       \
210         contrib/help/Makefile  \
211         src/Makefile           \

Diff Legend

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