Override DISABLE_DNSSEC when EXPERIMENTAL_DANE is in use

[exim.git] / src / src / EDITME

diff --git a/src/src/EDITME b/src/src/EDITME
index 426033577172a0612304d9053df65c44ade7614d..9b649c6cff9a548d3f86fab73786188b1d15e209 100644 (file)
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -426,6 +426,7 @@ EXIM_MONITOR=eximon.bin
 # 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
 # do not support that bit, then set DISABLE_DNSSEC to "yes"
+# Note: Enabling EXPERIMENTAL_DANE unconditionally overrides this setting.
 
 # DISABLE_DNSSEC=yes
 
@@ -492,6 +493,7 @@ EXIM_MONITOR=eximon.bin
 # EXPERIMENTAL_CERTNAMES=yes
 
 # Uncomment the following line to add DANE support
+# Note: Enabling this unconditionally overrides DISABLE_DNSSEC
 # EXPERIMENTAL_DANE=yes
 
 # Uncomment the following line to add SOCKS support
@@ -499,8 +501,8 @@ EXIM_MONITOR=eximon.bin
 
 # Uncomment the following to add Internationalisation features. You need to
 # have the IDN library installed.
-EXPERIMENTAL_INTERNATIONAL=yes
-LDFLAGS += -lidn
+#EXPERIMENTAL_INTERNATIONAL=yes
+#LDFLAGS += -lidn
 
 ###############################################################################
 #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
@@ -876,9 +878,15 @@ COMPRESS_SUFFIX=gz
 # If the exigrep utility is fed compressed log files, it tries to uncompress
 # them using this command.
 
+# Leave it empty to enforce autodetection at runtime:
+# ZCAT_COMMAND=
+#
+# Omit the path if you want to use your system's PATH:
+# ZCAT_COMMAND=zcat
+#
+# Or specify the full pathname:
 ZCAT_COMMAND=/usr/bin/zcat
 
-
 #------------------------------------------------------------------------------
 # Compiling in support for embedded Perl: If you want to be able to
 # use Perl code in Exim's string manipulation language and you have Perl