comparison configure.ac @ 27193:916f266aca98

merge of '1356d70e521b4cb5ab8ea10f0927063b5c62394a' and '6e02b385a7decbbfdad9bc91c80b0bc86fbd8129'
author Paul Aurich <paul@darkrain42.org>
date Sat, 27 Jun 2009 17:50:49 +0000
parents 8f405df1652d
children 552b5292f36f
comparison
equal deleted inserted replaced
27072:cb3e89f5a2d5 27193:916f266aca98
1661 AC_ARG_ENABLE(nss, 1661 AC_ARG_ENABLE(nss,
1662 [ --enable-nss=[yes,no,static] attempt to use Mozilla libnss for SSL support [default=yes]], 1662 [ --enable-nss=[yes,no,static] attempt to use Mozilla libnss for SSL support [default=yes]],
1663 [enable_nss="$enableval"], 1663 [enable_nss="$enableval"],
1664 [enable_nss="yes"]) 1664 [enable_nss="yes"])
1665 1665
1666 msg_ssl="None. MSN, Novell Groupwise, Yahoo! and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!" 1666 msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
1667 looked_for_gnutls="no" 1667 looked_for_gnutls="no"
1668 dnl # 1668 dnl #
1669 dnl # Check for GnuTLS if it's specified. 1669 dnl # Check for GnuTLS if it's specified.
1670 dnl # 1670 dnl #
1671 if test "x$enable_gnutls" != "xno"; then 1671 if test "x$enable_gnutls" != "xno"; then
2055 msg_ssl=$msg_gnutls 2055 msg_ssl=$msg_gnutls
2056 elif test "x$looked_for_gnutls" = "xyes" -a "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then 2056 elif test "x$looked_for_gnutls" = "xyes" -a "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
2057 AC_MSG_ERROR([ 2057 AC_MSG_ERROR([
2058 Neither GnuTLS or NSS SSL development headers found. 2058 Neither GnuTLS or NSS SSL development headers found.
2059 Use --disable-nss --disable-gnutls if you do not need SSL support. 2059 Use --disable-nss --disable-gnutls if you do not need SSL support.
2060 MSN, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable! 2060 MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
2061 ]) 2061 ])
2062 elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then 2062 elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
2063 AC_MSG_ERROR([ 2063 AC_MSG_ERROR([
2064 GnuTLS SSL development headers not found. 2064 GnuTLS SSL development headers not found.
2065 Use --disable-gnutls if you do not need SSL support. 2065 Use --disable-gnutls if you do not need SSL support.
2066 MSN, Novell Groupwise and Google Talk will not work without SSL support. 2066 MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
2067 ]) 2067 ])
2068 elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then 2068 elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
2069 AC_MSG_ERROR([ 2069 AC_MSG_ERROR([
2070 NSS SSL development headers not found. 2070 NSS SSL development headers not found.
2071 Use --disable-nss if you do not need SSL support. 2071 Use --disable-nss if you do not need SSL support.
2072 MSN, Novell Groupwise and Google Talk will not work without SSL support. 2072 MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
2073 ]) 2073 ])
2074 fi 2074 fi
2075 2075
2076 dnl ####################################################################### 2076 dnl #######################################################################
2077 dnl # Check for Tcl 2077 dnl # Check for Tcl