projects
/
perl-fuse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a word boundary match to MacFUSE compat hack.
[perl-fuse.git]
/
Makefile.PL
diff --git
a/Makefile.PL
b/Makefile.PL
index
18f2cf0
..
b64ab59
100644
(file)
--- a/
Makefile.PL
+++ b/
Makefile.PL
@@
-55,7
+55,7
@@
unless ($fusever) {
$explanation = 'Could not find librefuse? Maybe install "perfuse" from pkgsrc, or upgrade to newer NetBSD';
}
elsif ($^O eq 'darwin') {
$explanation = 'Could not find librefuse? Maybe install "perfuse" from pkgsrc, or upgrade to newer NetBSD';
}
elsif ($^O eq 'darwin') {
- $explanation = 'Please install
MacFuse from http://code.google.com/p/macfuse
/';
+ $explanation = 'Please install
OSXFUSE from http://osxfuse.github.com
/';
}
else {
$explanation = 'There is no FUSE support for your platform to our knowledge, sorry';
}
else {
$explanation = 'There is no FUSE support for your platform to our knowledge, sorry';
@@
-68,14
+68,15
@@
if ($fusever && $fusever + 0 < 2.6) {
warn "fuse version found: ", $fusever, "\n";
}
warn "fuse version found: ", $fusever, "\n";
}
-chomp(my $inc = `pkg-config --cflags-only-I fuse 2> /dev/null`
|| '-I ../include'
);
+chomp(my $inc = `pkg-config --cflags-only-I fuse 2> /dev/null`);
chomp(my $libs = `pkg-config --libs-only-L fuse 2> /dev/null`);
chomp($libs .= `pkg-config --libs-only-l fuse 2> /dev/null` || (($^O eq 'netbsd') ? '-lrefuse' : '-lfuse'));
# Needed for Fuse on OS X 10.6, due to 10.6 and up always using the 64-bit
# inode structs; unfortunately MacFuse doesn't just do the right thing
chomp(my $libs = `pkg-config --libs-only-L fuse 2> /dev/null`);
chomp($libs .= `pkg-config --libs-only-l fuse 2> /dev/null` || (($^O eq 'netbsd') ? '-lrefuse' : '-lfuse'));
# Needed for Fuse on OS X 10.6, due to 10.6 and up always using the 64-bit
# inode structs; unfortunately MacFuse doesn't just do the right thing
-# on its own.
-if ($^O eq 'darwin' && (uname())[2] =~ /^10\./) {
- $libs =~ s/-lfuse/-lfuse_ino64/;
+# on its own. (Not applicable for OSXFUSE; it uses a new SONAME, so we
+# don't have to worry about conflicts/compatibility, it "just works".)
+if ($^O eq 'darwin' && (uname())[2] =~ /^1[01]\./) {
+ $libs =~ s/-lfuse\b/-lfuse_ino64/;
}
chomp(my $def = '-Wall -DFUSE_USE_VERSION=26 ' . `pkg-config --cflags-only-other fuse 2> /dev/null` || '-D_FILE_OFFSET_BITS=64');
chomp($def .= `pkg-config --libs-only-other fuse 2> /dev/null`);
}
chomp(my $def = '-Wall -DFUSE_USE_VERSION=26 ' . `pkg-config --cflags-only-other fuse 2> /dev/null` || '-D_FILE_OFFSET_BITS=64');
chomp($def .= `pkg-config --libs-only-other fuse 2> /dev/null`);