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 9124 by michael, Sun Jan 5 19:09:19 2020 UTC vs.
Revision 9307 by michael, Wed Feb 26 17:04:10 2020 UTC

# Line 1 | Line 1
1   #! /bin/sh
2 < # From configure.ac Id: configure.ac 8977 2019-05-18 20:53:40Z michael .
2 > # From configure.ac Id: configure.ac 9260 2020-02-02 19:22:23Z michael .
3   # Guess values for system-dependent variables and create Makefiles.
4 < # Generated by GNU Autoconf 2.69 for ircd-hybrid 8.2.26.
4 > # Generated by GNU Autoconf 2.69 for ircd-hybrid 8.2.30.
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.26'
597 < PACKAGE_STRING='ircd-hybrid 8.2.26'
596 > PACKAGE_VERSION='8.2.30'
597 > PACKAGE_STRING='ircd-hybrid 8.2.30'
598   PACKAGE_BUGREPORT='bugs@ircd-hybrid.org'
599   PACKAGE_URL=''
600  
# Line 814 | Line 814 | enable_assert
814   enable_debugging
815   enable_warnings
816   enable_efence
817 < enable_openssl
818 < enable_gnutls
817 > with_tls
818   '
819        ac_precious_vars='build_alias
820   host_alias
# Line 1379 | Line 1378 | if test "$ac_init_help" = "long"; then
1378    # Omit some internal or obsolete options to make the list less imposing.
1379    # This message is too long to be a string in the A/UX 3.1 sh.
1380    cat <<_ACEOF
1381 < \`configure' configures ircd-hybrid 8.2.26 to adapt to many kinds of systems.
1381 > \`configure' configures ircd-hybrid 8.2.30 to adapt to many kinds of systems.
1382  
1383   Usage: $0 [OPTION]... [VAR=VALUE]...
1384  
# Line 1450 | Line 1449 | fi
1449  
1450   if test -n "$ac_init_help"; then
1451    case $ac_init_help in
1452 <     short | recursive ) echo "Configuration of ircd-hybrid 8.2.26:";;
1452 >     short | recursive ) echo "Configuration of ircd-hybrid 8.2.30:";;
1453     esac
1454    cat <<\_ACEOF
1455  
# Line 1482 | Line 1481 | Optional Features:
1481    --enable-warnings       Enable compiler warnings.
1482    --enable-efence         Enable linking with Electric Fence 'efence' memory
1483                            debugger library.
1485  --enable-openssl=DIR       Enable LibreSSL/OpenSSL support (DIR optional).
1486  --disable-openssl            Disable LibreSSL/OpenSSL support.
1487  --enable-gnutls             Enable GnuTLS support.
1488  --disable-gnutls             Disable GnuTLS support.
1484  
1485   Optional Packages:
1486    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
# Line 1501 | Line 1496 | Optional Packages:
1496    --with-included-ltdl    use the GNU ltdl sources included here
1497    --with-ltdl-include=DIR use the ltdl headers installed in DIR
1498    --with-ltdl-lib=DIR     use the libltdl.la installed in DIR
1499 +  --with-tls              Enables TLS with specified library. Options:
1500 +                          'openssl', 'wolfssl', 'gnutls' or 'none'
1501  
1502   Some influential environment variables:
1503    CC          C compiler command
# Line 1586 | Line 1583 | fi
1583   test -n "$ac_init_help" && exit $ac_status
1584   if $ac_init_version; then
1585    cat <<\_ACEOF
1586 < ircd-hybrid configure 8.2.26
1586 > ircd-hybrid configure 8.2.30
1587   generated by GNU Autoconf 2.69
1588  
1589   Copyright (C) 2012 Free Software Foundation, Inc.
# Line 2055 | Line 2052 | cat >config.log <<_ACEOF
2052   This file contains any messages produced by compilers while
2053   running configure, to aid debugging if configure makes a mistake.
2054  
2055 < It was created by ircd-hybrid $as_me 8.2.26, which was
2055 > It was created by ircd-hybrid $as_me 8.2.30, which was
2056   generated by GNU Autoconf 2.69.  Invocation command line was
2057  
2058    $ $0 $@
# Line 2335 | Line 2332 | $as_echo "$as_me: creating cache $cache_
2332    >$cache_file
2333   fi
2334  
2338 as_fn_append ac_func_list " accept4"
2335   as_fn_append ac_func_list " strtok_r"
2336   as_fn_append ac_func_list " strlcat"
2337   as_fn_append ac_func_list " strlcpy"
# Line 2927 | Line 2923 | fi
2923  
2924   # Define the identity of the package.
2925   PACKAGE='ircd-hybrid'
2926 < VERSION='8.2.26'
2926 > VERSION='8.2.30'
2927  
2928  
2929   cat >>confdefs.h <<_ACEOF
# Line 14193 | Line 14189 | done
14189  
14190  
14191  
14196
14197
14192   # Checks for header files.
14193  
14194  
# Line 16687 | Line 16681 | fi
16681   fi
16682  
16683  
16690 # Check whether --enable-openssl was given.
16691 if test "${enable_openssl+set}" = set; then :
16692  enableval=$enable_openssl;  cf_enable_openssl=$enableval
16693 else
16694   cf_enable_openssl="auto"
16695 fi
16696
16697 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL/OpenSSL" >&5
16698 $as_echo_n "checking for LibreSSL/OpenSSL... " >&6; }
16699 if test "$cf_enable_openssl" != "no"; then
16700  cf_openssl_basedir=""
16701  if test "$cf_enable_openssl" != "auto" &&
16702     test "$cf_enable_openssl" != "yes"; then
16703          cf_openssl_basedir="${cf_enable_openssl}"
16704  else
16705        for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/lib /usr/lib/ssl\
16706                /opt /opt/openssl /usr/local/openssl; do
16707      if test -f "${dirs}/include/openssl/opensslv.h"; then
16708        cf_openssl_basedir="${dirs}"
16709        break
16710      fi
16711    done
16712    unset dirs
16713  fi
16684  
16715    if test ! -z "$cf_openssl_basedir"; then
16716    if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h"; then
16717      CPPFLAGS="-I${cf_openssl_basedir}/include $CPPFLAGS"
16718      LDFLAGS="-L${cf_openssl_basedir}/lib $LDFLAGS"
16719    else
16720                  cf_openssl_basedir=""
16721    fi
16722  else
16723                            if test -f "/usr/include/openssl/opensslv.h"; then
16724      cf_openssl_basedir="/usr"
16725    fi
16726  fi
16685  
16686 <      if test ! -z "$cf_openssl_basedir"; then
16687 <    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_openssl_basedir" >&5
16688 < $as_echo "$cf_openssl_basedir" >&6; }
16731 <    cf_enable_openssl="yes"
16732 <  else
16733 <    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found. Please check your path." >&5
16734 < $as_echo "not found. Please check your path." >&6; }
16735 <    cf_enable_openssl="no"
16736 <  fi
16737 <  unset cf_openssl_basedir
16686 > # Check whether --with-tls was given.
16687 > if test "${with_tls+set}" = set; then :
16688 >  withval=$with_tls; with_tls=$withval
16689   else
16690 <    { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
16740 < $as_echo "disabled" >&6; }
16690 >  with_tls=auto
16691   fi
16692  
16693 < if test "$cf_enable_openssl" != "no"; then :
16694 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL or OpenSSL 1.0.1f and above" >&5
16695 < $as_echo_n "checking for LibreSSL or OpenSSL 1.0.2r and above... " >&6; }
16696 <  if test "$cross_compiling" = yes; then :
16697 <  cf_openssl_version_ok=no
16693 >
16694 > if test "$with_tls" = "openssl" ||
16695 >   test "$with_tls" = "auto"; then
16696 >    ac_fn_c_check_header_mongrel "$LINENO" "openssl/opensslv.h" "ac_cv_header_openssl_opensslv_h" "$ac_includes_default"
16697 > if test "x$ac_cv_header_openssl_opensslv_h" = xyes; then :
16698 >
16699 >      if test "$cross_compiling" = yes; then :
16700 >  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
16701 > $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
16702 > as_fn_error $? "cannot run test program while cross compiling
16703 > See \`config.log' for more details" "$LINENO" 5; }
16704   else
16705    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16706   /* end confdefs.h.  */
16707  
16708  
16709 <    #include <openssl/opensslv.h>
16710 <    #include <stdlib.h>
16709 >          #include <openssl/opensslv.h>
16710 >          #include <stdlib.h>
16711   int
16712   main ()
16713   {
16714 < exit(!(OPENSSL_VERSION_NUMBER >= 0x1000212fL));
16714 >
16715 >          exit(!(OPENSSL_VERSION_NUMBER >= 0x1010100fL));
16716    ;
16717    return 0;
16718   }
16719   _ACEOF
16720   if ac_fn_c_try_run "$LINENO"; then :
16721 <  cf_openssl_version_ok=yes
16765 < else
16766 <  cf_openssl_version_ok=no
16767 < fi
16768 < rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
16769 <  conftest.$ac_objext conftest.beam conftest.$ac_ext
16770 < fi
16771 <
16772 <
16773 <  if test "$cf_openssl_version_ok" = "yes"; then :
16774 <  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
16775 < $as_echo "found" >&6; }
16776 <
16777 <    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
16721 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
16722   $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
16723   if ${ac_cv_lib_crypto_RSA_free+:} false; then :
16724    $as_echo_n "(cached) " >&6
# Line 16819 | Line 16763 | _ACEOF
16763  
16764   fi
16765  
16766 + fi
16767 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
16768 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
16769 + fi
16770 +
16771 + fi
16772 +
16773 +
16774 +
16775      if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then :
16776    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
16777   $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
# Line 16867 | Line 16820 | fi
16820  
16821   fi
16822  
16823 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL, or OpenSSL 1.1.1 and above" >&5
16824 + $as_echo_n "checking for LibreSSL, or OpenSSL 1.1.1 and above... " >&6; }
16825 +    if test "$ac_cv_lib_ssl_SSL_connect" = "yes"; then :
16826 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
16827 + $as_echo "found" >&6; }
16828   else
16829    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - LibreSSL/OpenSSL support disabled" >&5
16830   $as_echo "no - LibreSSL/OpenSSL support disabled" >&6; }
16873    cf_enable_openssl="no"
16831   fi
16875 fi
16876
16832  
16878 # Check whether --enable-gnutls was given.
16879 if test "${enable_gnutls+set}" = set; then :
16880  enableval=$enable_gnutls;  cf_enable_gnutls=$enableval
16881 else
16882   cf_enable_gnutls="auto"
16833   fi
16834  
16835 <
16836 < if test "$cf_enable_openssl" != "auto" &&
16837 <   test "$cf_enable_openssl" != "yes"; then
16888 <  if test "$cf_enable_gnutls" != "no"; then
16835 > if test "$with_tls" = "gnutls" ||
16836 >   test "$with_tls" = "auto"; then
16837 >  if test "$ac_cv_lib_ssl_SSL_connect" != "yes"; then
16838  
16839      ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
16840   if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
# Line 16906 | Line 16855 | int
16855   main ()
16856   {
16857  
16858 <          exit(!(GNUTLS_VERSION_NUMBER >= 0x030508));
16858 >          exit(!(GNUTLS_VERSION_NUMBER >= 0x030605));
16859    ;
16860    return 0;
16861   }
16862   _ACEOF
16863   if ac_fn_c_try_run "$LINENO"; then :
16864 <   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_init in -lgnutls" >&5
16864 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_init in -lgnutls" >&5
16865   $as_echo_n "checking for gnutls_init in -lgnutls... " >&6; }
16866   if ${ac_cv_lib_gnutls_gnutls_init+:} false; then :
16867    $as_echo_n "(cached) " >&6
# Line 16966 | Line 16915 | fi
16915  
16916  
16917  
16918 <    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GnuTLS 3.5.8 and above" >&5
16919 < $as_echo_n "checking for GnuTLS 3.5.8 and above... " >&6; }
16918 >    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GnuTLS 3.6.5 and above" >&5
16919 > $as_echo_n "checking for GnuTLS 3.6.5 and above... " >&6; }
16920      if test "$ac_cv_lib_gnutls_gnutls_init" = "yes"; then :
16921    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
16922   $as_echo "found" >&6; }
# Line 16979 | Line 16928 | fi
16928    fi
16929   fi
16930  
16931 + if test "$with_tls" = "wolfssl" ||
16932 +   test "$with_tls" = "auto"; then
16933 +  if test "$ac_cv_lib_ssl_SSL_connect" != "yes" &&
16934 +     test "$ac_cv_lib_gnutls_gnutls_init" != "yes"; then
16935 +
16936 +    ac_fn_c_check_header_mongrel "$LINENO" "wolfssl/ssl.h" "ac_cv_header_wolfssl_ssl_h" "$ac_includes_default"
16937 + if test "x$ac_cv_header_wolfssl_ssl_h" = xyes; then :
16938 +
16939 +      if test "$cross_compiling" = yes; then :
16940 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
16941 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
16942 + as_fn_error $? "cannot run test program while cross compiling
16943 + See \`config.log' for more details" "$LINENO" 5; }
16944 + else
16945 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16946 + /* end confdefs.h.  */
16947 +
16948 +
16949 +          #include <wolfssl/version.h>
16950 +          #include <stdlib.h>
16951 + int
16952 + main ()
16953 + {
16954 +
16955 +          exit(!(LIBWOLFSSL_VERSION_HEX >= 0x04003000));
16956 +  ;
16957 +  return 0;
16958 + }
16959 + _ACEOF
16960 + if ac_fn_c_try_run "$LINENO"; then :
16961 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wolfSSL_X509_digest in -lwolfssl" >&5
16962 + $as_echo_n "checking for wolfSSL_X509_digest in -lwolfssl... " >&6; }
16963 + if ${ac_cv_lib_wolfssl_wolfSSL_X509_digest+:} false; then :
16964 +  $as_echo_n "(cached) " >&6
16965 + else
16966 +  ac_check_lib_save_LIBS=$LIBS
16967 + LIBS="-lwolfssl  $LIBS"
16968 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16969 + /* end confdefs.h.  */
16970 +
16971 + /* Override any GCC internal prototype to avoid an error.
16972 +   Use char because int might match the return type of a GCC
16973 +   builtin and then its argument prototype would still apply.  */
16974 + #ifdef __cplusplus
16975 + extern "C"
16976 + #endif
16977 + char wolfSSL_X509_digest ();
16978 + int
16979 + main ()
16980 + {
16981 + return wolfSSL_X509_digest ();
16982 +  ;
16983 +  return 0;
16984 + }
16985 + _ACEOF
16986 + if ac_fn_c_try_link "$LINENO"; then :
16987 +  ac_cv_lib_wolfssl_wolfSSL_X509_digest=yes
16988 + else
16989 +  ac_cv_lib_wolfssl_wolfSSL_X509_digest=no
16990 + fi
16991 + rm -f core conftest.err conftest.$ac_objext \
16992 +    conftest$ac_exeext conftest.$ac_ext
16993 + LIBS=$ac_check_lib_save_LIBS
16994 + fi
16995 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wolfssl_wolfSSL_X509_digest" >&5
16996 + $as_echo "$ac_cv_lib_wolfssl_wolfSSL_X509_digest" >&6; }
16997 + if test "x$ac_cv_lib_wolfssl_wolfSSL_X509_digest" = xyes; then :
16998 +  cat >>confdefs.h <<_ACEOF
16999 + #define HAVE_LIBWOLFSSL 1
17000 + _ACEOF
17001 +
17002 +  LIBS="-lwolfssl $LIBS"
17003 +
17004 + fi
17005 +
17006 + fi
17007 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
17008 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
17009 + fi
17010 +
17011 + fi
17012 +
17013 +
17014 +
17015 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wolfSSL 4.3.0 and above built with extended/full OpenSSL compatibility layer" >&5
17016 + $as_echo_n "checking for wolfSSL 4.3.0 and above built with extended/full OpenSSL compatibility layer... " >&6; }
17017 +    if test "$ac_cv_lib_wolfssl_wolfSSL_X509_digest" = "yes"; then :
17018 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
17019 + $as_echo "found" >&6; }
17020 + else
17021 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - wolfSSL support disabled" >&5
17022 + $as_echo "no - wolfSSL support disabled" >&6; }
17023 + fi
17024 +
17025 +  fi
17026 + fi
17027 +
17028 +
17029  
17030   # Disable -Wformat-truncation
17031  
# Line 17706 | Line 17753 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
17753   # report actual input values of CONFIG_FILES etc. instead of their
17754   # values after options handling.
17755   ac_log="
17756 < This file was extended by ircd-hybrid $as_me 8.2.26, which was
17756 > This file was extended by ircd-hybrid $as_me 8.2.30, which was
17757   generated by GNU Autoconf 2.69.  Invocation command line was
17758  
17759    CONFIG_FILES    = $CONFIG_FILES
# Line 17772 | Line 17819 | _ACEOF
17819   cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17820   ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
17821   ac_cs_version="\\
17822 < ircd-hybrid config.status 8.2.26
17822 > ircd-hybrid config.status 8.2.30
17823   configured by $0, generated by GNU Autoconf 2.69,
17824    with options \\"\$ac_cs_config\\"
17825  

Diff Legend

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