]>
Commit | Line | Data |
---|---|---|
e73b68be | 1 | diff -Nru procmail-3.14/src/autoconf procmail-3.14.new/src/autoconf |
2 | --- procmail-3.14/src/autoconf Mon May 3 17:22:46 1999 | |
3 | +++ procmail-3.14.new/src/autoconf Fri Mar 3 04:00:00 2000 | |
4 | @@ -78,8 +78,8 @@ | |
5 | # #define NOfcntl_lock | |
6 | #Ok #define USElockf | |
7 | #Ok #define USEflock | |
8 | -#Ok #define MAILSPOOLDIR "/var/spool/mail/" | |
9 | -#Ok #define SENDMAIL "/usr/sbin/sendmail" | |
10 | +#Ok #define MAILSPOOLDIR "/var/mail/" | |
11 | +#Ok #define SENDMAIL "/usr/lib/sendmail" | |
12 | # #define buggy_SENDMAIL | |
13 | # #define DEFflagsendmail "" | |
14 | #Ok #define CF_no_procmail_yet | |
15 | @@ -1329,47 +1329,11 @@ | |
16 | ||
17 | found=no | |
18 | ||
19 | -for a in /var/spool/mail /usr/spool/mail /var/mail /usr/mail /spool/mail | |
20 | -do | |
21 | - test -d $a -a $found != yes && | |
22 | - echo '#define MAILSPOOLDIR "'$a'/"' >>$ACONF && found=yes | |
23 | -done | |
24 | -if test $found != yes | |
25 | -then | |
26 | - echo '#define MAILSPOOLDIR "/var/spool/mail/"' >>$ACONF | |
27 | - echo Could not find the system-mailbox directory, supplied default. | |
28 | -fi | |
29 | - | |
30 | -cat >lookfor <<HERE | |
31 | -for a in /usr/sbin /usr/lib /lib /usr/etc /etc /usr/bin /bin /usr/local/bin \ | |
32 | - /usr/lbin /usr/local/lib /usr/local /usr/.lib /local/bin /sbin | |
33 | -do | |
34 | - if test -f "\$a/\$1" | |
35 | - then | |
36 | - echo '#define SENDMAIL "'"\$a/\$1"'"' >>$ACONF | |
37 | - exit 0 | |
38 | - fi | |
39 | -done | |
40 | -exit 1 | |
41 | -HERE | |
42 | -chmod 0755 lookfor | |
43 | +echo '#define MAILSPOOLDIR "'/var/mail'/"' >>$ACONF && found=yes | |
44 | ||
45 | -if _autotst 2 3 >>$ACONF | |
46 | - test $? != 0 || | |
47 | - lookfor sendmail || lookfor smail || lookfor mail #|| lookfor rmail | |
48 | -then | |
49 | -: | |
50 | -else | |
51 | - echo 'Could not find any mailer. It should be a mailer accepting at least' | |
52 | - echo 'one plain destination address as its only argument (any sendmail' | |
53 | - echo 'compatible mailer will do), and the mail-to-be-sent on stdin.' | |
54 | - echo 'What is your mailer called? (You can override this in config.h)' | |
55 | - read a | |
56 | - echo "#define SENDMAIL \"$a\"" >>$ACONF | |
57 | -fi | |
58 | +echo '#define SENDMAIL "/usr/lib/sendmail"' >>$ACONF | |
59 | ||
60 | -grep '^#define SENDMAIL ".*/sendmail"' $ACONF >$DEVNULL || | |
61 | - echo "#define DEFflagsendmail \"\"" >>$ACONF | |
62 | +echo "#define DEFflagsendmail \"\"" >>$ACONF | |
63 | ||
64 | a=/tmp/_chowntst.$$ | |
65 | $RM -r $a |