]>
Commit | Line | Data |
---|---|---|
f9dda27f JR |
1 | --- alpine-0.9999/configure.ac.orig 2007-08-22 00:13:29.000000000 +0200 |
2 | +++ alpine-0.9999/configure.ac 2007-11-05 15:24:56.000000000 +0100 | |
3 | @@ -765,6 +765,15 @@ | |
4 | ||
5 | dnl CHECK LIBRARIES | |
6 | ||
7 | +AC_CHECK_LIB(home_etc, get_home_etc_static, | |
8 | + [ | |
9 | + AC_CHECK_HEADER([home_etc.h]) | |
10 | + LIBS="$LIBS -lhome_etc" | |
11 | + have_home_etc=yes | |
12 | + AC_DEFINE(HAVE_HOME_ETC,1,[ Define if want to use the HOME-ETC library. ]) | |
13 | + ], | |
14 | + AC_MSG_ERROR([could not find libhome_etc])) | |
15 | + | |
16 | if test x$enable_dmalloc = "xyes" ; then | |
17 | if test "x$with_pthread" = "xyes" ; then | |
18 | dmalloc_lib=dmallocth | |
19 | --- alpine-0.9999/alpine/pine-use.c~ 2006-09-22 22:06:05.000000000 +0200 | |
20 | +++ alpine-0.9999/alpine/pine-use.c 2007-11-05 15:13:10.000000000 +0100 | |
21 | @@ -20,6 +20,13 @@ | |
22 | #include <sys/types.h> | |
23 | #include <sys/stat.h> | |
24 | ||
25 | +#ifdef HAVE_HOME_ETC | |
26 | +# include <home_etc.h> | |
27 | +# define HOMEDIR _HEdir | |
28 | +#else | |
29 | +# define HOMEDIR pw->pw_dir | |
30 | +#endif | |
31 | + | |
32 | #ifndef MAILSPOOLPCTS | |
33 | #define MAILSPOOLPCTS "/usr/spool/mail/%s" | |
34 | /* #define MAILSPOOLPCTS "/usr/mail/%s" */ | |
35 | @@ -74,7 +81,7 @@ | |
36 | if(strcmp(pw->pw_dir, "/") == 0) | |
37 | continue; | |
38 | ||
39 | - sprintf(filename, "%s/.pinerc", pw->pw_dir); | |
40 | + sprintf(filename, "%s/.pinerc", HOMEDIR); | |
41 | if(stat(filename, &statb) < 0) | |
42 | continue; | |
43 | if(statb.st_mtime + 7 * DAYSEC > now) | |
44 | --- alpine-0.9999/pith/conf.c~ 2007-11-02 16:19:06.000000000 +0100 | |
45 | +++ alpine-0.9999/pith/conf.c 2007-11-05 15:12:00.000000000 +0100 | |
46 | @@ -57,6 +57,12 @@ | |
47 | #include "../pico/osdep/mswin.h" | |
48 | #endif | |
49 | ||
50 | +#ifdef HAVE_HOME_ETC | |
51 | +# include <home_etc.h> | |
52 | +# define HOMEDIR _HEdir | |
53 | +#else | |
54 | +# define HOMEDIR ps->home_dir | |
55 | +#endif | |
56 | ||
57 | #define TO_BAIL_THRESHOLD 60 | |
58 | ||
59 | @@ -1473,7 +1479,7 @@ | |
60 | } | |
61 | ||
62 | if(!ps->pinerc){ | |
63 | - build_path(buf, ps->home_dir, ".pinerc", sizeof(buf)); | |
64 | + build_path(buf, HOMEDIR, ".pinerc", sizeof(buf)); | |
65 | ps->pinerc = cpystr(buf); | |
66 | } | |
67 |