--- configure.in	2005-04-04 18:19:28.889141056 -0400
+++ configure.in.bak	2005-04-04 18:19:24.023880688 -0400
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to p
 dnl
 
 AC_INIT(acinclude.m4)
-AM_INIT_AUTOMAKE(sfs,0.8pre)
+AM_INIT_AUTOMAKE(async,0.8pre)
 dnl AC_INIT(sfs,0.7.2)
 dnl AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
@@ -37,7 +37,7 @@ if test "$no_x" != yes; then
   test -z "$x_includes" || CPPFLAGS="$CPPFLAGS -I$x_includes"
 fi
 
-SFS_USER
+# SFS_USER
 
 AC_ARG_ENABLE(shlib,
 --enable-shlib            Build shared libraries rather than static ones,,)
@@ -212,39 +212,40 @@ if test "$sfs_cv_have_dev_xfs" = yes; th
 fi
 
 SFS_SLEEPYCAT(4.3 4.2 4.1 4.0 3.3 3.2 3.1, no)
-AC_SUBST(DBLIB)
-AC_SUBST(DBDEPS)
-DBLIB='$(top_builddir)/sfsrodb/libsfsrodb.a'
-DBDEPS='$(top_builddir)/sfsrodb/libsfsrodb.a'
-if test "${USE_DB}" != no; then
-	CPPFLAGS="$CPPFLAGS -DSLEEPYCAT"
-	DBLIB="$DBLIB $DB_LIB"
-else
-	DBLIB="$DBLIB"' $(top_builddir)/adb/libbtree.a'
-	DBDEPS="$DBDEPS"' $(top_builddir)/adb/libbtree.a'
-fi
+# AC_SUBST(DBLIB)
+# AC_SUBST(DBDEPS)
+# DBLIB='$(top_builddir)/sfsrodb/libsfsrodb.a'
+# DBDEPS='$(top_builddir)/sfsrodb/libsfsrodb.a'
+# if test "${USE_DB}" != no; then
+# 	CPPFLAGS="$CPPFLAGS -DSLEEPYCAT"
+# 	DBLIB="$DBLIB $DB_LIB"
+# else
+# 	DBLIB="$DBLIB"' $(top_builddir)/adb/libbtree.a'
+# 	DBDEPS="$DBDEPS"' $(top_builddir)/adb/libbtree.a'
+# fi
 
 dnl Add SFS libraries to LDADD by default.
 CPPFLAGS="$CPPFLAGS -I"'$(top_srcdir)'
-for lib in async arpc crypt sfsmisc sfsrodb adb; do
+# for lib in async arpc crypt sfsmisc sfsrodb adb; do
+for lib in async; do
     CPPFLAGS="$CPPFLAGS -I"'$(top_srcdir)'"/$lib"
 done
-CPPFLAGS="$CPPFLAGS -I"'$(top_builddir)'"/svc"
-CPPFLAGS="$CPPFLAGS -I"'$(top_srcdir)'"/svc"
+# CPPFLAGS="$CPPFLAGS -I"'$(top_builddir)'"/svc"
+# CPPFLAGS="$CPPFLAGS -I"'$(top_srcdir)'"/svc"
 AC_SUBST(LIBASYNC)
 LIBASYNC='$(top_builddir)/async/libasync.la'
-AC_SUBST(LIBARPC)
-LIBARPC='$(top_builddir)/arpc/libarpc.la'
-AC_SUBST(LIBSFSCRYPT)
-LIBSFSCRYPT='$(top_builddir)/crypt/libsfscrypt.la'
-AC_SUBST(LIBSVC)
-LIBSVC='$(top_builddir)/svc/libsvc.la'
-AC_SUBST(LIBADB)
-LIBADB='$(top_builddir)/adb/btree/libbtree.la'
-AC_SUBST(LIBSFSRODB)
-LIBSFSRODB='$(top_builddir)/sfsrodb/libsfsrodb.la'
-AC_SUBST(LIBSFSMISC)
-LIBSFSMISC='$(top_builddir)/sfsmisc/libsfsmisc.la'
+# AC_SUBST(LIBARPC)
+# LIBARPC='$(top_builddir)/arpc/libarpc.la'
+# AC_SUBST(LIBSFSCRYPT)
+# LIBSFSCRYPT='$(top_builddir)/crypt/libsfscrypt.la'
+# AC_SUBST(LIBSVC)
+# LIBSVC='$(top_builddir)/svc/libsvc.la'
+# AC_SUBST(LIBADB)
+# LIBADB='$(top_builddir)/adb/btree/libbtree.la'
+# AC_SUBST(LIBSFSRODB)
+# LIBSFSRODB='$(top_builddir)/sfsrodb/libsfsrodb.la'
+# AC_SUBST(LIBSFSMISC)
+# LIBSFSMISC='$(top_builddir)/sfsmisc/libsfsmisc.la'
 LDADD='$(LIBSFSMISC) $(LIBSVC) $(LIBSFSCRYPT) $(LIBARPC) $(LIBASYNC) $(LIBGMP)'
 if test "$enable_shared" = yes; then
     LDEPS=
@@ -302,26 +303,26 @@ ETAGS_ARGS='-C /dev/null'
 AC_SUBST(ETAGS_ARGS)
 
 
