X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/74f150bf80451e34b2fae10c14019e37d644420a..0cbf2b821bb13da0268556d0e30ea627d5592c60:/src/src/smtp_out.c

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index abc5b80fe..c55b29254 100644
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -155,7 +155,7 @@ int sock;
 int on = 1;
 int save_errno = 0;
 
-#ifdef EXPERIMENTAL_EVENT
+#ifndef DISABLE_EVENT
 deliver_host_address = host->address;
 deliver_host_port = port;
 if (event_raise(tb->event_action, US"tcp:connect", NULL)) return -1;
@@ -267,7 +267,7 @@ int
 smtp_connect(host_item *host, int host_af, int port, uschar *interface,
   int timeout, transport_instance * tb)
 {
-#ifndef DISABLE_SOCKS
+#ifdef SUPPORT_SOCKS
 smtp_transport_options_block * ob =
   (smtp_transport_options_block *)tb->options_block;
 #endif
@@ -287,7 +287,7 @@ HDEBUG(D_transport|D_acl|D_v)
   {
   uschar * s = US" ";
   if (interface) s = string_sprintf(" from %s ", interface);
-#ifndef DISABLE_SOCKS
+#ifdef SUPPORT_SOCKS
   if (ob->socks_proxy) s = string_sprintf("%svia proxy ", s);
 #endif
   debug_printf("Connecting to %s %s%s... ", host->name, callout_address, s);
@@ -295,7 +295,7 @@ HDEBUG(D_transport|D_acl|D_v)
 
 /* Create and connect the socket */
 
-#ifndef DISABLE_SOCKS
+#ifdef SUPPORT_SOCKS
 if (ob->socks_proxy)
   return socks_sock_connect(host, host_af, port, interface, tb, timeout);
 #endif