From 0cb2db32e73cb06716ea797374c42e99d782643b Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 25 Jul 2013 16:54:42 +0200 Subject: [PATCH] libfuse: fuse -> fuse3 Allow 2.X and 3.X to coexist. Includes are now stored under /usr/include/fuse3 and library is named libfuse3.*. Invoke pkg-config with "fuse3" as the first argument to build with version 3 of the library. --- .gitignore | 2 +- ChangeLog | 7 +++++++ Makefile.am | 4 ++-- configure.ac | 2 +- example/Makefile.am | 4 ++-- example/cusexmp.c | 2 +- example/fioc.c | 2 +- example/fsel.c | 2 +- example/fusexmp.c | 2 +- example/fusexmp_fh.c | 2 +- example/hello.c | 2 +- example/hello_ll.c | 2 +- example/null.c | 2 +- fuse.pc.in => fuse3.pc.in | 2 +- include/Makefile.am | 2 +- lib/Makefile.am | 8 ++++---- 16 files changed, 27 insertions(+), 20 deletions(-) rename fuse.pc.in => fuse3.pc.in (87%) diff --git a/.gitignore b/.gitignore index 6a5e5e4..ff4a66e 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,7 @@ config.* /compile /libtool /INSTALL -/fuse.pc +/*.pc /.pc /patches* /m4 diff --git a/ChangeLog b/ChangeLog index e4b11aa..616e02f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-07-25 Miklos Szeredi + + * libfuse: fuse -> fuse3. Allow 2.X and 3.X to coexist. Includes + are now stored under /usr/include/fuse3 and library is named + libfuse3.*. Invoke pkg-config with "fuse3" as the first argument + to build with version 3 of the library. + 2013-07-24 Miklos Szeredi * libfuse: remove "-D_FILE_OFFSET_BITS=64" from fuse.pc, add diff --git a/Makefile.am b/Makefile.am index 8bb0781..10926cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,12 +5,12 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = @subdirs2@ doc EXTRA_DIST = \ - fuse.pc.in \ + fuse3.pc.in \ README* \ Filesystems \ FAQ pkgconfigdir = @pkgconfigdir@ -pkgconfig_DATA = fuse.pc +pkgconfig_DATA = fuse3.pc $(pkgconfig_DATA): config.status diff --git a/configure.ac b/configure.ac index c04260b..d542526 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,7 @@ if test "$arch" = linux -a "$cross_compiling" != "yes"; then fi fi -AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile doc/Makefile]) +AC_CONFIG_FILES([fuse3.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile doc/Makefile]) AC_OUTPUT if test "$util_linux_ok" = no; then diff --git a/example/Makefile.am b/example/Makefile.am index 26c3976..8b123d2 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -5,8 +5,8 @@ noinst_HEADERS = fioc.h noinst_PROGRAMS = fusexmp fusexmp_fh null hello hello_ll fioc fioclient \ fsel fselclient cusexmp -LDADD = ../lib/libfuse.la -fusexmp_fh_LDADD = ../lib/libfuse.la ../lib/libulockmgr.la +LDADD = ../lib/libfuse3.la +fusexmp_fh_LDADD = ../lib/libfuse3.la ../lib/libulockmgr.la fioclient_CPPFLAGS = fioclient_LDFLAGS = diff --git a/example/cusexmp.c b/example/cusexmp.c index 73b12f4..8d22075 100755 --- a/example/cusexmp.c +++ b/example/cusexmp.c @@ -15,7 +15,7 @@ * * \section section_compile compiling this example * - * gcc -Wall cusexmp.c `pkg-config fuse --cflags --libs` -o cusexmp + * gcc -Wall cusexmp.c `pkg-config fuse3 --cflags --libs` -o cusexmp * * \section section_source the complete source * \include cusexmp.c diff --git a/example/fioc.c b/example/fioc.c index b4cc334..2117ac8 100755 --- a/example/fioc.c +++ b/example/fioc.c @@ -15,7 +15,7 @@ * * \section section_compile compiling this example * - * gcc -Wall fioc.c `pkg-config fuse --cflags --libs` -o fioc + * gcc -Wall fioc.c `pkg-config fuse3 --cflags --libs` -o fioc * * \section section_source the complete source * \include fioc.c diff --git a/example/fsel.c b/example/fsel.c index 657111e..69202ee 100755 --- a/example/fsel.c +++ b/example/fsel.c @@ -15,7 +15,7 @@ * * \section section_compile compiling this example * - * gcc -Wall fsel.c `pkg-config fuse --cflags --libs` -o fsel + * gcc -Wall fsel.c `pkg-config fuse3 --cflags --libs` -o fsel * * \section section_source the complete source * \include fsel.c diff --git a/example/fusexmp.c b/example/fusexmp.c index 73e9898..6f63ae9 100755 --- a/example/fusexmp.c +++ b/example/fusexmp.c @@ -14,7 +14,7 @@ * * \section section_compile compiling this example * - * gcc -Wall fusexmp.c `pkg-config fuse --cflags --libs` -o fusexmp + * gcc -Wall fusexmp.c `pkg-config fuse3 --cflags --libs` -o fusexmp * * \section section_source the complete source * \include fusexmp.c diff --git a/example/fusexmp_fh.c b/example/fusexmp_fh.c index e538b49..3be5071 100755 --- a/example/fusexmp_fh.c +++ b/example/fusexmp_fh.c @@ -14,7 +14,7 @@ * * \section section_compile compiling this example * - * gcc -Wall fusexmp_fh.c `pkg-config fuse --cflags --libs` -lulockmgr -o fusexmp_fh + * gcc -Wall fusexmp_fh.c `pkg-config fuse3 --cflags --libs` -lulockmgr -o fusexmp_fh * * \section section_source the complete source * \include fusexmp_fh.c diff --git a/example/hello.c b/example/hello.c index 20021af..d26d826 100755 --- a/example/hello.c +++ b/example/hello.c @@ -12,7 +12,7 @@ * * \section section_compile compiling this example * - * gcc -Wall hello.c `pkg-config fuse --cflags --libs` -o hello + * gcc -Wall hello.c `pkg-config fuse3 --cflags --libs` -o hello * * \section section_usage usage \verbatim diff --git a/example/hello_ll.c b/example/hello_ll.c index 27859ce..1bf7155 100755 --- a/example/hello_ll.c +++ b/example/hello_ll.c @@ -15,7 +15,7 @@ * * \section section_compile compiling this example * - * gcc -Wall hello_ll.c `pkg-config fuse --cflags --libs` -o hello_ll + * gcc -Wall hello_ll.c `pkg-config fuse3 --cflags --libs` -o hello_ll * * \section section_usage usage \verbatim diff --git a/example/null.c b/example/null.c index 4d39eb8..1ff1954 100755 --- a/example/null.c +++ b/example/null.c @@ -12,7 +12,7 @@ * * \section section_compile compiling this example * - * gcc -Wall null.c `pkg-config fuse --cflags --libs` -o null + * gcc -Wall null.c `pkg-config fuse3 --cflags --libs` -o null * * \section section_source the complete source * \include null.c diff --git a/fuse.pc.in b/fuse3.pc.in similarity index 87% rename from fuse.pc.in rename to fuse3.pc.in index a535e04..0b52ba1 100644 --- a/fuse.pc.in +++ b/fuse3.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 +Cflags: -I${includedir}/fuse3 diff --git a/include/Makefile.am b/include/Makefile.am index df02a59..bfe91e4 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -fuseincludedir=$(includedir)/fuse +fuseincludedir=$(includedir)/fuse3 fuseinclude_HEADERS = \ fuse.h \ diff --git a/lib/Makefile.am b/lib/Makefile.am index 64d2a84..eab9382 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -DFUSERMOUNT_DIR=\"$(bindir)\" \ -D_REENTRANT -DFUSE_USE_VERSION=30 -lib_LTLIBRARIES = libfuse.la libulockmgr.la +lib_LTLIBRARIES = libfuse3.la libulockmgr.la if BSD mount_source = mount_bsd.c @@ -17,7 +17,7 @@ else iconv_source = endif -libfuse_la_SOURCES = \ +libfuse3_la_SOURCES = \ fuse.c \ fuse_i.h \ fuse_loop.c \ @@ -35,11 +35,11 @@ libfuse_la_SOURCES = \ $(iconv_source) \ $(mount_source) -libfuse_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 3:0:0 \ +libfuse3_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 0:0:0 \ -Wl,--version-script,$(srcdir)/fuse_versionscript if NETBSD -libfuse_la_LIBADD = -lperfuse -lpuffs +libfuse3_la_LIBADD = -lperfuse -lpuffs endif libulockmgr_la_SOURCES = ulockmgr.c