-AC_ARG_ENABLE(uvfs,
---enable-uvfs             Build support for user-level VFS lkm,,
-enable_uvfs=no)
-if test "$enable_uvfs" = yes; then
-    CPPFLAGS="$CPPFLAGS -DUSE_UVFS "'-I$(top_srcdir)/uvfs'
-    UVFS_DIR=uvfs
-else
-    UVFS_DIR=
-    case "$ac_configure_args" in
-	*--disable-uvfs*)
-	    ;;
-	*)
-	    ac_configure_args="${ac_configure_args}${ac_configure_args+ }--disable-uvfs"
-	    ;;
-    esac
-fi
-AC_SUBST(UVFS_DIR)
-dnl AC_CONFIG_SUBDIRS($UVFS_DIR)
-AC_CONFIG_SUBDIRS(uvfs)
-AM_CONDITIONAL(UVFS, test "$enable_uvfs" = yes)
+# AC_ARG_ENABLE(uvfs,
+# --enable-uvfs             Build support for user-level VFS lkm,,
+# enable_uvfs=no)
+# if test "$enable_uvfs" = yes; then
+#     CPPFLAGS="$CPPFLAGS -DUSE_UVFS "'-I$(top_srcdir)/uvfs'
+#     UVFS_DIR=uvfs
+# else
+#     UVFS_DIR=
+#     case "$ac_configure_args" in
+# 	*--disable-uvfs*)
+# 	    ;;
+# 	*)
+# 	    ac_configure_args="${ac_configure_args}${ac_configure_args+ }--disable-uvfs"
+# 	    ;;
+#     esac
+# fi
+# AC_SUBST(UVFS_DIR)
+# dnl AC_CONFIG_SUBDIRS($UVFS_DIR)
+# AC_CONFIG_SUBDIRS(uvfs)
+# AM_CONDITIONAL(UVFS, test "$enable_uvfs" = yes)
 
 AC_ARG_ENABLE(repo,
 --enable-repo             Try to use the -frepo flag of egcs,,
@@ -356,8 +357,8 @@ AC_ARG_WITH(etcdir,
 etcdir="$with_etcdir"
 test -z "$etcdir" -o "$etcdir" = yes -o "$etcdir" = no && etcdir=/etc/sfs
 AC_SUBST(etcdir)
-CPPFLAGS="$CPPFLAGS -DETCDIR="'\"$(etcdir)\"'
-CPPFLAGS="$CPPFLAGS -DDATADIR="'\"$(pkgdatadir)\"'
+# CPPFLAGS="$CPPFLAGS -DETCDIR="'\"$(etcdir)\"'
+# CPPFLAGS="$CPPFLAGS -DDATADIR="'\"$(pkgdatadir)\"'
 
 if test -d /var/run; then
     piddir=/var/run
@@ -373,23 +374,25 @@ AC_ARG_WITH(sfsdir,
     if test -d /var; then sfsdir=/var/sfs;
     else sfsdir=/usr/sfs; fi)
 AC_SUBST(sfsdir)
-CPPFLAGS="$CPPFLAGS -DSFSDIR="'\"$(sfsdir)\"'
+# CPPFLAGS="$CPPFLAGS -DSFSDIR="'\"$(sfsdir)\"'
 
 AC_SUBST(SFSRO_PROXY_LIB)
 
-AC_ARG_WITH(sfsuser,
---with-sfsuser=name       Name of sfs user)
-AC_ARG_WITH(sfsgroup,
---with-sfsgroup=name      Name of sfs group)
-
-
+# AC_ARG_WITH(sfsuser,
+# --with-sfsuser=name       Name of sfs user)
+# AC_ARG_WITH(sfsgroup,
+# --with-sfsgroup=name      Name of sfs group)
+# 
+
+
+# AC_OUTPUT(Makefile async/Makefile rpcc/Makefile arpc/Makefile
+# 	crypt/Makefile svc/Makefile sfsmisc/Makefile libsfs/Makefile
+# 	etc/Makefile etc/agentrc etc/sfs_config etc/sfscd_config
+# 	etc/sfssd_config etc/sfsauthd_config doc/Makefile tests/Makefile
+# 	sfssd/Makefile sfsrwsd/Makefile
+# 	nfsmounter/Makefile sfscd/Makefile sfsrwcd/Makefile agent/Makefile
+# 	rex/Makefile sfsauthd/Makefile sfsusrv/Makefile
+# 	adb/Makefile sfsrodb/Makefile sfsrosd/Makefile sfsrocd/Makefile
+# 	sfsaclsd/Makefile)
 
-AC_OUTPUT(Makefile async/Makefile rpcc/Makefile arpc/Makefile
-	crypt/Makefile svc/Makefile sfsmisc/Makefile libsfs/Makefile
-	etc/Makefile etc/agentrc etc/sfs_config etc/sfscd_config
-	etc/sfssd_config etc/sfsauthd_config doc/Makefile tests/Makefile
-	sfssd/Makefile sfsrwsd/Makefile
-	nfsmounter/Makefile sfscd/Makefile sfsrwcd/Makefile agent/Makefile
-	rex/Makefile sfsauthd/Makefile sfsusrv/Makefile
-	adb/Makefile sfsrodb/Makefile sfsrosd/Makefile sfsrocd/Makefile
-	sfsaclsd/Makefile)
+AC_OUTPUT(Makefile async/Makefile)