From: Andres Freund Date: Wed, 12 Feb 2025 13:15:54 +0000 (-0500) Subject: meson: Fix failure to detect bsd_auth.h presence X-Git-Tag: REL_16_8~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01cdb98e446aadd10132574d7e9fa4470d17b45e;p=thirdparty%2Fpostgresql.git meson: Fix failure to detect bsd_auth.h presence bsd_auth.h file needs to be included after 'sys/types.h', as documented in https://man.openbsd.org/authenticate.3 The reason a similar looking stanza works for autoconf is that autoconf automatically adds AC_INCLUDES_DEFAULT, which in turn includes sys/types.h. Backpatch to all versions with meson support. Author: Nazir Bilal Yavuz Discussion: https://postgr.es/m/637haqqyhg2wlz7q6wq25m2qupe67g7f2uupngzui64zypy4x2@ysr2xnmynmu4 Backpatch-through: 16 --- diff --git a/meson.build b/meson.build index ae2bb95b9cc..16de8bfd598 100644 --- a/meson.build +++ b/meson.build @@ -553,7 +553,8 @@ test_c_args = cppflags + cflags bsd_authopt = get_option('bsd_auth') bsd_auth = not_found_dep if cc.check_header('bsd_auth.h', required: bsd_authopt, - args: test_c_args, include_directories: postgres_inc) + args: test_c_args, prefix: '#include ', + include_directories: postgres_inc) cdata.set('USE_BSD_AUTH', 1) bsd_auth = declare_dependency() endif