diff options
| author | Masafumi Max NAKANE <max@FreeBSD.org> | 1997-01-14 07:10:52 +0000 |
|---|---|---|
| committer | Masafumi Max NAKANE <max@FreeBSD.org> | 1997-01-14 07:10:52 +0000 |
| commit | 91e91b11ad66bde821f555f31ba9962637772105 (patch) | |
| tree | e1af96508c49b8755fadfc85fe515c1dbaa143e4 /net/cap | |
| parent | Make the long-awaited change from $Id$ to $FreeBSD$ (diff) | |
Modify the configuration to use file locking with fcntl() so that
the trash folder works properly.
Submitted by: Koichi Satou <copan@ppp.fastnet.or.jp>
Notes
Notes:
svn path=/head/; revision=5350
Diffstat (limited to 'net/cap')
| -rw-r--r-- | net/cap/files/m4.setup.in | 5 | ||||
| -rw-r--r-- | net/cap/files/patch-aa | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/net/cap/files/m4.setup.in b/net/cap/files/m4.setup.in index f91d7c7db130..b62f5bb40b4d 100644 --- a/net/cap/files/m4.setup.in +++ b/net/cap/files/m4.setup.in @@ -445,9 +445,10 @@ define([caposdefs], # second: " " isn't defined so define no lockf # we "know" that flock() was hiding in libbsd.a under aix define([afposdefs], - concat( ifdef([X_FLOCK],[], ifelse(os,[aix],[],[ -DNOFLOCK])), + concat( ifdef([X_FLOCK],[], ifelse(os,[aix],[],[ -DNOFLOCK])), ifdef([X_LOCKF],[], - [ifdef([X_FCNTLLOCKF],[ -DLOCKFUSESFCNTL],[ -DNOLOCKF])]))) + [ifdef([X_FCNTLLOCKF],[ -DLOCKFUSESFCNTL], + ifelse(os,[freebsd],[ -DUSEFCNTLLOCK],[ -DNOLOCKF]))]))) # for aufs define([aufsosdefs], concat(aufsosdefs, diff --git a/net/cap/files/patch-aa b/net/cap/files/patch-aa index b341ade918e1..881d4655fe43 100644 --- a/net/cap/files/patch-aa +++ b/net/cap/files/patch-aa @@ -1,5 +1,5 @@ ---- Configure.orig Fri Nov 15 15:53:40 1996 -+++ Configure Fri Nov 15 16:43:36 1996 +--- Configure.orig Tue Jan 14 15:11:45 1997 ++++ Configure Tue Jan 14 15:52:29 1997 @@ -433,7 +433,7 @@ usingphase2="# define([usephase2],1)" usingatis="# define([useatis],1)" @@ -80,3 +80,13 @@ ifdef([columbia], [define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"]))]) # for atalkdbm - allows change following line(s) to modify atalk.local +@@ -1850,7 +1860,8 @@ + define([afposdefs], + concat( ifdef([X_FLOCK],[], ifelse(os,[aix],[],[ -DNOFLOCK])), + ifdef([X_LOCKF],[], +- [ifdef([X_FCNTLLOCKF],[ -DLOCKFUSESFCNTL],[ -DNOLOCKF])]))) ++ [ifdef([X_FCNTLLOCKF],[ -DLOCKFUSESFCNTL],[ -DNOLOCKF])], ++ ifelse(os,[freebsd],[ -DUSEFCNTLLOCK],[ -DNOLOCKF]))]))) + # for aufs + define([aufsosdefs], + concat(aufsosdefs, |