Merge branch 'master' into 4.next

[users/heiko/exim.git] / src / OS / Makefile-Default

diff --git a/src/OS/Makefile-Default b/src/OS/Makefile-Default
index 4c08c4e3e35833bc86123de7ff3a6774c0ed34b6..a0d9afa956dc05cae74cd0751fdf0e40a68a4650 100644 (file)
--- a/src/OS/Makefile-Default
+++ b/src/OS/Makefile-Default
@@ -1,5 +1,3 @@
-# $Cambridge: exim/src/OS/Makefile-Default,v 1.4 2008/07/25 20:27:30 fanf2 Exp $
-
 ##################################################
 #          The Exim mail transport agent         #
 ##################################################
@@ -91,7 +89,7 @@ CC=gcc
 
 # PCRE_LIBS contains the library to be linked for PCRE
 
-#PCRE_LIBS=-lpcre
+PCRE_LIBS=-lpcre
 
 
 # LIBS and EXTRALIBS contain library settings that are used on linking
@@ -188,14 +186,6 @@ EXIWHAT_KILL_SIGNAL=-USR1
 
 # IPV6_USE_INET_PTON=yes
 
-# Setting the next option brings in support for A6 DNS records for IPV6. These
-# were at one time expected to supplant AAAA records, but were eventually
-# rejected. The code remains in Exim, but has not been compiled or tested for
-# quite some time. Do not set this unless you know what you are doing.
-
-# SUPPORT_A6=yes
-
-
 # HOSTNAME_COMMAND contains the path to the "hostname" command, which varies
 # from OS to OS. This is used when building the Exim monitor script only. (See
 # also BASENAME_COMMAND.) If HOSTNAME_COMMAND is set to "look_for_it" then the