From 0793d4d1e4ab31c8bb45a1f930becd55d6bc5944 Mon Sep 17 00:00:00 2001
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Thu, 2 Sep 2004 20:44:56 +0000
Subject: [PATCH] Hook autofs to the build.

---
 etc/mtree/BSD.include.dist | 2 ++
 include/Makefile           | 2 +-
 lib/libautofs/Makefile     | 9 ++++++---
 lib/libautofs/libautofs.c  | 2 +-
 sys/conf/NOTES             | 1 +
 sys/conf/files             | 3 +++
 sys/conf/options           | 1 +
 sys/modules/Makefile       | 1 +
 8 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index e6cad0911f69..f7850f858927 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -54,6 +54,8 @@
         ..
     ..
     fs
+        autofs
+        ..
         devfs
         ..
         fdescfs
diff --git a/include/Makefile b/include/Makefile
index 0fd1dd9b7c18..e6a23e5a4d91 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -43,7 +43,7 @@ LSUBDIRS=	cam/scsi dev/an dev/bktr dev/firewire dev/ic dev/iicbus \
 	isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
 	netgraph/atm security/mac_biba security/mac_bsdextended \
 	security/mac_lomac security/mac_mls security/mac_partition \
-	ufs/ffs ufs/ufs
+	ufs/ffs ufs/ufs fs/autofs
 
 .if !defined(NO_BLUETOOTH)
 LSUBSUBDIRS=	netgraph/bluetooth/include
diff --git a/lib/libautofs/Makefile b/lib/libautofs/Makefile
index 92945c954666..4166366f2037 100644
--- a/lib/libautofs/Makefile
+++ b/lib/libautofs/Makefile
@@ -1,14 +1,17 @@
-# $Id: Makefile,v 1.3 2004/08/31 08:49:56 bright Exp $
+# $Id: Makefile,v 1.4 2004/08/31 16:26:24 bright Exp $
 # $FreeBSD$
 
 LIB=autofs
 SHLIB_MAJOR= 1
 SHLIB_MINOR= 0
 WARNS=4
-CFLAGS+=	-I${.CURDIR}/../autofs -Werror
-CFLAGS+=	-g
+#CFLAGS+=	-I${.CURDIR}/../autofs -Werror
+#CFLAGS+=	-g
+
+#CFLAGS+=	-I${.CURDIR}/../../sys
 
 SRCS=	libautofs.c
+INCS=	libautofs.h
 MAN+=	libautofs.3
 
 .include <bsd.lib.mk>
diff --git a/lib/libautofs/libautofs.c b/lib/libautofs/libautofs.c
index f68e90430ee0..7d2e26a4b3df 100644
--- a/lib/libautofs/libautofs.c
+++ b/lib/libautofs/libautofs.c
@@ -43,7 +43,7 @@
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 
-#include <autofs.h>
+#include <fs/autofs/autofs.h>
 
 #include "libautofs.h"
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 43a870906202..33e66a867d0a 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -744,6 +744,7 @@ options 	FFS			#Fast filesystem
 options 	NFSCLIENT		#Network File System client
 
 # The rest are optional:
+options		AUTOFS			#Auto File System
 options 	CD9660			#ISO 9660 filesystem
 options 	FDESCFS			#File descriptor filesystem
 options 	HPFS			#OS/2 File system
diff --git a/sys/conf/files b/sys/conf/files
index 0874c7ad9b7e..2d675b081bd5 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -858,6 +858,9 @@ dev/xe/if_xe_pccard.c		optional xe pccard
 dev/zs/zs.c			optional zs
 dev/zs/zs_sbus.c		optional zs fhc
 dev/zs/zs_sbus.c		optional zs sbus
+fs/autofs/autofs_vnops.c	optional autofs
+fs/autofs/autofs_vfsops.c	optional autofs
+fs/autofs/autofs_util.c		optional autofs
 fs/deadfs/dead_vnops.c	standard
 fs/devfs/devfs_devs.c		standard
 fs/devfs/devfs_rule.c		standard
diff --git a/sys/conf/options b/sys/conf/options
index f7ac6d25b5a2..0ea8f9ea4af6 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -161,6 +161,7 @@ INCLUDE_CONFIG_FILE	opt_config.h
 # time, since the corresponding lkms cannot work if there are any static
 # dependencies.  Unusability is enforced by hiding the defines for the
 # options in a never-included header.
+AUTOFS		opt_dontuse.h
 CD9660		opt_dontuse.h
 CODA		opt_dontuse.h
 EXT2FS		opt_dontuse.h
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 8964983ab066..a502b5c124fc 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -27,6 +27,7 @@ SUBDIR=	${_3dfx} \
 	ath \
 	${_ath_hal} \
 	aue \
+	autofs \
 	${_awi} \
 	axe \
 	bfe \