Mercurial > noffle
changeset 146:fd821441f016 noffle
[svn] Applied patch by Paul Slootman: using the mail program is
replaced by sendmail (SENDMAILPROG variable).
author | enz |
---|---|
date | Sun, 15 Oct 2000 18:23:27 +0100 |
parents | deb2320befd7 |
children | 64b682c7732d |
files | Makefile.in acconfig.h config.h.in configure configure.in docs/Makefile.in |
diffstat | 6 files changed, 117 insertions(+), 143 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sun Oct 15 18:22:42 2000 +0100 +++ b/Makefile.in Sun Oct 15 18:23:27 2000 +0100 @@ -62,10 +62,9 @@ CC = @CC@ CONFIGFILE = @CONFIGFILE@ DOCDIR = @DOCDIR@ -MAILPROG = @MAILPROG@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ -SORTPROG = @SORTPROG@ +SENDMAILPROG = @SENDMAILPROG@ SPOOLDIR = @SPOOLDIR@ VERSION = @VERSION@
--- a/acconfig.h Sun Oct 15 18:22:42 2000 +0100 +++ b/acconfig.h Sun Oct 15 18:23:27 2000 +0100 @@ -15,6 +15,8 @@ /* Define to 'unsigned int' if not already defined by the system. */ #undef socklen_t +/* path to sendmail binary */ +#undef SENDMAILPROG @TOP@ /* autoheader generated things inserted here. */
--- a/config.h.in Sun Oct 15 18:22:42 2000 +0100 +++ b/config.h.in Sun Oct 15 18:23:27 2000 +0100 @@ -16,6 +16,8 @@ /* Define to 'unsigned int' if not already defined by the system. */ #undef socklen_t +/* path to sendmail binary */ +#undef SENDMAILPROG /* Define if on AIX 3.
--- a/configure Sun Oct 15 18:22:42 2000 +0100 +++ b/configure Sun Oct 15 18:23:27 2000 +0100 @@ -1247,78 +1247,51 @@ fi -# Extract the first word of "mail", so it can be a program name with args. -set dummy mail; ac_word=$2 +# Extract the first word of "sendmail", so it can be a program name with args. +set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:1254: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_MAILPROG'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_path_SENDMAILPROG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$MAILPROG"; then - ac_cv_prog_MAILPROG="$MAILPROG" # Let the user override the test. -else + case "$SENDMAILPROG" in + /*) + ac_cv_path_SENDMAILPROG="$SENDMAILPROG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_SENDMAILPROG="$SENDMAILPROG" # Let the user override the test with a dos path. + ;; + *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do + ac_dummy="/usr/sbin:/usr/lib:$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_MAILPROG="mail" + ac_cv_path_SENDMAILPROG="$ac_dir/$ac_word" break fi done IFS="$ac_save_ifs" -fi + test -z "$ac_cv_path_SENDMAILPROG" && ac_cv_path_SENDMAILPROG="'notfound'" + ;; +esac fi -MAILPROG="$ac_cv_prog_MAILPROG" -if test -n "$MAILPROG"; then - echo "$ac_t""$MAILPROG" 1>&6 +SENDMAILPROG="$ac_cv_path_SENDMAILPROG" +if test -n "$SENDMAILPROG"; then + echo "$ac_t""$SENDMAILPROG" 1>&6 else echo "$ac_t""no" 1>&6 fi -if test "x$MAILPROG" != "xmail"; then - { echo "configure: error: mail program not found." 1>&2; exit 1; } -fi - -# Extract the first word of "sort", so it can be a program name with args. -set dummy sort; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1287: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_SORTPROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$SORTPROG"; then - ac_cv_prog_SORTPROG="$SORTPROG" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_SORTPROG="sort" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -SORTPROG="$ac_cv_prog_SORTPROG" -if test -n "$SORTPROG"; then - echo "$ac_t""$SORTPROG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -if test "x$SORTPROG" != "xsort"; then - { echo "configure: error: sort program not found." 1>&2; exit 1; } +if test "x$SENDMAILPROG" = "xnotfound"; then + { echo "configure: error: sendmail program not found in /usr/lib:/usr/sbin:$PATH ." 1>&2; exit 1; } fi - echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1320: checking for AIX" >&5 +echo "configure:1293: checking for AIX" >&5 cat > conftest.$ac_ext <<EOF -#line 1322 "configure" +#line 1295 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1340,7 +1313,7 @@ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1344: checking for POSIXized ISC" >&5 +echo "configure:1317: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1362,17 +1335,17 @@ ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1366: checking for minix/config.h" >&5 +echo "configure:1339: checking for minix/config.h" >&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 1371 "configure" +#line 1344 "configure" #include "confdefs.h" #include <minix/config.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1349: \"$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* @@ -1421,12 +1394,12 @@ # [ This is ripped from GNU tar. ] echo $ac_n "checking for gethostent""... $ac_c" 1>&6 -echo "configure:1425: checking for gethostent" >&5 +echo "configure:1398: checking for gethostent" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostent'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1430 "configure" +#line 1403 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostent(); below. */ @@ -1449,7 +1422,7 @@ ; return 0; } EOF -if { (eval echo configure:1453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostent=yes" else @@ -1470,7 +1443,7 @@ if test $ac_cv_func_gethostent = no; then echo $ac_n "checking for gethostent in -lnsl""... $ac_c" 1>&6 -echo "configure:1474: checking for gethostent in -lnsl" >&5 +echo "configure:1447: checking for gethostent in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1478,7 +1451,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 1482 "configure" +#line 1455 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1489,7 +1462,7 @@ gethostent() ; return 0; } EOF -if { (eval echo configure:1493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1518,12 +1491,12 @@ fi echo $ac_n "checking for setsockopt""... $ac_c" 1>&6 -echo "configure:1522: checking for setsockopt" >&5 +echo "configure:1495: checking for setsockopt" >&5 if eval "test \"`echo '$''{'ac_cv_func_setsockopt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1527 "configure" +#line 1500 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char setsockopt(); below. */ @@ -1546,7 +1519,7 @@ ; return 0; } EOF -if { (eval echo configure:1550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setsockopt=yes" else @@ -1567,7 +1540,7 @@ if test $ac_cv_func_setsockopt = no; then echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6 -echo "configure:1571: checking for setsockopt in -lsocket" >&5 +echo "configure:1544: checking for setsockopt in -lsocket" >&5 ac_lib_var=`echo socket'_'setsockopt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1575,7 +1548,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 1579 "configure" +#line 1552 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1586,7 +1559,7 @@ setsockopt() ; return 0; } EOF -if { (eval echo configure:1590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1617,7 +1590,7 @@ echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:1621: checking for gdbm_open in -lgdbm" >&5 +echo "configure:1594: checking for gdbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1625,7 +1598,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <<EOF -#line 1629 "configure" +#line 1602 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1636,7 +1609,7 @@ gdbm_open() ; return 0; } EOF -if { (eval echo configure:1640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1667,12 +1640,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1671: checking for ANSI C header files" >&5 +echo "configure:1644: 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 1676 "configure" +#line 1649 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1680,7 +1653,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1657: \"$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* @@ -1697,7 +1670,7 @@ 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 1701 "configure" +#line 1674 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1715,7 +1688,7 @@ 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 1719 "configure" +#line 1692 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1736,7 +1709,7 @@ : else cat > conftest.$ac_ext <<EOF -#line 1740 "configure" +#line 1713 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1747,7 +1720,7 @@ exit (0); } EOF -if { (eval echo configure:1751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1775,12 +1748,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1779: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1752: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1784 "configure" +#line 1757 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -1788,7 +1761,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1813,7 +1786,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1817: checking for opendir in -ldir" >&5 +echo "configure:1790: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1821,7 +1794,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 1825 "configure" +#line 1798 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1832,7 +1805,7 @@ opendir() ; return 0; } EOF -if { (eval echo configure:1836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1854,7 +1827,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1858: checking for opendir in -lx" >&5 +echo "configure:1831: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1862,7 +1835,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 1866 "configure" +#line 1839 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1873,7 +1846,7 @@ opendir() ; return 0; } EOF -if { (eval echo configure:1877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1899,17 +1872,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1903: checking for $ac_hdr" >&5 +echo "configure:1876: 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 1908 "configure" +#line 1881 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1886: \"$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* @@ -1939,17 +1912,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1943: checking for $ac_hdr" >&5 +echo "configure:1916: 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 1948 "configure" +#line 1921 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1926: \"$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* @@ -1979,17 +1952,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1983: checking for $ac_hdr" >&5 +echo "configure:1956: 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 1988 "configure" +#line 1961 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1966: \"$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* @@ -2019,12 +1992,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2023: checking for working const" >&5 +echo "configure:1996: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2028 "configure" +#line 2001 "configure" #include "confdefs.h" int main() { @@ -2073,7 +2046,7 @@ ; return 0; } EOF -if { (eval echo configure:2077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2094,12 +2067,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2098: checking for size_t" >&5 +echo "configure:2071: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2103 "configure" +#line 2076 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2127,12 +2100,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2131: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2104: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2136 "configure" +#line 2109 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -2141,7 +2114,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2162,12 +2135,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2166: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2139: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2171 "configure" +#line 2144 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -2175,7 +2148,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2197,12 +2170,12 @@ echo $ac_n "checking socklen_t""... $ac_c" 1>&6 -echo "configure:2201: checking socklen_t" >&5 +echo "configure:2174: checking socklen_t" >&5 if eval "test \"`echo '$''{'noffle_cv_type_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2206 "configure" +#line 2179 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2212,7 +2185,7 @@ socklen_t s; ; return 0; } EOF -if { (eval echo configure:2216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* noffle_cv_type_socklen_t=yes else @@ -2238,12 +2211,12 @@ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2242: checking return type of signal handlers" >&5 +echo "configure:2215: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2247 "configure" +#line 2220 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2260,7 +2233,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2279,12 +2252,12 @@ echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:2283: checking for strftime" >&5 +echo "configure:2256: checking for strftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2288 "configure" +#line 2261 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strftime(); below. */ @@ -2307,7 +2280,7 @@ ; return 0; } EOF -if { (eval echo configure:2311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -2329,7 +2302,7 @@ echo "$ac_t""no" 1>&6 # strftime is in -lintl on SCO UNIX. echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:2333: checking for strftime in -lintl" >&5 +echo "configure:2306: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2337,7 +2310,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2341 "configure" +#line 2314 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2348,7 +2321,7 @@ strftime() ; return 0; } EOF -if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2375,7 +2348,7 @@ fi echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 -echo "configure:2379: checking for working fnmatch" >&5 +echo "configure:2352: checking for working fnmatch" >&5 if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2386,11 +2359,11 @@ ac_cv_func_fnmatch_works=no else cat > conftest.$ac_ext <<EOF -#line 2390 "configure" +#line 2363 "configure" #include "confdefs.h" main() { exit (fnmatch ("a*", "abc", 0) != 0); } EOF -if { (eval echo configure:2394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_fnmatch_works=yes else @@ -2415,12 +2388,12 @@ for ac_func in fdopen vsnprintf snprintf __vsnprintf __snprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2419: checking for $ac_func" >&5 +echo "configure:2392: 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 2424 "configure" +#line 2397 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2443,7 +2416,7 @@ ; return 0; } EOF -if { (eval echo configure:2447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2420: \"$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 @@ -2470,12 +2443,12 @@ for ac_func in gethostname mkdir mktime select socket strerror strstr uname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2474: checking for $ac_func" >&5 +echo "configure:2447: 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 2479 "configure" +#line 2452 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2498,7 +2471,7 @@ ; return 0; } EOF -if { (eval echo configure:2502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2475: \"$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 @@ -2564,7 +2537,7 @@ noffle_cv_docdir=$withval else echo $ac_n "checking where to put the documentation""... $ac_c" 1>&6 -echo "configure:2568: checking where to put the documentation" >&5 +echo "configure:2541: checking where to put the documentation" >&5 if eval "test \"`echo '$''{'noffle_cv_docdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2603,6 +2576,10 @@ DOCDIR=$noffle_cv_docdir +cat >> confdefs.h <<EOF +#define SENDMAILPROG "$SENDMAILPROG" +EOF + trap '' 1 2 15 @@ -2751,8 +2728,7 @@ s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g s%@CPP@%$CPP%g -s%@MAILPROG@%$MAILPROG%g -s%@SORTPROG@%$SORTPROG%g +s%@SENDMAILPROG@%$SENDMAILPROG%g s%@CONFIGFILE@%$CONFIGFILE%g s%@SPOOLDIR@%$SPOOLDIR%g s%@DOCDIR@%$DOCDIR%g
--- a/configure.in Sun Oct 15 18:22:42 2000 +0100 +++ b/configure.in Sun Oct 15 18:23:27 2000 +0100 @@ -28,17 +28,12 @@ AC_PROG_INSTALL AC_PROG_MAKE_SET -AC_CHECK_PROG(MAILPROG, mail, mail) -if test "x$MAILPROG" != "xmail"; then - AC_MSG_ERROR(mail program not found.) +AC_PATH_PROG(SENDMAILPROG, sendmail, 'notfound', + /usr/sbin:/usr/lib:$PATH) +if test "x$SENDMAILPROG" = "xnotfound"; then + AC_MSG_ERROR(sendmail program not found in /usr/lib:/usr/sbin:$PATH .) fi -AC_CHECK_PROG(SORTPROG, sort, sort) -if test "x$SORTPROG" != "xsort"; then - AC_MSG_ERROR(sort program not found.) -fi - - dnl --------------------------------------------------------------------------- dnl System checks. dnl --------------------------------------------------------------------------- @@ -200,6 +195,7 @@ DOCDIR=$noffle_cv_docdir AC_SUBST(DOCDIR) +AC_DEFINE_UNQUOTED(SENDMAILPROG, "$SENDMAILPROG") dnl --------------------------------------------------------------------------- dnl Output files.
--- a/docs/Makefile.in Sun Oct 15 18:22:42 2000 +0100 +++ b/docs/Makefile.in Sun Oct 15 18:23:27 2000 +0100 @@ -62,10 +62,9 @@ CC = @CC@ CONFIGFILE = @CONFIGFILE@ DOCDIR = @DOCDIR@ -MAILPROG = @MAILPROG@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ -SORTPROG = @SORTPROG@ +SENDMAILPROG = @SENDMAILPROG@ SPOOLDIR = @SPOOLDIR@ VERSION = @VERSION@