1 files changed, 23 insertions, 15 deletions

diff --git a/configure.in b/configure.in
index 11328d132..f403730eb 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 809 $)
+AC_REVISION($Revision: 882 $)
 AC_PREREQ(2.0)
 AC_INIT(src/alias-wrapper.c)
 
@@ -28,7 +28,6 @@ VERSION=1.0b5
 # /home/mailman is the default installation directory
 AC_PREFIX_DEFAULT(/home/mailman)
 
-
 # Check for Python!  Better be found on $PATH
 AC_MSG_CHECKING(for --with-python)
 AC_ARG_WITH(python, [
@@ -156,24 +155,33 @@ fi
 # Now make sure that $prefix is set up correctly.  It must be group
 # owned by `mailman', it must have the group sticky bit set, and it
 # must be a+rx
-AC_MSG_CHECKING(permissions on $prefix)
+if test "$prefix" = "NONE"
+then
+    prefixcheck=$ac_default_prefix
+else
+    prefixcheck=$prefix
+fi
+AC_MSG_CHECKING(permissions on $prefixcheck)
 changequote(,)
 cat > conftest.py <<EOF
 import os, grp, string
 from stat import *
-prefix = '$prefix'
+prefix = "$prefixcheck"
 mailmangid = $MAILMAN_GID
-statdata = os.stat(prefix)
-mode = statdata[ST_MODE]
-gid = statdata[ST_GID]
 problems = []
-if mailmangid <> gid:
-    problems.append("Directory must be owned by group mailman: " + prefix)
-if (mode & S_ISGID) <> S_ISGID:
-    problems.append("Group set-id bit must be set for directory: " + prefix)
-perms = S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH
-if (mode & perms) <> perms:
-    problems.append("Permissions should be at least 0775: " + prefix)
+try: statdata = os.stat(prefix)
+except os.error:
+    problems.append("Directory doesn't exist: " + prefix)
+else:    
+    mode = statdata[ST_MODE]
+    gid = statdata[ST_GID]
+    if mailmangid <> gid:
+	problems.append("Directory must be owned by group mailman: " + prefix)
+    if (mode & S_ISGID) <> S_ISGID:
+	problems.append("Group set-id bit must be set for directory: " +prefix)
+    perms = S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH
+    if (mode & perms) <> perms:
+	problems.append("Permissions should be at least 0775: " + prefix)
 if not problems:
     msg = "okay\n"
 else:
@@ -190,7 +198,7 @@ if test "$status" != "okay"
 then
     AC_MSG_ERROR([
 
-***** Installation directory $prefix is not configured properly!
+***** Installation directory $prefixcheck is not configured properly!
 $status])
 fi
 AC_MSG_RESULT(okay)