aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2024-07-20 13:51:09 -0700
committerAndres Freund <andres@anarazel.de>2024-07-20 13:51:09 -0700
commitcc50694c8d9604374c27f7a1899c4721031fc008 (patch)
treecacabe9f0aaa70eacc08978e460c7ab41ff09a52
parentfd958bbbdf20c7f29188ee6f2687773edf0228af (diff)
downloadpostgresql-cc50694c8d9604374c27f7a1899c4721031fc008.tar.gz
postgresql-cc50694c8d9604374c27f7a1899c4721031fc008.zip
meson: Add missing argument to gssapi.h check
These were missing since the initial introduction of the meson based build, in e6927270cd18. As-is this is unlikely to cause an issue, but a future commit will add support for detecting gssapi without use of dependency(), which could fail due to this. Discussion: https://postgr.es/m/20240708225659.gmyqoosi7km6ysgn@awork3.anarazel.de Backpatch: 16-, where the meson based build was added
-rw-r--r--meson.build6
1 files changed, 4 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index 60025ac8b55..c068d9a568b 100644
--- a/meson.build
+++ b/meson.build
@@ -627,7 +627,8 @@ if not gssapiopt.disabled()
elif cc.check_header('gssapi/gssapi.h', dependencies: gssapi, required: false,
args: test_c_args, include_directories: postgres_inc)
cdata.set('HAVE_GSSAPI_GSSAPI_H', 1)
- elif cc.check_header('gssapi.h', args: test_c_args, dependencies: gssapi, required: gssapiopt)
+ elif cc.check_header('gssapi.h', dependencies: gssapi, required: gssapiopt,
+ args: test_c_args, include_directories: postgres_inc)
cdata.set('HAVE_GSSAPI_H', 1)
else
have_gssapi = false
@@ -637,7 +638,8 @@ if not gssapiopt.disabled()
elif cc.check_header('gssapi/gssapi_ext.h', dependencies: gssapi, required: false,
args: test_c_args, include_directories: postgres_inc)
cdata.set('HAVE_GSSAPI_GSSAPI_EXT_H', 1)
- elif cc.check_header('gssapi_ext.h', args: test_c_args, dependencies: gssapi, required: gssapiopt)
+ elif cc.check_header('gssapi_ext.h', dependencies: gssapi, required: gssapiopt,
+ args: test_c_args, include_directories: postgres_inc)
cdata.set('HAVE_GSSAPI_EXT_H', 1)
else
have_gssapi = false