Explicit IPv6 addresses for mysql and pgsql

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

diff --git a/src/OS/Makefile-Default b/src/OS/Makefile-Default
index a0d9afa956dc05cae74cd0751fdf0e40a68a4650..581b3ed5b8485f59d66b0ac572e22e876754bdfb 100644 (file)
--- a/src/OS/Makefile-Default
+++ b/src/OS/Makefile-Default
@@ -2,6 +2,9 @@
 #          The Exim mail transport agent         #
 ##################################################
 
+# Copyright (c) The Exim Maintainers 2022
+# SPDX-License-Identifier: GPL-2.0-or-later
+
 # Generic default make file containing settings that relate to the OS or
 # to selectable features within the OS. The configuration options for Exim
 # itself live in Local/Makefile, which is constructed by editing src/EDITME.
@@ -89,7 +92,7 @@ CC=gcc
 
 # PCRE_LIBS contains the library to be linked for PCRE
 
-PCRE_LIBS=-lpcre
+PCRE_LIBS=-lpcre2-8
 
 
 # LIBS and EXTRALIBS contain library settings that are used on linking
@@ -144,15 +147,15 @@ PCRE_LIBS=-lpcre
 # EXIWHAT_MULTIKILL_CMD=
 # EXIWHAT_MULTIKILL_ARG=
 
-# (2) For other operating systems, exiwhat calls the ps command and egreps the
+# (2) For other operating systems, exiwhat calls the ps command and greps the
 # output in order to find all the processes running Exim. The arguments for the
 # various commands needed to do this vary from OS to OS. These defaults work on
 # Solaris 2, HPUX, and IRIX. The OS-specific Makefiles have different versions
 # for other systems, and you can override with your own requirements in your
 # private Makefiles in the Local directory. The most commonly found
 # alternatives are -ax instead of -e for the ps argument, and / instead of a
-# blank before the name exim for the egrep argument on systems whose ps output
-# shows the full path name. The quotes for the egrep argument are specified
+# blank before the name exim for the grep argument on systems whose ps output
+# shows the full path name. The quotes for the grep argument are specified
 # here so that leading white space can be used. This value should always be
 # given in single quotes.
 
@@ -232,6 +235,11 @@ RANLIB=ranlib
 EXIM_CHMOD=@true
 
 
+# If you want to use local_scan() at all, the support code must be included
+# by uncommenting this line.
+
+# HAVE_LOCAL_SCAN=yes
+
 # LOCAL_SCAN_SOURCE defines the file in which the function local_scan() is
 # defined. This provides the administrator with a hook for including C code
 # for scanning incoming mails. The path that is defined must be relative to
@@ -239,8 +247,9 @@ EXIM_CHMOD=@true
 
 # LOCAL_SCAN_SOURCE=Local/local_scan.c
 
-# The default setting points to a template function that doesn't actually do
-# any scanning, but just accepts the message.
+# A very simple example points to a template function that doesn't actually do
+# any scanning, but just accepts the message.  A compilable file must be
+# included in the build even if HAVE_LOCAL_SCAN is not defined.
 
 LOCAL_SCAN_SOURCE=src/local_scan.c
 
@@ -286,7 +295,7 @@ LOCAL_SCAN_SOURCE=src/local_scan.c
 
 #############################################################################
 # The following definitions are relevant only when compiling the Exim monitor
-# program, which requires an X11 display. See the varible EXIM_MONITOR in
+# program, which requires an X11 display. See the variable EXIM_MONITOR in
 # src/EDITME for how to suppress this compilation.
 
 # X11 contains the location of the X11 libraries and include files.