libfuse: remove "-D_FILE_OFFSET_BITS=64" from fuse.pc

add AC_SYS_LARGEFILE to your configure.ac instead.

diff --git a/ChangeLog b/ChangeLog
index 8b37e099e0112c739b3bee791130bac1e60ecc85..e4b11aa043a970e25270cd1dd3dc8b1b222c6e2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-24  Miklos Szeredi <miklos@szeredi.hu>
+
+       * libfuse: remove "-D_FILE_OFFSET_BITS=64" from fuse.pc, add
+       AC_SYS_LARGEFILE to your configure.ac instead.
+
 2013-06-21  Miklos Szeredi <miklos@szeredi.hu>
 
        * libfuse: set FD_CLOEXEC also when receiving device fd from

diff --git a/configure.ac b/configure.ac
index 7bf6553301307ff03ee5aba80557ca375cd58f94..751b3430ebddfe3fee1164907090a2a8d56d543b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ AC_CONFIG_HEADERS(include/config.h)
 
 AC_PROG_LIBTOOL
 AC_PROG_CC
+AC_SYS_LARGEFILE
 AC_PROG_MKDIR_P
 AM_PROG_CC_C_O
 

diff --git a/example/Makefile.am b/example/Makefile.am
index 1c0405742dc8827401a089fbe15b9db4653d62a7..26c397660bc05ccdc1372183db5447dbf180f94b 100644 (file)
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 -D_REENTRANT
+AM_CPPFLAGS = -I$(top_srcdir)/include -D_REENTRANT
 noinst_HEADERS = fioc.h
 noinst_PROGRAMS = fusexmp fusexmp_fh null hello hello_ll fioc fioclient \
                  fsel fselclient cusexmp

diff --git a/example/cusexmp.c b/example/cusexmp.c
index a02818c20e2ecba256a77dc34e0c49b1e6ee51f8..73b12f4313b24764b9e2d1d46cbb8b961c18d916 100755 (executable)
--- a/example/cusexmp.c
+++ b/example/cusexmp.c
@@ -24,6 +24,8 @@
 
 #define FUSE_USE_VERSION 30
 
+#include <config.h>
+
 #include <cuse_lowlevel.h>
 #include <fuse_opt.h>
 #include <stddef.h>

diff --git a/example/fioc.c b/example/fioc.c
index c79c734e8239d07d432cf03a2162da77dbda40e5..b4cc334c281d697a48a30691f9a1980c5524237e 100755 (executable)
--- a/example/fioc.c
+++ b/example/fioc.c
@@ -24,6 +24,8 @@
 
 #define FUSE_USE_VERSION 30
 
+#include <config.h>
+
 #include <fuse.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/example/fioclient.c b/example/fioclient.c
index 97186223aecdc268e58bcf161040876a4c1222d4..a7c0dbe29c66225ababab58547211500878f7f2d 100755 (executable)
--- a/example/fioclient.c
+++ b/example/fioclient.c
@@ -21,6 +21,7 @@
  * \include fioclient.c
  */
 
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/fcntl.h>

diff --git a/example/fsel.c b/example/fsel.c
index 3c520331f2cf2d21de096a9316ce40a0a1fda242..657111ec67562395b4a94e6f1c2cacdcf08c9d83 100755 (executable)
--- a/example/fsel.c
+++ b/example/fsel.c
@@ -24,6 +24,8 @@
 
 #define FUSE_USE_VERSION 30
 
+#include <config.h>
+
 #include <fuse.h>
 #include <unistd.h>
 #include <ctype.h>

diff --git a/example/fselclient.c b/example/fselclient.c
index 2e2e571f315f749a318185b826d956a13b17e71a..ac8b7b0486d44d3006ff5badab840bc11c9c2a79 100755 (executable)
--- a/example/fselclient.c
+++ b/example/fselclient.c
@@ -21,6 +21,7 @@
  * \include fselclient.c
  */
 
+#include <config.h>
 
 #include <sys/select.h>
 #include <sys/time.h>

diff --git a/example/hello.c b/example/hello.c
index f678931d322efcf17c56de8a0b5ed273737f70d9..20021aff9fcebad81cf0fc92eebaeedda346d9e9 100755 (executable)
--- a/example/hello.c
+++ b/example/hello.c
@@ -35,6 +35,8 @@
 
 #define FUSE_USE_VERSION 30
 
+#include <config.h>
+
 #include <fuse.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/example/hello_ll.c b/example/hello_ll.c
