Changeset de61ab1 for server/mail/postfix.xml

Timestamp:

08/27/2024 08:03:55 AM (7 weeks ago)

Author:

Thomas Trepl <thomas@…>

Branches:

lazarus

Children:

53d0e62a

Parents:

7d55a6a (diff), c36ca685 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge trunk

File:

• server/mail/postfix.xml (modified) (11 diffs)

server/mail/postfix.xml

@@ -162 +162 @@
       <note>
         <para>
-          For all variants of the CCARGS you should ensure that -DNO_NIS is
+          For all variants of the CCARGS you should ensure that '-D NO_NIS' is
           specified so that the build does not attempt to access an rpcsvc
           header which do not exist in BLFS.  If &berkeley-db; is
-          not installed, -DNO_DB needs to be specified as well.
+          not installed, '-D NO_DB' needs to be specified as well.
         </para>
       </note>
@@ -178 +178 @@
       </para>
 
-<screen><userinput>CCARGS="-DNO_NIS -DNO_DB"
+<screen><userinput>CCARGS="-D NO_NIS -D NO_DB"
 AUXLIBS=""</userinput></screen>
 
@@ -199 +199 @@
 
 <screen><userinput>if [ -r /usr/lib/libsasl2.so ]; then
-  CCARGS="$CCARGS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+  CCARGS="$CCARGS -D USE_SASL_AUTH -D USE_CYRUS_SASL -I/usr/include/sasl"
   AUXLIBS="$AUXLIBS -lsasl2"
 fi</userinput></screen>
@@ -212 +212 @@
 
 <screen><userinput>if [ -r /usr/lib/liblmdb.so ]; then
-  CCARGS="$CCARGS -DHAS_LMDB"
+  CCARGS="$CCARGS -D HAS_LMDB"
   AUXLIBS="$AUXLIBS -llmdb"
 fi</userinput></screen>
@@ -226 +226 @@
 
 <screen><userinput>if [ -r /usr/lib/libldap.so -a -r /usr/lib/liblber.so ]; then
-  CCARGS="$CCARGS -DHAS_LDAP"
+  CCARGS="$CCARGS -D HAS_LDAP"
   AUXLIBS="$AUXLIBS -lldap -llber"
 fi</userinput></screen>
@@ -241 +241 @@
 
 <screen><userinput>if [ -r /usr/lib/libsqlite3.so ]; then
-  CCARGS="$CCARGS -DHAS_SQLITE"
+  CCARGS="$CCARGS -D HAS_SQLITE"
   AUXLIBS="$AUXLIBS -lsqlite3 -lpthread"
 fi</userinput></screen>
@@ -256 +256 @@
 
 <screen><userinput>if [ -r /usr/lib/libmysqlclient.so ]; then
-  CCARGS="$CCARGS -DHAS_MYSQL -I/usr/include/mysql"
+  CCARGS="$CCARGS -D HAS_MYSQL -I/usr/include/mysql"
   AUXLIBS="$AUXLIBS -lmysqlclient -lz -lm"
 fi</userinput></screen>
@@ -271 +271 @@
 
 <screen><userinput>if [ -r /usr/lib/libpq.so ]; then
-  CCARGS="$CCARGS -DHAS_PGSQL -I/usr/include/postgresql"
+  CCARGS="$CCARGS -D HAS_PGSQL -I/usr/include/postgresql"
   AUXLIBS="$AUXLIBS -lpq -lz -lm"
 fi</userinput></screen>
@@ -287 +287 @@
 
 <screen><literal>if [ -r <replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a ]; then
-  CCARGS="$CCARGS -DHAS_CDB"
+  CCARGS="$CCARGS -D HAS_CDB"
   AUXLIBS="$AUXLIBS <replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a"
 fi</literal></screen>
@@ -302 +302 @@
 
 <screen><userinput>if [ -r /usr/lib/libssl.so -a -r /usr/lib/libcrypto.so ]; then
-  CCARGS="$CCARGS -DUSE_TLS -I/usr/include/openssl/"
+  CCARGS="$CCARGS -D USE_TLS -I/usr/include/openssl/"
   AUXLIBS="$AUXLIBS -lssl -lcrypto"
 fi</userinput></screen>
@@ -369 +369 @@
 
     <para>
-      <option>CCARGS="-DNO_EAI ..."</option>: this will turn off SMTPUTF8
+      <option>CCARGS="-D NO_EAI ..."</option>: this will turn off SMTPUTF8
       support, for example  if the rest of your email address infrastructure
       cannot handle UTF-8 email addresses and message header values.