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.

diff --git a/example/passthrough.c b/example/passthrough.c
index ae1322549f88b6309c7dbcc41e75a80d323831ce..5963d5895799475c86a04a1ea5626b9e2b03ff5e 100644 (file)
--- 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 bdc5ecdec76f553f8d5593e92d70f1533129c178..bc027941b8c4540a2eb521ffb8e9897889331db8 100644 (file)
--- 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 b3679789c4ad3d0be0628c6dcafa90d432c7703b..26fa42e437127460c8001c41e7d93c3855a9ca49 100644 (file)
--- 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 a1d237a6209bc933c4f9ebd5b1be89491e81ce77..8b2eb4bc5b19eecb4196899f2ac19e2d5b90ad93 100644 (file)
--- 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 521e6aad1db2fe0e3c37fa3baf9722ad6ed587c4..e231b967db3a2914044a5f4d187a348b4c978830 100644 (file)
--- 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 222452adc66a893247d5c0742822c086201f2fa4..e51bd0ed4cc6251f7723428e8159ed352cd61b37 100644 (file)
--- 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 48679883c9e8a8bfd25bbfb6f21236ec83c0ebd8..30e20573167769b87314b161c4a0466583a35b8a 100644 (file)
--- 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>

diff --git a/include/fuse_common.h b/include/fuse_common.h
index cf9bc270c8e4af6def27403a3303f6bdb10d13aa..1d050bb3a00a6b3d022c29ddd2774a487d144030 100644 (file)
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -14,6 +14,7 @@
 #ifndef FUSE_COMMON_H_
 #define FUSE_COMMON_H_
 
+#include "fuse_config.h"
 #include "fuse_opt.h"
 #include "fuse_log.h"
 #include <stdint.h>

diff --git a/lib/buffer.c b/lib/buffer.c
index 757807a177b7065df4539768e0ee76e3c16b6ec3..4f2f491dfa1da780b2183b87175d3e6379065c50 100644 (file)
--- a/lib/buffer.c
+++ b/lib/buffer.c
@@ -11,7 +11,7 @@
 
 #define _GNU_SOURCE
 
-#include "config.h"
+#include "fuse_config.h"
 #include "fuse_i.h"
 #include "fuse_lowlevel.h"
 #include <string.h>

diff --git a/lib/compat.c b/lib/compat.c
index 6d4decea69296c85ea2e3dcc3531baef7fe2f0fb..cab6cbfe96411bb010fe7688be39788f3ae650d7 100644 (file)
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -15,7 +15,7 @@
     support version symboling
 */
 
-#include "config.h"
+#include "fuse_config.h"
 #include "fuse_i.h"
 #include "fuse_misc.h"
 #include "fuse_opt.h"

diff --git a/lib/cuse_lowlevel.c b/lib/cuse_lowlevel.c
index 01a62ab0a28def53c1c6a47ff548902ca93adf7e..cd687870bccf8a9c092bb5664faf64f99e5f45aa 100644 (file)
--- a/lib/cuse_lowlevel.c
+++ b/lib/cuse_lowlevel.c
@@ -7,7 +7,7 @@
   See the file COPYING.LIB.
 */
 
-#include "config.h"
+#include "fuse_config.h"
 #include "cuse_lowlevel.h"
 #include "fuse_kernel.h"
 #include "fuse_i.h"

diff --git a/lib/fuse.c b/lib/fuse.c
index 9834f756ce57cb98b82499c4a6ce6bd1e23c82c7..a247d3c1cd2738ffa71d6cf1130b9ef44f3ea077 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -13,7 +13,7 @@
 /* For pthread_rwlock_t */
 #define _GNU_SOURCE
 
-#include "config.h"
+#include "fuse_config.h"
 #include "fuse_i.h"
 #include "fuse_lowlevel.h"
 #include "fuse_opt.h"

diff --git a/lib/fuse_loop.c b/lib/fuse_loop.c
index e6560aa9f3b8e8902c69a599aeb6767c48f1a683..b9c498b340fe003d4305f4b887d7520095dcc2cf 100644 (file)
--- a/lib/fuse_loop.c
+++ b/lib/fuse_loop.c
@@ -8,7 +8,7 @@
   See the file COPYING.LIB
 */
 
