diff options
| -rwxr-xr-x | configure | 216 | ||||
| -rw-r--r-- | configure.in | 74 |
2 files changed, 163 insertions, 127 deletions
@@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.46 +# From configure.in Revision: 1.47 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 @@ -19,9 +19,11 @@ ac_help="$ac_help ac_help="$ac_help --without-gcc never use gcc" ac_help="$ac_help - --with-ownername specify a user name other than \"mailman\"" + --with-var-prefix directory for mutable data [/var/mailman]" ac_help="$ac_help - --with-ownergroup specify a group name other than \"mailman\"" + --with-username specify a user name other than \"mailman\"" +ac_help="$ac_help + --with-groupname specify a group name other than \"mailman\"" ac_help="$ac_help --with-mail-gid specify GID mail programs run as" ac_help="$ac_help @@ -546,21 +548,25 @@ fi # Check for Python! Better be found on $PATH echo $ac_n "checking for --with-python""... $ac_c" 1>&6 -echo "configure:550: checking for --with-python" >&5 +echo "configure:552: checking for --with-python" >&5 # Check whether --with-python or --without-python was given. if test "${with_python+set}" = set; then withval="$with_python" : fi -echo "$ac_t""$with_python" 1>&6 +case "$with_python" in + "") ans="no";; + *) ans="$with_python" +esac +echo "$ac_t""$ans" 1>&6 if test -z "$with_python" then # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:564: checking for $ac_word" >&5 +echo "configure:570: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_with_python'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -596,7 +602,7 @@ fi fi echo $ac_n "checking Python interpreter""... $ac_c" 1>&6 -echo "configure:600: checking Python interpreter" >&5 +echo "configure:606: checking Python interpreter" >&5 if test ! -x $with_python then { echo "configure: error: @@ -611,7 +617,7 @@ echo "$ac_t""$PYTHON" 1>&6 # See if Python is new enough. 1.5.2 or better is required. echo $ac_n "checking Python version""... $ac_c" 1>&6 -echo "configure:615: checking Python version" >&5 +echo "configure:621: checking Python version" >&5 cat > conftest.py <<EOF import sys @@ -674,7 +680,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:678: checking for a BSD compatible install" >&5 +echo "configure:684: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -727,7 +733,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:731: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:737: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -756,7 +762,7 @@ fi # Extract the first word of "true", so it can be a program name with args. set dummy true; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:760: checking for $ac_word" >&5 +echo "configure:766: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TRUE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -792,7 +798,7 @@ fi # Find compiler, allow alternatives to gcc echo $ac_n "checking for --without-gcc""... $ac_c" 1>&6 -echo "configure:796: checking for --without-gcc" >&5 +echo "configure:802: checking for --without-gcc" >&5 # Check whether --with-gcc or --without-gcc was given. if test "${with_gcc+set}" = set; then withval="$with_gcc" @@ -821,7 +827,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:825: checking for $ac_word" >&5 +echo "configure:831: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -851,7 +857,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:855: checking for $ac_word" >&5 +echo "configure:861: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -902,7 +908,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:906: checking for $ac_word" >&5 +echo "configure:912: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -934,7 +940,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:938: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:944: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -945,12 +951,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 949 "configure" +#line 955 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -976,12 +982,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:980: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:986: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:985: checking whether we are using GNU C" >&5 +echo "configure:991: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -990,7 +996,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1009,7 +1015,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1013: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1019: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1061,7 +1067,7 @@ fi # Pull the hash mark out of the macro call to avoid m4 problems. ac_msg="whether #! works in shell scripts" echo $ac_n "checking $ac_msg""... $ac_c" 1>&6 -echo "configure:1065: checking $ac_msg" >&5 +echo "configure:1071: checking $ac_msg" >&5 if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1090,6 +1096,24 @@ then fi +# Check for an alternate data directory, separate from installation dir. +default_var_prefix="/var/mailman" + +echo $ac_n "checking for --with-var-prefix""... $ac_c" 1>&6 +echo "configure:1104: checking for --with-var-prefix" >&5 +# Check whether --with-var-prefix or --without-var-prefix was given. +if test "${with_var_prefix+set}" = set; then + withval="$with_var_prefix" + : +fi + +case "$with_var_prefix" in + yes) VAR_PREFIX="$default_var_prefix";; + ""|no) VAR_PREFIX="$ac_default_prefix";; + *) VAR_PREFIX="$with_var_prefix";; +esac +echo "$ac_t""$VAR_PREFIX" 1>&6 + # new macro for finding GIDs @@ -1098,28 +1122,29 @@ fi # Check for some other uid to use than `mailman' -echo $ac_n "checking for --with-ownername""... $ac_c" 1>&6 -echo "configure:1103: checking for --with-ownername" >&5 -# Check whether --with-ownername or --without-ownername was given. -if test "${with_ownername+set}" = set; then - withval="$with_ownername" +echo $ac_n "checking for --with-username""... $ac_c" 1>&6 +echo "configure:1127: checking for --with-username" >&5 +# Check whether --with-username or --without-username was given. +if test "${with_username+set}" = set; then + withval="$with_username" : fi -if test -z "$with_ownername" +if test -z "$with_username" then - with_ownername="mailman" + with_username="mailman" fi -OWNERNAME=$with_ownername -echo "$ac_t""$OWNERNAME" 1>&6 +USERNAME=$with_username +echo "$ac_t""$USERNAME" 1>&6 # User `mailman' must exist -echo $ac_n "checking for $OWNERNAME UID""... $ac_c" 1>&6 -echo "configure:1120: checking for $OWNERNAME UID" >&5 + +echo $ac_n "checking for $USERNAME UID""... $ac_c" 1>&6 +echo "configure:1145: checking for $USERNAME UID" >&5 # MAILMAN_UID == variable name -# $OWNERNAME == user id to check for +# $USERNAME == user id to check for if test -z "$MAILMAN_UID" @@ -1127,7 +1152,7 @@ then cat > conftest.py <<EOF import pwd, string uid = '' -for user in string.split("$OWNERNAME"): +for user in string.split("$USERNAME"): try: try: uid = pwd.getpwuid(int(user))[2] @@ -1150,37 +1175,38 @@ rm -f conftest.out conftest.py if test -z "$MAILMAN_UID" then { echo "configure: error: -***** No \"$OWNERNAME\" user found! -***** Your system must have a \"$OWNERNAME\" user defined +***** No \"$USERNAME\" user found! +***** Your system must have a \"$USERNAME\" user defined ***** (usually in your /etc/passwd file). Please see the INSTALL ***** file for details." 1>&2; exit 1; } fi # Check for some other gid to use than `mailman' -echo $ac_n "checking for --with-ownergroup""... $ac_c" 1>&6 -echo "configure:1163: checking for --with-ownergroup" >&5 -# Check whether --with-ownergroup or --without-ownergroup was given. -if test "${with_ownergroup+set}" = set; then - withval="$with_ownergroup" +echo $ac_n "checking for --with-groupname""... $ac_c" 1>&6 +echo "configure:1188: checking for --with-groupname" >&5 +# Check whether --with-groupname or --without-groupname was given. +if test "${with_groupname+set}" = set; then + withval="$with_groupname" : fi -if test -z "$with_ownergroup" +if test -z "$with_groupname" then - with_ownergroup="mailman" + with_groupname="mailman" fi -OWNERGROUP=$with_ownergroup -echo "$ac_t""$OWNERGROUP" 1>&6 +GROUPNAME=$with_groupname +echo "$ac_t""$GROUPNAME" 1>&6 # Group `mailman' must exist -echo $ac_n "checking for $OWNERGROUP GID""... $ac_c" 1>&6 -echo "configure:1181: checking for $OWNERGROUP GID" >&5 + +echo $ac_n "checking for $GROUPNAME GID""... $ac_c" 1>&6 +echo "configure:1207: checking for $GROUPNAME GID" >&5 # MAILMAN_GID == variable name -# $OWNERGROUP == user id to check for +# $GROUPNAME == user id to check for if test -z "$MAILMAN_GID" @@ -1188,7 +1214,7 @@ then cat > conftest.py <<EOF import grp, string gid = '' -for group in string.split("$OWNERGROUP"): +for group in string.split("$GROUPNAME"): try: try: gid = grp.getgrgid(int(group))[2] @@ -1211,8 +1237,8 @@ rm -f conftest.out conftest.py if test -z "$MAILMAN_GID" then { echo "configure: error: -***** No \"$OWNERGROUP\" group found! -***** Your system must have a \"$OWNERGROUP\" group defined +***** No \"$GROUPNAME\" group found! +***** Your system must have a \"$GROUPNAME\" group defined ***** (usually in your /etc/group file). Please see the INSTALL ***** file for details." 1>&2; exit 1; } fi @@ -1221,15 +1247,10 @@ 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 -if test "$prefix" = "NONE" -then - prefixcheck=$ac_default_prefix -else - prefixcheck=$prefix -fi +prefixcheck=$VAR_PREFIX echo $ac_n "checking permissions on $prefixcheck""... $ac_c" 1>&6 -echo "configure:1233: checking permissions on $prefixcheck" >&5 +echo "configure:1254: checking permissions on $prefixcheck" >&5 cat > conftest.py <<EOF import os, grp, string @@ -1275,7 +1296,7 @@ echo "$ac_t""okay" 1>&6 # Now find the UIDs and GIDs # Support --with-mail-gid and --with-cgi-gid echo $ac_n "checking for mail wrapper GID""... $ac_c" 1>&6 -echo "configure:1279: checking for mail wrapper GID" >&5 +echo "configure:1300: checking for mail wrapper 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" @@ -1336,7 +1357,7 @@ fi echo $ac_n "checking for CGI wrapper GID""... $ac_c" 1>&6 -echo "configure:1340: checking for CGI wrapper GID" >&5 +echo "configure:1361: checking for CGI wrapper 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" @@ -1402,7 +1423,7 @@ fi # Check for CGI extensions, required by some Web servers echo $ac_n "checking for CGI extensions""... $ac_c" 1>&6 -echo "configure:1406: checking for CGI extensions" >&5 +echo "configure:1427: 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" @@ -1453,14 +1474,14 @@ EOF $PYTHON conftest.py echo $ac_n "checking for default fully qualified host name""... $ac_c" 1>&6 -echo "configure:1457: checking for default fully qualified host name" >&5 +echo "configure:1478: 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:1464: checking for default URL host component" >&5 +echo "configure:1485: checking for default URL host component" >&5 if test -z "$URL" then URL=`tail -1 conftest.out` @@ -1472,12 +1493,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:1476: checking for $ac_func" >&5 +echo "configure:1497: 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 1481 "configure" +#line 1502 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1500,7 +1521,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1525: \"$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 @@ -1531,17 +1552,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:1535: checking for syslog in -l$lib" >&5 +echo "configure:1556: checking for syslog in -l$lib" >&5 Mailman_LIBS_save="$LIBS"; LIBS="$LIBS -l$lib" cat > conftest.$ac_ext <<EOF -#line 1538 "configure" +#line 1559 "configure" #include "confdefs.h" #include <syslog.h> int main() { syslog(LOG_DEBUG, "Just a test..."); ; return 0; } EOF -if { (eval echo configure:1545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1566: \"$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 @@ -1563,7 +1584,7 @@ fi # Checks for header files. echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1567: checking how to run the C preprocessor" >&5 +echo "configure:1588: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1578,13 +1599,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 1582 "configure" +#line 1603 "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:1588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1609: \"$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 : @@ -1595,13 +1616,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1599 "configure" +#line 1620 "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:1605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1626: \"$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 : @@ -1612,13 +1633,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1616 "configure" +#line 1637 "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:1622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1643: \"$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 : @@ -1643,12 +1664,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1647: checking for ANSI C header files" >&5 +echo "configure:1668: 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 1652 "configure" +#line 1673 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1656,7 +1677,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1681: \"$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* @@ -1673,7 +1694,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 1677 "configure" +#line 1698 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1691,7 +1712,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 1695 "configure" +#line 1716 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1712,7 +1733,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1716 "configure" +#line 1737 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1723,7 +1744,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1750,17 +1771,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:1754: checking for $ac_hdr" >&5 +echo "configure:1775: 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 1759 "configure" +#line 1780 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1785: \"$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* @@ -1789,12 +1810,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:1793: checking for uid_t in sys/types.h" >&5 +echo "configure:1814: 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 1798 "configure" +#line 1819 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -1823,7 +1844,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:1827: checking type of array argument to getgroups" >&5 +echo "configure:1848: 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 @@ -1831,7 +1852,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <<EOF -#line 1835 "configure" +#line 1856 "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ @@ -1856,7 +1877,7 @@ main() } EOF -if { (eval echo configure:1860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1881: \"$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 @@ -1870,7 +1891,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF -#line 1874 "configure" +#line 1895 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -1898,12 +1919,12 @@ EOF for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1902: checking for $ac_func" >&5 +echo "configure:1923: 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 1907 "configure" +#line 1928 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1926,7 +1947,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1951: \"$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 @@ -2112,6 +2133,7 @@ s%@SET_MAKE@%$SET_MAKE%g s%@TRUE@%$TRUE%g s%@CC@%$CC%g s%@OPT@%$OPT%g +s%@VAR_PREFIX@%$VAR_PREFIX%g s%@MAILMAN_UID@%$MAILMAN_UID%g s%@MAILMAN_GID@%$MAILMAN_GID%g s%@MAIL_GID@%$MAIL_GID%g diff --git a/configure.in b/configure.in index d70af366e..9dc74884f 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: 2684 $) +AC_REVISION($Revision: 2706 $) AC_PREREQ(2.0) AC_INIT(src/alias-wrapper.c) @@ -28,7 +28,11 @@ AC_PREFIX_DEFAULT(/home/mailman) AC_MSG_CHECKING(for --with-python) AC_ARG_WITH(python, dnl [ --with-python specify path to Python interpreter]) -AC_MSG_RESULT($with_python) +case "$with_python" in + "") ans="no";; + *) ans="$with_python" +esac +AC_MSG_RESULT($ans) if test -z "$with_python" then @@ -134,6 +138,19 @@ then fi +# Check for an alternate data directory, separate from installation dir. +default_var_prefix="/var/mailman" +AC_SUBST(VAR_PREFIX) +AC_MSG_CHECKING(for --with-var-prefix) +AC_ARG_WITH(var-prefix, dnl +[ --with-var-prefix directory for mutable data [/var/mailman]]) +case "$with_var_prefix" in + yes) VAR_PREFIX="$default_var_prefix";; + ""|no) VAR_PREFIX="$ac_default_prefix";; + *) VAR_PREFIX="$with_var_prefix";; +esac +AC_MSG_RESULT($VAR_PREFIX) + # new macro for finding GIDs AC_DEFUN(MM_FIND_GROUP_ID, [ # $1 == variable name @@ -200,51 +217,53 @@ AC_MSG_RESULT($$1) rm -f conftest.out conftest.py]) # Check for some other uid to use than `mailman' -AC_MSG_CHECKING(for --with-ownername) -AC_ARG_WITH(ownername, dnl -[ --with-ownername specify a user name other than \"mailman\"]) +AC_MSG_CHECKING(for --with-username) +AC_ARG_WITH(username, dnl +[ --with-username specify a user name other than \"mailman\"]) -if test -z "$with_ownername" +if test -z "$with_username" then - with_ownername="mailman" + with_username="mailman" fi -OWNERNAME=$with_ownername -AC_MSG_RESULT($OWNERNAME) +USERNAME=$with_username +AC_MSG_RESULT($USERNAME) # User `mailman' must exist -AC_MSG_CHECKING(for $OWNERNAME UID) -MM_FIND_USER_ID(MAILMAN_UID, $OWNERNAME) +AC_SUBST(MAILMAN_UID) +AC_MSG_CHECKING(for $USERNAME UID) +MM_FIND_USER_ID(MAILMAN_UID, $USERNAME) if test -z "$MAILMAN_UID" then AC_MSG_ERROR([ -***** No \"$OWNERNAME\" user found! -***** Your system must have a \"$OWNERNAME\" user defined +***** No \"$USERNAME\" user found! +***** Your system must have a \"$USERNAME\" user defined ***** (usually in your /etc/passwd file). Please see the INSTALL ***** file for details.]) fi # Check for some other gid to use than `mailman' -AC_MSG_CHECKING(for --with-ownergroup) -AC_ARG_WITH(ownergroup, dnl -[ --with-ownergroup specify a group name other than \"mailman\"]) +AC_MSG_CHECKING(for --with-groupname) +AC_ARG_WITH(groupname, dnl +[ --with-groupname specify a group name other than \"mailman\"]) -if test -z "$with_ownergroup" +if test -z "$with_groupname" then - with_ownergroup="mailman" + with_groupname="mailman" fi -OWNERGROUP=$with_ownergroup -AC_MSG_RESULT($OWNERGROUP) +GROUPNAME=$with_groupname +AC_MSG_RESULT($GROUPNAME) # Group `mailman' must exist -AC_MSG_CHECKING(for $OWNERGROUP GID) -MM_FIND_GROUP_ID(MAILMAN_GID, $OWNERGROUP) +AC_SUBST(MAILMAN_GID) +AC_MSG_CHECKING(for $GROUPNAME GID) +MM_FIND_GROUP_ID(MAILMAN_GID, $GROUPNAME) if test -z "$MAILMAN_GID" then AC_MSG_ERROR([ -***** No \"$OWNERGROUP\" group found! -***** Your system must have a \"$OWNERGROUP\" group defined +***** No \"$GROUPNAME\" group found! +***** Your system must have a \"$GROUPNAME\" group defined ***** (usually in your /etc/group file). Please see the INSTALL ***** file for details.]) fi @@ -253,12 +272,7 @@ 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 -if test "$prefix" = "NONE" -then - prefixcheck=$ac_default_prefix -else - prefixcheck=$prefix -fi +prefixcheck=$VAR_PREFIX AC_MSG_CHECKING(permissions on $prefixcheck) changequote(,) |