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

Comparing ircd-hybrid/trunk/configure (file contents):
Revision 9169 by michael, Sat Jan 18 19:08:44 2020 UTC vs.
Revision 9175 by michael, Sun Jan 19 12:39:07 2020 UTC

# Line 814 | Line 814 | enable_assert
814   enable_debugging
815   enable_warnings
816   enable_efence
817 < enable_openssl
818 < enable_gnutls
819 < enable_wolfssl
817 > with_tls
818   '
819        ac_precious_vars='build_alias
820   host_alias
# Line 1483 | Line 1481 | Optional Features:
1481    --enable-warnings       Enable compiler warnings.
1482    --enable-efence         Enable linking with Electric Fence 'efence' memory
1483                            debugger library.
1486 –  --enable-openssl=DIR       Enable LibreSSL/OpenSSL support (DIR optional).
1487 –  --disable-openssl            Disable LibreSSL/OpenSSL support.
1488 –  --enable-gnutls             Enable GnuTLS support.
1489 –  --disable-gnutls             Disable GnuTLS support.
1490 –  --enable-wolfssl             Enable wolfSSL support.
1491 –  --disable-wolfssl             Disable wolfSSL support.
1484  
1485   Optional Packages:
1486    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
# Line 1504 | 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 16690 | Line 16684 | fi
16684   fi
16685  
16686  
16693 – # Check whether --enable-openssl was given.
16694 – if test "${enable_openssl+set}" = set; then :
16695 –  enableval=$enable_openssl;  cf_enable_openssl=$enableval
16696 – else
16697 –   cf_enable_openssl="auto"
16698 – fi
16699 –
16700 – { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL/OpenSSL" >&5
16701 – $as_echo_n "checking for LibreSSL/OpenSSL... " >&6; }
16702 – if test "$cf_enable_openssl" != "no"; then
16703 –  cf_openssl_basedir=""
16704 –  if test "$cf_enable_openssl" != "auto" &&
16705 –     test "$cf_enable_openssl" != "yes"; then
16706 –          cf_openssl_basedir="${cf_enable_openssl}"
16707 –  else
16708 –        for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/lib /usr/lib/ssl\
16709 –                /opt /opt/openssl /usr/local/openssl; do
16710 –      if test -f "${dirs}/include/openssl/opensslv.h"; then
16711 –        cf_openssl_basedir="${dirs}"
16712 –        break
16713 –      fi
16714 –    done
16715 –    unset dirs
16716 –  fi
16687  
16718 –    if test ! -z "$cf_openssl_basedir"; then
16719 –    if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h"; then
16720 –      CPPFLAGS="-I${cf_openssl_basedir}/include $CPPFLAGS"
16721 –      LDFLAGS="-L${cf_openssl_basedir}/lib $LDFLAGS"
16722 –    else
16723 –                  cf_openssl_basedir=""
16724 –    fi
16725 –  else
16726 –                            if test -f "/usr/include/openssl/opensslv.h"; then
16727 –      cf_openssl_basedir="/usr"
16728 –    fi
16729 –  fi
16688  
16689 <      if test ! -z "$cf_openssl_basedir"; then
16690 <    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_openssl_basedir" >&5
16691 < $as_echo "$cf_openssl_basedir" >&6; }
16734 <    cf_enable_openssl="yes"
16735 <  else
16736 <    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found. Please check your path." >&5
16737 < $as_echo "not found. Please check your path." >&6; }
16738 <    cf_enable_openssl="no"
16739 <  fi
16740 <  unset cf_openssl_basedir
16689 > # Check whether --with-tls was given.
16690 > if test "${with_tls+set}" = set; then :
16691 >  withval=$with_tls; with_tls=$withval
16692   else
16693 <    { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
16743 < $as_echo "disabled" >&6; }
16693 >  with_tls=auto
16694   fi
16695  
16696 < if test "$cf_enable_openssl" != "no"; then :
16697 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL, or OpenSSL 1.1.1 and above" >&5
16698 < $as_echo_n "checking for LibreSSL, or OpenSSL 1.1.1 and above... " >&6; }
16699 <  if test "$cross_compiling" = yes; then :
16700 <  cf_openssl_version_ok=no
16696 >
16697 > if test "$with_tls" = "openssl" ||
16698 >   test "$with_tls" = "auto"; then
16699 >    ac_fn_c_check_header_mongrel "$LINENO" "openssl/opensslv.h" "ac_cv_header_openssl_opensslv_h" "$ac_includes_default"
16700 > if test "x$ac_cv_header_openssl_opensslv_h" = xyes; then :
16701 >
16702 >      if test "$cross_compiling" = yes; then :
16703 >  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
16704 > $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
16705 > as_fn_error $? "cannot run test program while cross compiling
16706 > See \`config.log' for more details" "$LINENO" 5; }
16707   else
16708    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16709   /* end confdefs.h.  */
16710  
16711  
16712 <    #include <openssl/opensslv.h>
16713 <    #include <stdlib.h>
16712 >          #include <openssl/opensslv.h>
16713 >          #include <stdlib.h>
16714   int
16715   main ()
16716   {
16717 < exit(!(OPENSSL_VERSION_NUMBER >= 0x1010100fL));
16717 >
16718 >          exit(!(OPENSSL_VERSION_NUMBER >= 0x1010100fL));
16719    ;
16720    return 0;
16721   }
16722   _ACEOF
16723   if ac_fn_c_try_run "$LINENO"; then :
16724 <  cf_openssl_version_ok=yes
16768 < else
16769 <  cf_openssl_version_ok=no
16770 < fi
16771 < rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
16772 <  conftest.$ac_objext conftest.beam conftest.$ac_ext
16773 < fi
16774 <
16775 <
16776 <  if test "$cf_openssl_version_ok" = "yes"; then :
16777 <  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
16778 < $as_echo "found" >&6; }
16779 <
16780 <    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
16724 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
16725   $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
16726   if ${ac_cv_lib_crypto_RSA_free+:} false; then :
16727    $as_echo_n "(cached) " >&6
# Line 16814 | Line 16758 | fi
16758   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
16759   $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
16760   if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
16817 –  cat >>confdefs.h <<_ACEOF
16818 – #define HAVE_LIBCRYPTO 1
16819 – _ACEOF
16820 –
16821 –  LIBS="-lcrypto $LIBS"
16822 –
16823 – fi
16824 –
16825 –    if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then :
16761    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
16762   $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
16763   if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
# Line 16870 | Line 16805 | fi
16805  
16806   fi
16807  
16873 – else
16874 –  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - LibreSSL/OpenSSL support disabled" >&5
16875 – $as_echo "no - LibreSSL/OpenSSL support disabled" >&6; }
16876 –    cf_enable_openssl="no"
16808   fi
16809 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
16810 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
16811   fi
16812  
16813 + fi
16814  
16815 < # Check whether --enable-gnutls was given.
16816 < if test "${enable_gnutls+set}" = set; then :
16817 <  enableval=$enable_gnutls;  cf_enable_gnutls=$enableval
16815 >
16816 >
16817 >    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL, or OpenSSL 1.1.1 and above" >&5
16818 > $as_echo_n "checking for LibreSSL, or OpenSSL 1.1.1 and above... " >&6; }
16819 >    if test "$ac_cv_lib_ssl_SSL_connect" = "yes"; then :
16820 >  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
16821 > $as_echo "found" >&6; }
16822   else
16823 <   cf_enable_gnutls="auto"
16823 >  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - LibreSSL/OpenSSL support disabled" >&5
16824 > $as_echo "no - LibreSSL/OpenSSL support disabled" >&6; }
16825   fi
16826  
16827 + fi
16828  
16829 < if test "$cf_enable_openssl" != "auto" &&
16830 <   test "$cf_enable_openssl" != "yes"; then
16831 <  if test "$cf_enable_gnutls" != "no"; then
16829 > if test "$with_tls" = "gnutls" ||
16830 >   test "$with_tls" = "auto"; then
16831 >  if test "$ac_cv_lib_ssl_SSL_connect" != "yes"; then
16832  
16833      ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
16834   if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
# Line 16915 | Line 16855 | main ()
16855   }
16856   _ACEOF
16857   if ac_fn_c_try_run "$LINENO"; then :
16858 <   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_init in -lgnutls" >&5
16858 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_init in -lgnutls" >&5
16859   $as_echo_n "checking for gnutls_init in -lgnutls... " >&6; }
16860   if ${ac_cv_lib_gnutls_gnutls_init+:} false; then :
16861    $as_echo_n "(cached) " >&6
# Line 16982 | Line 16922 | fi
16922    fi
16923   fi
16924  
16925 <
16926 < # Check whether --enable-wolfssl was given.
16927 < if test "${enable_wolfssl+set}" = set; then :
16928 <  enableval=$enable_wolfssl;  cf_enable_wolfssl=$enableval
16989 < else
16990 <   cf_enable_wolfssl="auto"
16991 < fi
16992 <
16993 <
16994 < if test "$cf_enable_openssl" != "auto" &&
16995 <   test "$cf_enable_openssl" != "yes"; then
16996 <  if test "$cf_enable_gnutls" = "no"; then
16925 > if test "$with_tls" = "wolfssl" ||
16926 >   test "$with_tls" = "auto"; then
16927 >  if test "$ac_cv_lib_ssl_SSL_connect" != "yes" &&
16928 >     test "$ac_cv_lib_gnutls_gnutls_init" != "yes"; then
16929  
16930      ac_fn_c_check_header_mongrel "$LINENO" "wolfssl/ssl.h" "ac_cv_header_wolfssl_ssl_h" "$ac_includes_default"
16931   if test "x$ac_cv_header_wolfssl_ssl_h" = xyes; then :
# Line 17088 | Line 17020 | fi
17020   fi
17021  
17022  
17023 +
17024   # Disable -Wformat-truncation
17025  
17026  

Diff Legend

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