]>
Commit | Line | Data |
---|---|---|
96c78afd | 1 | diff -Nur mutt-1.4.1.orig/configure.in mutt-1.4.1/configure.in |
2 | --- mutt-1.4.1.orig/configure.in Mon Dec 8 13:51:51 2003 | |
3 | +++ mutt-1.4.1/configure.in Mon Dec 8 14:01:22 2003 | |
4 | @@ -592,6 +592,31 @@ | |
5 | ]) | |
6 | AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes) | |
7 | ||
8 | +AC_ARG_WITH(home-etc, [ --with-home-etc[=PFX] Use HOME-ETC library to allow user keeping it's configuration files in a non-standard place ], | |
9 | + [ | |
10 | + if test "$with_home_etc" != "no" | |
11 | + then | |
12 | + if test "$with_home_etc" != "yes" | |
13 | + then | |
14 | + LDFLAGS="$LDFLAGS -L$with_home_etc/lib" | |
15 | + fi | |
16 | + | |
17 | + saved_LIBS="$LIBS" | |
18 | + | |
19 | + AC_CHECK_LIB(home_etc, get_home_etc_static,, | |
20 | + AC_MSG_ERROR([could not find libhome_etc]),) | |
21 | + | |
22 | + AC_CHECK_HEADERS(home_etc.h) | |
23 | + | |
24 | + MUTTLIBS="$MUTTLIBS -lhome_etc" | |
25 | + LIBS="$saved_LIBS" | |
26 | + AC_DEFINE(USE_HOME_ETC,1, | |
27 | + [ Define if want to use the HOME-ETC library. ]) | |
28 | + need_home_etc=yes | |
29 | + fi | |
30 | + ]) | |
31 | +AM_CONDITIONAL(USE_HOME_ETC, test x$need_home_etc = xyes) | |
32 | + | |
33 | if test "$need_md5" = "yes" | |
34 | then | |
35 | MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5c.o" | |
36 | diff -Nur mutt-1.4.1.orig/doc/mutt.man mutt-1.4.1/doc/mutt.man | |
1bd25f33 | 37 | --- mutt-1.4.1.orig/doc/mutt.man Wed Jul 24 10:41:31 2002 |
96c78afd | 38 | +++ mutt-1.4.1/doc/mutt.man Mon Dec 8 13:53:17 2003 |
1bd25f33 | 39 | @@ -122,13 +122,13 @@ |
40 | Specifies the editor to use when composing messages. | |
41 | .SH FILES | |
42 | .PP | |
43 | -.IP "~/.muttrc or ~/.mutt/muttrc" | |
44 | +.IP "$HOME_ETC/.muttrc" or "$HOME_ETC/.mutt/muttrc" or "~/.muttrc" or "~/.mutt/muttrc" | |
45 | User configuration file. | |
46 | .IP "/etc/Muttrc" | |
47 | System-wide configuration file. | |
48 | .IP "/tmp/muttXXXXXX" | |
49 | Temporary files created by Mutt. | |
50 | -.IP "~/.mailcap" | |
51 | +.IP "$HOME_ETC/.mailcap" or "~/.mailcap" | |
52 | User definition for handling non-text MIME types. | |
53 | .IP "/etc/mailcap" | |
54 | System definition for handling non-text MIME types. | |
55 | diff -Nur mutt-1.4.1.orig/init.c mutt-1.4.1/init.c | |
96c78afd | 56 | --- mutt-1.4.1.orig/init.c Mon Dec 8 13:51:51 2003 |
57 | +++ mutt-1.4.1/init.c Mon Dec 8 14:02:19 2003 | |
58 | @@ -25,6 +25,12 @@ | |
1bd25f33 | 59 | #include "mbyte.h" |
60 | #include "charset.h" | |
61 | ||
96c78afd | 62 | +#ifdef HAVE_HOME_ETC_H |
63 | +# include <home_etc.h> | |
64 | +# define H_CFDIR _HEdir | |
65 | +#else | |
66 | +# define H_CFDIR Homedir | |
67 | +#endif | |
1bd25f33 | 68 | |
69 | #ifdef HAVE_PGP | |
70 | #include "pgp.h" | |
96c78afd | 71 | @@ -1892,13 +1898,13 @@ |
cdf1731c TO |
72 | |
73 | if (!Muttrc) | |
74 | { | |
75 | - snprintf (buffer, sizeof(buffer), "%s/.muttrc-%s", NONULL(Homedir), MUTT_VERSION); | |
96c78afd | 76 | + snprintf (buffer, sizeof(buffer), "%s/.muttrc-%s", NONULL(H_CFDIR), MUTT_VERSION); |
cdf1731c | 77 | if (access(buffer, F_OK) == -1) |
1bd25f33 | 78 | - snprintf (buffer, sizeof(buffer), "%s/.muttrc", NONULL(Homedir)); |
96c78afd | 79 | + snprintf (buffer, sizeof(buffer), "%s/.muttrc", NONULL(H_CFDIR)); |
cdf1731c | 80 | if (access(buffer, F_OK) == -1) |
1bd25f33 | 81 | - snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc-%s", NONULL(Homedir), MUTT_VERSION); |
96c78afd | 82 | + snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc-%s", NONULL(H_CFDIR), MUTT_VERSION); |
1bd25f33 | 83 | if (access(buffer, F_OK) == -1) |
84 | - snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc", NONULL(Homedir)); | |
96c78afd | 85 | + snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc", NONULL(H_CFDIR)); |
1bd25f33 | 86 | |
87 | default_rc = 1; | |
88 | Muttrc = safe_strdup (buffer); | |
96c78afd | 89 | diff -Nur mutt-1.4.1.orig/muttbug.sh.in mutt-1.4.1/muttbug.sh.in |
90 | --- mutt-1.4.1.orig/muttbug.sh.in Mon Dec 8 13:51:50 2003 | |
91 | +++ mutt-1.4.1/muttbug.sh.in Mon Dec 8 13:53:17 2003 | |
1bd25f33 | 92 | @@ -244,13 +244,21 @@ |
93 | if test "$personal" = "yes" ; then | |
94 | CANDIDATES=".muttrc-${MUTTVERSION} .muttrc .mutt/muttrc-${MUTTVERSION} .mutt/muttrc" | |
95 | MATCHED="none" | |
96 | + if test -n "$HOME_ETC" ; then | |
97 | + for f in $CANDIDATES; do | |
98 | + if test -f "${HOME_ETC}/$f" ; then | |
99 | + MATCHED="${HOME_ETC}/$f" | |
100 | + break | |
101 | + fi | |
102 | + done | |
103 | + else | |
104 | for f in $CANDIDATES; do | |
105 | if test -f "${HOME}/$f" ; then | |
106 | MATCHED="${HOME}/$f" | |
107 | break | |
108 | fi | |
109 | done | |
110 | - | |
111 | + fi | |
112 | if test "$MATCHED" = "none" ; then | |
113 | echo "Warning: Can't find your personal .muttrc." >&2 | |
114 | else | |
115 | diff -Nur mutt-1.4.1.orig/sendlib.c mutt-1.4.1/sendlib.c | |
96c78afd | 116 | --- mutt-1.4.1.orig/sendlib.c Mon Dec 8 13:51:51 2003 |
117 | +++ mutt-1.4.1/sendlib.c Mon Dec 8 14:02:54 2003 | |
118 | @@ -29,7 +29,6 @@ | |
119 | #include "pager.h" | |
120 | #include "charset.h" | |
121 | ||
122 | - | |
123 | #include <string.h> | |
124 | #include <stdlib.h> | |
125 | #include <unistd.h> | |
126 | @@ -40,6 +39,13 @@ | |
1bd25f33 | 127 | #include <sys/wait.h> |
128 | #include <fcntl.h> | |
129 | ||
96c78afd | 130 | +#ifdef HAVE_HOME_ETC_H |
131 | +# include <home_etc.h> | |
132 | +# define H_CFDIR _HEdir | |
133 | +#else | |
134 | +# define H_CFDIR Homedir | |
135 | +#endif | |
1bd25f33 | 136 | + |
137 | #ifdef HAVE_SYSEXITS_H | |
138 | #include <sysexits.h> | |
139 | #else /* Make sure EX_OK is defined <philiph@pobox.com> */ | |
96c78afd | 140 | @@ -958,9 +964,9 @@ |
1bd25f33 | 141 | |
142 | /* Given a file with path ``s'', see if there is a registered MIME type. | |
143 | * returns the major MIME type, and copies the subtype to ``d''. First look | |
144 | - * for ~/.mime.types, then look in a system mime.types if we can find one. | |
145 | - * The longest match is used so that we can match `ps.gz' when `gz' also | |
146 | - * exists. | |
147 | + * for either $HOME_ETC/.mime.types or ~/.mime.types, then look in a system | |
148 | + * mime.types if we can find one. The longest match is used so that we can | |
149 | + * match `ps.gz' when `gz' also exists. | |
150 | */ | |
151 | ||
152 | static int lookup_mime_type (BODY *att, const char *path) | |
96c78afd | 153 | @@ -989,7 +995,7 @@ |
1bd25f33 | 154 | switch (count) |
155 | { | |
156 | case 0: | |
157 | - snprintf (buf, sizeof (buf), "%s/.mime.types", NONULL(Homedir)); | |
96c78afd | 158 | + snprintf (buf, sizeof (buf), "%s/.mime.types", NONULL(H_CFDIR)); |
1bd25f33 | 159 | break; |
160 | case 1: | |
161 | strfcpy (buf, SYSCONFDIR"/mime.types", sizeof(buf)); |