ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/configure.ac
(Generate patch)

Comparing ircd-hybrid/trunk/configure.ac (file contents):
Revision 2480 by michael, Wed Oct 23 16:05:41 2013 UTC vs.
Revision 2481 by michael, Wed Oct 23 16:38:58 2013 UTC

# Line 57 | Line 57 | AC_ARG_ENABLE(libgeoip,
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,
62 < [  --enable-openssl[=DIR]       Enable OpenSSL support (DIR optional).
63 <  --disable-openssl            Disable OpenSSL support. ],
64 < [ cf_enable_openssl=$enableval ],
65 < [ cf_enable_openssl="auto" ])
66 < AC_MSG_CHECKING([for OpenSSL])
67 < if test "$cf_enable_openssl" != "no"; then
68 <  cf_openssl_basedir=""
69 <  if test "$cf_enable_openssl" != "auto" &&
70 <     test "$cf_enable_openssl" != "yes"; then
71 <     dnl Support for --enable-openssl=/some/place
72 <     cf_openssl_basedir="${cf_enable_openssl}"
73 <  else
74 <    dnl Do the auto-probe here.  Check some common directory paths.
75 <    for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/lib /usr/lib/ssl\
76 <                /opt /opt/openssl /usr/local/openssl; do
77 <      if test -f "${dirs}/include/openssl/opensslv.h"; then
78 <        cf_openssl_basedir="${dirs}"
79 <        break
80 <      fi
81 <    done
82 <    unset dirs
83 <  fi
84 <
85 <  dnl Now check cf_openssl_found to see if we found anything.
86 <  if test ! -z "$cf_openssl_basedir"; then
87 <    if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h"; then
88 <      CPPFLAGS="-I${cf_openssl_basedir}/include $CPPFLAGS"
89 <      LDFLAGS="-L${cf_openssl_basedir}/lib $LDFLAGS"
90 <    else
91 <      dnl OpenSSL wasn't found in the directory specified.  Naughty
92 <      dnl administrator...
93 <      cf_openssl_basedir=""
94 <    fi
95 <  else
96 <    dnl Check for stock FreeBSD 4.x and 5.x systems, since their files
97 <    dnl are in /usr/include and /usr/lib.  In this case, we don't want to
98 <    dnl change INCLUDES or LIBS, but still want to enable OpenSSL.
99 <    dnl We can't do this check above, because some people want two versions
100 <    dnl of OpenSSL installed (stock FreeBSD 4.x/5.x and /usr/local/ssl)
101 <    dnl and they want /usr/local/ssl to have preference.
102 <    if test -f "/usr/include/openssl/opensslv.h"; then
103 <      cf_openssl_basedir="/usr"
104 <    fi
105 <  fi
106 <
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
110 <    AC_MSG_RESULT([$cf_openssl_basedir])
111 <    cf_enable_openssl="yes"
112 <  else
113 <    AC_MSG_RESULT([not found. Please check your path.])
114 <    cf_enable_openssl="no"
115 <  fi
116 <  unset cf_openssl_basedir
117 < else
118 <  dnl If --disable-openssl was specified
119 <  AC_MSG_RESULT([disabled])
120 < fi
121 <
122 < AS_IF([test "$cf_enable_openssl" != "no"],
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 >= 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 <
136 <    AC_CHECK_LIB(crypto, RSA_free)
137 <    AS_IF([test "$ac_cv_lib_crypto_RSA_free" = "yes"],
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 "$ac_cv_lib_ssl_SSL_connect" = yes])
143 <
60 > AX_CHECK_OPENSSL
61  
62   AC_ARG_ENABLE(assert, AS_HELP_STRING([--enable-assert],
63                                       [Enable assert() statements]),

Diff Legend

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