*** empty log message ***

diff --git a/.cvsignore b/.cvsignore
index 94d2eb8fb7800ec6d71f5d75be28a5e2411b255f..add950b5b3ac8769b157a29e99d99470f21659eb 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -12,3 +12,4 @@ config.*
 depcomp
 libtool
 INSTALL
+fuse.pc

diff --git a/ChangeLog b/ChangeLog
index 9eda3cf257922254dbb0aee29beb3f444e53d600..1ceba55116874a1ff4acb945803a11ba8c51cdf1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 f319a927650d3ba7c8b1f564cbf31fb63bb5ea56..74350e3d37df80f3c4b66845d51248f63ab0dd65 100644 (file)
--- 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 cd4a856b072c964b064f571565c5c5519125c482..de40ea34cac17f5d6d6cb173430715d1ade4cd70 100644 (file)
--- 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 (file)
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 9e67b61fb7a77365341d03ec4db61336ff9b9702..feb8cbd8f6e91d2826fa40f1ac7eefeddeffc005 100644 (file)
--- 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