diff options
| author | Peter Eisentraut | 2023-03-13 05:46:09 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2023-03-13 06:04:11 +0000 |
| commit | 6a3002715eca4ae68e4d76606a6b3fd56d633741 (patch) | |
| tree | 8d295a38ef61b70fb7c3e13b302d68ae3ef8916b /src | |
| parent | 1f282c24e464d8b2647b86bf465e04cc540404f6 (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 <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/ad65ffd1-a9a7-fda1-59c6-f7dc763c3051%40enterprisedb.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/libpq/meson.build | 2 | ||||
| -rw-r--r-- | src/makefiles/meson.build | 2 | ||||
| -rw-r--r-- | src/test/ssl/meson.build | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/interfaces/libpq/meson.build b/src/interfaces/libpq/meson.build index 573fd9b6ea4..3cd0ddb4945 100644 --- a/src/interfaces/libpq/meson.build +++ b/src/interfaces/libpq/meson.build @@ -117,7 +117,7 @@ tests += { 't/001_uri.pl', 't/002_api.pl', ], - 'env': {'with_ssl': get_option('ssl')}, + 'env': {'with_ssl': ssl_library}, }, } diff --git a/src/makefiles/meson.build b/src/makefiles/meson.build index 5a0032ab0d2..7635771c5ae 100644 --- a/src/makefiles/meson.build +++ b/src/makefiles/meson.build @@ -66,7 +66,7 @@ pgxs_kv = { 'SUN_STUDIO_CC': 'no', # not supported so far # want the chosen option, rather than the library - 'with_ssl' : get_option('ssl'), + 'with_ssl' : ssl_library, 'with_uuid': uuidopt, 'default_port': get_option('pgport'), diff --git a/src/test/ssl/meson.build b/src/test/ssl/meson.build index a8d9a5424d4..4cda81f3bc2 100644 --- a/src/test/ssl/meson.build +++ b/src/test/ssl/meson.build @@ -6,7 +6,7 @@ tests += { 'bd': meson.current_build_dir(), 'tap': { 'env': { - 'with_ssl': get_option('ssl'), + 'with_ssl': ssl_library, 'OPENSSL': openssl.path(), }, 'tests': [ |