--- acinclude.m4	2005-04-04 18:19:28.890140904 -0400
+++ acinclude.m4.bak	2005-04-04 18:19:24.023880688 -0400
@@ -1694,70 +1694,70 @@ AC_SUBST(LDADD)
 dnl
 dnl Test user ID and group ID required for SFS
 dnl
-AC_DEFUN(SFS_USER,
-[AC_SUBST(sfsuser)
-AC_SUBST(sfsgroup)
-sfsuser="$with_sfsuser"
-test -z "$sfsuser" && sfsuser=sfs
-sfsgroup="$with_sfsgroup"
-test -z "$sfsgroup" && sfsgroup="$sfsuser"
-
-if test -z "${with_sfsuser+set}" -o -z "${with_sfsgroup+set}"; then
-AC_CACHE_CHECK(for sfs user and group, sfs_cv_ugidok,
-    [changequote expr='[0-9][0-9]*$' changequote([,])]
-    uid_isnum=`expr $sfsuser : $expr`
-    if test "$uid_isnum" != 0; then
-	sfs_getpwd="getpwuid ($sfsuser)"
-    else
-	sfs_getpwd="getpwnam (\"$sfsuser\")"
-    fi
-    gid_isnum=`expr $sfsgroup : $expr`
-    if test "$gid_isnum" != 0; then
-	sfs_getgrp="getgrgid ($sfsgroup)"
-    else
-	sfs_getgrp="getgrnam (\"$sfsgroup\")"
-    fi
-    AC_TRY_RUN([changequote changequote([[,]])
-#include <stdio.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <grp.h>
-
-static int error;
-
-static void
-bad (char *p)
-{
-  if (error)
-    printf (" %s", p);
-  else {
-    error = 1;
-    printf ("[%s", p);
-  }
-}
-
-int
-main ()
-{
-  struct passwd *pw = $sfs_getpwd;
-  struct group *gr = $sfs_getgrp;
-
-  if (!$uid_isnum && !pw)
-    bad ("No user $sfsuser."); 
-  if (!$gid_isnum && !gr)
-    bad ("No group $sfsgroup."); 
-  else if (gr && gr->gr_mem[0])
-    bad ("Group $sfsgroup cannot have users."); 
-  if (pw && gr && pw->pw_gid != gr->gr_gid)
-    bad ("Login group of $sfsuser must be $sfsgroup."); 
-  if (error)
-    printf ("] ");
-  return error;
-}
-changequote([,])],
-    sfs_cv_ugidok=yes, sfs_cv_ugidok=no, sfs_cv_ugidok=skipped))
-
-    test "$sfs_cv_ugidok" = no \
-	&& AC_MSG_ERROR(Create sfs user/group or use --with-sfsuser/--with-sfsgroup)
-fi
-])
+dnl AC_DEFUN(SFS_USER,
+dnl [AC_SUBST(sfsuser)
+dnl AC_SUBST(sfsgroup)
+dnl sfsuser="$with_sfsuser"
+dnl test -z "$sfsuser" && sfsuser=sfs
+dnl sfsgroup="$with_sfsgroup"
+dnl test -z "$sfsgroup" && sfsgroup="$sfsuser"
+dnl 
+dnl if test -z "${with_sfsuser+set}" -o -z "${with_sfsgroup+set}"; then
+dnl AC_CACHE_CHECK(for sfs user and group, sfs_cv_ugidok,
+dnl     [changequote expr='[0-9][0-9]*$' changequote([,])]
+dnl     uid_isnum=`expr $sfsuser : $expr`
+dnl     if test "$uid_isnum" != 0; then
+dnl 	sfs_getpwd="getpwuid ($sfsuser)"
+dnl     else
+dnl 	sfs_getpwd="getpwnam (\"$sfsuser\")"
+dnl     fi
+dnl     gid_isnum=`expr $sfsgroup : $expr`
+dnl     if test "$gid_isnum" != 0; then
+dnl 	sfs_getgrp="getgrgid ($sfsgroup)"
+dnl     else
+dnl 	sfs_getgrp="getgrnam (\"$sfsgroup\")"
+dnl     fi
+dnl     AC_TRY_RUN([changequote changequote([[,]])
+dnl #include <stdio.h>
+dnl #include <sys/types.h>
+dnl #include <pwd.h>
+dnl #include <grp.h>
+dnl 
+dnl static int error;
+dnl 
+dnl static void
+dnl bad (char *p)
+dnl {
+dnl   if (error)
+dnl     printf (" %s", p);
+dnl   else {
+dnl     error = 1;
+dnl     printf ("[%s", p);
+dnl   }
+dnl }
+dnl 
+dnl int
+dnl main ()
+dnl {
+dnl   struct passwd *pw = $sfs_getpwd;
+dnl   struct group *gr = $sfs_getgrp;
+dnl 
+dnl   if (!$uid_isnum && !pw)
+dnl     bad ("No user $sfsuser."); 
+dnl   if (!$gid_isnum && !gr)
+dnl     bad ("No group $sfsgroup."); 
+dnl   else if (gr && gr->gr_mem[0])
+dnl     bad ("Group $sfsgroup cannot have users."); 
+dnl   if (pw && gr && pw->pw_gid != gr->gr_gid)
+dnl     bad ("Login group of $sfsuser must be $sfsgroup."); 
+dnl   if (error)
+dnl     printf ("] ");
+dnl   return error;
+dnl }
+dnl changequote([,])],
+dnl     sfs_cv_ugidok=yes, sfs_cv_ugidok=no, sfs_cv_ugidok=skipped))
+dnl 
+dnl     test "$sfs_cv_ugidok" = no \
+dnl 	&& AC_MSG_ERROR(Create sfs user/group or use --with-sfsuser/--with-sfsgroup)
+dnl fi
+dnl ])