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.

diff --git a/.gitignore b/.gitignore
index 6a5e5e48095ae53452d30d6dcb8ead9249a51dfe..ff4a66e097ccb6f52fa41f2198e95ba6920dad35 100644 (file)
--- 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 e4b11aa043a970e25270cd1dd3dc8b1b222c6e2a..616e02ffd19c75436efba74cede89d07c489e6a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-25  Miklos Szeredi <miklos@szeredi.hu>
+
+       * 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 <miklos@szeredi.hu>
 
        * libfuse: remove "-D_FILE_OFFSET_BITS=64" from fuse.pc, add

diff --git a/Makefile.am b/Makefile.am
index 8bb0781ee7631a0630cab9e000d62cf08de5d8c9..10926cc5c40bfdf0126281ab107be1f578b51460 100644 (file)
--- 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 c04260b69fb9fb16b9c4a2be5621d02c0fd7200b..d542526028d6559b652b75fed4749e70de0753e8 100644 (file)
--- 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 26c397660bc05ccdc1372183db5447dbf180f94b..8b123d2875f5c28a9ef48ef17fa6486ac5a7f2be 100644 (file)
--- 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 73b12f4313b24764b9e2d1d46cbb8b961c18d916..8d2207528ca9e393c9c14195ec83aad43f7b9140 100755 (executable)
--- 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 b4cc334c281d697a48a30691f9a1980c5524237e..2117ac8089668ca828d7c1eb7133b4ef80658b4e 100755 (executable)
--- 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 657111ec67562395b4a94e6f1c2cacdcf08c9d83..69202ee6af3e204b4384c9ec2983e0b76483a6fb 100755 (executable)
--- 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 73e98983af662c3a9c5c4fd160ae79324ab071a6..6f63ae9593d4a640bb5c589531b69d648aee7fc1 100755 (executable)
--- 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 e538b49bb3355a670d3901cd619261474778fc2f..3be5071a82bca28625bc7acd1e2028a9a75bec72 100755 (executable)
--- 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 20021aff9fcebad81cf0fc92eebaeedda346d9e9..d26d826cdb89050e2c99b0cf5eaa95344c48f88e 100755 (executable)
--- 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 27859cefe8cf917316b90194423085c0e3374184..1bf715542603dfc54813c2663ceff8d581f38e76 100755 (executable)
--- 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 4d39eb87746d83a983e35b05b1d36c5ee7d89caa..1ff19548248f7e90c93f6d47f3197ab18d447548 100755 (executable)
--- 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/fuse.pc.in
deleted file mode 100644 (file)
index a535e04..0000000
--- a/fuse.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: fuse
-Description: Filesystem in Userspace
-Version: @VERSION@
-Libs: -L${libdir} -lfuse -pthread
-Libs.private: @libfuse_libs@
-Cflags: -I${includedir}/fuse

diff --git a/fuse3.pc.in b/fuse3.pc.in
new file mode 100644 (file)
index 0000000..0b52ba1
--- /dev/null
+++ b/fuse3.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: fuse
+Description: Filesystem in Userspace
+Version: @VERSION@
+Libs: -L${libdir} -lfuse -pthread
+Libs.private: @libfuse_libs@
+Cflags: -I${includedir}/fuse3

diff --git a/include/Makefile.am b/include/Makefile.am
index df02a59ce24c3a6bedd31179fbb1a6d2a505c925..bfe91e4d9e75b4e4a1bccc76c057bfee217a59d1 100644 (file)
--- 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 64d2a84e6bb7cf507acfc265cf6fff42b8954194..eab93820c5c3a46b20c9c6968584cac69fb33d88 100644 (file)
--- 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