index 151fe8b6d0810d6b93220d52233043ea7bbdebff..27859cefe8cf917316b90194423085c0e3374184 100755 (executable)
--- a/example/hello_ll.c
+++ b/example/hello_ll.c
@@ -39,6 +39,8 @@
 
 #define FUSE_USE_VERSION 30
 
+#include <config.h>
+
 #include <fuse_lowlevel.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/example/null.c b/example/null.c
index 3e57dbe9fa2f889317232f4f9bfe8d57a94982bc..4d39eb87746d83a983e35b05b1d36c5ee7d89caa 100755 (executable)
--- a/example/null.c
+++ b/example/null.c
@@ -21,6 +21,8 @@
 
 #define FUSE_USE_VERSION 30
 
+#include <config.h>
+
 #include <fuse.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/fuse.pc.in b/fuse.pc.in
index 8fdb84154c74a351d03934e71c8f64061cd1021a..a535e04786412bfca66792e9b384b210e46f26b3 100644 (file)
--- a/fuse.pc.in
+++ b/fuse.pc.in
@@ -8,4 +8,4 @@ Description: Filesystem in Userspace
 Version: @VERSION@
 Libs: -L${libdir} -lfuse -pthread
 Libs.private: @libfuse_libs@
-Cflags: -I${includedir}/fuse -D_FILE_OFFSET_BITS=64
+Cflags: -I${includedir}/fuse

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e1dbfa2596009ee6e1adfb2312bb38d0e32d391e..64d2a84e6bb7cf507acfc265cf6fff42b8954194 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -DFUSERMOUNT_DIR=\"$(bindir)\" \
- -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=30
+ -D_REENTRANT -DFUSE_USE_VERSION=30
 
 lib_LTLIBRARIES = libfuse.la libulockmgr.la
 

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

diff --git a/lib/fuse_loop.c b/lib/fuse_loop.c
index 7ddf2f982ba46cd0de40dc4bd351108eb9d4d311..fb6d8a6ccbfd9680fc52a91f7aec52a3636f2393 100644 (file)
--- a/lib/fuse_loop.c
+++ b/lib/fuse_loop.c
@@ -6,6 +6,7 @@
   See the file COPYING.LIB
 */
 
+#include "config.h"
 #include "fuse_lowlevel.h"
 
 #include <stdio.h>

diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c
index b146d736002d0998ce692242241c04437e531809..8f4dceb5f49a51dd1d85dd0f2c823cf47c2cc50e 100755 (executable)
--- a/lib/fuse_loop_mt.c
+++ b/lib/fuse_loop_mt.c
@@ -6,6 +6,7 @@
   See the file COPYING.LIB.
 */
 
+#include "config.h"
 #include "fuse_lowlevel.h"
 #include "fuse_misc.h"
 #include "fuse_kernel.h"

diff --git a/lib/fuse_misc.h b/lib/fuse_misc.h
index f102ba38f8281f59b7e0438da1cc8dfdb718a71e..8b7677561e700fa02187fd07867171e495035b39 100644 (file)
--- a/lib/fuse_misc.h
+++ b/lib/fuse_misc.h
@@ -6,7 +6,6 @@
   See the file COPYING.LIB
 */
 
-#include "config.h"
 #include <pthread.h>
 
 #ifndef USE_UCLIBC

diff --git a/lib/fuse_mt.c b/lib/fuse_mt.c
index ee38b28646e7d45264ca818e7022150402b0ab54..be5d6445dab5db1adeffd662ada2cfe2420aad96 100644 (file)
--- a/lib/fuse_mt.c
+++ b/lib/fuse_mt.c
@@ -6,6 +6,7 @@
   See the file COPYING.LIB.
 */
 
+#include "config.h"
 #include "fuse.h"
 #include "fuse_lowlevel.h"
 

diff --git a/lib/fuse_opt.c b/lib/fuse_opt.c
index 15f9e2152ba31eec8eab5a684004b6b7e9018de8..bd7a6eec247033d6184c93f075ae999ae9a002d9 100644 (file)
--- a/lib/fuse_opt.c
+++ b/lib/fuse_opt.c
@@ -6,6 +6,7 @@
   See the file COPYING.LIB
 */
 
+#include "config.h"
 #include "fuse_opt.h"
 #include "fuse_misc.h"
 

diff --git a/lib/fuse_session.c b/lib/fuse_session.c
index c030d68399b29bccc96a6e45bdb323d434532649..e919e731ff78cc3c427d550cb4386fd98eaecb00 100644 (file)
--- a/lib/fuse_session.c
+++ b/lib/fuse_session.c
@@ -6,6 +6,7 @@
   See the file COPYING.LIB
 */
 
