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

add AC_SYS_LARGEFILE to your configure.ac instead.

29 files changed, 41 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 8b37e09..e4b11aa 100644
--- 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 7bf6553..751b343 100644
--- 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 1c04057..26c3976 100644
--- 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 a02818c..73b12f4 100755
--- 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 c79c734..b4cc334 100755
--- 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 9718622..a7c0dbe 100755
--- 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 3c52033..657111e 100755
--- 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 2e2e571..ac8b7b0 100755
--- 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 f678931..20021af 100755
--- 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 151fe8b..27859ce 100755
--- 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 3e57dbe..4d39eb8 100755
--- 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 8fdb841..a535e04 100644
--- 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 e1dbfa2..64d2a84 100644
--- 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 b094bd1..fbaa873 100644
--- 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 7ddf2f9..fb6d8a6 100644
--- 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 b146d73..8f4dceb 100755
--- 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 f102ba3..8b76775 100644
--- 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 ee38b28..be5d644 100644
--- 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 15f9e21..bd7a6ee 100644
--- 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 c030d68..e919e73 100644
--- 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 8cdc17d..c78c62d 100755
--- 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 bc3694e..7e449e6 100644
--- 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 52b91e1..1d3345d 100644
--- 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 36c5a2b..52c55f5 100644
--- 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 3d2f4cd..4415aa1 100644
--- 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 b875c50..78f6859 100644
--- 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 059d5fc..e77782b 100644
--- 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 6df8c03..363b12b 100644
--- 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 baef45d..09972ce 100644
--- 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>