-#include "config.h"
+#include "fuse_config.h"
 #include "fuse_lowlevel.h"
 #include "fuse_i.h"
 

diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c
index b8b2fdd44c5292e042bd6ced098109f3348b3950..cf9ad86f3667992bee1540ee62224eba50e4c21c 100644 (file)
--- a/lib/fuse_loop_mt.c
+++ b/lib/fuse_loop_mt.c
@@ -8,7 +8,7 @@
   See the file COPYING.LIB.
 */
 
-#include "config.h"
+#include "fuse_config.h"
 #include "fuse_lowlevel.h"
 #include "fuse_misc.h"
 #include "fuse_kernel.h"

diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 8fe47db19702bdb8acd952f28ed48fa0db458c85..fcc2108ac827a4309e886ddc63f32fa436a35f1a 100644 (file)
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -11,7 +11,7 @@
 
 #define _GNU_SOURCE
 
-#include "config.h"
+#include "fuse_config.h"
 #include "fuse_i.h"
 #include "fuse_kernel.h"
 #include "fuse_opt.h"

diff --git a/lib/fuse_opt.c b/lib/fuse_opt.c
index 93066b926ecd97df4bd985761022daeaf81a0bc1..1d3b6a1a5d6c4a363b389ccdf70fd929a74598d5 100644 (file)
--- a/lib/fuse_opt.c
+++ b/lib/fuse_opt.c
@@ -9,7 +9,7 @@
   See the file COPYING.LIB
 */
 
-#include "config.h"
+#include "fuse_config.h"
 #include "fuse_i.h"
 #include "fuse_opt.h"
 #include "fuse_misc.h"

diff --git a/lib/fuse_signals.c b/lib/fuse_signals.c
index 4271947bd49f1f1131696c45ef67d9a48c9c6fd6..048d0471e6e4bcda31b6e90aec92919d4c9863c0 100644 (file)
--- a/lib/fuse_signals.c
+++ b/lib/fuse_signals.c
@@ -8,7 +8,7 @@
   See the file COPYING.LIB
 */
 
-#include "config.h"
+#include "fuse_config.h"
 #include "fuse_lowlevel.h"
 #include "fuse_i.h"
 

diff --git a/lib/helper.c b/lib/helper.c
index c3796c1b50e227855afc06981f56f9407c1ae690..b270b85750e9e13e1ca699fe069d8800da44ace0 100644 (file)
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -10,7 +10,7 @@
   See the file COPYING.LIB.
 */
 
-#include "config.h"
+#include "fuse_config.h"
 #include "fuse_i.h"
 #include "fuse_misc.h"
 #include "fuse_opt.h"

diff --git a/lib/modules/iconv.c b/lib/modules/iconv.c
index 0ec3c2bd1a34228dfbb788575dedfef41c1f3eca..3d18a363651d3a4e349cd9de6582ac2ec802f7e1 100644 (file)
--- a/lib/modules/iconv.c
+++ b/lib/modules/iconv.c
@@ -6,7 +6,7 @@
   See the file COPYING.LIB
 */
 
-#include <config.h>
+#include <fuse_config.h>
 
 #include <fuse.h>
 #include <stdio.h>

diff --git a/lib/modules/subdir.c b/lib/modules/subdir.c
index 616c0eea3202e4ed874566618dba1bcee6a1bb8c..e92eb628438bd5c1fe39b239e7cf8bd7b3085778 100644 (file)
--- a/lib/modules/subdir.c
+++ b/lib/modules/subdir.c
@@ -6,7 +6,7 @@
   See the file COPYING.LIB
 */
 
-#include <config.h>
+#include <fuse_config.h>
 
 #include <fuse.h>
 #include <stdio.h>

diff --git a/lib/mount.c b/lib/mount.c
index 484bf4071d663768700d4a9027b105e8c3caf1ee..bda3c47f234fcd676502c0b7bf10087b6d4a07b3 100644 (file)
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -8,7 +8,7 @@
   See the file COPYING.LIB.
 */
 
-#include "config.h"
+#include "fuse_config.h"
 #include "fuse_i.h"
 #include "fuse_misc.h"
 #include "fuse_opt.h"

