diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2004-11-08 21:11:53 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2004-11-08 21:11:53 +0000 |
| commit | db1c3650b287d1766017aec3c370c70aed29261e (patch) | |
| tree | ac24c6be1b1c6d23ac1efd0d87f59fc8c82fdd2b | |
| parent | d507c73e8fda72305b3e172ac7686c05d2dd73da (diff) | |
| download | android_external_fuse-db1c3650b287d1766017aec3c370c70aed29261e.tar.gz android_external_fuse-db1c3650b287d1766017aec3c370c70aed29261e.tar.bz2 android_external_fuse-db1c3650b287d1766017aec3c370c70aed29261e.zip | |
*** empty log message ***
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | fuse.pc.in | 10 | ||||
| -rw-r--r-- | include/Makefile.am | 10 |
6 files changed, 35 insertions, 4 deletions
@@ -12,3 +12,4 @@ config.* depcomp libtool INSTALL +fuse.pc @@ -5,6 +5,13 @@ just add '-DFUSE_DIRFIL_COMPAT' compile flag or fix the source. Do not use the "use_ino" mount flag with filesystems compiled with FUSE_DIRFIL_COMPAT. + + * Add pkg-config support. To compile a FUSE based filesystem you + can do "gcc -Wall `pkg-config --cflags --libs fuse` myfs.c -o myfs" + or similar. Note, that the PKG_CONFIG_PATH environment variable + usually needs to be set to "/usr/local/lib/pkgconfig". + + * fuse.h is now installed in ${prefix}/include/fuse/ 2004-11-02 Miklos Szeredi <miklos@szeredi.hu> diff --git a/Makefile.am b/Makefile.am index f319a92..74350e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,8 +3,13 @@ SUBDIRS = @subdirs@ EXTRA_DIST = \ - fuse.spec \ + fuse.pc.in \ README* \ Filesystems \ BUGS \ doc/how-fuse-works + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = fuse.pc + +$(pkgconfig_DATA): config.status diff --git a/configure.in b/configure.in index cd4a856..de40ea3 100644 --- a/configure.in +++ b/configure.in @@ -121,5 +121,5 @@ AC_CHECK_MEMBERS([struct stat.st_atim]) AC_SUBST(subdirs) -AC_OUTPUT([Makefile kernel/Makefile lib/Makefile util/Makefile example/Makefile include/Makefile include/linux/Makefile patch/Makefile]) - +AC_CONFIG_FILES([fuse.pc Makefile kernel/Makefile lib/Makefile util/Makefile example/Makefile include/Makefile include/linux/Makefile patch/Makefile]) +AC_OUTPUT diff --git a/fuse.pc.in b/fuse.pc.in new file mode 100644 index 0000000..d55970c --- /dev/null +++ b/fuse.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: fuse +Description: Filesystem in Userspace +Version: @VERSION@ +Libs: -L${libdir} -lfuse +Cflags: -I${includedir}/fuse diff --git a/include/Makefile.am b/include/Makefile.am index 9e67b61..feb8cbd 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,4 +2,12 @@ SUBDIRS = linux -include_HEADERS = fuse.h +fuseincludedir=$(includedir)/fuse +fuseinclude_HEADERS = fuse.h + +# remove fuse.h from old place to avoid collision with new one +install-data-local: + @if test -f $(includedir)/fuse.h; then \ + echo "Removing old FUSE header from $(includedir)/fuse.h"; \ + rm -f $(includedir)/fuse.h; \ + fi |