diff options
| author | Bernd Schubert <bschubert@ddn.com> | 2023-01-27 21:54:48 +0100 |
|---|---|---|
| committer | Nikolaus Rath <Nikolaus@rath.org> | 2023-01-28 09:35:34 +0000 |
| commit | db35a37def14b72181f3630efeea0e0433103c41 (patch) | |
| tree | 95a70e1bf36e968dcd6218731e6b061b3ceedae2 /example | |
| parent | e42b972271dfd70735eada21e7770a19effe7fd4 (diff) | |
| download | libfuse-db35a37def14b72181f3630efeea0e0433103c41.tar.gz | |
Install a the configure_file (config.h) and use in headers
This addresses: https://github.com/libfuse/libfuse/issues/724
HAVE_LIBC_VERSIONED_SYMBOLS configures the library if to use
versioned symbols and is set at meson configuration time.
External filesystems (the main target, actually)
include fuse headers and the preprocessor
then acts on HAVE_LIBC_VERSIONED_SYMBOLS. Problem was now that
'config.h' was not distributed with libfuse and so
HAVE_LIBC_VERSIONED_SYMBOLS was never defined with external
tools and the preprocessor did the wrong decision.
This commit also increases the the minimal meson version,
as this depends on meson feature only available in 0.50
<quote 'meson' >
WARNING: Project specifies a minimum meson_
version '>= 0.42' but uses features which were added
in newer versions:
* 0.50.0: {'install arg in configure_file'}
</quote>
Additionally the config file has been renamed to "fuse_config.h"
to avoid clashes - 'config.h' is not very specific.
Diffstat (limited to 'example')
| -rw-r--r-- | example/passthrough.c | 4 | ||||
| -rw-r--r-- | example/passthrough_fh.c | 4 | ||||
| -rw-r--r-- | example/passthrough_hp.cc | 4 | ||||
| -rw-r--r-- | example/passthrough_ll.c | 2 | ||||
| -rw-r--r-- | example/poll.c | 2 | ||||
| -rw-r--r-- | example/poll_client.c | 2 | ||||
| -rw-r--r-- | example/printcap.c | 2 |
7 files changed, 1 insertions, 19 deletions
diff --git a/example/passthrough.c b/example/passthrough.c index ae13225..5963d58 100644 --- a/example/passthrough.c +++ b/example/passthrough.c @@ -25,10 +25,6 @@ #define FUSE_USE_VERSION 31 -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #define _GNU_SOURCE #ifdef linux diff --git a/example/passthrough_fh.c b/example/passthrough_fh.c index bdc5ecd..bc02794 100644 --- a/example/passthrough_fh.c +++ b/example/passthrough_fh.c @@ -25,10 +25,6 @@ #define FUSE_USE_VERSION 31 -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #define _GNU_SOURCE #include <fuse.h> diff --git a/example/passthrough_hp.cc b/example/passthrough_hp.cc index b367978..26fa42e 100644 --- a/example/passthrough_hp.cc +++ b/example/passthrough_hp.cc @@ -45,10 +45,6 @@ #define FUSE_USE_VERSION FUSE_MAKE_VERSION(3, 12) -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif diff --git a/example/passthrough_ll.c b/example/passthrough_ll.c index a1d237a..8b2eb4b 100644 --- a/example/passthrough_ll.c +++ b/example/passthrough_ll.c @@ -37,8 +37,6 @@ #define _GNU_SOURCE #define FUSE_USE_VERSION 34 -#include "config.h" - #include <fuse_lowlevel.h> #include <unistd.h> #include <stdlib.h> diff --git a/example/poll.c b/example/poll.c index 521e6aa..e231b96 100644 --- a/example/poll.c +++ b/example/poll.c @@ -23,8 +23,6 @@ #define FUSE_USE_VERSION 31 -#include <config.h> - #include <fuse.h> #include <unistd.h> #include <ctype.h> diff --git a/example/poll_client.c b/example/poll_client.c index 222452a..e51bd0e 100644 --- a/example/poll_client.c +++ b/example/poll_client.c @@ -19,7 +19,7 @@ * \include poll_client.c */ -#include <config.h> +#include <fuse_config.h> #include <sys/select.h> #include <sys/time.h> diff --git a/example/printcap.c b/example/printcap.c index 4867988..30e2057 100644 --- a/example/printcap.c +++ b/example/printcap.c @@ -21,8 +21,6 @@ #define FUSE_USE_VERSION 31 -#include <config.h> - #include <fuse_lowlevel.h> #include <stdio.h> #include <unistd.h> |