diff src/config.h.in @ 5922:4b055de36bb9 cygwin

merging heads 2
author Henry Thompson <ht@markup.co.uk>
date Fri, 27 Feb 2015 17:47:15 +0000
parents 69f9e31c9ccf
children
line wrap: on
line diff
--- a/src/config.h.in	Wed Apr 23 22:22:37 2014 +0100
+++ b/src/config.h.in	Fri Feb 27 17:47:15 2015 +0000
@@ -499,6 +499,15 @@
 /* Compile in support for SOCKS? */
 #undef HAVE_SOCKS
 
+/* Compile in support for TLS */
+#undef WITH_TLS
+#undef HAVE_NSS
+#undef HAVE_GNUTLS
+#undef HAVE_GNUTLS_CERTIFICATE_VERIFICATION_STATUS_PRINT
+#undef HAVE_GNUTLS_CERTIFICATE_VERIFY_PEERS3
+#undef HAVE_OPENSSL
+#undef HAVE_X509_CHECK_HOST
+
 /* Compile in support for X pixmaps via the `xpm' library? */
 #undef HAVE_XPM
 #undef FOR_MSW
@@ -859,6 +868,7 @@
 #undef LWLIB_WIDGETS_MOTIF
 #undef LWLIB_WIDGETS_ATHENA
 #undef HAVE_ATHENA_3D
+#undef HAVE_ATHENA_I18N
 
 /* Other things that can be disabled by configure. */
 #undef HAVE_MENUBARS