diff -u -r -N ../arla-20080223-orig/Makefile.in ./Makefile.in --- ../arla-20080223-orig/Makefile.in 2008-01-18 08:29:06.000000000 -0600 +++ ./Makefile.in 2008-02-23 11:24:29.000000000 -0600 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.5 2007/01/25 11:23:05 lha Exp $ +# $Id: Makefile.am,v 1.6 2007/11/05 21:20:41 tol Exp $ # $Id: Makefile.am.common,v 1.3 2007/01/12 09:02:21 tol Exp $ @@ -111,7 +111,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ @@ -205,7 +210,8 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = include lib util ydr lwp rxdef lib/ko rx rxgk \ - lib/bufdir rxkad nnpfs arlad conf appl tests doc tools + lib/bufdir rxkad nnpfs appl/lib arlad conf appl tests doc \ + tools DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -516,6 +522,7 @@ lib/bufdir \ $(rxkad) \ nnpfs \ + appl/lib \ arlad \ conf \ appl \ diff -u -r -N ../arla-20080223-orig/aclocal.m4 ./aclocal.m4 --- ../arla-20080223-orig/aclocal.m4 2008-01-18 08:28:42.000000000 -0600 +++ ./aclocal.m4 2008-02-23 11:24:04.000000000 -0600 @@ -7228,8 +7228,12 @@ m4_include([cf/bsd-uvm-only.m4]) m4_include([cf/bsd-vfs-busy.m4]) m4_include([cf/bsd-vfs-object-create.m4]) +m4_include([cf/bsd-vfs-quotactl.m4]) m4_include([cf/bsd-vget.m4]) +m4_include([cf/bsd-vnode-create-vobject.m4]) m4_include([cf/bsd-vop-lock.m4]) +m4_include([cf/bsd-vop-open.m4]) +m4_include([cf/bsd-vop-unlock.m4]) m4_include([cf/c-attribute.m4]) m4_include([cf/c-function.m4]) m4_include([cf/check-declaration.m4]) diff -u -r -N ../arla-20080223-orig/appl/Makefile.in ./appl/Makefile.in --- ../arla-20080223-orig/appl/Makefile.in 2008-01-18 08:29:00.000000000 -0600 +++ ./appl/Makefile.in 2008-02-23 11:24:23.000000000 -0600 @@ -64,7 +64,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/appl/afstool/Makefile.in ./appl/afstool/Makefile.in --- ../arla-20080223-orig/appl/afstool/Makefile.in 2008-01-18 08:29:00.000000000 -0600 +++ ./appl/afstool/Makefile.in 2008-02-23 11:24:23.000000000 -0600 @@ -63,7 +63,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/appl/afsutils/Makefile.in ./appl/afsutils/Makefile.in --- ../arla-20080223-orig/appl/afsutils/Makefile.in 2008-01-18 08:29:00.000000000 -0600 +++ ./appl/afsutils/Makefile.in 2008-02-23 11:24:23.000000000 -0600 @@ -63,7 +63,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/appl/amon/Makefile.in ./appl/amon/Makefile.in --- ../arla-20080223-orig/appl/amon/Makefile.in 2008-01-18 08:29:01.000000000 -0600 +++ ./appl/amon/Makefile.in 2008-02-23 11:24:23.000000000 -0600 @@ -63,7 +63,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/appl/bos/Makefile.in ./appl/bos/Makefile.in --- ../arla-20080223-orig/appl/bos/Makefile.in 2008-01-18 08:29:01.000000000 -0600 +++ ./appl/bos/Makefile.in 2008-02-23 11:24:24.000000000 -0600 @@ -63,7 +63,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/appl/fs/Makefile.in ./appl/fs/Makefile.in --- ../arla-20080223-orig/appl/fs/Makefile.in 2008-01-18 08:29:01.000000000 -0600 +++ ./appl/fs/Makefile.in 2008-02-23 11:24:24.000000000 -0600 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.4 2005/11/17 12:29:25 tol Exp $ +# $Id: Makefile.am,v 1.5 2008/02/21 20:42:53 tol Exp $ # $Id: Makefile.am.common,v 1.3 2007/01/12 09:02:21 tol Exp $ @@ -63,7 +63,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ @@ -117,7 +122,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_fs_OBJECTS = fs-fs.$(OBJEXT) fs-fs_flushvol.$(OBJEXT) \ @@ -158,6 +163,8 @@ $(LDFLAGS) -o $@ SOURCES = $(fs_SOURCES) DIST_SOURCES = $(fs_SOURCES) +man1dir = $(mandir)/man1 +MANS = $(man_MANS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -511,6 +518,7 @@ $(KAFS_LIBS) \ $(RXKAD_LIBS) @LIBS@ +man_MANS = fs.1 all: all-am .SUFFIXES: @@ -794,6 +802,51 @@ clean-libtool: -rm -rf .libs _libs +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -874,9 +927,9 @@ dist-hook check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) all-local +all-am: Makefile $(PROGRAMS) $(MANS) all-local installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -922,7 +975,7 @@ info-am: -install-data-am: install-data-local +install-data-am: install-data-local install-man install-dvi: install-dvi-am @@ -934,7 +987,7 @@ install-info: install-info-am -install-man: +install-man: install-man1 install-pdf: install-pdf-am @@ -959,7 +1012,9 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS +uninstall-am: uninstall-binPROGRAMS uninstall-man + +uninstall-man: uninstall-man1 .MAKE: install-am install-exec-am install-strip @@ -971,12 +1026,13 @@ install-data install-data-am install-data-local install-dvi \ install-dvi-am install-exec install-exec-am install-exec-hook \ install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ + install-man install-man1 install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS + uninstall-am uninstall-binPROGRAMS uninstall-man \ + uninstall-man1 install-suid-programs: diff -u -r -N ../arla-20080223-orig/appl/fs/fs_local.h ./appl/fs/fs_local.h --- ../arla-20080223-orig/appl/fs/fs_local.h 2006-03-16 08:38:28.000000000 -0600 +++ ./appl/fs/fs_local.h 2008-02-23 11:03:56.000000000 -0600 @@ -43,7 +43,6 @@ #endif #include #include -#include #include #include diff -u -r -N ../arla-20080223-orig/appl/kalog/Makefile.in ./appl/kalog/Makefile.in --- ../arla-20080223-orig/appl/kalog/Makefile.in 2008-01-18 08:29:01.000000000 -0600 +++ ./appl/kalog/Makefile.in 2008-02-23 11:24:24.000000000 -0600 @@ -63,7 +63,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/appl/lib/Makefile.in ./appl/lib/Makefile.in --- ../arla-20080223-orig/appl/lib/Makefile.in 2008-01-18 08:29:02.000000000 -0600 +++ ./appl/lib/Makefile.in 2008-02-23 11:24:24.000000000 -0600 @@ -62,7 +62,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/appl/mac/Makefile.in ./appl/mac/Makefile.in --- ../arla-20080223-orig/appl/mac/Makefile.in 2008-01-18 08:29:02.000000000 -0600 +++ ./appl/mac/Makefile.in 2008-02-23 11:24:25.000000000 -0600 @@ -62,7 +62,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/appl/perf/Makefile.in ./appl/perf/Makefile.in --- ../arla-20080223-orig/appl/perf/Makefile.in 2008-01-18 08:29:02.000000000 -0600 +++ ./appl/perf/Makefile.in 2008-02-23 11:24:25.000000000 -0600 @@ -63,7 +63,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/appl/pts/Makefile.in ./appl/pts/Makefile.in --- ../arla-20080223-orig/appl/pts/Makefile.in 2008-01-18 08:29:02.000000000 -0600 +++ ./appl/pts/Makefile.in 2008-02-23 11:24:25.000000000 -0600 @@ -63,7 +63,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/appl/rxgklog/Makefile.in ./appl/rxgklog/Makefile.in --- ../arla-20080223-orig/appl/rxgklog/Makefile.in 2008-01-18 08:29:02.000000000 -0600 +++ ./appl/rxgklog/Makefile.in 2008-02-23 11:24:25.000000000 -0600 @@ -61,7 +61,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/appl/udebug/Makefile.in ./appl/udebug/Makefile.in --- ../arla-20080223-orig/appl/udebug/Makefile.in 2008-01-18 08:29:02.000000000 -0600 +++ ./appl/udebug/Makefile.in 2008-02-23 11:24:25.000000000 -0600 @@ -62,7 +62,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/appl/vos/Makefile.in ./appl/vos/Makefile.in --- ../arla-20080223-orig/appl/vos/Makefile.in 2008-01-18 08:29:03.000000000 -0600 +++ ./appl/vos/Makefile.in 2008-02-23 11:24:25.000000000 -0600 @@ -63,7 +63,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/cf/bsd-func-suser.m4 ./cf/bsd-func-suser.m4 --- ../arla-20080223-orig/cf/bsd-func-suser.m4 2004-02-12 10:28:15.000000000 -0600 +++ ./cf/bsd-func-suser.m4 2008-02-23 11:23:18.000000000 -0600 @@ -5,6 +5,8 @@ AC_DEFUN([AC_BSD_FUNC_SUSER], [ AC_CACHE_CHECK(if suser takes two arguments, ac_cv_func_suser_two_args, +save_CFLAGS2="$CFLAGS" +CFLAGS="-Werror $CFLAGS" AC_TRY_COMPILE_KERNEL([ #ifdef HAVE_SYS_CDEFS_H #include @@ -21,4 +23,5 @@ AC_DEFINE(HAVE_TWO_ARGUMENT_SUSER, 1, [define if suser takes two arguments]) fi +CFLAGS="$save_CFLAGS2" ]) diff -u -r -N ../arla-20080223-orig/cf/bsd-insmntque.m4 ./cf/bsd-insmntque.m4 --- ../arla-20080223-orig/cf/bsd-insmntque.m4 1969-12-31 18:00:00.000000000 -0600 +++ ./cf/bsd-insmntque.m4 2008-02-23 11:03:56.000000000 -0600 @@ -0,0 +1,27 @@ +dnl +dnl $Id: bsd-vop-lock.m4,v 1.4 2004/02/12 16:28:15 lha Exp $ +dnl + +dnl +dnl Find out if kernel has insmntque +dnl + +AC_DEFUN([AC_BSD_FUNC_INSMNTQUE], [ +AC_CACHE_CHECK(if kernel has insmntque, ac_cv_func_insmntque, +AC_TRY_COMPILE_KERNEL([ +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include +],[insmntque(0, 0)], +ac_cv_func_insmntque=yes, +ac_cv_func_insmntque=no)) +if test "$ac_cv_func_insmntque" = yes; then + AC_DEFINE_UNQUOTED(HAVE_KERNEL_INSMNTQUE, 1, + [define if kernel has insmntque]) +fi +]) diff -u -r -N ../arla-20080223-orig/cf/bsd-vfs-quotactl.m4 ./cf/bsd-vfs-quotactl.m4 --- ../arla-20080223-orig/cf/bsd-vfs-quotactl.m4 1969-12-31 18:00:00.000000000 -0600 +++ ./cf/bsd-vfs-quotactl.m4 2008-02-23 11:03:56.000000000 -0600 @@ -0,0 +1,38 @@ +dnl +dnl $Id$ +dnl + +dnl +dnl Find out if VFS_QUOTACTL accepts a void * or a caddr_t argument. +dnl + +AC_DEFUN([AC_BSD_FUNC_VFS_QUOTACTL], [ +AC_CACHE_CHECK(if VFS_QUOTACTL takes caddr_t argument, ac_cv_func_vfs_quotactl_caddr, +AC_TRY_COMPILE_KERNEL([ +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include +#include + +vfs_quotactl_t foo_quotactl; + +int +foo_quotactl(struct mount *mp, int cmds, uid_t uid, caddr_t arg, + struct thread *td) +{ + + return (0); +} +],[], +ac_cv_func_vfs_quotactl_caddr=yes, +ac_cv_func_vfs_quotactl_caddr=no)) +if test "$ac_cv_func_vfs_quotactl_caddr" = yes; then + AC_DEFINE(HAVE_VFS_QUOTACTL_CADDR, 1, + [define if VFS_QUOTACTL takes a caddr_t argument]) +fi +]) diff -u -r -N ../arla-20080223-orig/cf/bsd-vnode-create-vobject.m4 ./cf/bsd-vnode-create-vobject.m4 --- ../arla-20080223-orig/cf/bsd-vnode-create-vobject.m4 1969-12-31 18:00:00.000000000 -0600 +++ ./cf/bsd-vnode-create-vobject.m4 2008-02-23 11:03:56.000000000 -0600 @@ -0,0 +1,28 @@ +dnl +dnl $Id$ +dnl + +dnl +dnl Find out if vnode_create_vobject() takes one argument or two on BSD; if +dnl two then we need to use vnode_create_vobject_off() instead. +dnl + +AC_DEFUN([AC_BSD_FUNC_VNODE_CREATE_VOBJECT], [ +AC_CACHE_CHECK(if vnode_create_vobject takes three arguments, ac_cv_func_vnode_create_vobject, +AC_TRY_COMPILE_KERNEL([ +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include +],[vnode_create_vobject(0, 0, 0)], +ac_cv_func_vnode_create_vobject_three_args=yes, +ac_cv_func_vnode_create_vobject_three_args=no)) +if test "$ac_cv_func_vnode_create_vobject_three_args" = yes; then + AC_DEFINE(HAVE_THREE_ARGUMENT_VNODE_CREATE_VOBJ, 1, + [define if vnode_create_vobject takes three arguments]) +fi +]) diff -u -r -N ../arla-20080223-orig/cf/bsd-vop-open.m4 ./cf/bsd-vop-open.m4 --- ../arla-20080223-orig/cf/bsd-vop-open.m4 1969-12-31 18:00:00.000000000 -0600 +++ ./cf/bsd-vop-open.m4 2008-02-23 11:03:56.000000000 -0600 @@ -0,0 +1,31 @@ +dnl +dnl $Id$ +dnl + +dnl +dnl Find out if VOP_OPEN takes a struct file or an integer final argument on +dnl FreeBSD. +dnl + +AC_DEFUN([AC_BSD_FUNC_VOP_OPEN], [ +AC_CACHE_CHECK(if VOP_OPEN takes a struct file final argument, ac_cv_func_vop_open_file_arg, +save_CFLAGS2="$CFLAGS" +CFLAGS="$CFLAGS -Werror" +AC_TRY_COMPILE_KERNEL([ +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include +],[VOP_OPEN(NULL, 0, NULL, NULL, (struct file *)NULL)], +ac_cv_func_vop_open_file_arg=yes, +ac_cv_func_vop_open_file_arg=no)) +if test "$ac_cv_func_vop_open_file_arg" = yes; then + AC_DEFINE(HAVE_FINAL_ARG_FILE_VOP_OPEN, 1, + [define if VOP_OPEN takes a file final argument]) +fi +CFLAGS="$save_CFLAGS2" +]) diff -u -r -N ../arla-20080223-orig/cf/bsd-vop-unlock.m4 ./cf/bsd-vop-unlock.m4 --- ../arla-20080223-orig/cf/bsd-vop-unlock.m4 1969-12-31 18:00:00.000000000 -0600 +++ ./cf/bsd-vop-unlock.m4 2008-02-23 11:03:56.000000000 -0600 @@ -0,0 +1,153 @@ +dnl +dnl $Id$ +dnl + +dnl +dnl Find out if VOP_UNLOCK takes two or three arguments +dnl + +AC_DEFUN([AC_BSD_FUNC_VOP_UNLOCK], [ +AC_CACHE_CHECK(if VOP_UNLOCK takes two arguments, ac_cv_func_vop_unlock_two_args, +AC_TRY_COMPILE_KERNEL([ +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include +],[VOP_UNLOCK(0, 0)], +ac_cv_func_vop_unlock_two_args=yes, +ac_cv_func_vop_unlock_two_args=no)) +if test "$ac_cv_func_vop_unlock_two_args" = yes; then + AC_DEFINE(HAVE_TWO_ARGUMENT_VOP_UNLOCK, 1, + [define if VOP_UNLOCK takes two arguments]) +fi + +AC_CACHE_CHECK(if VOP_UNLOCK takes three arguments, ac_cv_func_vop_unlock_three_args, +AC_TRY_COMPILE_KERNEL([ +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include +],[VOP_UNLOCK(0, 0, 0)], +ac_cv_func_vop_unlock_three_args=yes, +ac_cv_func_vop_unlock_three_args=no)) +if test "$ac_cv_func_vop_unlock_three_args" = yes; then + AC_DEFINE(HAVE_THREE_ARGUMENT_VOP_UNLOCK, 1, + [define if VOP_UNLOCK takes three arguments]) +fi +]) +dnl +dnl $Id$ +dnl + +dnl +dnl Find out if VOP_UNLOCK takes two or three arguments +dnl + +AC_DEFUN([AC_BSD_FUNC_VOP_UNLOCK], [ +AC_CACHE_CHECK(if VOP_UNLOCK takes two arguments, ac_cv_func_vop_unlock_two_args, +AC_TRY_COMPILE_KERNEL([ +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include +],[VOP_UNLOCK(0, 0)], +ac_cv_func_vop_unlock_two_args=yes, +ac_cv_func_vop_unlock_two_args=no)) +if test "$ac_cv_func_vop_unlock_two_args" = yes; then + AC_DEFINE(HAVE_TWO_ARGUMENT_VOP_UNLOCK, 1, + [define if VOP_UNLOCK takes two arguments]) +fi + +AC_CACHE_CHECK(if VOP_UNLOCK takes three arguments, ac_cv_func_vop_unlock_three_args, +AC_TRY_COMPILE_KERNEL([ +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include +],[VOP_UNLOCK(0, 0, 0)], +ac_cv_func_vop_unlock_three_args=yes, +ac_cv_func_vop_unlock_three_args=no)) +if test "$ac_cv_func_vop_unlock_three_args" = yes; then + AC_DEFINE(HAVE_THREE_ARGUMENT_VOP_UNLOCK, 1, + [define if VOP_UNLOCK takes three arguments]) +fi +]) +dnl +dnl $Id: $ +dnl + +dnl +dnl Find out if VOP_UNLOCK takes one, two, or three arguments +dnl + +AC_DEFUN([AC_BSD_FUNC_VOP_UNLOCK], [ +AC_CACHE_CHECK(if VOP_UNLOCK takes one argument, ac_cv_func_vop_unlock_one_arg, +AC_TRY_COMPILE_KERNEL([ +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include +],[VOP_UNLOCK(0)], +ac_cv_func_vop_unlock_one_arg=yes, +ac_cv_func_vop_unlock_one_arg=no)) +if test "$ac_cv_func_vop_unlock_one_arg" = yes; then + AC_DEFINE_UNQUOTED(HAVE_ONE_ARGUMENT_VOP_UNLOCK, 1, + [define if VOP_UNLOCK takes one argument]) +fi + +AC_CACHE_CHECK(if VOP_UNLOCK takes two arguments, ac_cv_func_vop_unlock_two_args, +AC_TRY_COMPILE_KERNEL([ +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include +],[VOP_UNLOCK(0, 0)], +ac_cv_func_vop_unlock_two_args=yes, +ac_cv_func_vop_unlock_two_args=no)) +if test "$ac_cv_func_vop_unlock_two_args" = yes; then + AC_DEFINE(HAVE_TWO_ARGUMENT_VOP_UNLOCK, 1, + [define if VOP_UNLOCK takes two arguments]) +fi + +AC_CACHE_CHECK(if VOP_UNLOCK takes three arguments, ac_cv_func_vop_unlock_three_args, +AC_TRY_COMPILE_KERNEL([ +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include +],[VOP_UNLOCK(0, 0, 0)], +ac_cv_func_vop_unlock_three_args=yes, +ac_cv_func_vop_unlock_three_args=no)) +if test "$ac_cv_func_vop_unlock_three_args" = yes; then + AC_DEFINE(HAVE_THREE_ARGUMENT_VOP_UNLOCK, 1, + [define if VOP_UNLOCK takes three arguments]) +fi +]) diff -u -r -N ../arla-20080223-orig/cf/try-compile-kernel.m4 ./cf/try-compile-kernel.m4 --- ../arla-20080223-orig/cf/try-compile-kernel.m4 2004-02-12 10:28:18.000000000 -0600 +++ ./cf/try-compile-kernel.m4 2008-02-23 11:03:56.000000000 -0600 @@ -8,7 +8,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" AC_TRY_COMPILE([$1], [$2], [$3], [$4]) CFLAGS="$save_CFLAGS" CC="$save_CC" diff -u -r -N ../arla-20080223-orig/config.guess ./config.guess --- ../arla-20080223-orig/config.guess 2008-02-23 05:35:29.000000000 -0600 +++ ./config.guess 2008-02-23 11:24:28.000000000 -0600 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2004-09-07' +timestamp='2003-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -197,21 +197,15 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -227,33 +221,25 @@ mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} + echo mipseb-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; - macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) + if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac + fi # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -291,12 +277,14 @@ "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac - # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha*:OpenVMS:*:*) + echo alpha-hp-vms exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? @@ -319,9 +307,6 @@ *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -414,9 +399,6 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -752,7 +734,7 @@ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` @@ -760,11 +742,6 @@ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -774,8 +751,22 @@ *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; - *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) + # Determine whether the default compiler uses glibc. + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #if __GLIBC__ >= 2 + LIBC=gnu + #else + LIBC= + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + # GNU/FreeBSD systems have a "k" prefix to indicate we are using + # FreeBSD's kernel, but not the complete OS. + case ${LIBC} in gnu) kernel_only='k' ;; esac + echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -808,13 +799,8 @@ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) - # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; @@ -824,18 +810,9 @@ cris:Linux:*:*) echo cris-axis-linux-gnu exit 0 ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit 0 ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -971,9 +948,6 @@ LIBC=gnuaout #endif #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 @@ -1004,9 +978,6 @@ i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1076,9 +1047,9 @@ M680?0:D-NIX:5.3:*) echo m68k-diab-dnix exit 0 ;; - M68*:*:R3V[5678]*:*) + M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1176,10 +1147,9 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in + case `uname -p` in *86) UNAME_PROCESSOR=i686 ;; - unknown) UNAME_PROCESSOR=powerpc ;; + powerpc) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; @@ -1194,7 +1164,7 @@ *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-?:NONSTOP_KERNEL:*:*) + NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1238,16 +1208,6 @@ SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms && exit 0 ;; - I*) echo ia64-dec-vms && exit 0 ;; - V*) echo vax-dec-vms && exit 0 ;; - esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -u -r -N ../arla-20080223-orig/config.sub ./config.sub --- ../arla-20080223-orig/config.sub 2008-02-23 05:35:29.000000000 -0600 +++ ./config.sub 2008-02-23 11:24:28.000000000 -0600 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2004-08-29' +timestamp='2003-07-04' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -70,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -118,8 +118,7 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -145,7 +144,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis) os= basic_machine=$1 ;; @@ -229,15 +228,14 @@ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | ip2k \ + | m32r | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -249,7 +247,6 @@ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ @@ -262,7 +259,7 @@ | pyramid \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ @@ -295,20 +292,20 @@ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ + | clipper-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | ip2k-* \ + | m32r-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -322,13 +319,11 @@ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ - | mmix-* \ | msp430-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ @@ -337,7 +332,7 @@ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ @@ -364,9 +359,6 @@ basic_machine=a29k-amd os=-udi ;; - abacus) - basic_machine=abacus-unknown - ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -384,9 +376,6 @@ amd64) basic_machine=x86_64-pc ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -446,27 +435,12 @@ basic_machine=j90-cray os=-unicos ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16c) - basic_machine=cr16c-unknown - os=-elf - ;; crds | unos) basic_machine=m68k-crds ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -667,6 +641,10 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + mmix*) + basic_machine=mmix-knuth + os=-mmixware + ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -747,6 +725,10 @@ np1) basic_machine=np1-gould ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -758,10 +740,6 @@ basic_machine=or32-unknown os=-coff ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -982,10 +960,6 @@ tower | tower-32) basic_machine=m68k-ncr ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; udi29k) basic_machine=a29k-amd os=-udi @@ -1059,9 +1033,6 @@ romp) basic_machine=romp-ibm ;; - mmix) - basic_machine=mmix-knuth - ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1084,7 +1055,7 @@ sh64) basic_machine=sh64-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) @@ -1157,20 +1128,19 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1194,9 +1164,6 @@ -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1209,9 +1176,6 @@ -opened*) os=-openedition ;; - -os400*) - os=-os400 - ;; -wince*) os=-wince ;; @@ -1233,9 +1197,6 @@ -atheos*) os=-atheos ;; - -syllable*) - os=-syllable - ;; -386bsd) os=-bsd ;; @@ -1258,9 +1219,6 @@ -sinix*) os=-sysv4 ;; - -tpf*) - os=-tpf - ;; -triton*) os=-sysv3 ;; @@ -1377,9 +1335,6 @@ *-ibm) os=-aix ;; - *-knuth) - os=-mmixware - ;; *-wec) os=-proelf ;; @@ -1512,15 +1467,9 @@ -mvs* | -opened*) vendor=ibm ;; - -os400*) - vendor=ibm - ;; -ptx*) vendor=sequent ;; - -tpf*) - vendor=ibm - ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; diff -u -r -N ../arla-20080223-orig/configure ./configure --- ../arla-20080223-orig/configure 2008-01-18 08:28:51.000000000 -0600 +++ ./configure 2008-02-23 11:24:14.000000000 -0600 @@ -7425,7 +7425,7 @@ NNPFS_SUBDIR=freebsd - KERNEL_INCLUDE=-I`(cd $srcdir; pwd)`/nnpfs/bsd + KERNEL_INCLUDE=-I/usr/include -I`(cd $srcdir; pwd)`/nnpfs/bsd KERNEL_SRCS='bsd-subr.c' KERNEL=`sysctl -n kern.bootfile` @@ -7462,7 +7462,7 @@ esac shift done - KERNEL_CPPFLAGS="${KERNEL_CPPFLAGS} -I. $defs${defs:+ }$flags${flags:+ }$incl" + KERNEL_CPPFLAGS="${KERNEL_CPPFLAGS} -I/usr/include -I. $defs${defs:+ }$flags${flags:+ }$incl" test_KERNEL_CFLAGS="${KERNEL_CFLAGS}" KERNEL_LD='ld' @@ -9994,6 +9994,7 @@ + for ac_header in \ arpa/inet.h \ arpa/nameser.h \ @@ -10046,6 +10047,7 @@ sys/mutex.h \ sys/param.h \ sys/prctl.h \ + sys/priv.h \ sys/poll.h \ sys/pool.h \ sys/queue.h \ @@ -11756,7 +11758,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 11759 "configure"' > conftest.$ac_ext + echo '#line 11761 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13916,11 +13918,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13919: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13921: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13923: \$? = $ac_status" >&5 + echo "$as_me:13925: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14206,11 +14208,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14209: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14211: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14213: \$? = $ac_status" >&5 + echo "$as_me:14215: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14310,11 +14312,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14313: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14315: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14317: \$? = $ac_status" >&5 + echo "$as_me:14319: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16659,7 +16661,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:19184: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19186: \$? = $ac_status" >&5 + echo "$as_me:19188: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19283,11 +19285,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19286: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19288: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19290: \$? = $ac_status" >&5 + echo "$as_me:19292: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20845,11 +20847,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20848: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20850: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20852: \$? = $ac_status" >&5 + echo "$as_me:20854: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -20949,11 +20951,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20952: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20954: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20956: \$? = $ac_status" >&5 + echo "$as_me:20958: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -23136,11 +23138,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:23139: $lt_compile\"" >&5) + (eval echo "\"\$as_me:23141: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:23143: \$? = $ac_status" >&5 + echo "$as_me:23145: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -23426,11 +23428,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:23429: $lt_compile\"" >&5) + (eval echo "\"\$as_me:23431: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:23433: \$? = $ac_status" >&5 + echo "$as_me:23435: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -23530,11 +23532,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:23533: $lt_compile\"" >&5) + (eval echo "\"\$as_me:23535: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:23537: \$? = $ac_status" >&5 + echo "$as_me:23539: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -54822,11 +54824,13 @@ udev2dev \ snprintf \ suser_ucred \ +priv_check \ namei_hash \ nosys \ sys_nosys \ sys_lkmnosys \ cache_purgevfs \ +insmntque \ do { echo "$as_me:$LINENO: checking for $ac_func in kernel" >&5 @@ -54867,7 +54871,7 @@ fi else cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -56380,7 +56388,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -56456,7 +56464,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -56532,7 +56540,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -56598,6 +56606,315 @@ fi +{ echo "$as_me:$LINENO: checking if VOP_UNLOCK takes one argument" >&5 +echo $ECHO_N "checking if VOP_UNLOCK takes one argument... $ECHO_C" >&6; } +if test "${ac_cv_func_vop_unlock_one_arg+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +save_CFLAGS="$CFLAGS" +save_CC="$CC" +if test "X${KERNEL_CC}" != "X"; then + CC="$KERNEL_CC" +fi +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include + +int +main () +{ +VOP_UNLOCK(0) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_func_vop_unlock_one_arg=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_vop_unlock_one_arg=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS="$save_CFLAGS" +CC="$save_CC" + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_vop_unlock_one_arg" >&5 +echo "${ECHO_T}$ac_cv_func_vop_unlock_one_arg" >&6; } +if test "$ac_cv_func_vop_unlock_one_arg" = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_ONE_ARGUMENT_VOP_UNLOCK 1 +_ACEOF + +fi + +{ echo "$as_me:$LINENO: checking if VOP_UNLOCK takes two arguments" >&5 +echo $ECHO_N "checking if VOP_UNLOCK takes two arguments... $ECHO_C" >&6; } +if test "${ac_cv_func_vop_unlock_two_args+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +save_CFLAGS="$CFLAGS" +save_CC="$CC" +if test "X${KERNEL_CC}" != "X"; then + CC="$KERNEL_CC" +fi +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include + +int +main () +{ +VOP_UNLOCK(0, 0) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_func_vop_unlock_two_args=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_vop_unlock_two_args=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS="$save_CFLAGS" +CC="$save_CC" + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_vop_unlock_two_args" >&5 +echo "${ECHO_T}$ac_cv_func_vop_unlock_two_args" >&6; } +if test "$ac_cv_func_vop_unlock_two_args" = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_TWO_ARGUMENT_VOP_UNLOCK 1 +_ACEOF + +fi + +{ echo "$as_me:$LINENO: checking if VOP_UNLOCK takes three arguments" >&5 +echo $ECHO_N "checking if VOP_UNLOCK takes three arguments... $ECHO_C" >&6; } +if test "${ac_cv_func_vop_unlock_three_args+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +save_CFLAGS="$CFLAGS" +save_CC="$CC" +if test "X${KERNEL_CC}" != "X"; then + CC="$KERNEL_CC" +fi +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include + +int +main () +{ +VOP_UNLOCK(0, 0, 0) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_func_vop_unlock_three_args=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_vop_unlock_three_args=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS="$save_CFLAGS" +CC="$save_CC" + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_vop_unlock_three_args" >&5 +echo "${ECHO_T}$ac_cv_func_vop_unlock_three_args" >&6; } +if test "$ac_cv_func_vop_unlock_three_args" = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_THREE_ARGUMENT_VOP_UNLOCK 1 +_ACEOF + +fi + + +{ echo "$as_me:$LINENO: checking if VOP_OPEN takes a struct file final argument" >&5 +echo $ECHO_N "checking if VOP_OPEN takes a struct file final argument... $ECHO_C" >&6; } +if test "${ac_cv_func_vop_open_file_arg+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + save_CFLAGS2="$CFLAGS" +CFLAGS="$CFLAGS -Werror" + +save_CFLAGS="$CFLAGS" +save_CC="$CC" +if test "X${KERNEL_CC}" != "X"; then + CC="$KERNEL_CC" +fi +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include + +int +main () +{ +VOP_OPEN(NULL, 0, NULL, NULL, (struct file *)NULL) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_func_vop_open_file_arg=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_vop_open_file_arg=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS="$save_CFLAGS" +CC="$save_CC" + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_vop_open_file_arg" >&5 +echo "${ECHO_T}$ac_cv_func_vop_open_file_arg" >&6; } +if test "$ac_cv_func_vop_open_file_arg" = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FINAL_ARG_FILE_VOP_OPEN 1 +_ACEOF + +fi +CFLAGS="$save_CFLAGS2" + + { echo "$as_me:$LINENO: checking if vfs_busy takes three arguments" >&5 echo $ECHO_N "checking if vfs_busy takes three arguments... $ECHO_C" >&6; } if test "${ac_cv_func_vfs_busy_three_args+set}" = set; then @@ -56609,7 +56926,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -56686,7 +57003,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -56753,6 +57070,94 @@ fi +{ echo "$as_me:$LINENO: checking if VFS_QUOTACTL takes caddr_t argument" >&5 +echo $ECHO_N "checking if VFS_QUOTACTL takes caddr_t argument... $ECHO_C" >&6; } +if test "${ac_cv_func_vfs_quotactl_caddr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +save_CFLAGS="$CFLAGS" +save_CC="$CC" +if test "X${KERNEL_CC}" != "X"; then + CC="$KERNEL_CC" +fi +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include +#include + +vfs_quotactl_t foo_quotactl; + +int +foo_quotactl(struct mount *mp, int cmds, uid_t uid, caddr_t arg, + struct thread *td) +{ + + return (0); +} + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_func_vfs_quotactl_caddr=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_vfs_quotactl_caddr=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS="$save_CFLAGS" +CC="$save_CC" + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_vfs_quotactl_caddr" >&5 +echo "${ECHO_T}$ac_cv_func_vfs_quotactl_caddr" >&6; } +if test "$ac_cv_func_vfs_quotactl_caddr" = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_VFS_QUOTACTL_CADDR 1 +_ACEOF + +fi + + { echo "$as_me:$LINENO: checking if vget takes one argument" >&5 echo $ECHO_N "checking if vget takes one argument... $ECHO_C" >&6; } if test "${ac_cv_func_vget_one_args+set}" = set; then @@ -56764,7 +57169,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -56843,7 +57248,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -56919,7 +57324,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -56995,7 +57400,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -57067,18 +57472,97 @@ fi +{ echo "$as_me:$LINENO: checking if vnode_create_vobject takes three arguments" >&5 +echo $ECHO_N "checking if vnode_create_vobject takes three arguments... $ECHO_C" >&6; } +if test "${ac_cv_func_vnode_create_vobject+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +save_CFLAGS="$CFLAGS" +save_CC="$CC" +if test "X${KERNEL_CC}" != "X"; then + CC="$KERNEL_CC" +fi +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_SYS_CDEFS_H +#include +#endif +#include +#include +#include +#include +#include + +int +main () +{ +vnode_create_vobject(0, 0, 0) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_func_vnode_create_vobject_three_args=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_vnode_create_vobject_three_args=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS="$save_CFLAGS" +CC="$save_CC" + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_vnode_create_vobject" >&5 +echo "${ECHO_T}$ac_cv_func_vnode_create_vobject" >&6; } +if test "$ac_cv_func_vnode_create_vobject_three_args" = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_THREE_ARGUMENT_VNODE_CREATE_VOBJ 1 +_ACEOF + +fi + + { echo "$as_me:$LINENO: checking if suser takes two arguments" >&5 echo $ECHO_N "checking if suser takes two arguments... $ECHO_C" >&6; } if test "${ac_cv_func_suser_two_args+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + save_CFLAGS2="$CFLAGS" +CFLAGS="-Werror $CFLAGS" save_CFLAGS="$CFLAGS" save_CC="$CC" if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -57142,6 +57626,7 @@ _ACEOF fi +CFLAGS="$save_CFLAGS2" for ac_func in vfs_getnewfsid @@ -57184,7 +57669,7 @@ fi else cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -57415,7 +57900,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -57521,7 +58006,7 @@ fi else cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -57751,7 +58236,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -57834,7 +58319,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -57915,7 +58400,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -58257,7 +58742,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -58353,7 +58838,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -58449,7 +58934,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -58530,7 +59015,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -58611,7 +59096,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -58694,7 +59179,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -58775,7 +59260,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -58856,7 +59341,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -58937,7 +59422,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -59018,7 +59503,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -59099,7 +59584,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -59183,7 +59668,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -59269,7 +59754,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -59350,7 +59835,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -59431,7 +59916,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -59512,7 +59997,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -59593,7 +60078,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -59674,7 +60159,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -59755,7 +60240,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -59836,7 +60321,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -59919,7 +60404,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -60002,7 +60487,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -60098,7 +60583,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -60179,7 +60664,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -60260,7 +60745,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -60341,7 +60826,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -60440,7 +60925,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -60539,7 +61024,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -60623,7 +61108,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -60707,7 +61192,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -60791,7 +61276,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -60875,7 +61360,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -60959,7 +61444,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -61043,7 +61528,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -61127,7 +61612,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -61211,7 +61696,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -61295,7 +61780,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -61379,7 +61864,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -61463,7 +61948,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -61547,7 +62032,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -61631,7 +62116,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -61713,7 +62198,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -61959,7 +62444,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -62041,7 +62526,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -62217,7 +62702,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -62440,7 +62925,7 @@ if test "X${KERNEL_CC}" != "X"; then CC="$KERNEL_CC" fi -CFLAGS="$CFLAGS $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" +CFLAGS="$CFLAGS -I/usr/include $test_KERNEL_CFLAGS $KERNEL_CPPFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -62560,7 +63045,7 @@ fi else cat > conftest.$ac_ext <= 58 #define AFS_SYSCALL 65 #endif +#endif #if defined(__hpux) #define AFS_SYSCALL 50 diff -u -r -N ../arla-20080223-orig/include/config.h.in ./include/config.h.in --- ../arla-20080223-orig/include/config.h.in 2008-01-18 08:28:59.000000000 -0600 +++ ./include/config.h.in 2008-02-23 11:24:22.000000000 -0600 @@ -205,6 +205,9 @@ /* Define to 1 if you have the `fhopen' function. */ #undef HAVE_FHOPEN +/* define if VOP_OPEN takes a file final argument */ +#undef HAVE_FINAL_ARG_FILE_VOP_OPEN + /* Define if you have the function `flock'. */ #undef HAVE_FLOCK @@ -446,6 +449,9 @@ /* Define to 1 if you have the `kernel_genfs_revoke' function. */ #undef HAVE_KERNEL_GENFS_REVOKE +/* Define to 1 if you have the `kernel_insmntque' function. */ +#undef HAVE_KERNEL_INSMNTQUE + /* Define to 1 if you have the `kernel_kauth_cred_getuid' function. */ #undef HAVE_KERNEL_KAUTH_CRED_GETUID @@ -467,6 +473,9 @@ /* Define to 1 if you have the `kernel_nosys' function. */ #undef HAVE_KERNEL_NOSYS +/* Define to 1 if you have the `kernel_priv_check' function. */ +#undef HAVE_KERNEL_PRIV_CHECK + /* Define to 1 if you have the `kernel_snprintf' function. */ #undef HAVE_KERNEL_SNPRINTF @@ -694,6 +703,9 @@ /* define if VOP_LOCK takes one argument */ #undef HAVE_ONE_ARGUMENT_VOP_LOCK +/* define if VOP_UNLOCK takes one argument */ +#undef HAVE_ONE_ARGUMENT_VOP_UNLOCK + /* Define to 1 if you have the `on_exit' function. */ #undef HAVE_ON_EXIT @@ -1162,6 +1174,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PRCTL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PRIV_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PROC_H @@ -1267,9 +1282,15 @@ /* define if vget takes three arguments */ #undef HAVE_THREE_ARGUMENT_VGET +/* define if vnode_create_vobject takes three arguments */ +#undef HAVE_THREE_ARGUMENT_VNODE_CREATE_VOBJ + /* define if VOP_LOCK takes three arguments */ #undef HAVE_THREE_ARGUMENT_VOP_LOCK +/* define if VOP_UNLOCK takes three arguments */ +#undef HAVE_THREE_ARGUMENT_VOP_UNLOCK + /* Define to 1 if you have the `thr_yield' function. */ #undef HAVE_THR_YIELD @@ -1294,6 +1315,9 @@ /* define if VOP_LOCK takes two arguments */ #undef HAVE_TWO_ARGUMENT_VOP_LOCK +/* define if VOP_UNLOCK takes two arguments */ +#undef HAVE_TWO_ARGUMENT_VOP_UNLOCK + /* Define to 1 if you have the `uint16_t' function. */ #undef HAVE_UINT16_T @@ -1363,6 +1387,9 @@ /* Define if you have the function `verrx'. */ #undef HAVE_VERRX +/* define if VFS_QUOTACTL takes a caddr_t argument */ +#undef HAVE_VFS_QUOTACTL_CADDR + /* Define to 1 if you have the `vis' function. */ #undef HAVE_VIS diff -u -r -N ../arla-20080223-orig/include/config.h.in~ ./include/config.h.in~ --- ../arla-20080223-orig/include/config.h.in~ 1969-12-31 18:00:00.000000000 -0600 +++ ./include/config.h.in~ 2008-02-23 11:11:35.000000000 -0600 @@ -0,0 +1,1701 @@ +/* include/config.h.in. Generated from configure.in by autoheader. */ + +#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY +#define OPENSSL_DES_LIBDES_COMPATIBILITY 1 +#endif + +#ifndef RCSID +#define RCSID(msg) \ +static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg } +#endif + +/* Maximum values on all known systems */ +#define MaxHostNameLen (64+4) +#define MaxPathLen (1024+4) + + + +/* Define to pull in bind8 glue for darwin. */ +#undef BIND_8_COMPAT + +/* Define if realloc(NULL) doesn't work. */ +#undef BROKEN_REALLOC + +/* define if you can include both dirent.h and sys/dir.h */ +#undef DIRENT_AND_SYS_DIR_H + +/* define if DIRSIZ is defined in dirent.h */ +#undef DIRSIZ_IN_DIRENT_H + +/* define if DIRSIZ is defined in sys/dir.h */ +#undef DIRSIZ_IN_SYS_DIR_H + +/* how should ntohl be done? */ +#undef EFF_NTOHL + +/* define if sys/param.h defines the endiness */ +#undef ENDIANESS_IN_SYS_PARAM_H + +/* define if DIRSIZ is defined in sys/dirent.h */ +#undef GENERIC_DIRSIZ_IN_SYS_DIRENT_H + +/* define if prototype of gethostbyaddr is compatible with struct hostent + *gethostbyaddr(const void *, size_t, int) */ +#undef GETHOSTBYADDR_PROTO_COMPATIBLE + +/* define if prototype of gethostbyname is compatible with struct hostent + *gethostbyname(const char *) */ +#undef GETHOSTBYNAME_PROTO_COMPATIBLE + +/* define if prototype of getservbyname is compatible with struct servent + *getservbyname(const char *, const char *) */ +#undef GETSERVBYNAME_PROTO_COMPATIBLE + +/* define if prototype of getsockname is compatible with int getsockname(int, + struct sockaddr*, socklen_t*) */ +#undef GETSOCKNAME_PROTO_COMPATIBLE + +/* define to enable groups-based pags on linux */ +#undef GROUPPAGS + +/* Define if you have the `altzone' variable. */ +#undef HAVE_ALTZONE + +/* define if your system declares altzone */ +#undef HAVE_ALTZONE_DECLARATION + +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_INET_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_NAMESER_H + +/* Define to 1 if you have the `asnprintf' function. */ +#undef HAVE_ASNPRINTF + +/* Define to 1 if you have the `asprintf' function. */ +#undef HAVE_ASPRINTF + +/* Define to 1 if you have the `atexit' function. */ +#undef HAVE_ATEXIT + +/* Define to 1 if you have the `bool' function. */ +#undef HAVE_BOOL + +/* Define to 1 if you have the `bswap16' function. */ +#undef HAVE_BSWAP16 + +/* Define to 1 if you have the `bswap32' function. */ +#undef HAVE_BSWAP32 + +/* Define to 1 if you have the `cgetent' function. */ +#undef HAVE_CGETENT + +/* Define if you have the function `chown'. */ +#undef HAVE_CHOWN + +/* Define to 1 if you have the header file. */ +#undef HAVE_COM_ERR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_CONFIG_H + +/* Define if you have the function `copyhostent'. */ +#undef HAVE_COPYHOSTENT + +/* Define to 1 if you have the `crypt' function. */ +#undef HAVE_CRYPT + +/* Define to 1 if you have the header file. */ +#undef HAVE_CRYPT_H + +/* Define if you have the function `daemon'. */ +#undef HAVE_DAEMON + +/* define if you have a berkeley db1/2 library */ +#undef HAVE_DB1 + +/* define if you have a berkeley db3/4 library */ +#undef HAVE_DB3 + +/* Define to 1 if you have the header file. */ +#undef HAVE_DB3_DB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_DB4_DB_H + +/* Define to 1 if you have the `dbm_firstkey' function. */ +#undef HAVE_DBM_FIRSTKEY + +/* Define to 1 if you have the header file. */ +#undef HAVE_DBM_H + +/* Define to 1 if you have the `dbopen' function. */ +#undef HAVE_DBOPEN + +/* Define to 1 if you have the header file. */ +#undef HAVE_DB_185_H + +/* Define to 1 if you have the `db_create' function. */ +#undef HAVE_DB_CREATE + +/* Define to 1 if you have the header file. */ +#undef HAVE_DB_H + +/* define if you have ndbm compat in db */ +#undef HAVE_DB_NDBM + +/* Define if you have struct setgroups_args */ +#undef HAVE_DEF_STRUCT_SETGROUPS_ARGS + +/* Define if you have struct sys_setgroups_args */ +#undef HAVE_DEF_STRUCT_SYS_SETGROUPS_ARGS + +/* Define to 1 if you have the header file. */ +#undef HAVE_DIRENT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the `dn_expand' function. */ +#undef HAVE_DN_EXPAND + +/* Define if you have the function `ecalloc'. */ +#undef HAVE_ECALLOC + +/* Define to 1 if you have the header file. */ +#undef HAVE_ELFLIB_NLIST_H + +/* Define to 1 if you have the `el_init' function. */ +#undef HAVE_EL_INIT + +/* Define if you have the function `emalloc'. */ +#undef HAVE_EMALLOC + +/* define if your system declares environ */ +#undef HAVE_ENVIRON_DECLARATION + +/* Define if you have the function `erealloc'. */ +#undef HAVE_EREALLOC + +/* Define if you have the function `err'. */ +#undef HAVE_ERR + +/* Define to 1 if you have the header file. */ +#undef HAVE_ERRNO_H + +/* Define if you have the function `errx'. */ +#undef HAVE_ERRX + +/* Define to 1 if you have the header file. */ +#undef HAVE_ERR_H + +/* Define if you have the function `estrdup'. */ +#undef HAVE_ESTRDUP + +/* Define to 1 if you have the header file. */ +#undef HAVE_ET_COM_ERR_H + +/* Define if you have the function `fchown'. */ +#undef HAVE_FCHOWN + +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if you have the `fhopen' function. */ +#undef HAVE_FHOPEN + +/* define if VOP_OPEN takes a file final argument */ +#undef HAVE_FINAL_ARG_FILE_VOP_OPEN + +/* Define if you have the function `flock'. */ +#undef HAVE_FLOCK + +/* Define if you have the function `fnmatch'. */ +#undef HAVE_FNMATCH + +/* Define to 1 if you have the header file. */ +#undef HAVE_FNMATCH_H + +/* define if lockmgr takes four arguments */ +#undef HAVE_FOUR_ARGUMENT_LOCKMGR + +/* define if vfs_busy takes four arguments */ +#undef HAVE_FOUR_ARGUMENT_VFS_BUSY + +/* if vfs_object_create takes four arguments */ +#undef HAVE_FOUR_ARGUMENT_VFS_OBJECT_CREATE + +/* define if vget takes four arguments */ +#undef HAVE_FOUR_ARGUMENT_VGET + +/* Define to 1 if you have the `freeaddrinfo' function. */ +#undef HAVE_FREEADDRINFO + +/* Define if you have the function `freehostent'. */ +#undef HAVE_FREEHOSTENT + +/* Define to 1 if you have the `gai_strerror' function. */ +#undef HAVE_GAI_STRERROR + +/* Define to 1 if you have the header file. */ +#undef HAVE_GDBM_NDBM_H + +/* Define to 1 if you have the `getaddrinfo' function. */ +#undef HAVE_GETADDRINFO + +/* Define to 1 if you have the header file. */ +#undef HAVE_GETARG_H + +/* Define to 1 if you have the `getattrlist' function. */ +#undef HAVE_GETATTRLIST + +/* Define to 1 if you have the `getconfattr' function. */ +#undef HAVE_GETCONFATTR + +/* Define if you have the function `getcwd'. */ +#undef HAVE_GETCWD + +/* Define if you have the function `getdtablesize'. */ +#undef HAVE_GETDTABLESIZE + +/* Define if you have the function `getegid'. */ +#undef HAVE_GETEGID + +/* Define if you have the function `geteuid'. */ +#undef HAVE_GETEUID + +/* Define to 1 if you have the `getfh' function. */ +#undef HAVE_GETFH + +/* Define if you have the function `getgid'. */ +#undef HAVE_GETGID + +/* Define to 1 if you have the `gethostbyname' function. */ +#undef HAVE_GETHOSTBYNAME + +/* Define to 1 if you have the `gethostbyname2' function. */ +#undef HAVE_GETHOSTBYNAME2 + +/* Define if you have the function `gethostname'. */ +#undef HAVE_GETHOSTNAME + +/* Define if you have the function `getifaddrs'. */ +#undef HAVE_GETIFADDRS + +/* Define if you have the function `getipnodebyaddr'. */ +#undef HAVE_GETIPNODEBYADDR + +/* Define if you have the function `getipnodebyname'. */ +#undef HAVE_GETIPNODEBYNAME + +/* Define to 1 if you have the `getlogin' function. */ +#undef HAVE_GETLOGIN + +/* Define to 1 if you have the `getnameinfo' function. */ +#undef HAVE_GETNAMEINFO + +/* Define if you have the function `getopt'. */ +#undef HAVE_GETOPT + +/* Define to 1 if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE + +/* Define to 1 if you have the `getprogname' function. */ +#undef HAVE_GETPROGNAME + +/* Define to 1 if you have the `getrlimit' function. */ +#undef HAVE_GETRLIMIT + +/* Define to 1 if you have the `getrusage' function. */ +#undef HAVE_GETRUSAGE + +/* Define to 1 if you have the `getsockopt' function. */ +#undef HAVE_GETSOCKOPT + +/* Define to 1 if you have the `getspnam' function. */ +#undef HAVE_GETSPNAM + +/* Define if you have the function `gettimeofday'. */ +#undef HAVE_GETTIMEOFDAY + +/* Define if you have the function `getuid'. */ +#undef HAVE_GETUID + +/* Define if you have the function `getusershell'. */ +#undef HAVE_GETUSERSHELL + +/* define if you have a glibc-based system */ +#undef HAVE_GLIBC + +/* define if you have a glob() that groks GLOB_BRACE, GLOB_NOCHECK, + GLOB_QUOTE, GLOB_TILDE, and GLOB_LIMIT */ +#undef HAVE_GLOB + +/* Define to 1 if you have the header file. */ +#undef HAVE_GLOB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GRP_H + +/* Define to 1 if you have the `hstrerror' function. */ +#undef HAVE_HSTRERROR + +/* Define if you have the `h_errlist' variable. */ +#undef HAVE_H_ERRLIST + +/* define if your system declares h_errlist */ +#undef HAVE_H_ERRLIST_DECLARATION + +/* Define if you have the `h_errno' variable. */ +#undef HAVE_H_ERRNO + +/* define if your system declares h_errno */ +#undef HAVE_H_ERRNO_DECLARATION + +/* Define if you have the `h_nerr' variable. */ +#undef HAVE_H_NERR + +/* define if your system declares h_nerr */ +#undef HAVE_H_NERR_DECLARATION + +/* Define to 1 if you have the header file. */ +#undef HAVE_IFADDRS_H + +/* Define if you have the in6addr_loopback variable */ +#undef HAVE_IN6ADDR_LOOPBACK + +/* define */ +#undef HAVE_INET_ATON + +/* define */ +#undef HAVE_INET_NTOP + +/* define */ +#undef HAVE_INET_PTON + +/* Define if you have the function `initgroups'. */ +#undef HAVE_INITGROUPS + +/* Define to 1 if you have the `initstate' function. */ +#undef HAVE_INITSTATE + +/* define if you have a function init_MUTEX */ +#undef HAVE_INIT_MUTEX + +/* Define if you have the function `innetgr'. */ +#undef HAVE_INNETGR + +/* Define to 1 if you have the `int16' function. */ +#undef HAVE_INT16 + +/* Define to 1 if you have the `int16_t' function. */ +#undef HAVE_INT16_T + +/* Define to 1 if you have the `int32' function. */ +#undef HAVE_INT32 + +/* Define to 1 if you have the `int32_t' function. */ +#undef HAVE_INT32_T + +/* Define to 1 if you have the `int64_t' function. */ +#undef HAVE_INT64_T + +/* Define to 1 if you have the `int8_t' function. */ +#undef HAVE_INT8_T + +/* Define to 1 if you have the `intptr_t' function. */ +#undef HAVE_INTPTR_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define if you have IPv6. */ +#undef HAVE_IPV6 + +/* Define if you have the function `iruserok'. */ +#undef HAVE_IRUSEROK + +/* Define to 1 if you have the `issetugid' function. */ +#undef HAVE_ISSETUGID + +/* define if you have kafs_settoken_rxkad */ +#undef HAVE_KAFS_SETTOKEN_RXKAD + +/* Define to 1 if you have the `kernel_aout_sysent' function. */ +#undef HAVE_KERNEL_AOUT_SYSENT + +/* Define to 1 if you have the `kernel_cache_purgevfs' function. */ +#undef HAVE_KERNEL_CACHE_PURGEVFS + +/* Define to 1 if you have the `kernel_cdevsw_add' function. */ +#undef HAVE_KERNEL_CDEVSW_ADD + +/* Define to 1 if you have the `kernel_debuglockmgr' function. */ +#undef HAVE_KERNEL_DEBUGLOCKMGR + +/* Define to 1 if you have the `kernel_devtoname' function. */ +#undef HAVE_KERNEL_DEVTONAME + +/* Define to 1 if you have the `kernel_doforce' function. */ +#undef HAVE_KERNEL_DOFORCE + +/* Define to 1 if you have the `kernel_findcdev' function. */ +#undef HAVE_KERNEL_FINDCDEV + +/* Define to 1 if you have the `kernel_genfs_mmap' function. */ +#undef HAVE_KERNEL_GENFS_MMAP + +/* Define to 1 if you have the `kernel_genfs_revoke' function. */ +#undef HAVE_KERNEL_GENFS_REVOKE + +/* Define to 1 if you have the `kernel_insmntque' function. */ +#undef HAVE_KERNEL_INSMNTQUE + +/* Define to 1 if you have the `kernel_kauth_cred_getuid' function. */ +#undef HAVE_KERNEL_KAUTH_CRED_GETUID + +/* Define to 1 if you have the `kernel_lf_advlock' function. */ +#undef HAVE_KERNEL_LF_ADVLOCK + +/* Define to 1 if you have the `kernel_lockmgr' function. */ +#undef HAVE_KERNEL_LOCKMGR + +/* Define to 1 if you have the `kernel_lockstatus' function. */ +#undef HAVE_KERNEL_LOCKSTATUS + +/* Define to 1 if you have the `kernel_memcpy' function. */ +#undef HAVE_KERNEL_MEMCPY + +/* Define to 1 if you have the `kernel_namei_hash' function. */ +#undef HAVE_KERNEL_NAMEI_HASH + +/* Define to 1 if you have the `kernel_nosys' function. */ +#undef HAVE_KERNEL_NOSYS + +/* Define to 1 if you have the `kernel_priv_check' function. */ +#undef HAVE_KERNEL_PRIV_CHECK + +/* Define to 1 if you have the `kernel_snprintf' function. */ +#undef HAVE_KERNEL_SNPRINTF + +/* Define to 1 if you have the `kernel_strlcpy' function. */ +#undef HAVE_KERNEL_STRLCPY + +/* Define to 1 if you have the `kernel_suser_ucred' function. */ +#undef HAVE_KERNEL_SUSER_UCRED + +/* Define to 1 if you have the `kernel_sys_lkmnosys' function. */ +#undef HAVE_KERNEL_SYS_LKMNOSYS + +/* Define to 1 if you have the `kernel_sys_nosys' function. */ +#undef HAVE_KERNEL_SYS_NOSYS + +/* Define to 1 if you have the `kernel_udev2dev' function. */ +#undef HAVE_KERNEL_UDEV2DEV + +/* Define to 1 if you have the `kernel_uma_zfree_arg' function. */ +#undef HAVE_KERNEL_UMA_ZFREE_ARG + +/* define if we only can include uvm headers */ +#undef HAVE_KERNEL_UVM_ONLY + +/* Define to 1 if you have the `kernel_vfs_add_vnodeops' function. */ +#undef HAVE_KERNEL_VFS_ADD_VNODEOPS + +/* Define to 1 if you have the `kernel_vfs_attach' function. */ +#undef HAVE_KERNEL_VFS_ATTACH + +/* Define to 1 if you have the `kernel_vfs_cache_lookup' function. */ +#undef HAVE_KERNEL_VFS_CACHE_LOOKUP + +/* Define to 1 if you have the `kernel_vfs_deallocate_syncvnode' function. */ +#undef HAVE_KERNEL_VFS_DEALLOCATE_SYNCVNODE + +/* Define to 1 if you have the `kernel_vfs_getnewfsid' function. */ +#undef HAVE_KERNEL_VFS_GETNEWFSID + +/* Define to 1 if you have the `kernel_vfs_getvfs' function. */ +#undef HAVE_KERNEL_VFS_GETVFS + +/* Define to 1 if you have the `kernel_vfs_object_create' function. */ +#undef HAVE_KERNEL_VFS_OBJECT_CREATE + +/* Define to 1 if you have the `kernel_vfs_opv_init' function. */ +#undef HAVE_KERNEL_VFS_OPV_INIT + +/* Define to 1 if you have the `kernel_vfs_opv_init_default' function. */ +#undef HAVE_KERNEL_VFS_OPV_INIT_DEFAULT + +/* Define to 1 if you have the `kernel_vfs_opv_init_explicit' function. */ +#undef HAVE_KERNEL_VFS_OPV_INIT_EXPLICIT + +/* Define to 1 if you have the `kernel_vfs_register' function. */ +#undef HAVE_KERNEL_VFS_REGISTER + +/* Define to 1 if you have the `kernel_vgonel' function. */ +#undef HAVE_KERNEL_VGONEL + +/* Define to 1 if you have the `kernel_vnode_pager_generic_getpages' function. + */ +#undef HAVE_KERNEL_VNODE_PAGER_GENERIC_GETPAGES + +/* Define to 1 if you have the `kernel_vnode_pager_generic_putpages' function. + */ +#undef HAVE_KERNEL_VNODE_PAGER_GENERIC_PUTPAGES + +/* Define to 1 if you have the `kernel_vnode_pager_setsize' function. */ +#undef HAVE_KERNEL_VNODE_PAGER_SETSIZE + +/* Define to 1 if you have the `kernel_vop_revoke' function. */ +#undef HAVE_KERNEL_VOP_REVOKE + +/* Define to 1 if you have the `kernel_vop_stdpathconf' function. */ +#undef HAVE_KERNEL_VOP_STDPATHCONF + +/* Define to 1 if you have the `kernel_zfree' function. */ +#undef HAVE_KERNEL_ZFREE + +/* Define to 1 if you have the `kernel_zfreei' function. */ +#undef HAVE_KERNEL_ZFREEI + +/* define if you have kerberos 4 */ +#undef HAVE_KRB4 + +/* define if you have kerberos 5 */ +#undef HAVE_KRB5 + +/* define if you have kerberos 4 compat */ +#undef HAVE_KRB5_COMPAT_KRB4 + +/* Define to 1 if you have the header file. */ +#undef HAVE_KTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBELF_NLIST_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_DEVFS_FS_H + +/* Define to 1 if you have the `linux_kernel_int16_t' function. */ +#undef HAVE_LINUX_KERNEL_INT16_T + +/* Define to 1 if you have the `linux_kernel_int32_t' function. */ +#undef HAVE_LINUX_KERNEL_INT32_T + +/* Define to 1 if you have the `linux_kernel_int64_t' function. */ +#undef HAVE_LINUX_KERNEL_INT64_T + +/* Define to 1 if you have the `linux_kernel_int8_t' function. */ +#undef HAVE_LINUX_KERNEL_INT8_T + +/* Define to 1 if you have the `linux_kernel_uint16_t' function. */ +#undef HAVE_LINUX_KERNEL_UINT16_T + +/* Define to 1 if you have the `linux_kernel_uint32_t' function. */ +#undef HAVE_LINUX_KERNEL_UINT32_T + +/* Define to 1 if you have the `linux_kernel_uint64_t' function. */ +#undef HAVE_LINUX_KERNEL_UINT64_T + +/* Define to 1 if you have the `linux_kernel_uint8_t' function. */ +#undef HAVE_LINUX_KERNEL_UINT8_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_STDDEF_H + +/* define if there exists a localtime_r */ +#undef HAVE_LOCALTIME_R + +/* Define to 1 if the system has the type `long long'. */ +#undef HAVE_LONG_LONG + +/* Define if you have the function `lstat'. */ +#undef HAVE_LSTAT + +/* Define to 1 if you have the header file. */ +#undef HAVE_MACHINE_ASM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MACHINE_REGDEF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MACH_ALPHA_ASM_H + +/* Define if you have the function `memmove'. */ +#undef HAVE_MEMMOVE + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MISCFS_GENFS_GENFS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MISCFS_SYNCFS_SYNCFS_H + +/* Define if you have the function `mkstemp'. */ +#undef HAVE_MKSTEMP + +/* Define to 1 if you have a working `mmap' system call. */ +#undef HAVE_MMAP + +/* define if you have a ndbm library */ +#undef HAVE_NDBM + +/* Define to 1 if you have the header file. */ +#undef HAVE_NDBM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETDB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET6_IN6_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET6_IN6_VAR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN6_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN6_MACHTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN_SYSTM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_TCP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_IF_DL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_IF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_IF_TYPES_H + +/* Define if NDBM really is DB (creates files *.db) */ +#undef HAVE_NEW_DB + +/* Define to 1 if you have the header file. */ +#undef HAVE_NLIST_H + +/* Define to 1 if you have the `off64_t' function. */ +#undef HAVE_OFF64_T + +/* define if lockstatus takes one argument */ +#undef HAVE_ONE_ARGUMENT_LOCKSTATUS + +/* define if vget takes one argument */ +#undef HAVE_ONE_ARGUMENT_VGET + +/* define if VOP_LOCK takes one argument */ +#undef HAVE_ONE_ARGUMENT_VOP_LOCK + +/* define if VOP_UNLOCK takes one argument */ +#undef HAVE_ONE_ARGUMENT_VOP_UNLOCK + +/* Define to 1 if you have the `on_exit' function. */ +#undef HAVE_ON_EXIT + +/* define if you have openssl */ +#undef HAVE_OPENSSL + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_UI_H + +/* define if your system declares optarg */ +#undef HAVE_OPTARG_DECLARATION + +/* define if your system declares opterr */ +#undef HAVE_OPTERR_DECLARATION + +/* define if your system declares optind */ +#undef HAVE_OPTIND_DECLARATION + +/* define if your system declares optopt */ +#undef HAVE_OPTOPT_DECLARATION + +/* Define if you have the `optreset' variable. */ +#undef HAVE_OPTRESET + +/* define if your system declares optreset */ +#undef HAVE_OPTRESET_DECLARATION + +/* Define to 1 if you have the header file. */ +#undef HAVE_PATHS_H + +/* Define to 1 if you have the `pidfile' function. */ +#undef HAVE_PIDFILE + +/* define if you have sigaction */ +#undef HAVE_POSIX_SIGNALS + +/* Define to 1 if you have the `pthread_create' function. */ +#undef HAVE_PTHREAD_CREATE + +/* Define if you have the function `putenv'. */ +#undef HAVE_PUTENV + +/* Define to 1 if you have the header file. */ +#undef HAVE_PWD_H + +/* Define to 1 if you have the `random' function. */ +#undef HAVE_RANDOM + +/* Define if you have the function `rcmd'. */ +#undef HAVE_RCMD + +/* define if you have a function readline */ +#undef HAVE_READLINE + +/* Define if you have the function `readv'. */ +#undef HAVE_READV + +/* Define if you have the function `recvmsg'. */ +#undef HAVE_RECVMSG + +/* Define to 1 if you have the header file. */ +#undef HAVE_REGDEF_H + +/* Define to 1 if you have the `register_t' function. */ +#undef HAVE_REGISTER_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_RESOLV_H + +/* Define to 1 if you have the `res_init' function. */ +#undef HAVE_RES_INIT + +/* Define to 1 if you have the `res_nsearch' function. */ +#undef HAVE_RES_NSEARCH + +/* Define to 1 if you have the `res_search' function. */ +#undef HAVE_RES_SEARCH + +/* Define to 1 if you have the header file. */ +#undef HAVE_RPCSVC_DBM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_RPCSVC_YPCLNT_H + +/* Define to 1 if the system has the type `sa_family_t'. */ +#undef HAVE_SA_FAMILY_T + +/* Define to 1 if you have the `sched_yield' function. */ +#undef HAVE_SCHED_YIELD + +/* Define if you have the function `sendmsg'. */ +#undef HAVE_SENDMSG + +/* Define to 1 if you have the `setattrlist' function. */ +#undef HAVE_SETATTRLIST + +/* Define if you have the function `setegid'. */ +#undef HAVE_SETEGID + +/* Define if you have the function `setenv'. */ +#undef HAVE_SETENV + +/* Define if you have the function `seteuid'. */ +#undef HAVE_SETEUID + +/* Define to 1 if you have the `setlogin' function. */ +#undef HAVE_SETLOGIN + +/* Define to 1 if you have the `setprogname' function. */ +#undef HAVE_SETPROGNAME + +/* Define to 1 if you have the `setsockopt' function. */ +#undef HAVE_SETSOCKOPT + +/* Define to 1 if you have the `setstate' function. */ +#undef HAVE_SETSTATE + +/* Define to 1 if you have the header file. */ +#undef HAVE_SHADOW_H + +/* define if you have a working snprintf */ +#undef HAVE_SNPRINTF + +/* Define to 1 if you have the `socket' function. */ +#undef HAVE_SOCKET + +/* Define to 1 if the system has the type `socklen_t'. */ +#undef HAVE_SOCKLEN_T + +/* Define to 1 if you have the `ssize_t' function. */ +#undef HAVE_SSIZE_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_STANDARDS_H + +/* Define to 1 if you have the `statvfs' function. */ +#undef HAVE_STATVFS + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define if you have the function `strcasecmp'. */ +#undef HAVE_STRCASECMP + +/* Define if you have the function `strdup'. */ +#undef HAVE_STRDUP + +/* Define if you have the function `strerror'. */ +#undef HAVE_STRERROR + +/* Define if you have the function `strftime'. */ +#undef HAVE_STRFTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define if you have the function `strlcat'. */ +#undef HAVE_STRLCAT + +/* Define if you have the function `strlcpy'. */ +#undef HAVE_STRLCPY + +/* Define if you have the function `strlwr'. */ +#undef HAVE_STRLWR + +/* Define if you have the function `strncasecmp'. */ +#undef HAVE_STRNCASECMP + +/* Define if you have the function `strndup'. */ +#undef HAVE_STRNDUP + +/* Define if you have the function `strnlen'. */ +#undef HAVE_STRNLEN + +/* Define if you have the function `strptime'. */ +#undef HAVE_STRPTIME + +/* Define if you have the function `strsep'. */ +#undef HAVE_STRSEP + +/* Define if you have the function `strsep_copy'. */ +#undef HAVE_STRSEP_COPY + +/* Define to 1 if you have the `strsvis' function. */ +#undef HAVE_STRSVIS + +/* Define if you have the function `strtok_r'. */ +#undef HAVE_STRTOK_R + +/* Define to 1 if you have the `strtoll' function. */ +#undef HAVE_STRTOLL + +/* Define to 1 if you have the `strtoq' function. */ +#undef HAVE_STRTOQ + +/* Define to 1 if the system has the type `struct addrinfo'. */ +#undef HAVE_STRUCT_ADDRINFO + +/* Define if struct cdevsw has field d_bmaj */ +#undef HAVE_STRUCT_CDEVSW_D_BMAJ + +/* Define if struct cdevsw has field d_bogoparms */ +#undef HAVE_STRUCT_CDEVSW_D_BOGOPARMS + +/* Define if struct cdevsw has field d_bogoreset */ +#undef HAVE_STRUCT_CDEVSW_D_BOGORESET + +/* Define if struct cdevsw has field d_devtotty */ +#undef HAVE_STRUCT_CDEVSW_D_DEVTOTTY + +/* Define if struct cdevsw has field d_dump */ +#undef HAVE_STRUCT_CDEVSW_D_DUMP + +/* Define if struct cdevsw has field d_kqfilter */ +#undef HAVE_STRUCT_CDEVSW_D_KQFILTER + +/* Define if struct cdevsw has field d_maxio */ +#undef HAVE_STRUCT_CDEVSW_D_MAXIO + +/* Define if struct cdevsw has field d_mmap */ +#undef HAVE_STRUCT_CDEVSW_D_MMAP + +/* Define if struct cdevsw has field d_psize */ +#undef HAVE_STRUCT_CDEVSW_D_PSIZE + +/* Define if struct cdevsw has field d_reset */ +#undef HAVE_STRUCT_CDEVSW_D_RESET + +/* Define if struct cdevsw has field d_spare */ +#undef HAVE_STRUCT_CDEVSW_D_SPARE + +/* Define if struct cdevsw has field d_stop */ +#undef HAVE_STRUCT_CDEVSW_D_STOP + +/* Define if struct cdevsw has field d_strategy */ +#undef HAVE_STRUCT_CDEVSW_D_STRATEGY + +/* Define if struct componentname has field cn_hash */ +#undef HAVE_STRUCT_COMPONENTNAME_CN_HASH + +/* Define if struct dirent has field d_type. */ +#undef HAVE_STRUCT_DIRENT_D_TYPE + +/* Define to 1 if the system has the type `struct ifaddrs'. */ +#undef HAVE_STRUCT_IFADDRS + +/* Define to 1 if the system has the type `struct iovec'. */ +#undef HAVE_STRUCT_IOVEC + +/* Define if struct mount has field mnt_syncer */ +#undef HAVE_STRUCT_MOUNT_MNT_SYNCER + +/* Define if struct mount has field m_info */ +#undef HAVE_STRUCT_MOUNT_M_INFO + +/* Define to 1 if the system has the type `struct msghdr'. */ +#undef HAVE_STRUCT_MSGHDR + +/* Define if struct proc has field p_sigctx. */ +#undef HAVE_STRUCT_PROC_P_SIGCTX + +/* Define if struct proc has field p_sigmask. */ +#undef HAVE_STRUCT_PROC_P_SIGMASK + +/* Define to 1 if the system has the type `struct sockaddr'. */ +#undef HAVE_STRUCT_SOCKADDR + +/* Define if struct sockaddr_in has field sin_len. */ +#undef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN + +/* Define if struct sockaddr has field sa_len. */ +#undef HAVE_STRUCT_SOCKADDR_SA_LEN + +/* Define to 1 if the system has the type `struct sockaddr_storage'. */ +#undef HAVE_STRUCT_SOCKADDR_STORAGE + +/* define if you have struct spwd */ +#undef HAVE_STRUCT_SPWD + +/* Define if struct sysent has field sy_flags */ +#undef HAVE_STRUCT_SYSENT_SY_FLAGS + +/* Define if struct sysent has field sy_info */ +#undef HAVE_STRUCT_SYSENT_SY_INFO + +/* Define if struct tm has field tm_gmtoff. */ +#undef HAVE_STRUCT_TM_TM_GMTOFF + +/* Define if struct tm has field tm_zone. */ +#undef HAVE_STRUCT_TM_TM_ZONE + +/* Define if struct uio has field uio_procp */ +#undef HAVE_STRUCT_UIO_UIO_PROCP + +/* Define if struct vfsconf has field vfc_mountroot */ +#undef HAVE_STRUCT_VFSCONF_VFC_MOUNTROOT + +/* Define if struct vfsconf has field vfc_refcount */ +#undef HAVE_STRUCT_VFSCONF_VFC_REFCOUNT + +/* Define if struct vfsops has field vfs_checkexp */ +#undef HAVE_STRUCT_VFSOPS_VFS_CHECKEXP + +/* Define if struct vfsops has field vfs_done */ +#undef HAVE_STRUCT_VFSOPS_VFS_DONE + +/* Define if struct vfsops has field vfs_extattrctl */ +#undef HAVE_STRUCT_VFSOPS_VFS_EXTATTRCTL + +/* Define if struct vfsops has field vfs_freevfs */ +#undef HAVE_STRUCT_VFSOPS_VFS_FREEVFS + +/* Define if struct vfsops has field vfs_mount */ +#undef HAVE_STRUCT_VFSOPS_VFS_MOUNT + +/* Define if struct vfsops has field vfs_mountroot */ +#undef HAVE_STRUCT_VFSOPS_VFS_MOUNTROOT + +/* Define if struct vfsops has field vfs_name */ +#undef HAVE_STRUCT_VFSOPS_VFS_NAME + +/* Define if struct vfsops has field vfs_oid */ +#undef HAVE_STRUCT_VFSOPS_VFS_OID + +/* Define if struct vfsops has field vfs_opv_descs */ +#undef HAVE_STRUCT_VFSOPS_VFS_OPV_DESCS + +/* Define if struct vfsops has field vfs_reinit */ +#undef HAVE_STRUCT_VFSOPS_VFS_REINIT + +/* Define if struct vfsops has field vfs_smoothsync */ +#undef HAVE_STRUCT_VFSOPS_VFS_SMOOTHSYNC + +/* Define if struct vfsops has field vfs_snapshot */ +#undef HAVE_STRUCT_VFSOPS_VFS_SNAPSHOT + +/* Define if struct vfsops has field vfs_swapvp */ +#undef HAVE_STRUCT_VFSOPS_VFS_SWAPVP + +/* Define if struct vfsops has field vfs_uninit */ +#undef HAVE_STRUCT_VFSOPS_VFS_UNINIT + +/* Define if struct vfsops has field vfs_wassysctl */ +#undef HAVE_STRUCT_VFSOPS_VFS_WASSYSCTL + +/* Define if struct ViceIoctl has field in */ +#undef HAVE_STRUCT_VICEIOCTL_IN + +/* Define if struct vnode has field v_id */ +#undef HAVE_STRUCT_VNODE_V_ID + +/* Define if struct vop_fsync_args has field a_flags */ +#undef HAVE_STRUCT_VOP_FSYNC_ARGS_A_FLAGS + +/* Define if struct vop_getpages_args has field a_offset */ +#undef HAVE_STRUCT_VOP_GETPAGES_ARGS_A_OFFSET + +/* Define if struct vop_putpages_args has field a_sync */ +#undef HAVE_STRUCT_VOP_PUTPAGES_ARGS_A_SYNC + +/* define if struct winsize is declared in sys/termios.h */ +#undef HAVE_STRUCT_WINSIZE + +/* Define to 1 if you have the `strunvis' function. */ +#undef HAVE_STRUNVIS + +/* Define if you have the function `strupr'. */ +#undef HAVE_STRUPR + +/* Define to 1 if you have the `strvis' function. */ +#undef HAVE_STRVIS + +/* Define to 1 if you have the `strvisx' function. */ +#undef HAVE_STRVISX + +/* Define to 1 if you have the `svis' function. */ +#undef HAVE_SVIS + +/* Define if you have the function `swab'. */ +#undef HAVE_SWAB + +/* Define to 1 if you have the `sysconf' function. */ +#undef HAVE_SYSCONF + +/* Define to 1 if you have the `sysctl' function. */ +#undef HAVE_SYSCTL + +/* Define to 1 if you have the `syslog' function. */ +#undef HAVE_SYSLOG + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYSLOG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_ATTR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_BITYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_BSWAP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_CDEFS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_DIR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_EXEC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_FILE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_IOCCOM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_IOCTL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_KAUTH_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_LIBKERN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_LKM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_LOCK_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MKDEV_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MMAN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MODULE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MOUNT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MUTEX_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_POLL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_POOL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PRCTL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PRIV_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PROC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_QUEUE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_RESOURCE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SELINFO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SIGNALVAR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKIO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STATFS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STATVFS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSCALLARGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSCTL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSENT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSPROTO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSTM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TTY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UBC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UIO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_USER_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UTSNAME_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_VFS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_VFS_PROTO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_VNODE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_WAIT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_TERMIOS_H + +/* Define to 1 if you have the `tgetent' function. */ +#undef HAVE_TGETENT + +/* define if vfs_fhtovp takes three arguments */ +#undef HAVE_THREE_ARGUMENT_FHTOVP + +/* define if selrecord takes three arguments */ +#undef HAVE_THREE_ARGUMENT_SELRECORD + +/* define if vfs_busy takes three arguments */ +#undef HAVE_THREE_ARGUMENT_VFS_BUSY + +/* define if vget takes three arguments */ +#undef HAVE_THREE_ARGUMENT_VGET + +/* define if vnode_create_vobject takes three arguments */ +#undef HAVE_THREE_ARGUMENT_VNODE_CREATE_VOBJ + +/* define if VOP_LOCK takes three arguments */ +#undef HAVE_THREE_ARGUMENT_VOP_LOCK + +/* define if VOP_UNLOCK takes three arguments */ +#undef HAVE_THREE_ARGUMENT_VOP_UNLOCK + +/* Define to 1 if you have the `thr_yield' function. */ +#undef HAVE_THR_YIELD + +/* Define if you have the `timezone' variable. */ +#undef HAVE_TIMEZONE + +/* define if your system declares timezone */ +#undef HAVE_TIMEZONE_DECLARATION + +/* define if lockstatus takes two arguments */ +#undef HAVE_TWO_ARGUMENT_LOCKSTATUS + +/* define if suser takes two arguments */ +#undef HAVE_TWO_ARGUMENT_SUSER + +/* define if vfs_getnewfsid takes two arguments */ +#undef HAVE_TWO_ARGUMENT_VFS_GETNEWFSID + +/* define if vget takes two arguments */ +#undef HAVE_TWO_ARGUMENT_VGET + +/* define if VOP_LOCK takes two arguments */ +#undef HAVE_TWO_ARGUMENT_VOP_LOCK + +/* define if VOP_UNLOCK takes two arguments */ +#undef HAVE_TWO_ARGUMENT_VOP_UNLOCK + +/* Define to 1 if you have the `uint16_t' function. */ +#undef HAVE_UINT16_T + +/* Define to 1 if you have the `uint32_t' function. */ +#undef HAVE_UINT32_T + +/* Define to 1 if you have the `uint64_t' function. */ +#undef HAVE_UINT64_T + +/* Define to 1 if you have the `uint8_t' function. */ +#undef HAVE_UINT8_T + +/* Define to 1 if you have the `uintptr_t' function. */ +#undef HAVE_UINTPTR_T + +/* Define to 1 if you have the `uname' function. */ +#undef HAVE_UNAME + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define if you have the function `unsetenv'. */ +#undef HAVE_UNSETENV + +/* Define to 1 if you have the `unvis' function. */ +#undef HAVE_UNVIS + +/* Define to 1 if you have the header file. */ +#undef HAVE_USERCONF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_USERSEC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UVM_UVM_EXTERN_H + +/* Define to 1 if you have the `u_int16' function. */ +#undef HAVE_U_INT16 + +/* Define to 1 if you have the `u_int16_t' function. */ +#undef HAVE_U_INT16_T + +/* Define to 1 if you have the `u_int32' function. */ +#undef HAVE_U_INT32 + +/* Define to 1 if you have the `u_int32_t' function. */ +#undef HAVE_U_INT32_T + +/* Define to 1 if you have the `u_int64_t' function. */ +#undef HAVE_U_INT64_T + +/* Define to 1 if you have the `u_int8_t' function. */ +#undef HAVE_U_INT8_T + +/* Define to 1 if you have the `vasnprintf' function. */ +#undef HAVE_VASNPRINTF + +/* Define to 1 if you have the `vasprintf' function. */ +#undef HAVE_VASPRINTF + +/* Define if you have the function `verr'. */ +#undef HAVE_VERR + +/* Define if you have the function `verrx'. */ +#undef HAVE_VERRX + +/* define if VFS_QUOTACTL takes a caddr_t argument */ +#undef HAVE_VFS_QUOTACTL_CADDR + +/* Define to 1 if you have the `vis' function. */ +#undef HAVE_VIS + +/* Define to 1 if you have the header file. */ +#undef HAVE_VIS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_VM_UMA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_VM_VM_EXTERN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_VM_VM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_VM_VM_OBJECT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_VM_VM_PAGER_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_VM_VM_ZONE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_VM_VNODE_PAGER_H + +/* define if you have a vop_t */ +#undef HAVE_VOP_T + +/* define if you have a working vsnprintf */ +#undef HAVE_VSNPRINTF + +/* Define if you have the function `vsyslog'. */ +#undef HAVE_VSYSLOG + +/* Define if you have the function `vwarn'. */ +#undef HAVE_VWARN + +/* Define if you have the function `vwarnx'. */ +#undef HAVE_VWARNX + +/* Define if you have the function `warn'. */ +#undef HAVE_WARN + +/* Define if you have the function `warnx'. */ +#undef HAVE_WARNX + +/* Define to 1 if you have the header file. */ +#undef HAVE_WINSOCK_H + +/* Define if you have the function `writev'. */ +#undef HAVE_WRITEV + +/* define if struct winsize has ws_xpixel */ +#undef HAVE_WS_XPIXEL + +/* define if struct winsize has ws_ypixel */ +#undef HAVE_WS_YPIXEL + +/* Define if you have the `_res' variable. */ +#undef HAVE__RES + +/* define if your system declares _res */ +#undef HAVE__RES_DECLARATION + +/* define if your compiler has __attribute__ */ +#undef HAVE___ATTRIBUTE__ + +/* define if your compiler has __FUNCTION__ */ +#undef HAVE___FUNCTION__ + +/* Define if you have the `__progname' variable. */ +#undef HAVE___PROGNAME + +/* define if your system declares __progname */ +#undef HAVE___PROGNAME_DECLARATION + +/* define this if on Irix6.4 or higher */ +#undef IRIX_64 + +/* define if you have kerberos */ +#undef KERBEROS + +/* define if the system is missing a prototype for asnprintf() */ +#undef NEED_ASNPRINTF_PROTO + +/* define if the system is missing a prototype for asprintf() */ +#undef NEED_ASPRINTF_PROTO + +/* define if the system is missing a prototype for crypt() */ +#undef NEED_CRYPT_PROTO + +/* define if the system is missing a prototype for gethostname() */ +#undef NEED_GETHOSTNAME_PROTO + +/* define if the system is missing a prototype for getusershell() */ +#undef NEED_GETUSERSHELL_PROTO + +/* define if the system is missing a prototype for glob() */ +#undef NEED_GLOB_PROTO + +/* define if the system is missing a prototype for hstrerror() */ +#undef NEED_HSTRERROR_PROTO + +/* define if the system is missing a prototype for inet_aton() */ +#undef NEED_INET_ATON_PROTO + +/* define if the system is missing a prototype for issignal() */ +#undef NEED_ISSIGNAL_PROTO + +/* define if the system is missing a prototype for mkstemp() */ +#undef NEED_MKSTEMP_PROTO + +/* define if the system is missing a prototype for select() */ +#undef NEED_SELECT_PROTO + +/* define if the system is missing a prototype for setenv() */ +#undef NEED_SETENV_PROTO + +/* libsl need sl_apropos */ +#undef NEED_SLCOMPAT_SL_APROPOS + +/* define if the system is missing a prototype for snprintf() */ +#undef NEED_SNPRINTF_PROTO + +/* define if the system is missing a prototype for strncmp() */ +#undef NEED_STRNCMP_PROTO + +/* define if the system is missing a prototype for strndup() */ +#undef NEED_STRNDUP_PROTO + +/* define if the system is missing a prototype for strsep() */ +#undef NEED_STRSEP_PROTO + +/* define if the system is missing a prototype for strsvis() */ +#undef NEED_STRSVIS_PROTO + +/* define if the system is missing a prototype for strtok_r() */ +#undef NEED_STRTOK_R_PROTO + +/* define if the system is missing a prototype for strunvis() */ +#undef NEED_STRUNVIS_PROTO + +/* define if the system is missing a prototype for strvisx() */ +#undef NEED_STRVISX_PROTO + +/* define if the system is missing a prototype for strvis() */ +#undef NEED_STRVIS_PROTO + +/* define if the system is missing a prototype for svis() */ +#undef NEED_SVIS_PROTO + +/* define if the system is missing a prototype for unsetenv() */ +#undef NEED_UNSETENV_PROTO + +/* define if the system is missing a prototype for unvis() */ +#undef NEED_UNVIS_PROTO + +/* define if the system is missing a prototype for vasnprintf() */ +#undef NEED_VASNPRINTF_PROTO + +/* define if the system is missing a prototype for vasprintf() */ +#undef NEED_VASPRINTF_PROTO + +/* define if the system is missing a prototype for vgonel() */ +#undef NEED_VGONEL_PROTO + +/* define if you need 32 bit compat pioctl */ +#undef NEED_VICEIOCTL32 + +/* define if the system is missing a prototype for vis() */ +#undef NEED_VIS_PROTO + +/* define if the system is missing a prototype for vn_writechk() */ +#undef NEED_VN_WRITECHK_PROTO + +/* define if the system is missing a prototype for vsnprintf() */ +#undef NEED_VSNPRINTF_PROTO + +/* define if prototype of openlog is compatible with void openlog(const char + *, int, int) */ +#undef OPENLOG_PROTO_COMPATIBLE + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define if getlogin has POSIX flavour (and not BSD). */ +#undef POSIX_GETLOGIN + +/* define this if your as understands .register */ +#undef PROG_AS_UNDERSTANDS_REGISTER + +/* Define if you have the readline package. */ +#undef READLINE + +/* Define as the return type of signal handlers (`int' or `void'). */ +#undef RETSIGTYPE + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* define to enable syscall table modification on linux */ +#undef SYSCALLHACK + +/* Define to 1 if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME + +/* Version number of package */ +#undef VERSION + +/* Define if signal handlers return void. */ +#undef VOID_RETSIGTYPE + +/* define if target is big endian */ +#undef WORDS_BIGENDIAN + +/* Define to 1 if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING + +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#undef YYTEXT_POINTER + +/* Define how big file offset is in your OS. 32/64 are valid values. */ +#undef _FILE_OFFSET_BITS + +/* Define to enable extensions on glibc-based systems such as Linux. */ +#undef _GNU_SOURCE + +/* Define if you have largefile support */ +#undef _LARGEFILE64_SOURCE + +/* Define if you have largefile support */ +#undef _LARGEFILE_SOURCE + + +/* + * Defining this enables us to get the definition of `sigset_t' and + * other importatnt definitions on Solaris. + */ + +#ifndef __EXTENSIONS__ +#define __EXTENSIONS__ +#endif + + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `int' if doesn't define. */ +#undef gid_t + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif + +/* Define to `int' if does not define. */ +#undef pid_t + +/* Define to `unsigned int' if does not define. */ +#undef size_t + +/* Define to `int' if doesn't define. */ +#undef uid_t + + +#if !(defined(USING_ASM) || defined(_KERNEL) || defined(__KERNEL__) || defined(_LKM) || defined(KERNEL)) +#if ENDIANESS_IN_SYS_PARAM_H +# include +# include +# if BYTE_ORDER == BIG_ENDIAN +# define WORDS_BIGENDIAN 1 +# endif +#endif +#endif + + +#ifdef VOID_RETSIGTYPE +#define SIGRETURN(x) return +#else +#define SIGRETURN(x) return (RETSIGTYPE)(x) +#endif + +#ifdef BROKEN_REALLOC +#define realloc(X, Y) isoc_realloc((X), (Y)) +#define isoc_realloc(X, Y) ((X) ? realloc((X), (Y)) : malloc(Y)) +#endif + +#ifdef ROKEN_RENAME +#include "roken_rename.h" +#endif diff -u -r -N ../arla-20080223-orig/install-sh ./install-sh --- ../arla-20080223-orig/install-sh 2008-02-23 05:35:29.000000000 -0600 +++ ./install-sh 2008-02-23 11:24:23.000000000 -0600 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2004-09-10.20 +scriptversion=2006-10-14.15 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -39,15 +39,24 @@ # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. +# from scratch. + +nl=' +' +IFS=" "" $nl" # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi -# put in absolute paths if you don't have them in your path; or use env. vars. +# Put in absolute file names if you don't have them in your path; +# or use environment vars. mvprog="${MVPROG-mv}" cpprog="${CPPROG-cp}" @@ -58,7 +67,13 @@ rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -chmodcmd="$chmodprog 0755" +posix_glob= +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chmodcmd=$chmodprog chowncmd= chgrpcmd= stripcmd= @@ -95,7 +110,7 @@ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG " -while test -n "$1"; do +while test $# -ne 0; do case $1 in -c) shift continue;; @@ -109,11 +124,17 @@ shift continue;; - --help) echo "$usage"; exit 0;; + --help) echo "$usage"; exit $?;; - -m) chmodcmd="$chmodprog $2" + -m) mode=$2 shift shift + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac continue;; -o) chowncmd="$chownprog $2" @@ -134,27 +155,35 @@ shift continue;; - --version) echo "$0 $scriptversion"; exit 0;; + --version) echo "$0 $scriptversion"; exit $?;; - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done + --) shift break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; esac done -if test -z "$1"; then +if test $# -ne 0 && test -z "$dir_arg$dstarg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done +fi + +if test $# -eq 0; then if test -z "$dir_arg"; then echo "$0: no input file specified." >&2 exit 1 @@ -164,6 +193,33 @@ exit 0 fi +if test -z "$dir_arg"; then + trap '(exit $?); exit' 1 2 13 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + for src do # Protect names starting with `-'. @@ -173,15 +229,11 @@ if test -n "$dir_arg"; then dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. @@ -208,52 +260,188 @@ echo "$0: $dstarg: Is a directory" >&2 exit 1 fi - dst=$dst/`basename "$src"` + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? fi fi - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - - # Make sure that the destination directory exists. + obsolete_mkdir_used=false - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - IFS=$oIFS + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writeable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac - pathcomp= + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix=/ ;; + -*) prefix=./ ;; + *) prefix= ;; + esac + + case $posix_glob in + '') + if (set -f) 2>/dev/null; then + posix_glob=true + else + posix_glob=false + fi ;; + esac + + oIFS=$IFS + IFS=/ + $posix_glob && set -f + set fnord $dstdir shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit + $posix_glob && set +f + IFS=$oIFS + + prefixes= + + for d + do + test -z "$d" && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi - pathcomp=$pathcomp/ - done + fi fi if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 else - dstfile=`basename "$dst"` # Make a couple of temp file names in the proper directory. dsttmp=$dstdir/_inst.$$_ @@ -261,10 +449,9 @@ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -275,10 +462,10 @@ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ || { # The rename failed, perhaps because mv can't rename something else # to itself, or perhaps because mv is so ancient that it does not @@ -290,12 +477,13 @@ # reasons. In this case, the final cleanup might fail but the new # file should still install successfully. { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + if test -f "$dst"; then + $doit $rmcmd -f "$dst" 2>/dev/null \ + || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ + && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit + echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 } else : @@ -303,16 +491,13 @@ } && # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + $doit $mvcmd "$dsttmp" "$dst" } - } - fi || { (exit 1); exit; } -done + } || exit 1 -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit -} + trap '' 0 + fi +done # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -u -r -N ../arla-20080223-orig/lib/Makefile.in ./lib/Makefile.in --- ../arla-20080223-orig/lib/Makefile.in 2008-01-18 08:29:03.000000000 -0600 +++ ./lib/Makefile.in 2008-02-23 11:24:26.000000000 -0600 @@ -61,7 +61,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/lib/bufdir/Makefile.in ./lib/bufdir/Makefile.in --- ../arla-20080223-orig/lib/bufdir/Makefile.in 2008-01-18 08:29:03.000000000 -0600 +++ ./lib/bufdir/Makefile.in 2008-02-23 11:24:26.000000000 -0600 @@ -66,7 +66,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/lib/ko/Makefile.in ./lib/ko/Makefile.in --- ../arla-20080223-orig/lib/ko/Makefile.in 2008-01-18 08:29:03.000000000 -0600 +++ ./lib/ko/Makefile.in 2008-02-23 11:24:26.000000000 -0600 @@ -68,7 +68,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/lib/roken/Makefile.in ./lib/roken/Makefile.in --- ../arla-20080223-orig/lib/roken/Makefile.in 2008-01-18 08:29:03.000000000 -0600 +++ ./lib/roken/Makefile.in 2008-02-23 11:24:26.000000000 -0600 @@ -83,7 +83,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/lib/sl/Makefile.in ./lib/sl/Makefile.in --- ../arla-20080223-orig/lib/sl/Makefile.in 2008-01-18 08:29:04.000000000 -0600 +++ ./lib/sl/Makefile.in 2008-02-23 11:24:27.000000000 -0600 @@ -67,7 +67,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/lib/vers/Makefile.in ./lib/vers/Makefile.in --- ../arla-20080223-orig/lib/vers/Makefile.in 2008-01-18 08:29:04.000000000 -0600 +++ ./lib/vers/Makefile.in 2008-02-23 11:24:27.000000000 -0600 @@ -64,7 +64,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/missing ./missing --- ../arla-20080223-orig/missing 2008-02-23 05:35:29.000000000 -0600 +++ ./missing 2008-02-23 11:24:23.000000000 -0600 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2004-09-07.08 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -87,12 +90,12 @@ yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to ." - exit 0 + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" - exit 0 + exit $? ;; -*) @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -288,11 +289,24 @@ call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; @@ -310,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -u -r -N ../arla-20080223-orig/mkinstalldirs ./mkinstalldirs --- ../arla-20080223-orig/mkinstalldirs 2008-02-23 05:35:29.000000000 -0600 +++ ./mkinstalldirs 2008-02-23 11:24:28.000000000 -0600 @@ -1,7 +1,7 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -scriptversion=2004-02-15.20 +scriptversion=2006-05-11.19 # Original author: Noah Friedman # Created: 1993-05-16 @@ -11,8 +11,11 @@ # bugs to or send patches to # . +nl=' +' +IFS=" "" $nl" errstatus=0 -dirmode="" +dirmode= usage="\ Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... @@ -27,7 +30,7 @@ case $1 in -h | --help | --h*) # -h for help echo "$usage" - exit 0 + exit $? ;; -m) # -m PERM arg shift @@ -37,7 +40,7 @@ ;; --version) echo "$0 $scriptversion" - exit 0 + exit $? ;; --) # stop option processing shift @@ -103,13 +106,21 @@ for file do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + case $file in + /*) pathcomp=/ ;; + *) pathcomp= ;; + esac + oIFS=$IFS + IFS=/ + set fnord $file shift + IFS=$oIFS - pathcomp= for d do - pathcomp="$pathcomp$d" + test "x$d" = x && continue + + pathcomp=$pathcomp$d case $pathcomp in -*) pathcomp=./$pathcomp ;; esac @@ -124,7 +135,7 @@ else if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" - lasterr="" + lasterr= chmod "$dirmode" "$pathcomp" || lasterr=$? if test ! -z "$lasterr"; then @@ -134,7 +145,7 @@ fi fi - pathcomp="$pathcomp/" + pathcomp=$pathcomp/ done done Files ../arla-20080223-orig/nnpfs/bsd/.nnpfs_blocks.c.swp and ./nnpfs/bsd/.nnpfs_blocks.c.swp differ diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/bin/mntopts.h ./nnpfs/bsd/bin/mntopts.h --- ../arla-20080223-orig/nnpfs/bsd/bin/mntopts.h 2005-12-28 08:32:03.000000000 -0600 +++ ./nnpfs/bsd/bin/mntopts.h 2008-02-23 11:03:56.000000000 -0600 @@ -48,7 +48,9 @@ #define MOPT_NOACCESSTIME { "accesstime", 1, MNT_NOATIME } #define MOPT_NOATIME { "atime", 1, MNT_NOATIME } #endif +#ifdef MOPT_NODEV #define MOPT_NODEV { "dev", 1, MNT_NODEV } +#endif #define MOPT_NOEXEC { "exec", 1, MNT_NOEXEC } #define MOPT_NOSUID { "suid", 1, MNT_NOSUID } #define MOPT_RDONLY { "rdonly", 0, MNT_RDONLY } @@ -78,6 +80,7 @@ /* Standard options which all mounts can understand. */ +#ifdef MOPT_NODEV #define MOPT_STDOPTS \ MOPT_USERQUOTA, \ MOPT_GROUPQUOTA, \ @@ -86,5 +89,14 @@ MOPT_NOEXEC, \ MOPT_NOSUID, \ MOPT_RDONLY +#else +#define MOPT_STDOPTS \ + MOPT_USERQUOTA, \ + MOPT_GROUPQUOTA, \ + MOPT_FSTAB_COMPAT, \ + MOPT_NOEXEC, \ + MOPT_NOSUID, \ + MOPT_RDONLY +#endif void getmntopts (const char *, const struct mntopt *, int *); diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/nnpfs/nnpfs_common.h ./nnpfs/bsd/nnpfs/nnpfs_common.h --- ../arla-20080223-orig/nnpfs/bsd/nnpfs/nnpfs_common.h 2006-10-24 11:33:14.000000000 -0500 +++ ./nnpfs/bsd/nnpfs/nnpfs_common.h 2008-02-23 11:03:56.000000000 -0600 @@ -59,7 +59,8 @@ #define nnpfs_free(a, size,t) free(a, t) #endif /* NNPFS_DEBUG */ -int nnpfs_suser(d_thread_t *p); +int nnpfs_priv_check_debug(d_thread_t *p); +int nnpfs_priv_check_fhlookup(d_thread_t *p); #ifndef HAVE_KERNEL_MEMCPY void * diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/nnpfs/nnpfs_locl.h ./nnpfs/bsd/nnpfs/nnpfs_locl.h --- ../arla-20080223-orig/nnpfs/bsd/nnpfs/nnpfs_locl.h 2008-02-23 05:27:50.000000000 -0600 +++ ./nnpfs/bsd/nnpfs/nnpfs_locl.h 2008-02-23 11:03:56.000000000 -0600 @@ -125,6 +125,9 @@ #ifdef HAVE_SYS_KAUTH_H #include #endif +#ifdef HAVE_SYS_PRIV_H +#include +#endif #ifdef HAVE_MISCFS_GENFS_GENFS_H #include @@ -300,7 +303,7 @@ struct genfs_ops nnpfs_genfsops; #endif -#if __NetBSD_Version__ >= 399001900 /* NetBSD 3.99.19 */ +#if defined(__NetBSD__) && __NetBSD_Version__ >= 399001900 /* NetBSD 3.99.19 */ typedef struct kauth_cred *nnpfs_kernel_cred; #define nnpfs_cred_get_uid(cred) kauth_cred_getuid(cred) #else diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/nnpfs/nnpfs_vfsops-bsd.h ./nnpfs/bsd/nnpfs/nnpfs_vfsops-bsd.h --- ../arla-20080223-orig/nnpfs/bsd/nnpfs/nnpfs_vfsops-bsd.h 2007-03-06 10:01:56.000000000 -0600 +++ ./nnpfs/bsd/nnpfs/nnpfs_vfsops-bsd.h 2008-02-23 11:03:56.000000000 -0600 @@ -79,7 +79,11 @@ nnpfs_root(struct mount *mp, struct vnode **vpp); int +#ifdef HAVE_VFS_QUOTACTL_CADDR nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, caddr_t arg, d_thread_t *p); +#else +nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg, d_thread_t *p); +#endif int nnpfs_statfs(struct mount *mp, nnpfs_statvfs *sbp, d_thread_t *p); @@ -114,6 +118,7 @@ struct ucred ** credanonp); #endif +#ifndef HAVE_VOP_VPTOFH int nnpfs_vptofh(struct vnode * vp, struct fid * fhp @@ -121,6 +126,7 @@ ,size_t * fidsz #endif ); +#endif int nnpfs_dead_lookup(struct vop_lookup_args *ap); diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/nnpfs_blocks.c ./nnpfs/bsd/nnpfs_blocks.c --- ../arla-20080223-orig/nnpfs/bsd/nnpfs_blocks.c 2008-02-23 05:27:48.000000000 -0600 +++ ./nnpfs/bsd/nnpfs_blocks.c 2008-02-23 11:03:56.000000000 -0600 @@ -306,8 +306,13 @@ LEASE_WRITE); ret = nnpfs_block_extend_int(node, vp, p); - + +#ifdef HAVE_TWO_ARGUMENT_VOP_UNLOCK + VOP_UNLOCK(vp, 0); +#endif +#ifdef HAVE_THREE_ARGUMENT_VOP_UNLOCK VOP_UNLOCK(vp, 0, p); +#endif vn_finished_write(mp); } #else @@ -501,7 +506,11 @@ #endif #ifdef __FreeBSD__ +#ifdef HAVE_FINAL_ARG_FILE_VOP_OPEN + error = VOP_OPEN(*vpp, fmode, cred, p, NULL); +#else error = VOP_OPEN(*vpp, fmode, cred, p, -1); +#endif #else error = VOP_OPEN(*vpp, fmode, cred, p); #endif diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/nnpfs_common-bsd.c ./nnpfs/bsd/nnpfs_common-bsd.c --- ../arla-20080223-orig/nnpfs/bsd/nnpfs_common-bsd.c 2008-02-23 05:27:48.000000000 -0600 +++ ./nnpfs/bsd/nnpfs_common-bsd.c 2008-02-23 11:09:28.000000000 -0600 @@ -72,10 +72,33 @@ #endif /* NNPFS_DEBUG */ int -nnpfs_suser(d_thread_t *p) +nnpfs_priv_check_debug(d_thread_t *p) { #if defined(__APPLE__) return proc_suser(p); +#elif defined(HAVE_KERNEL_PRIV_CHECK) && defined(PRIV_NNPFS_DEBUG) + return (priv_check(p, PRIV_NNPFS_DEBUG)); +#elif defined(HAVE_KERNEL_KAUTH_CRED_GETUID) + uid_t uid = kauth_cred_getuid(p->l_proc->p_cred); + if (uid == 0) + return 0; + return EPERM; +#elif defined(HAVE_KERNEL_SUSER_UCRED) + return suser_ucred (nnpfs_proc_to_cred(p)); +#elif defined(HAVE_TWO_ARGUMENT_SUSER) + return suser (nnpfs_proc_to_cred(p), NULL); +#else + return suser (p); +#endif +} + +int +nnpfs_priv_check_fhlookup(d_thread_t *p) +{ +#if defined(__APPLE__) + return proc_suser(p); +#elif defined(HAVE_KERNEL_PRIV_CHECK) + return (priv_check(p, PRIV_VFS_GETFH)); #elif defined(HAVE_KERNEL_KAUTH_CRED_GETUID) if (kauth_cred_getuid(nnpfs_proc_to_cred(p)) == 0) return 0; diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/nnpfs_message.c ./nnpfs/bsd/nnpfs_message.c --- ../arla-20080223-orig/nnpfs/bsd/nnpfs_message.c 2007-03-28 07:05:46.000000000 -0500 +++ ./nnpfs/bsd/nnpfs_message.c 2008-02-23 11:03:56.000000000 -0600 @@ -483,7 +483,7 @@ nnpfs_block_free_all(VNODE_TO_XNODE(vp)); -#if HAVE_KERNEL_VGONEL +#ifdef HAVE_KERNEL_VGONEL vgonel (vp, p); #else /* !have vgonel */ nnpfs_interlock_unlock(&vp->v_interlock); diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/nnpfs_node-bsd.c ./nnpfs/bsd/nnpfs_node-bsd.c --- ../arla-20080223-orig/nnpfs/bsd/nnpfs_node-bsd.c 2008-02-23 05:27:48.000000000 -0600 +++ ./nnpfs/bsd/nnpfs_node-bsd.c 2008-02-23 11:03:56.000000000 -0600 @@ -169,6 +169,15 @@ genfs_node_init(*vpp, &nnpfs_genfsops); #endif +#ifdef HAVE_KERNEL_INSMNTQUE + error = insmntque(*vpp, NNPFS_TO_VFS(nnpfsp)); + if (error) { + nnpfs_free(result, sizeof(*result), M_NNPFS_NODE); + *vpp = NULL; + return error; + } +#endif + retry: error = nnpfs_node_find(nnpfsp, handle, &check); if (error == ENOENT) { @@ -757,7 +766,7 @@ * The real change is sys/kern/vfs_cache:1.20 */ -#if __NetBSD_Version__ >= 104120000 || OpenBSD > 200211 +#if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104120000) || (defined(OpenBSD) && OpenBSD > 200211) if (cache_lookup(dvp, &dummy, cnp) != -1) { nnpfs_vfs_unlock(dummy, nnpfs_cnp_to_proc(cnp)); printf ("NNPFS PANIC WARNING! nnpfs_dnlc_enter: %s already in cache\n", @@ -802,7 +811,7 @@ cn->cn_nameptr = (char *)name; cn->cn_namelen = strlen(name); cn->cn_flags = 0; -#if __APPLE__ +#ifdef __APPLE__ cn->cn_hash = 0; /* Let the vfs compute the hash */ #elif defined(HAVE_KERNEL_NAMEI_HASH) { diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/nnpfs_syscalls-common.c ./nnpfs/bsd/nnpfs_syscalls-common.c --- ../arla-20080223-orig/nnpfs/bsd/nnpfs_syscalls-common.c 2008-02-23 05:27:49.000000000 -0600 +++ ./nnpfs/bsd/nnpfs_syscalls-common.c 2008-02-23 11:03:56.000000000 -0600 @@ -569,7 +569,7 @@ if (vice_ioctl->in_size < sizeof(int32_t)) return EINVAL; - error = nnpfs_suser(p); + error = nnpfs_priv_check_debug(p); if (error) return error; diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/nnpfs_vfsops-bsd.c ./nnpfs/bsd/nnpfs_vfsops-bsd.c --- ../arla-20080223-orig/nnpfs/bsd/nnpfs_vfsops-bsd.c 2008-02-23 05:27:49.000000000 -0600 +++ ./nnpfs/bsd/nnpfs_vfsops-bsd.c 2008-02-23 11:03:56.000000000 -0600 @@ -84,7 +84,11 @@ } int +#ifdef HAVE_VFS_QUOTACTL_CADDR nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, caddr_t arg, d_thread_t *p) +#else +nnpfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg, d_thread_t *p) +#endif { NNPFSDEB(XDEBVFOPS, ("nnpfs_quotactl: mp = %lx, cmd = %d, uid = %u, " "arg = %lx, proc = %lx\n", @@ -225,6 +229,7 @@ return 0; } +#ifndef HAVE_VOP_VPTOFH int nnpfs_vptofh(struct vnode * vp, struct fid * fhp @@ -236,6 +241,7 @@ NNPFSDEB(XDEBVFOPS, ("nnpfs_vptofh\n")); return EOPNOTSUPP; } +#endif #endif /* !__APPLE__ */ @@ -321,7 +327,7 @@ NNPFSDEB(XDEBVFOPS, ("nnpfs_fhlookup (nnpfs)\n")); - error = nnpfs_suser (proc); + error = nnpfs_priv_check_fhlookup(proc); if (error) return EPERM; @@ -484,7 +490,11 @@ goto out; #if defined(__FreeBSD__) && __FreeBSD_version >= 502000 +#ifdef HAVE_FINAL_ARG_FILE_VOP_OPEN + error = VOP_OPEN(vp, flags, cred, proc, fp); +#else error = VOP_OPEN(vp, flags, cred, proc, index); +#endif #else error = VOP_OPEN(vp, flags, cred, proc); #endif diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/nnpfs_vfsops-freebsd.c ./nnpfs/bsd/nnpfs_vfsops-freebsd.c --- ../arla-20080223-orig/nnpfs/bsd/nnpfs_vfsops-freebsd.c 2007-03-06 10:00:57.000000000 -0600 +++ ./nnpfs/bsd/nnpfs_vfsops-freebsd.c 2008-02-23 11:03:56.000000000 -0600 @@ -60,7 +60,12 @@ .vop_default = &default_vnodeops, .vop_lookup = nnpfs_dead_lookup, .vop_reclaim = nnpfs_dead_reclaim, +#ifdef HAVE_VOP_LOCK1 + .vop_lock1 = vop_stdlock, +#endif +#ifdef HAVE_VOP_LOCK .vop_lock = vop_stdlock, +#endif .vop_unlock = vop_stdunlock, .vop_islocked = vop_stdislocked, }; @@ -76,6 +81,15 @@ if (error == 0) NNPFS_MAKE_VROOT(*vpp); +#ifdef HAVE_KERNEL_INSMNTQUE + /* XXX: Possibly should lock with lockmgr here. */ + error = insmntque(*vpp, mp); + if (error) { + *vpp = NULL; + return error; + } +#endif + nnpfs_vfs_writelock(*vpp, nnpfs_curproc()); return error; @@ -163,7 +177,9 @@ .vfs_vget = nnpfs_vget_freebsd, .vfs_fhtovp = nnpfs_fhtovp, .vfs_checkexp = nnpfs_checkexp, +#ifndef HAVE_VOP_VPTOFH .vfs_vptofh = nnpfs_vptofh, +#endif .vfs_init = nnpfs_init }; /*VFS_SET(nnpfs_vfsops, arlannpfsdev, 0);*/ diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/nnpfs_vnodeops-bsd.c ./nnpfs/bsd/nnpfs_vnodeops-bsd.c --- ../arla-20080223-orig/nnpfs/bsd/nnpfs_vnodeops-bsd.c 2008-02-23 05:27:49.000000000 -0600 +++ ./nnpfs/bsd/nnpfs_vnodeops-bsd.c 2008-02-23 11:03:56.000000000 -0600 @@ -85,7 +85,11 @@ ret = nnpfs_open_common(ap->a_vp, ap->a_mode, ctx); #ifdef __FreeBSD__ if (!ret) +#ifdef HAVE_THREE_ARGUMENT_VNODE_CREATE_VOBJ + vnode_create_vobject(ap->a_vp, +#else vnode_create_vobject_off(ap->a_vp, +#endif nnpfs_vattr_get_size(&VNODE_TO_XNODE(ap->a_vp)->attr), ap->a_td); #endif @@ -797,16 +801,25 @@ #ifdef __FreeBSD__ int +#ifdef HAVE_VOP_LOCK1 +nnpfs_lock1(struct vop_lock1_args * ap) +#else nnpfs_lock(struct vop_lock_args * ap) +#endif { struct vnode *vp = ap->a_vp; int ret; nnpfs_assert(vp); +#ifdef HAVE_VOP_LOCK1 + NNPFSDEB(XDEBVNOPS, ("nnpfs_lock1: %lx, flags 0x%x\n", + (unsigned long)vp, ap->a_flags)); +#else nnpfs_assert(ap->a_td); NNPFSDEB(XDEBVNOPS, ("nnpfs_lock: %lx, td %p, flags 0x%x, nlocks %d\n", (unsigned long)vp, NNPFS_AP_PROC(ap), ap->a_flags, NNPFS_AP_PROC(ap)->td_locks)); +#endif nnpfs_lk_info("nnpfs_lock before", vp); ret = vop_stdlock(ap); @@ -821,16 +834,26 @@ struct vnode *vp = ap->a_vp; int ret; +#ifdef HAVE_TWO_ARGUMENT_VOP_UNLOCK + NNPFSDEB(XDEBVNOPS, + ("nnpfs_unlock: %lx, flags 0x%x\n", (unsigned long)vp, + ap->a_flags)); +#else NNPFSDEB(XDEBVNOPS, ("nnpfs_unlock: %lx, td %p, flags 0x%x, nlocks %d\n", (unsigned long)vp, ap->a_td, ap->a_flags, NNPFS_AP_PROC(ap)->td_locks)); +#endif nnpfs_lk_info("nnpfs_unlock before", vp); ret = vop_stdunlock(ap); +#ifdef HAVE_TWO_ARGUMENT_VOP_UNLOCK + NNPFSDEB(XDEBVNOPS, ("nnpfs_unlock: return %d\n", ret)); +#else NNPFSDEB(XDEBVNOPS, ("nnpfs_unlock: return %d, td %p, nlocks %d\n", ret, NNPFS_AP_PROC(ap), NNPFS_AP_PROC(ap)->td_locks)); +#endif return ret; } @@ -1317,6 +1340,23 @@ } #endif +#ifdef HAVE_VOP_VPTOFH +int +nnpfs_vptofh(struct vop_vptofh_args *ap) +/* +struct vop_vptofh_args { + struct vnodeop_desc *a_desc; + struct vnode *a_vp; + struct fid *a_fhp; +}; +*/ +{ + NNPFSDEB(XDEBVNOPS, ("nnpfs_vptofh\n")); + + return EOPNOTSUPP; +} +#endif + vop_t **nnpfs_vnodeop_p; @@ -1470,7 +1510,12 @@ .vop_bmap = nnpfs_bmap, .vop_poll = nnpfs_poll, +#ifdef HAVE_VOP_LOCK1 + .vop_lock1 = nnpfs_lock1, +#endif +#ifdef HAVE_VOP_LOCK .vop_lock = nnpfs_lock, +#endif .vop_unlock = nnpfs_unlock, .vop_islocked = nnpfs_islocked, .vop_revoke = nnpfs_revoke, @@ -1610,6 +1655,9 @@ #ifdef HAVE_VOP_PATHCONF {&vop_pathconf_desc, (vop_t *) nnpfs_pathconf }, #endif +#ifdef HAVE_VOP_VPTOFH + {&vop_vptofh_desc, (vop_t *) nnpfs_vptofh }, +#endif {(struct vnodeop_desc *) NULL, (int (*) (void *)) NULL} }; diff -u -r -N ../arla-20080223-orig/nnpfs/bsd/nnpfs_vnodeops-common.c ./nnpfs/bsd/nnpfs_vnodeops-common.c --- ../arla-20080223-orig/nnpfs/bsd/nnpfs_vnodeops-common.c 2008-02-23 05:27:49.000000000 -0600 +++ ./nnpfs/bsd/nnpfs_vnodeops-common.c 2008-02-23 11:03:56.000000000 -0600 @@ -50,7 +50,7 @@ static void nnpfs_handle_stale(struct nnpfs_node *xn) { -#if __APPLE__ +#ifdef __APPLE__ struct vnode *vp = XNODE_TO_VNODE(xn); #endif @@ -1440,7 +1440,9 @@ int error = 0; nnpfs_cred cred; struct nnpfs *nnpfsp = NNPFS_FROM_VNODE(vp); +#ifdef HAVE_THREE_ARGUMENT_VOP_UNLOCK d_thread_t *proc = nnpfs_vfs_context_proc(ctx); +#endif NNPFSDEB(XDEBVNOPS, ("nnpfs_readlink\n")); diff -u -r -N ../arla-20080223-orig/nnpfs/dummer/Makefile.in ./nnpfs/dummer/Makefile.in --- ../arla-20080223-orig/nnpfs/dummer/Makefile.in 2008-01-18 08:29:04.000000000 -0600 +++ ./nnpfs/dummer/Makefile.in 2008-02-23 11:24:27.000000000 -0600 @@ -63,7 +63,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/nnpfs/freebsd/FreeBSD-Makefile ./nnpfs/freebsd/FreeBSD-Makefile --- ../arla-20080223-orig/nnpfs/freebsd/FreeBSD-Makefile 2007-03-06 06:54:00.000000000 -0600 +++ ./nnpfs/freebsd/FreeBSD-Makefile 2008-02-23 11:03:56.000000000 -0600 @@ -29,6 +29,7 @@ bsdsrcdir= $(srcdir)/../bsd CFLAGS= -g \ + -I/usr/include \ -I${.CURDIR} \ -I${.CURDIR}/../../include \ -I${.CURDIR}/../include \ @@ -45,6 +46,6 @@ .PATH: $(bsdsrcdir) nnpfs_vopdefs.h: vnode_if.h - awk '/^struct vop_[a-z]*_args/ { vop=substr($$2,5,length($$2)-9); printf("#define HAVE_VOP_%s 1\n", toupper(vop)); printf("NNPFS_VOP_DEF(%s);\n", vop); }' vnode_if.h > ${.TARGET} + awk '/^struct vop_[a-z0-9]*_args/ { vop=substr($$2,5,length($$2)-9); printf("#define HAVE_VOP_%s 1\n", toupper(vop)); printf("NNPFS_VOP_DEF(%s);\n", vop); }' vnode_if.h > ${.TARGET} -mkdir nnpfs test -d nnpfs && ( test -f nnpfs/nnpfs_vopdefs.h || ln -s ../nnpfs_vopdefs.h nnpfs/nnpfs_vopdefs.h ) diff -u -r -N ../arla-20080223-orig/rx/Makefile.in ./rx/Makefile.in --- ../arla-20080223-orig/rx/Makefile.in 2008-01-18 08:29:04.000000000 -0600 +++ ./rx/Makefile.in 2008-02-23 11:24:27.000000000 -0600 @@ -66,7 +66,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/rxdef/Makefile.in ./rxdef/Makefile.in --- ../arla-20080223-orig/rxdef/Makefile.in 2008-01-18 08:29:05.000000000 -0600 +++ ./rxdef/Makefile.in 2008-02-23 11:24:27.000000000 -0600 @@ -62,7 +62,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/rxgk/Makefile.in ./rxgk/Makefile.in --- ../arla-20080223-orig/rxgk/Makefile.in 2008-01-18 08:29:05.000000000 -0600 +++ ./rxgk/Makefile.in 2008-02-23 11:24:28.000000000 -0600 @@ -72,7 +72,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/rxkad/Makefile.in ./rxkad/Makefile.in --- ../arla-20080223-orig/rxkad/Makefile.in 2008-01-18 08:29:05.000000000 -0600 +++ ./rxkad/Makefile.in 2008-02-23 11:24:28.000000000 -0600 @@ -65,7 +65,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/util/Makefile.in ./util/Makefile.in --- ../arla-20080223-orig/util/Makefile.in 2008-01-18 08:29:05.000000000 -0600 +++ ./util/Makefile.in 2008-02-23 11:24:28.000000000 -0600 @@ -65,7 +65,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \ diff -u -r -N ../arla-20080223-orig/ydr/Makefile.in ./ydr/Makefile.in --- ../arla-20080223-orig/ydr/Makefile.in 2008-01-18 08:29:05.000000000 -0600 +++ ./ydr/Makefile.in 2008-02-23 11:24:28.000000000 -0600 @@ -65,7 +65,12 @@ $(top_srcdir)/cf/bsd-uvm-only.m4 \ $(top_srcdir)/cf/bsd-vfs-busy.m4 \ $(top_srcdir)/cf/bsd-vfs-object-create.m4 \ - $(top_srcdir)/cf/bsd-vget.m4 $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vfs-quotactl.m4 \ + $(top_srcdir)/cf/bsd-vget.m4 \ + $(top_srcdir)/cf/bsd-vnode-create-vobject.m4 \ + $(top_srcdir)/cf/bsd-vop-lock.m4 \ + $(top_srcdir)/cf/bsd-vop-open.m4 \ + $(top_srcdir)/cf/bsd-vop-unlock.m4 \ $(top_srcdir)/cf/c-attribute.m4 $(top_srcdir)/cf/c-function.m4 \ $(top_srcdir)/cf/check-declaration.m4 \ $(top_srcdir)/cf/check-dirsiz.m4 \