aboutsummaryrefslogtreecommitdiffstats
path: root/lib/meson.build
diff options
context:
space:
mode:
authorBernd Schubert <bschubert@ddn.com>2023-02-07 23:06:42 +0100
committerNikolaus Rath <Nikolaus@rath.org>2023-02-09 10:21:29 +0000
commitd7560cc9916b086bfe5d86459cc9f04033edd904 (patch)
treecd86f44f9ec63e666a272af3388f42f8f21d3ef6 /lib/meson.build
parentbecc030e94a1ac7a5af2c530cd7526aadfaac3f5 (diff)
downloadlibfuse-d7560cc9916b086bfe5d86459cc9f04033edd904.tar.gz
Split config.h into private and public config
This addresses https://github.com/libfuse/libfuse/issues/729 commit db35a37def14b72181f3630efeea0e0433103c41 introduced a public config.h (rename to fuse_config.h to avoid conflicts) that was installed with the package and included by libfuse users through fuse_common.h. Probablem is that this file does not have unique defines so that they are unique to libfuse - on including the file conflicts with libfuse users came up. In principle all defines could be prefixed, but then most of them are internal for libfuse compilation only. So this splits out publically required defines to a new file 'libfuse_config.h' and changes back to include of "fuse_config.h" only when HAVE_LIBFUSE_PRIVATE_CONFIG_H is defined. This also renames HAVE_LIBC_VERSIONED_SYMBOLS to LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS, as it actually better explains for libfuse users what that variable is for.
Diffstat (limited to 'lib/meson.build')
-rw-r--r--lib/meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/meson.build b/lib/meson.build
index 54d0759..9044630 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -11,7 +11,7 @@ else
endif
deps = [ thread_dep ]
-if cfg.get('HAVE_ICONV')
+if private_cfg.get('HAVE_ICONV')
libfuse_sources += [ 'modules/iconv.c' ]
libiconv = cc.find_library('iconv', required: false)
if libiconv.found()