summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2023-03-13 06:46:09 +0100
committerPeter Eisentraut <peter@eisentraut.org>2023-03-13 07:04:11 +0100
commit6a3002715eca4ae68e4d76606a6b3fd56d633741 (patch)
tree8d295a38ef61b70fb7c3e13b302d68ae3ef8916b /doc/src
parent1f282c24e464d8b2647b86bf465e04cc540404f6 (diff)
meson: Make auto the default of the ssl option
The 'ssl' option is of type 'combo', but we add a choice 'auto' that simulates the behavior of a feature option. This way, openssl is used automatically by default if present, but we retain the ability to potentially select another ssl library. Author: Nazir Bilal Yavuz <byavuz81@gmail.com> Discussion: https://www.postgresql.org/message-id/flat/ad65ffd1-a9a7-fda1-59c6-f7dc763c3051%40enterprisedb.com
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/installation.sgml4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 5affb64d952..70ab5b77d86 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -2474,7 +2474,7 @@ ninja install
</varlistentry>
<varlistentry id="configure-with-ssl-meson">
- <term><option>-Dssl=<replaceable>LIBRARY</replaceable></option>
+ <term><option>-Dssl={ auto | <replaceable>LIBRARY</replaceable> }</option>
<indexterm>
<primary>OpenSSL</primary>
<seealso>SSL</seealso>
@@ -2488,7 +2488,7 @@ ninja install
<productname>OpenSSL</productname> package to be installed. Building
with this will check for the required header files and libraries to
make sure that your <productname>OpenSSL</productname> installation is
- sufficient before proceeding. The default for this option is none.
+ sufficient before proceeding. The default for this option is auto.
</para>
</listitem>
</varlistentry>