The usual

1 files changed, 72 insertions, 53 deletions

diff --git a/configure b/configure
index 87552ba29..96b8a7f50 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.5 
+# From configure.in Revision: 1.7 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.12 
@@ -962,35 +962,44 @@ fi
 # new macro for finding GIDs
 
 
-
 # Now find the UIDs and GIDs
 # Support --with-mail-gid and --with-cgi-gid
 echo $ac_n "checking for --with-mail-gid""... $ac_c" 1>&6
-echo "configure:970: checking for --with-mail-gid" >&5
+echo "configure:969: checking for --with-mail-gid" >&5
 # Check whether --with-mail-gid or --without-mail-gid was given.
 if test "${with_mail_gid+set}" = set; then
   withval="$with_mail_gid"
   :
 fi
 
+if test -z "$with_mail_gid"
+then
+    with_mail_gid=other
+fi
 echo "$ac_t""$with_mail_gid" 1>&6
-MAIL_GID=$with_mail_gid
 
 # MAIL_GID == variable name
-# other == user id to check for
+# $with_mail_gid == user id to check for
 # mail_wrapper == purpose
 echo $ac_n "checking for mail_wrapper GID""... $ac_c" 1>&6
-echo "configure:984: checking for mail_wrapper GID" >&5
+echo "configure:986: checking for mail_wrapper GID" >&5
 
 
 if test -z "$MAIL_GID"
 then
     cat > conftest.py <<EOF
-import grp
-try:
-    gid = grp.getgrnam("other")[2]
-except KeyError:
-    gid = ''
+import grp, string
+gid = ''
+for group in string.split("$with_mail_gid"):
+    try:
+        try:
+	    gid = grp.getgrgid(int(group))
+	    break
+	except ValueError:
+	    gid = grp.getgrnam(group)[2]
+	    break
+    except KeyError:
+        gid = ''
 fp = open("conftest.out", "w")
 fp.write("%s\n" % gid)
 fp.close()
@@ -1003,8 +1012,8 @@ if test -z "$MAIL_GID"
 then
     { echo "configure: error: 
 
-***** Group other not found!  You must first
-***** set up the other entry in /etc/group
+***** Group $with_mail_gid not found!  You must first
+***** set up the $with_mail_gid entry in /etc/group
 ***** or set the MAIL_GID shell variable on the
 ***** configure command line" 1>&2; exit 1; }
 fi
@@ -1012,31 +1021,41 @@ echo "$ac_t""$MAIL_GID" 1>&6
 rm -f conftest.out conftest.py
 
 echo $ac_n "checking for --with-cgi-gid""... $ac_c" 1>&6
-echo "configure:1016: checking for --with-cgi-gid" >&5
+echo "configure:1025: checking for --with-cgi-gid" >&5
 # Check whether --with-cgi-gid or --without-cgi-gid was given.
 if test "${with_cgi_gid+set}" = set; then
   withval="$with_cgi_gid"
   :
 fi
 
+if test -z "$with_cgi_gid"
+then
+    with_cgi_gid="www www-data nobody"
+fi
 echo "$ac_t""$with_cgi_gid" 1>&6
-CGI_GID=$with_cgi_gid
 
 # CGI_GID == variable name
-# nobody == user id to check for
+# $with_cgi_gid == user id to check for
 # cgi_wrapper == purpose
 echo $ac_n "checking for cgi_wrapper GID""... $ac_c" 1>&6
-echo "configure:1030: checking for cgi_wrapper GID" >&5
+echo "configure:1042: checking for cgi_wrapper GID" >&5
 
 
 if test -z "$CGI_GID"
 then
     cat > conftest.py <<EOF
-import grp
-try:
-    gid = grp.getgrnam("nobody")[2]
-except KeyError:
-    gid = ''
+import grp, string
+gid = ''
+for group in string.split("$with_cgi_gid"):
+    try:
+        try:
+	    gid = grp.getgrgid(int(group))
+	    break
+	except ValueError:
+	    gid = grp.getgrnam(group)[2]
+	    break
+    except KeyError:
+        gid = ''
 fp = open("conftest.out", "w")
 fp.write("%s\n" % gid)
 fp.close()
@@ -1049,8 +1068,8 @@ if test -z "$CGI_GID"
 then
     { echo "configure: error: 
 
-***** Group nobody not found!  You must first
-***** set up the nobody entry in /etc/group
+***** Group $with_cgi_gid not found!  You must first
+***** set up the $with_cgi_gid entry in /etc/group
 ***** or set the CGI_GID shell variable on the
 ***** configure command line" 1>&2; exit 1; }
 fi
@@ -1093,14 +1112,14 @@ EOF
 python conftest.py
 
 echo $ac_n "checking for default fully qualified host name""... $ac_c" 1>&6
-echo "configure:1097: checking for default fully qualified host name" >&5
+echo "configure:1116: checking for default fully qualified host name" >&5
 if test -z "$FQDN"
 then
     FQDN=`head -1 conftest.out`
 fi
 echo "$ac_t""$FQDN" 1>&6
 echo $ac_n "checking for default URL host component""... $ac_c" 1>&6
-echo "configure:1104: checking for default URL host component" >&5
+echo "configure:1123: checking for default URL host component" >&5
 if test -z "$URL"
 then
     URL=`tail -1 conftest.out`
@@ -1112,7 +1131,7 @@ rm -f conftest.out conftest.py
 
 # Checks for header files.
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1116: checking how to run the C preprocessor" >&5
+echo "configure:1135: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1127,13 +1146,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1131 "configure"
+#line 1150 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1144,13 +1163,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1148 "configure"
+#line 1167 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1173,12 +1192,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1177: checking for ANSI C header files" >&5
+echo "configure:1196: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1182 "configure"
+#line 1201 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1186,7 +1205,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1203,7 +1222,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1207 "configure"
+#line 1226 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1221,7 +1240,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1225 "configure"
+#line 1244 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1242,7 +1261,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1246 "configure"
+#line 1265 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1253,7 +1272,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1280,17 +1299,17 @@ for ac_hdr in syslog.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1284: checking for $ac_hdr" >&5
+echo "configure:1303: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1289 "configure"
+#line 1308 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1319,12 +1338,12 @@ done
 
 # Checks for typedefs, structures, and compiler characteristics.
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:1323: checking for uid_t in sys/types.h" >&5
+echo "configure:1342: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1328 "configure"
+#line 1347 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -1353,7 +1372,7 @@ EOF
 fi
 
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:1357: checking type of array argument to getgroups" >&5
+echo "configure:1376: checking type of array argument to getgroups" >&5
 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1361,7 +1380,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 1365 "configure"
+#line 1384 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Rendell for this test.  */
@@ -1386,7 +1405,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:1390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
     ac_cv_type_getgroups=gid_t
 else
@@ -1400,7 +1419,7 @@ fi
 
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 1404 "configure"
+#line 1423 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -1426,12 +1445,12 @@ EOF
 
 # Checks for library functions.
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:1430: checking for vprintf" >&5
+echo "configure:1449: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1435 "configure"
+#line 1454 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -1454,7 +1473,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -1478,12 +1497,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:1482: checking for _doprnt" >&5
+echo "configure:1501: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1487 "configure"
+#line 1506 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -1506,7 +1525,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else