Add -lulockmgr to compilation comment in fusexmp_fh.c

diff --git a/ChangeLog b/ChangeLog
index d5a254e774f8dd013b7a53627c799323c6094fcf..a1d24a9ec053fdc805d00ab8c0ac30176ee4729b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-15  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Add -lulockmgr to compilation comment in fusexmp_fh.c
+
 2007-04-05  Miklos Szeredi <miklos@szeredi.hu>
 
        * mount.fuse should handle spaces in paths.  Debian Bug#417834.

diff --git a/example/fusexmp_fh.c b/example/fusexmp_fh.c
index c10044c4292d7b6e4aedea848db9bcc15cbaf2a2..f8c1ed48281b92d8342a383a2cd5f3efe20fa74c 100644 (file)
--- a/example/fusexmp_fh.c
+++ b/example/fusexmp_fh.c
@@ -5,7 +5,7 @@
     This program can be distributed under the terms of the GNU GPL.
     See the file COPYING.
 
-    gcc -Wall `pkg-config fuse --cflags --libs` fusexmp_fh.c -o fusexmp_fh
+    gcc -Wall `pkg-config fuse --cflags --libs` -lulockmgr fusexmp_fh.c -o fusexmp_fh
 */
 
 #define FUSE_USE_VERSION 26

diff --git a/util/mount.fuse b/util/mount.fuse
index 6ee636e84efbb7b11affce72db5f32ed332f8bf3..e8febfef5e536019c23e07b583deb33f5eb7b0c2 100644 (file)
--- a/util/mount.fuse
+++ b/util/mount.fuse
@@ -57,4 +57,8 @@ IFS=" "
 # add "-o " and remove trailing comma
 OPTIONS="-o `echo $OPTIONS | sed "s/,$//"`"
 
-"${FSTYPE}" "${MOUNTPATH}" "${MOUNTPOINT}" ${OPTIONS}
+if test -z "$MOUNTPATH"; then
+    "${FSTYPE}" "${MOUNTPOINT}" ${OPTIONS}
+else
+    "${FSTYPE}" "${MOUNTPATH}" "${MOUNTPOINT}" ${OPTIONS}
+fi