summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbwarsaw2003-04-08 03:20:45 +0000
committerbwarsaw2003-04-08 03:20:45 +0000
commit5c1a8bbf0c18cb16b0cef983ca1691ca3299e7d0 (patch)
tree1a31635aa5a432dbe5f4491d92d8b6fcf1e73104
parentbb8cb121b80b604eea40a04be177c790c1c2c792 (diff)
downloadmailman-5c1a8bbf0c18cb16b0cef983ca1691ca3299e7d0.tar.gz
mailman-5c1a8bbf0c18cb16b0cef983ca1691ca3299e7d0.tar.zst
mailman-5c1a8bbf0c18cb16b0cef983ca1691ca3299e7d0.zip
When --without-permcheck is given and the groupname doesn't exist on
the system, one of the build tests would fail with an exception, but configure would carry on. This patch avoids the traceback.
-rwxr-xr-xconfigure85
-rw-r--r--configure.in7
2 files changed, 49 insertions, 43 deletions
diff --git a/configure b/configure
index cd8cda9b1..0b6575d5b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
-# From configure.in Revision: 2.38
+# From configure.in Revision: 2.39
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.13
@@ -1327,7 +1327,10 @@ from stat import *
prefix = "$prefixcheck"
groupname = "$GROUPNAME"
mailmangroup = "$MAILMAN_GROUP"
-mailmangid = grp.getgrnam(mailmangroup)[2]
+try:
+ mailmangid = grp.getgrnam(mailmangroup)[2]
+except KeyError:
+ mailmangid = -1
problems = []
try: statdata = os.stat(prefix)
except OSError:
@@ -1372,7 +1375,7 @@ echo "$ac_t""$status" 1>&6
# Now find the UIDs and GIDs
# Support --with-mail-gid and --with-cgi-gid
echo $ac_n "checking for mail wrapper group; i.e. --with-mail-gid""... $ac_c" 1>&6
-echo "configure:1376: checking for mail wrapper group; i.e. --with-mail-gid" >&5
+echo "configure:1379: checking for mail wrapper group; i.e. --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"
@@ -1431,7 +1434,7 @@ echo "$ac_t""$MAIL_GROUP" 1>&6
echo $ac_n "checking for CGI wrapper group; i.e. --with-cgi-gid""... $ac_c" 1>&6
-echo "configure:1435: checking for CGI wrapper group; i.e. --with-cgi-gid" >&5
+echo "configure:1438: checking for CGI wrapper group; i.e. --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"
@@ -1493,7 +1496,7 @@ echo "$ac_t""$CGI_GROUP" 1>&6
# Check for CGI extensions, required by some Web servers
echo $ac_n "checking for CGI extensions""... $ac_c" 1>&6
-echo "configure:1497: checking for CGI extensions" >&5
+echo "configure:1500: checking for CGI extensions" >&5
# Check whether --with-cgi-ext or --without-cgi-ext was given.
if test "${with_cgi_ext+set}" = set; then
withval="$with_cgi_ext"
@@ -1513,7 +1516,7 @@ echo "$ac_t""$with_cgi_ext" 1>&6
# figure out the default mail hostname and url host component
echo $ac_n "checking for --with-mailhost""... $ac_c" 1>&6
-echo "configure:1517: checking for --with-mailhost" >&5
+echo "configure:1520: checking for --with-mailhost" >&5
# Check whether --with-mailhost or --without-mailhost was given.
if test "${with_mailhost+set}" = set; then
withval="$with_mailhost"
@@ -1531,7 +1534,7 @@ echo "$ac_t""$with_mailhost" 1>&6
echo $ac_n "checking for --with-urlhost""... $ac_c" 1>&6
-echo "configure:1535: checking for --with-urlhost" >&5
+echo "configure:1538: checking for --with-urlhost" >&5
# Check whether --with-urlhost or --without-urlhost was given.
if test "${with_urlhost+set}" = set; then
withval="$with_urlhost"
@@ -1560,14 +1563,14 @@ EOF
$PYTHON conftest.py
echo $ac_n "checking for default mail host name""... $ac_c" 1>&6
-echo "configure:1564: checking for default mail host name" >&5
+echo "configure:1567: checking for default mail host name" >&5
if test -z "$MAILHOST"
then
MAILHOST=`sed q conftest.out`
fi
echo "$ac_t""$MAILHOST" 1>&6
echo $ac_n "checking for default URL host component""... $ac_c" 1>&6
-echo "configure:1571: checking for default URL host component" >&5
+echo "configure:1574: checking for default URL host component" >&5
if test -z "$URLHOST"
then
URLHOST=`sed -n '$p' conftest.out`
@@ -1579,12 +1582,12 @@ rm -f conftest.out conftest.py
for ac_func in strerror setregid syslog
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1583: checking for $ac_func" >&5
+echo "configure:1586: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1588 "configure"
+#line 1591 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1607,7 +1610,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1638,17 +1641,17 @@ if test $ac_cv_func_syslog = no; then
# with the appropriate include.
for lib in bsd socket inet; do
echo $ac_n "checking for syslog in -l$lib""... $ac_c" 1>&6
-echo "configure:1642: checking for syslog in -l$lib" >&5
+echo "configure:1645: checking for syslog in -l$lib" >&5
Mailman_LIBS_save="$LIBS"; LIBS="$LIBS -l$lib"
cat > conftest.$ac_ext <<EOF
-#line 1645 "configure"
+#line 1648 "configure"
#include "confdefs.h"
#include <syslog.h>
int main() {
syslog(LOG_DEBUG, "Just a test...");
; return 0; }
EOF
-if { (eval echo configure:1652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -1670,7 +1673,7 @@ fi
# Checks for header files.
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1674: checking how to run the C preprocessor" >&5
+echo "configure:1677: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1685,13 +1688,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 1689 "configure"
+#line 1692 "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:1695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1702,13 +1705,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1706 "configure"
+#line 1709 "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:1712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1719,13 +1722,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1723 "configure"
+#line 1726 "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:1729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1750,12 +1753,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1754: checking for ANSI C header files" >&5
+echo "configure:1757: 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 1759 "configure"
+#line 1762 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1763,7 +1766,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1780,7 +1783,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 1784 "configure"
+#line 1787 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1798,7 +1801,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 1802 "configure"
+#line 1805 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1819,7 +1822,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1823 "configure"
+#line 1826 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1830,7 +1833,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1857,17 +1860,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:1861: checking for $ac_hdr" >&5
+echo "configure:1864: 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 1866 "configure"
+#line 1869 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1896,12 +1899,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:1900: checking for uid_t in sys/types.h" >&5
+echo "configure:1903: 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 1905 "configure"
+#line 1908 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -1930,7 +1933,7 @@ EOF
fi
echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:1934: checking type of array argument to getgroups" >&5
+echo "configure:1937: 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
@@ -1938,7 +1941,7 @@ else
ac_cv_type_getgroups=cross
else
cat > conftest.$ac_ext <<EOF
-#line 1942 "configure"
+#line 1945 "configure"
#include "confdefs.h"
/* Thanks to Mike Rendell for this test. */
@@ -1963,7 +1966,7 @@ main()
}
EOF
-if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_type_getgroups=gid_t
else
@@ -1977,7 +1980,7 @@ fi
if test $ac_cv_type_getgroups = cross; then
cat > conftest.$ac_ext <<EOF
-#line 1981 "configure"
+#line 1984 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
@@ -2005,12 +2008,12 @@ EOF
for ac_func in vsnprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2009: checking for $ac_func" >&5
+echo "configure:2012: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2014 "configure"
+#line 2017 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2033,7 +2036,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
diff --git a/configure.in b/configure.in
index 6d5f0af0f..4b636ad9e 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: 6094 $)
+AC_REVISION($Revision: 6330 $)
AC_PREREQ(2.0)
AC_INIT(src/common.h)
@@ -339,7 +339,10 @@ from stat import *
prefix = "$prefixcheck"
groupname = "$GROUPNAME"
mailmangroup = "$MAILMAN_GROUP"
-mailmangid = grp.getgrnam(mailmangroup)[2]
+try:
+ mailmangid = grp.getgrnam(mailmangroup)[2]
+except KeyError:
+ mailmangid = -1
problems = []
try: statdata = os.stat(prefix)
except OSError: