Merge branch 'SMTPUTF8_1516'. Bug 1516

[exim.git] / src / src / EDITME

diff --git a/src/src/EDITME b/src/src/EDITME
index 0d31ba5c16ebbf25855b3b1dc723683ef5b22489..426033577172a0612304d9053df65c44ade7614d 100644 (file)
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -415,6 +415,13 @@ EXIM_MONITOR=eximon.bin
 
 # DISABLE_PRDR=yes
 
+#------------------------------------------------------------------------------
+# Uncomment the following line to remove OCSP stapling support in TLS,
+# from Exim.  Note it can only be supported when built with
+# GnuTLS 3.1.3 or later, or OpenSSL
+
+# DISABLE_OCSP=yes
+
 #------------------------------------------------------------------------------
 # By default, Exim has support for checking the AD bit in a DNS response, to
 # determine if DNSSEC validation was successful.  If your system libraries
@@ -459,11 +466,6 @@ EXIM_MONITOR=eximon.bin
 # CFLAGS  += -I/opt/brightmail/bsdk-6.0/include
 # LDFLAGS += -lxml2_single -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib
 
-# Uncomment the following line to add OCSP stapling support in TLS, if Exim
-# was built using OpenSSL, or with GnuTLS 3.1.3 or later.
-
-# EXPERIMENTAL_OCSP=yes
-
 # Uncomment the following line to add DMARC checking capability, implemented
 # using libopendmarc libraries.
 # EXPERIMENTAL_DMARC=yes
@@ -471,9 +473,9 @@ EXIM_MONITOR=eximon.bin
 # LDFLAGS += -lopendmarc
 
 
-# Uncomment the following line to support Transport post-delivery actions,
+# Uncomment the following line to support Events,
 # eg. for logging to a database.
-# EXPERIMENTAL_TPDA=yes
+# EXPERIMENTAL_EVENT=yes
 
 # Uncomment the following line to add Redis lookup support
 # You need to have hiredis installed on your system (https://github.com/redis/hiredis).
@@ -489,8 +491,16 @@ EXIM_MONITOR=eximon.bin
 # ownership
 # EXPERIMENTAL_CERTNAMES=yes
 
-# Uncomment the following line to add DSN support
-# EXPERIMENTAL_DSN=yes
+# Uncomment the following line to add DANE support
+# EXPERIMENTAL_DANE=yes
+
+# Uncomment the following line to add SOCKS support
+# EXPERIMENTAL_SOCKS=yes
+
+# Uncomment the following to add Internationalisation features. You need to
+# have the IDN library installed.
+EXPERIMENTAL_INTERNATIONAL=yes
+LDFLAGS += -lidn
 
 ###############################################################################
 #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #