[privoxy-commits] current configure.in,1.80,1.81

[<no...@so...>]

Update of /cvsroot/ijbswa/current
In directory usw-pr-cvs1:/tmp/cvs-serv19515

Modified Files:
	configure.in 
Log Message:
Some general cleanup of the user/group stuff. Including remove up to ':' to
make Linux (?) compatible with other *nix. Better AC output stuff.


Index: configure.in
===================================================================
RCS file: /cvsroot/ijbswa/current/configure.in,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- configure.in	26 Sep 2002 18:47:46 -0000	1.80
+++ configure.in	27 Sep 2002 00:38:44 -0000	1.81
@@ -28,6 +28,10 @@
 dnl Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 dnl 
 dnl $Log$
+dnl Revision 1.81  2002/09/27 00:38:44  hal9
+dnl Some general cleanup of the user/group stuff. Including remove up to ':' to
+dnl make Linux (?) compatible with other *nix. Better AC output stuff.
+dnl
 dnl Revision 1.80  2002/09/26 18:47:46  hal9
 dnl This is most of Al's patch for --with-user and --with-group which tests that
 dnl these are valid values, if specified. If not specified, they are left empty.
@@ -522,6 +526,15 @@
         ]
 )
 
+dnl =================================================================
+dnl Check for user and group validity
+dnl =================================================================
+
+$ID privoxy >/dev/null 2>/dev/null
+if ! test $? -eq 0 ; then
+ AC_MSG_WARN(There is no user 'privoxy' on this system)
+fi
+AC_MSG_CHECKING([for user])
 AC_ARG_WITH(user,
         [  --with-user=privoxy          Set user under which privoxy will run],
         [
@@ -529,6 +542,7 @@
                   if test $ID = no ; then
                     AC_MSG_ERROR(There is no 'id' program on this system)
                   else
+                    AC_MSG_RESULT($with_user)
                     $ID $with_user 2>/dev/null >/dev/null
                     if test $? -eq 0 ; then
                       USER=$with_user;
@@ -544,30 +558,27 @@
           if test $ID = no ; then
             AC_MSG_ERROR(There is no 'id' programm on this system)
           else
-            $ID privoxy >/dev/null
-            if test $? -eq 0 ; then
-              USER=privoxy;
-            else
-              AC_MSG_WARN(There is no user 'privoxy' on this system)
-              USER=$with_user
-            fi
+            AC_MSG_RESULT(none specified)
+            USER=$with_user
           fi
         ]
 )
 AC_SUBST(USER)
 
+AC_MSG_CHECKING([for group])
 AC_ARG_WITH(group,
         [  --with-group=privoxy         Set group for privoxy],
-        [
+        [ 
                 if test "x$withval" != "xyes"; then
                   if test $BGROUPS = no ; then
                     AC_MSG_ERROR(There is no 'groups' program on this system)
                   else
+                    AC_MSG_RESULT($with_group)
                     $BGROUPS $USER >/dev/null
                     if test $? -eq 0 ; then
                     # FIXME: this fails if valid group, but not first group
                     # listed.
-                      if test "$with_group" != "`$BGROUPS $USER 2>/dev/null |$AWK '{print $3}'`" ; then
+                      if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then
                         AC_MSG_ERROR(The given value '$withval' does not match group entry)
                       else
                         GROUP=$with_group;
@@ -584,16 +595,8 @@
           if test $BGROUPS = no ; then
             AC_MSG_ERROR(There is no 'groups' programm on this system)
           else
-            $BGROUPS $USER >/dev/null
-            if test $? -eq 0 ; then
-              if test "$with_group" != "`$BGROUPS $USER 2>/dev/null |$AWK '{print $3}'`" -a "$with_group" != "" ; then
-                AC_MSG_ERROR('$USER' isn't a member of '$with_group' group)
-              else
-                GROUP=$with_group;
-              fi
-            else
-              AC_MSG_ERROR(There is no group entry for user '$USER')
-            fi
+            AC_MSG_RESULT(none specified)
+            GROUP=$with_group;
           fi
         ]
 )