diff --git a/lib/mount_util.c b/lib/mount_util.c
index 35e994838472301a32f8c20af2c7cfba31a2b6ad..daf7b5e7aa798374fed31fed36d8cdcaee53380c 100644 (file)
--- a/lib/mount_util.c
+++ b/lib/mount_util.c
@@ -8,7 +8,7 @@
   See the file COPYING.LIB.
 */
 
-#include "config.h"
+#include "fuse_config.h"
 #include "mount_util.h"
 #include <stdio.h>
 #include <unistd.h>

diff --git a/meson.build b/meson.build
index d1b2ae094351b32473face6beb55442bfe470a9e..0057c116a508a7a5b0c7de473ec676450365cb17 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('libfuse3', ['c'], version: '3.13.0',
-        meson_version: '>= 0.42',
+        meson_version: '>= 0.50',
         default_options: [
             'buildtype=debugoptimized',
             'cpp_std=c++11',
@@ -141,8 +141,8 @@ else
 endif
 
 # Write the test results into config.h (stored in build directory)
-configure_file(output: 'config.h',
-               configuration : cfg)
+configure_file(output: 'fuse_config.h',
+               configuration : cfg, install: true, install_dir: 'include/fuse3')
 
 # '.' will refer to current build directory, which contains config.h
 include_dirs = include_directories('include', 'lib', '.')
@@ -169,3 +169,4 @@ endif
 foreach n : subdirs
     subdir(n)
 endforeach
+

diff --git a/test/test_setattr.c b/test/test_setattr.c
index fa7c8ba5f0cf1c81983025b9d90c6eec4a5e3a13..8575203d17ef2e9e772ac90eb8b669a32d108dae 100644 (file)
--- a/test/test_setattr.c
+++ b/test/test_setattr.c
@@ -9,7 +9,7 @@
 
 #define FUSE_USE_VERSION 30
 
-#include <config.h>
+#include <fuse_config.h>
 #include <fuse_lowlevel.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/test/test_syscalls.c b/test/test_syscalls.c
index c835661ca06e655becdf1dd15769121ff35927d3..2ba55de673e4af78005b717891326eae63ae5bc5 100644 (file)
--- a/test/test_syscalls.c
+++ b/test/test_syscalls.c
@@ -1,5 +1,5 @@
 #define _GNU_SOURCE
-#include "config.h"
+#include "fuse_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/test/test_write_cache.c b/test/test_write_cache.c
index 03ccc988a55abb6d5c7e7d7795d5c182f49be9d5..bc62ac1e67db2250641f908b1f3b81020a825e0e 100644 (file)
--- a/test/test_write_cache.c
+++ b/test/test_write_cache.c
@@ -9,7 +9,7 @@
 
 #define FUSE_USE_VERSION 30
 
-#include <config.h>
+#include <fuse_config.h>
 #include <fuse_lowlevel.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/test/travis-install.sh b/test/travis-install.sh
index 65360b40b5b8f1bb529ecf4a7bc94f4c54b2d5f7..924623b9ef2a82101dde5310d8f837c5d996e0b9 100755 (executable)
--- a/test/travis-install.sh
+++ b/test/travis-install.sh
@@ -4,7 +4,7 @@ set -e
 
 sudo python3 -m pip install --upgrade pip
 # Meson 0.45 requires Python 3.5 or newer
-sudo python3 -m pip install pytest meson==0.44
+sudo python3 -m pip install pytest meson==0.50
 valgrind --version
 ninja --version
 meson --version

diff --git a/util/fusermount.c b/util/fusermount.c
index ed62ea9cd4978ebafc5bd184907a6bf19ba75fe7..50989eb1fdba76afe77006e8cbe6bb2980ef812e 100644 (file)
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -8,7 +8,7 @@
 /* This program does the mounting and unmounting of FUSE filesystems */
 
 #define _GNU_SOURCE /* for clone */
-#include "config.h"
+#include "fuse_config.h"
 #include "mount_util.h"
 
 #include <stdio.h>

diff --git a/util/mount.fuse.c b/util/mount.fuse.c
index a6e5629dd3521120c91d381df4b51614d0742d87..04d63b221200d75096623b59a329aee4e04b0c61 100644 (file)
--- a/util/mount.fuse.c
+++ b/util/mount.fuse.c
@@ -6,7 +6,7 @@
   See the file COPYING.
 */
 
-#include "config.h"
+#include "fuse_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>