DKIM: support oversigning. Bugs 1309, 1310

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

diff --git a/src/OS/Makefile-Default b/src/OS/Makefile-Default
index 9f9ff2276699e9a8fb9756cfb9dc1d37388c0abc..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.2 2006/02/10 14:33:26 ph10 Exp $
-

 ##################################################
 #          The Exim mail transport agent         #
 ##################################################
 ##################################################
 #          The Exim mail transport agent         #
 ##################################################


@@ -42,8 +40,10 @@ BASENAME_COMMAND=/usr/bin/basename
 
 CHOWN_COMMAND=/usr/bin/chown
 CHGRP_COMMAND=/usr/bin/chgrp
 
 CHOWN_COMMAND=/usr/bin/chown
 CHGRP_COMMAND=/usr/bin/chgrp

+CHMOD_COMMAND=/usr/bin/chmod

 MV_COMMAND=/bin/mv
 RM_COMMAND=/bin/rm
 MV_COMMAND=/bin/mv
 RM_COMMAND=/bin/rm

+TOUCH_COMMAND=/usr/bin/touch

 
 
 # Some operating systems have different ways of building libraries of
 
 
 # Some operating systems have different ways of building libraries of


@@ -87,6 +87,11 @@ CC=gcc
 # LFLAGS=
 
 
 # LFLAGS=
 
 

+# PCRE_LIBS contains the library to be linked for PCRE
+
+PCRE_LIBS=-lpcre
+
+

 # LIBS and EXTRALIBS contain library settings that are used on linking
 # commands to build binaries. The OS-dependent Makefile may contain a default
 # setting for LIBS, leaving EXTRALIBS available for adding further libraries
 # LIBS and EXTRALIBS contain library settings that are used on linking
 # commands to build binaries. The OS-dependent Makefile may contain a default
 # setting for LIBS, leaving EXTRALIBS available for adding further libraries


@@ -112,14 +117,6 @@ CC=gcc
 # EXTRALIBS_EXIMON=
 
 
 # EXTRALIBS_EXIMON=
 
 

-# PCRE_CFLAGS contains flags to be passed to the CFLAGS parameter of the
-# makefile for building the PCRE regular expression library, in addition
-# to CFLAGS. Typical use is to set -DUSE_BCOPY on legacy systems that lack
-# the memmove() function but do have bcopy().
-
-# PCRE_CFLAGS=
-
-

 # The error name for quota exceeded varies among operating systems, and
 # even, unfortunately, in different versions of the same operating system.
 # EDQUOT was not in Sys V, but is in SPEC 1170, apparently. It was used
 # The error name for quota exceeded varies among operating systems, and
 # even, unfortunately, in different versions of the same operating system.
 # EDQUOT was not in Sys V, but is in SPEC 1170, apparently. It was used


@@ -189,14 +186,6 @@ EXIWHAT_KILL_SIGNAL=-USR1
 
 # IPV6_USE_INET_PTON=yes
 
 
 # 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
 # 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