+#include "config.h"
 #include "fuse_i.h"
 #include "fuse_misc.h"
 

diff --git a/lib/fuse_signals.c b/lib/fuse_signals.c
index 8cdc17d9d05b8516afa10a9064210622a7b7316e..c78c62d50ca095fe220daf6ed95bd621c06ee631 100755 (executable)
--- a/lib/fuse_signals.c
+++ b/lib/fuse_signals.c
@@ -6,6 +6,7 @@
   See the file COPYING.LIB
 */
 
+#include "config.h"
 #include "fuse_lowlevel.h"
 
 #include <stdio.h>

diff --git a/lib/modules/iconv.c b/lib/modules/iconv.c
index bc3694edec984141a35c8685a962dada2e652d39..7e449e67bce1a97ebe3f5f95f9a668248a7bf19f 100644 (file)
--- a/lib/modules/iconv.c
+++ b/lib/modules/iconv.c
@@ -8,6 +8,8 @@
 
 #define FUSE_USE_VERSION 30
 
+#include <config.h>
+
 #include <fuse.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/lib/modules/subdir.c b/lib/modules/subdir.c
index 52b91e16802ab34d63b0c0319fb2267e6b5725dc..1d3345db18d36c148ac540ae4af41bb5c2f23750 100644 (file)
--- a/lib/modules/subdir.c
+++ b/lib/modules/subdir.c
@@ -8,6 +8,8 @@
 
 #define FUSE_USE_VERSION 30
 
+#include <config.h>
+
 #include <fuse.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/lib/mount_bsd.c b/lib/mount_bsd.c
index 36c5a2bade40535dbc2745357194d99c33459b2b..52c55f53d704577504ef43b888e9d91cafc30b9a 100644 (file)
--- a/lib/mount_bsd.c
+++ b/lib/mount_bsd.c
@@ -6,6 +6,7 @@
   See the file COPYING.LIB.
 */
 
+#include "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 3d2f4cd71ae8e8be4d85a0f8f2b0229bf642a8fc..4415aa18d9d13648d5e436e633b75cc9fca5f85d 100644 (file)
--- a/lib/mount_util.c
+++ b/lib/mount_util.c
@@ -6,6 +6,7 @@
   See the file COPYING.LIB.
 */
 
+#include "config.h"
 #include "mount_util.h"
 #include <stdio.h>
 #include <unistd.h>

diff --git a/lib/ulockmgr.c b/lib/ulockmgr.c
index b875c5077f78eff5a5c8977414ed8b6e95676891..78f68592de2f5a7d952f0bc2f217b24ccd9262a1 100644 (file)
--- a/lib/ulockmgr.c
+++ b/lib/ulockmgr.c
@@ -8,6 +8,7 @@
 
 /* #define DEBUG 1 */
 
+#include "config.h"
 #include "ulockmgr.h"
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/util/Makefile.am b/util/Makefile.am
index 059d5fc2e474f4941e4a9f662abc4bf815db1db0..e77782b09ce6ec337bb9f62842b9ffe8ea9215e2 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -D_FILE_OFFSET_BITS=64 
 bin_PROGRAMS = fusermount ulockmgr_server
 noinst_PROGRAMS = mount.fuse
 
@@ -17,7 +16,7 @@ mount_util.c: $(top_srcdir)/lib/mount_util.c
 mount_fuse_SOURCES = mount.fuse.c
 
 ulockmgr_server_SOURCES = ulockmgr_server.c
-ulockmgr_server_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_REENTRANT 
+ulockmgr_server_CPPFLAGS = -D_REENTRANT 
 ulockmgr_server_LDFLAGS = -pthread
 
 install-exec-hook:

diff --git a/util/mount.fuse.c b/util/mount.fuse.c
index 6df8c03f697e7b4830f4428b4aa1ce8255b3e745..363b12b89c54613eb2435d969cc353dc5194ba38 100644 (file)
--- a/util/mount.fuse.c
+++ b/util/mount.fuse.c
@@ -6,6 +6,8 @@
   See the file COPYING.
 */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c
index baef45dccc5d842c510b480d097be659051c726c..09972ce2f135db811521213f3c35980cc76d2f4c 100644 (file)
--- a/util/ulockmgr_server.c
+++ b/util/ulockmgr_server.c
@@ -7,6 +7,7 @@
 */
 
 /* #define DEBUG 1 */
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>