From 0cb2db32e73cb06716ea797374c42e99d782643b Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 25 Jul 2013 16:54:42 +0200 Subject: 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. --- lib/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') 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 -- cgit v1.2.3