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

Comparing ircd-hybrid/branches/8.2.x/configure (file contents):
Revision 3839 by michael, Thu Jun 5 00:35:43 2014 UTC vs.
Revision 4371 by michael, Sun Aug 3 10:56:24 2014 UTC

# Line 1 | Line 1
1   #! /bin/sh
2 < # From configure.ac Id: configure.ac 3725 2014-05-31 16:29:38Z michael .
2 > # From configure.ac Id: configure.ac 4363 2014-08-02 22:23:09Z michael .
3   # Guess values for system-dependent variables and create Makefiles.
4 < # Generated by GNU Autoconf 2.69 for ircd-hybrid 8.2.0beta3.
4 > # Generated by GNU Autoconf 2.69 for ircd-hybrid 8.2.0rc2.
5   #
6   # Report bugs to <bugs@ircd-hybrid.org>.
7   #
# Line 593 | Line 593 | MAKEFLAGS=
593   # Identity of this package.
594   PACKAGE_NAME='ircd-hybrid'
595   PACKAGE_TARNAME='ircd-hybrid'
596 < PACKAGE_VERSION='8.2.0beta3'
597 < PACKAGE_STRING='ircd-hybrid 8.2.0beta3'
596 > PACKAGE_VERSION='8.2.0rc2'
597 > PACKAGE_STRING='ircd-hybrid 8.2.0rc2'
598   PACKAGE_BUGREPORT='bugs@ircd-hybrid.org'
599   PACKAGE_URL=''
600  
# Line 806 | Line 806 | with_ltdl_include
806   with_ltdl_lib
807   enable_ltdl_install
808   enable_libgeoip
809 enable_openssl
809   enable_assert
810   enable_kqueue
811   enable_epoll
812   enable_devpoll
813   enable_poll
815 enable_select
814   enable_debugging
815   enable_warnings
816 + enable_openssl
817   '
818        ac_precious_vars='build_alias
819   host_alias
# Line 1367 | Line 1366 | if test "$ac_init_help" = "long"; then
1366    # Omit some internal or obsolete options to make the list less imposing.
1367    # This message is too long to be a string in the A/UX 3.1 sh.
1368    cat <<_ACEOF
1369 < \`configure' configures ircd-hybrid 8.2.0beta3 to adapt to many kinds of systems.
1369 > \`configure' configures ircd-hybrid 8.2.0rc2 to adapt to many kinds of systems.
1370  
1371   Usage: $0 [OPTION]... [VAR=VALUE]...
1372  
# Line 1437 | Line 1436 | fi
1436  
1437   if test -n "$ac_init_help"; then
1438    case $ac_init_help in
1439 <     short | recursive ) echo "Configuration of ircd-hybrid 8.2.0beta3:";;
1439 >     short | recursive ) echo "Configuration of ircd-hybrid 8.2.0rc2:";;
1440     esac
1441    cat <<\_ACEOF
1442  
# Line 1461 | Line 1460 | Optional Features:
1460    --disable-libtool-lock  avoid locking (might break parallel builds)
1461    --enable-ltdl-install   install libltdl
1462    --disable-libgeoip      Disable GeoIP support
1464  --enable-openssl=DIR       Enable OpenSSL support (DIR optional).
1465  --disable-openssl            Disable OpenSSL support.
1463    --enable-assert         Enable assert() statements
1464    --enable-kqueue         Force kqueue usage.
1465    --enable-epoll          Force epoll usage.
1466    --enable-devpoll        Force devpoll usage.
1467    --enable-poll           Force poll usage.
1471  --enable-select         Force select usage.
1468    --enable-debugging      Enable debugging.
1469    --enable-warnings       Enable compiler warnings.
1470 +  --enable-openssl=DIR       Enable LibreSSL/OpenSSL support (DIR optional).
1471 +  --disable-openssl            Disable LibreSSL/OpenSSL support.
1472  
1473   Optional Packages:
1474    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
# Line 1566 | Line 1564 | fi
1564   test -n "$ac_init_help" && exit $ac_status
1565   if $ac_init_version; then
1566    cat <<\_ACEOF
1567 < ircd-hybrid configure 8.2.0beta3
1567 > ircd-hybrid configure 8.2.0rc2
1568   generated by GNU Autoconf 2.69
1569  
1570   Copyright (C) 2012 Free Software Foundation, Inc.
# Line 1941 | Line 1939 | $as_echo "$ac_res" >&6; }
1939  
1940   } # ac_fn_c_check_type
1941  
1944 # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
1945 # ----------------------------------------------------
1946 # Tries to find if the field MEMBER exists in type AGGR, after including
1947 # INCLUDES, setting cache variable VAR accordingly.
1948 ac_fn_c_check_member ()
1949 {
1950  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1951  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
1952 $as_echo_n "checking for $2.$3... " >&6; }
1953 if eval \${$4+:} false; then :
1954  $as_echo_n "(cached) " >&6
1955 else
1956  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1957 /* end confdefs.h.  */
1958 $5
1959 int
1960 main ()
1961 {
1962 static $2 ac_aggr;
1963 if (ac_aggr.$3)
1964 return 0;
1965  ;
1966  return 0;
1967 }
1968 _ACEOF
1969 if ac_fn_c_try_compile "$LINENO"; then :
1970  eval "$4=yes"
1971 else
1972  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1973 /* end confdefs.h.  */
1974 $5
1975 int
1976 main ()
1977 {
1978 static $2 ac_aggr;
1979 if (sizeof ac_aggr.$3)
1980 return 0;
1981  ;
1982  return 0;
1983 }
1984 _ACEOF
1985 if ac_fn_c_try_compile "$LINENO"; then :
1986  eval "$4=yes"
1987 else
1988  eval "$4=no"
1989 fi
1990 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1991 fi
1992 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1993 fi
1994 eval ac_res=\$$4
1995               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1996 $as_echo "$ac_res" >&6; }
1997  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1998
1999 } # ac_fn_c_check_member
2000
1942   # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
1943   # -------------------------------------------------------
1944   # Tests whether HEADER exists, giving a warning if it cannot be compiled using
# Line 2092 | Line 2033 | cat >config.log <<_ACEOF
2033   This file contains any messages produced by compilers while
2034   running configure, to aid debugging if configure makes a mistake.
2035  
2036 < It was created by ircd-hybrid $as_me 8.2.0beta3, which was
2036 > It was created by ircd-hybrid $as_me 8.2.0rc2, which was
2037   generated by GNU Autoconf 2.69.  Invocation command line was
2038  
2039    $ $0 $@
# Line 2966 | Line 2907 | fi
2907  
2908   # Define the identity of the package.
2909   PACKAGE='ircd-hybrid'
2910 < VERSION='8.2.0beta3'
2910 > VERSION='8.2.0rc2'
2911  
2912  
2913   cat >>confdefs.h <<_ACEOF
# Line 13215 | Line 13156 | $as_echo "#define ENABLE_SSP_CC 1" >>con
13156    fi
13157  
13158  
13159 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libssp exists" >&5
13160 + $as_echo_n "checking whether libssp exists... " >&6; }
13161 + if ${ssp_cv_lib+:} false; then :
13162 +  $as_echo_n "(cached) " >&6
13163 + else
13164 +  ssp_old_libs="$LIBS"
13165 +     LIBS="$LIBS -lssp"
13166 +     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13167 + /* end confdefs.h.  */
13168 +
13169 + int
13170 + main ()
13171 + {
13172 +
13173 +  ;
13174 +  return 0;
13175 + }
13176 + _ACEOF
13177 + if ac_fn_c_try_link "$LINENO"; then :
13178 +  ssp_cv_lib=yes
13179 + else
13180 +  ssp_cv_lib=no
13181 + fi
13182 + rm -f core conftest.err conftest.$ac_objext \
13183 +    conftest$ac_exeext conftest.$ac_ext
13184 +     LIBS="$ssp_old_libs"
13185 +
13186 + fi
13187 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssp_cv_lib" >&5
13188 + $as_echo "$ssp_cv_lib" >&6; }
13189 +  if test $ssp_cv_lib = yes; then
13190 +    LIBS="$LIBS -lssp"
13191 +  fi
13192 +
13193 +
13194  
13195  
13196  
# Line 13281 | Line 13257 | fi
13257   done
13258  
13259  
13284
13260    ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
13261   if test "x$ac_cv_func_getaddrinfo" = xyes; then :
13262  
# Line 13464 | Line 13439 | else
13439    as_fn_error $? "socket library not found" "$LINENO" 5
13440   fi
13441  
13442 +  ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "#include <netinet/in.h>
13443 + "
13444 + if test "x$ac_cv_type_struct_sockaddr_in6" = xyes; then :
13445 +
13446 + $as_echo "#define IPV6 1" >>confdefs.h
13447 +
13448 + fi
13449 +
13450    ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "#include <sys/types.h>
13451     #include <sys/socket.h>
13452     #include <netdb.h>
# Line 13504 | Line 13487 | _ACEOF
13487  
13488   fi
13489  
13507  ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" "#include <sys/types.h>
13508  <sys/socket.h>
13509 "
13510 if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes; then :
13511
13512 cat >>confdefs.h <<_ACEOF
13513 #define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1
13514 _ACEOF
13515
13516
13517 fi
13518
13519
13520
13521  ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "#include <netinet/in.h>
13522 "
13523 if test "x$ac_cv_type_struct_sockaddr_in6" = xyes; then :
13524
13525 $as_echo "#define IPV6 1" >>confdefs.h
13526
13527 fi
13528
13490  
13491  
13492   # Checks for typedefs, structures, and compiler characteristics.
# Line 13941 | Line 13902 | fi
13902   fi
13903  
13904  
13944
13945 # Check whether --enable-openssl was given.
13946 if test "${enable_openssl+set}" = set; then :
13947  enableval=$enable_openssl;  cf_enable_openssl=$enableval
13948 else
13949   cf_enable_openssl="auto"
13950 fi
13951
13952 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL" >&5
13953 $as_echo_n "checking for OpenSSL... " >&6; }
13954 if test "$cf_enable_openssl" != "no"; then
13955  cf_openssl_basedir=""
13956  if test "$cf_enable_openssl" != "auto" &&
13957     test "$cf_enable_openssl" != "yes"; then
13958          cf_openssl_basedir="${cf_enable_openssl}"
13959  else
13960        for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/lib /usr/lib/ssl\
13961                /opt /opt/openssl /usr/local/openssl; do
13962      if test -f "${dirs}/include/openssl/opensslv.h"; then
13963        cf_openssl_basedir="${dirs}"
13964        break
13965      fi
13966    done
13967    unset dirs
13968  fi
13969
13970    if test ! -z "$cf_openssl_basedir"; then
13971    if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h"; then
13972      CPPFLAGS="-I${cf_openssl_basedir}/include $CPPFLAGS"
13973      LDFLAGS="-L${cf_openssl_basedir}/lib $LDFLAGS"
13974    else
13975                  cf_openssl_basedir=""
13976    fi
13977  else
13978                            if test -f "/usr/include/openssl/opensslv.h"; then
13979      cf_openssl_basedir="/usr"
13980    fi
13981  fi
13982
13983      if test ! -z "$cf_openssl_basedir"; then
13984    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_openssl_basedir" >&5
13985 $as_echo "$cf_openssl_basedir" >&6; }
13986    cf_enable_openssl="yes"
13987  else
13988    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found. Please check your path." >&5
13989 $as_echo "not found. Please check your path." >&6; }
13990    cf_enable_openssl="no"
13991  fi
13992  unset cf_openssl_basedir
13993 else
13994    { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
13995 $as_echo "disabled" >&6; }
13996 fi
13997
13998 if test "$cf_enable_openssl" != "no"; then :
13999  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8 or above" >&5
14000 $as_echo_n "checking for OpenSSL 0.9.8 or above... " >&6; }
14001  if test "$cross_compiling" = yes; then :
14002  cf_openssl_version_ok=no
14003 else
14004  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14005 /* end confdefs.h.  */
14006
14007
14008    #include <openssl/opensslv.h>
14009    #include <stdlib.h>
14010 int
14011 main ()
14012 {
14013 exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000));
14014  ;
14015  return 0;
14016 }
14017 _ACEOF
14018 if ac_fn_c_try_run "$LINENO"; then :
14019  cf_openssl_version_ok=yes
14020 else
14021  cf_openssl_version_ok=no
14022 fi
14023 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
14024  conftest.$ac_objext conftest.beam conftest.$ac_ext
14025 fi
14026
14027
14028  if test "$cf_openssl_version_ok" = "yes"; then :
14029  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
14030 $as_echo "found" >&6; }
14031
14032    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
14033 $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
14034 if ${ac_cv_lib_crypto_RSA_free+:} false; then :
14035  $as_echo_n "(cached) " >&6
14036 else
14037  ac_check_lib_save_LIBS=$LIBS
14038 LIBS="-lcrypto  $LIBS"
14039 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14040 /* end confdefs.h.  */
14041
14042 /* Override any GCC internal prototype to avoid an error.
14043   Use char because int might match the return type of a GCC
14044   builtin and then its argument prototype would still apply.  */
14045 #ifdef __cplusplus
14046 extern "C"
14047 #endif
14048 char RSA_free ();
14049 int
14050 main ()
14051 {
14052 return RSA_free ();
14053  ;
14054  return 0;
14055 }
14056 _ACEOF
14057 if ac_fn_c_try_link "$LINENO"; then :
14058  ac_cv_lib_crypto_RSA_free=yes
14059 else
14060  ac_cv_lib_crypto_RSA_free=no
14061 fi
14062 rm -f core conftest.err conftest.$ac_objext \
14063    conftest$ac_exeext conftest.$ac_ext
14064 LIBS=$ac_check_lib_save_LIBS
14065 fi
14066 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
14067 $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
14068 if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
14069  cat >>confdefs.h <<_ACEOF
14070 #define HAVE_LIBCRYPTO 1
14071 _ACEOF
14072
14073  LIBS="-lcrypto $LIBS"
14074
14075 fi
14076
14077    if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then :
14078  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
14079 $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
14080 if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
14081  $as_echo_n "(cached) " >&6
14082 else
14083  ac_check_lib_save_LIBS=$LIBS
14084 LIBS="-lssl  $LIBS"
14085 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14086 /* end confdefs.h.  */
14087
14088 /* Override any GCC internal prototype to avoid an error.
14089   Use char because int might match the return type of a GCC
14090   builtin and then its argument prototype would still apply.  */
14091 #ifdef __cplusplus
14092 extern "C"
14093 #endif
14094 char SSL_connect ();
14095 int
14096 main ()
14097 {
14098 return SSL_connect ();
14099  ;
14100  return 0;
14101 }
14102 _ACEOF
14103 if ac_fn_c_try_link "$LINENO"; then :
14104  ac_cv_lib_ssl_SSL_connect=yes
14105 else
14106  ac_cv_lib_ssl_SSL_connect=no
14107 fi
14108 rm -f core conftest.err conftest.$ac_objext \
14109    conftest$ac_exeext conftest.$ac_ext
14110 LIBS=$ac_check_lib_save_LIBS
14111 fi
14112 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
14113 $as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
14114 if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
14115  cat >>confdefs.h <<_ACEOF
14116 #define HAVE_LIBSSL 1
14117 _ACEOF
14118
14119  LIBS="-lssl $LIBS"
14120
14121 fi
14122
14123 fi
14124
14125 else
14126  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - OpenSSL support disabled" >&5
14127 $as_echo "no - OpenSSL support disabled" >&6; }
14128    cf_enable_openssl="no"
14129 fi
14130 fi
14131
14132 if test "$ac_cv_lib_ssl_SSL_connect" = yes; then
14133  ENABLE_SSL_TRUE=
14134  ENABLE_SSL_FALSE='#'
14135 else
14136  ENABLE_SSL_TRUE='#'
14137  ENABLE_SSL_FALSE=
14138 fi
14139
14140
14141
13905   # Check whether --enable-assert was given.
13906   if test "${enable_assert+set}" = set; then :
13907    enableval=$enable_assert; assert=$enableval
# Line 14198 | Line 13961 | $as_echo "#define MP_CHUNK_SIZE_IP_ENTRY
13961  
13962   # Argument processing.
13963  
13964 <    desired_iopoll_mechanism="none"
13965 <    # Check whether --enable-kqueue was given.
13964 >  desired_iopoll_mechanism="none"
13965 >
13966 >  # Check whether --enable-kqueue was given.
13967   if test "${enable_kqueue+set}" = set; then :
13968    enableval=$enable_kqueue; desired_iopoll_mechanism="kqueue"
13969   fi
# Line 14219 | Line 13983 | if test "${enable_poll+set}" = set; then
13983    enableval=$enable_poll; desired_iopoll_mechanism="poll"
13984   fi
13985  
14222  # Check whether --enable-select was given.
14223 if test "${enable_select+set}" = set; then :
14224  enableval=$enable_select; desired_iopoll_mechanism="select"
14225 fi
13986  
13987 <      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optimal/desired iopoll mechanism" >&5
13987 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optimal/desired iopoll mechanism" >&5
13988   $as_echo_n "checking for optimal/desired iopoll mechanism... " >&6; }
13989 +
13990    iopoll_mechanism_none=0
13991  
13992   cat >>confdefs.h <<_ACEOF
13993   #define __IOPOLL_MECHANISM_NONE $iopoll_mechanism_none
13994   _ACEOF
13995  
13996 <      iopoll_mechanism_kqueue=1
13996 >
13997 >  iopoll_mechanism_kqueue=1
13998  
13999   cat >>confdefs.h <<_ACEOF
14000   #define __IOPOLL_MECHANISM_KQUEUE $iopoll_mechanism_kqueue
# Line 14286 | Line 14048 | else
14048   fi
14049   rm -f core conftest.err conftest.$ac_objext \
14050      conftest$ac_exeext conftest.$ac_ext
14051 <      iopoll_mechanism_epoll=2
14051 >
14052 >  iopoll_mechanism_epoll=2
14053  
14054   cat >>confdefs.h <<_ACEOF
14055   #define __IOPOLL_MECHANISM_EPOLL $iopoll_mechanism_epoll
14056   _ACEOF
14057  
14295  if test "$cross_compiling" = yes; then :
14296  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14297 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14298 as_fn_error $? "cannot run test program while cross compiling
14299 See \`config.log' for more details" "$LINENO" 5; }
14300 else
14058    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14059   /* end confdefs.h.  */
14303
14060   #include <sys/epoll.h>
14305 #include <sys/syscall.h>
14306 #if defined(__stub_epoll_create) || defined(__stub___epoll_create) || defined(EPOLL_NEED_BODY)
14307 #if !defined(__NR_epoll_create)
14308 #if defined(__ia64__)
14309 #define __NR_epoll_create 1243
14310 #elif defined(__x86_64__)
14311 #define __NR_epoll_create 214
14312 #elif defined(__sparc64__) || defined(__sparc__)
14313 #define __NR_epoll_create 193
14314 #elif defined(__s390__) || defined(__m68k__)
14315 #define __NR_epoll_create 249
14316 #elif defined(__ppc64__) || defined(__ppc__)
14317 #define __NR_epoll_create 236
14318 #elif defined(__parisc__) || defined(__arm26__) || defined(__arm__)
14319 #define __NR_epoll_create 224
14320 #elif defined(__alpha__)
14321 #define __NR_epoll_create 407
14322 #elif defined(__sh64__)
14323 #define __NR_epoll_create 282
14324 #elif defined(__i386__) || defined(__sh__) || defined(__m32r__) || defined(__h8300__) || defined(__frv__)
14325 #define __NR_epoll_create 254
14326 #else
14327 #error No system call numbers defined for epoll family.
14328 #endif
14329 #endif
14330 _syscall1(int, epoll_create, int, size)
14331 #endif
14332
14061   int
14062   main ()
14063   {
14064 < return epoll_create(256) == -1 ? 1 : 0
14064 > epoll_create(256);
14065    ;
14066    return 0;
14067   }
14068   _ACEOF
14069 < if ac_fn_c_try_run "$LINENO"; then :
14069 > if ac_fn_c_try_link "$LINENO"; then :
14070    is_epoll_mechanism_available="yes"
14071   else
14072    is_epoll_mechanism_available="no"
14073   fi
14074 < rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
14075 <  conftest.$ac_objext conftest.beam conftest.$ac_ext
14348 < fi
14074 > rm -f core conftest.err conftest.$ac_objext \
14075 >    conftest$ac_exeext conftest.$ac_ext
14076  
14077 <      iopoll_mechanism_devpoll=3
14077 >  iopoll_mechanism_devpoll=3
14078  
14079   cat >>confdefs.h <<_ACEOF
14080   #define __IOPOLL_MECHANISM_DEVPOLL $iopoll_mechanism_devpoll
# Line 14397 | Line 14124 | rm -f core conftest.err conftest.$ac_obj
14124   $as_echo "#define HAVE_SYS_DEVPOLL_H 1" >>confdefs.h
14125  
14126    fi
14127 <      iopoll_mechanism_poll=4
14127 >
14128 >  iopoll_mechanism_poll=4
14129  
14130   cat >>confdefs.h <<_ACEOF
14131   #define __IOPOLL_MECHANISM_POLL $iopoll_mechanism_poll
# Line 14451 | Line 14179 | else
14179   fi
14180   rm -f core conftest.err conftest.$ac_objext \
14181      conftest$ac_exeext conftest.$ac_ext
14454      iopoll_mechanism_select=5
14182  
14183 < cat >>confdefs.h <<_ACEOF
14184 < #define __IOPOLL_MECHANISM_SELECT $iopoll_mechanism_select
14458 < _ACEOF
14459 <
14460 <  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14461 < /* end confdefs.h.  */
14462 < /* Define select to an innocuous variant, in case <limits.h> declares select.
14463 <   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
14464 < #define select innocuous_select
14465 <
14466 < /* System header to define __stub macros and hopefully few prototypes,
14467 <    which can conflict with char select (); below.
14468 <    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
14469 <    <limits.h> exists even on freestanding compilers.  */
14470 <
14471 < #ifdef __STDC__
14472 < # include <limits.h>
14473 < #else
14474 < # include <assert.h>
14475 < #endif
14476 <
14477 < #undef select
14478 <
14479 < /* Override any GCC internal prototype to avoid an error.
14480 <   Use char because int might match the return type of a GCC
14481 <   builtin and then its argument prototype would still apply.  */
14482 < #ifdef __cplusplus
14483 < extern "C"
14484 < #endif
14485 < char select ();
14486 < /* The GNU C library defines this for functions which it implements
14487 <    to always fail with ENOSYS.  Some functions are actually named
14488 <    something starting with __ and the normal name is an alias.  */
14489 < #if defined __stub_select || defined __stub___select
14490 < choke me
14491 < #endif
14492 <
14493 < int
14494 < main ()
14495 < {
14496 < return select ();
14497 <  ;
14498 <  return 0;
14499 < }
14500 < _ACEOF
14501 < if ac_fn_c_try_link "$LINENO"; then :
14502 <  is_select_mechanism_available="yes"
14503 < else
14504 <  is_select_mechanism_available="no"
14505 < fi
14506 < rm -f core conftest.err conftest.$ac_objext \
14507 <    conftest$ac_exeext conftest.$ac_ext
14508 <      optimal_iopoll_mechanism="none"
14509 <  for mechanism in "kqueue" "epoll" "devpoll" "poll" "select" ; do # order is important
14183 >  optimal_iopoll_mechanism="none"
14184 >  for mechanism in "kqueue" "epoll" "devpoll" "poll" ; do # order is important
14185      eval "is_optimal_iopoll_mechanism_available=\$is_${mechanism}_mechanism_available"
14186      if test "$is_optimal_iopoll_mechanism_available" = "yes" ; then
14187        optimal_iopoll_mechanism="$mechanism"
14188        break
14189      fi
14190    done
14191 <      if test "$desired_iopoll_mechanism" = "none" ; then
14191 >
14192 >  if test "$desired_iopoll_mechanism" = "none" ; then
14193      if test "$optimal_iopoll_mechanism" = "none" ; then
14194        { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
14195   $as_echo "none" >&6; }
# Line 14535 | Line 14211 | $as_echo "none" >&6; }
14211        as_fn_error $? "desired iopoll mechanism, $desired_iopoll_mechanism, is not available" "$LINENO" 5
14212      fi
14213    fi
14214 <      eval "use_iopoll_mechanism=\$iopoll_mechanism_${selected_iopoll_mechanism}"
14214 >
14215 >  eval "use_iopoll_mechanism=\$iopoll_mechanism_${selected_iopoll_mechanism}"
14216  
14217   cat >>confdefs.h <<_ACEOF
14218   #define USE_IOPOLL_MECHANISM $use_iopoll_mechanism
# Line 14562 | Line 14239 | else
14239    warnings="no"
14240   fi
14241  
14242 +
14243    if test "$warnings" = "yes" ; then
14244  
14245  
# Line 15606 | Line 15284 | done
15284    fi
15285  
15286  
15287 + # Check whether --enable-openssl was given.
15288 + if test "${enable_openssl+set}" = set; then :
15289 +  enableval=$enable_openssl;  cf_enable_openssl=$enableval
15290 + else
15291 +   cf_enable_openssl="auto"
15292 + fi
15293 +
15294 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL/OpenSSL" >&5
15295 + $as_echo_n "checking for LibreSSL/OpenSSL... " >&6; }
15296 + if test "$cf_enable_openssl" != "no"; then
15297 +  cf_openssl_basedir=""
15298 +  if test "$cf_enable_openssl" != "auto" &&
15299 +     test "$cf_enable_openssl" != "yes"; then
15300 +          cf_openssl_basedir="${cf_enable_openssl}"
15301 +  else
15302 +        for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/lib /usr/lib/ssl\
15303 +                /opt /opt/openssl /usr/local/openssl; do
15304 +      if test -f "${dirs}/include/openssl/opensslv.h"; then
15305 +        cf_openssl_basedir="${dirs}"
15306 +        break
15307 +      fi
15308 +    done
15309 +    unset dirs
15310 +  fi
15311 +
15312 +    if test ! -z "$cf_openssl_basedir"; then
15313 +    if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h"; then
15314 +      CPPFLAGS="-I${cf_openssl_basedir}/include $CPPFLAGS"
15315 +      LDFLAGS="-L${cf_openssl_basedir}/lib $LDFLAGS"
15316 +    else
15317 +                  cf_openssl_basedir=""
15318 +    fi
15319 +  else
15320 +                            if test -f "/usr/include/openssl/opensslv.h"; then
15321 +      cf_openssl_basedir="/usr"
15322 +    fi
15323 +  fi
15324 +
15325 +      if test ! -z "$cf_openssl_basedir"; then
15326 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_openssl_basedir" >&5
15327 + $as_echo "$cf_openssl_basedir" >&6; }
15328 +    cf_enable_openssl="yes"
15329 +  else
15330 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found. Please check your path." >&5
15331 + $as_echo "not found. Please check your path." >&6; }
15332 +    cf_enable_openssl="no"
15333 +  fi
15334 +  unset cf_openssl_basedir
15335 + else
15336 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
15337 + $as_echo "disabled" >&6; }
15338 + fi
15339 +
15340 + if test "$cf_enable_openssl" != "no"; then :
15341 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL or OpenSSL 0.9.8o and above" >&5
15342 + $as_echo_n "checking for LibreSSL or OpenSSL 0.9.8o and above... " >&6; }
15343 +  if test "$cross_compiling" = yes; then :
15344 +  cf_openssl_version_ok=no
15345 + else
15346 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15347 + /* end confdefs.h.  */
15348 +
15349 +
15350 +    #include <openssl/opensslv.h>
15351 +    #include <stdlib.h>
15352 + int
15353 + main ()
15354 + {
15355 + exit(!(OPENSSL_VERSION_NUMBER >= 0x009080ffL));
15356 +  ;
15357 +  return 0;
15358 + }
15359 + _ACEOF
15360 + if ac_fn_c_try_run "$LINENO"; then :
15361 +  cf_openssl_version_ok=yes
15362 + else
15363 +  cf_openssl_version_ok=no
15364 + fi
15365 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
15366 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
15367 + fi
15368 +
15369 +
15370 +  if test "$cf_openssl_version_ok" = "yes"; then :
15371 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
15372 + $as_echo "found" >&6; }
15373 +
15374 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
15375 + $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
15376 + if ${ac_cv_lib_crypto_RSA_free+:} false; then :
15377 +  $as_echo_n "(cached) " >&6
15378 + else
15379 +  ac_check_lib_save_LIBS=$LIBS
15380 + LIBS="-lcrypto  $LIBS"
15381 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15382 + /* end confdefs.h.  */
15383 +
15384 + /* Override any GCC internal prototype to avoid an error.
15385 +   Use char because int might match the return type of a GCC
15386 +   builtin and then its argument prototype would still apply.  */
15387 + #ifdef __cplusplus
15388 + extern "C"
15389 + #endif
15390 + char RSA_free ();
15391 + int
15392 + main ()
15393 + {
15394 + return RSA_free ();
15395 +  ;
15396 +  return 0;
15397 + }
15398 + _ACEOF
15399 + if ac_fn_c_try_link "$LINENO"; then :
15400 +  ac_cv_lib_crypto_RSA_free=yes
15401 + else
15402 +  ac_cv_lib_crypto_RSA_free=no
15403 + fi
15404 + rm -f core conftest.err conftest.$ac_objext \
15405 +    conftest$ac_exeext conftest.$ac_ext
15406 + LIBS=$ac_check_lib_save_LIBS
15407 + fi
15408 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
15409 + $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
15410 + if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
15411 +  cat >>confdefs.h <<_ACEOF
15412 + #define HAVE_LIBCRYPTO 1
15413 + _ACEOF
15414 +
15415 +  LIBS="-lcrypto $LIBS"
15416 +
15417 + fi
15418 +
15419 +    if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then :
15420 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
15421 + $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
15422 + if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
15423 +  $as_echo_n "(cached) " >&6
15424 + else
15425 +  ac_check_lib_save_LIBS=$LIBS
15426 + LIBS="-lssl  $LIBS"
15427 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15428 + /* end confdefs.h.  */
15429 +
15430 + /* Override any GCC internal prototype to avoid an error.
15431 +   Use char because int might match the return type of a GCC
15432 +   builtin and then its argument prototype would still apply.  */
15433 + #ifdef __cplusplus
15434 + extern "C"
15435 + #endif
15436 + char SSL_connect ();
15437 + int
15438 + main ()
15439 + {
15440 + return SSL_connect ();
15441 +  ;
15442 +  return 0;
15443 + }
15444 + _ACEOF
15445 + if ac_fn_c_try_link "$LINENO"; then :
15446 +  ac_cv_lib_ssl_SSL_connect=yes
15447 + else
15448 +  ac_cv_lib_ssl_SSL_connect=no
15449 + fi
15450 + rm -f core conftest.err conftest.$ac_objext \
15451 +    conftest$ac_exeext conftest.$ac_ext
15452 + LIBS=$ac_check_lib_save_LIBS
15453 + fi
15454 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
15455 + $as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
15456 + if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
15457 +  cat >>confdefs.h <<_ACEOF
15458 + #define HAVE_LIBSSL 1
15459 + _ACEOF
15460 +
15461 +  LIBS="-lssl $LIBS"
15462 +
15463 + fi
15464 +
15465 + fi
15466 +
15467 + else
15468 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - LibreSSL/OpenSSL support disabled" >&5
15469 + $as_echo "no - LibreSSL/OpenSSL support disabled" >&6; }
15470 +    cf_enable_openssl="no"
15471 + fi
15472 + fi
15473 +
15474 + if test "$ac_cv_lib_ssl_SSL_connect" = yes; then
15475 +  ENABLE_SSL_TRUE=
15476 +  ENABLE_SSL_FALSE='#'
15477 + else
15478 +  ENABLE_SSL_TRUE='#'
15479 +  ENABLE_SSL_FALSE=
15480 + fi
15481 +
15482 +
15483 +
15484  
15485    prefix_NONE=
15486    exec_prefix_NONE=
# Line 16259 | Line 16134 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
16134   # report actual input values of CONFIG_FILES etc. instead of their
16135   # values after options handling.
16136   ac_log="
16137 < This file was extended by ircd-hybrid $as_me 8.2.0beta3, which was
16137 > This file was extended by ircd-hybrid $as_me 8.2.0rc2, which was
16138   generated by GNU Autoconf 2.69.  Invocation command line was
16139  
16140    CONFIG_FILES    = $CONFIG_FILES
# Line 16325 | Line 16200 | _ACEOF
16200   cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16201   ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
16202   ac_cs_version="\\
16203 < ircd-hybrid config.status 8.2.0beta3
16203 > ircd-hybrid config.status 8.2.0rc2
16204   configured by $0, generated by GNU Autoconf 2.69,
16205    with options \\"\$ac_cs_config\\"
16206  

Diff Legend

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