]>
Commit | Line | Data |
---|---|---|
44bad41b | 1 | # |
2 | # WARNING: this patch is devoted to a specific configuration | |
3 | # | |
4 | --- perl.c~ Tue Jul 9 19:41:43 2002 | |
5 | +++ perl.c Fri Mar 14 22:54:52 2003 | |
6 | @@ -3679,39 +3679,6 @@ | |
7 | incpush(APPLLIB_EXP, TRUE, TRUE); | |
8 | #endif | |
9 | ||
10 | -#ifdef ARCHLIB_EXP | |
11 | - incpush(ARCHLIB_EXP, FALSE, FALSE); | |
12 | -#endif | |
13 | -#ifdef MACOS_TRADITIONAL | |
14 | - { | |
15 | - Stat_t tmpstatbuf; | |
16 | - SV * privdir = NEWSV(55, 0); | |
17 | - char * macperl = PerlEnv_getenv("MACPERL"); | |
18 | - | |
19 | - if (!macperl) | |
20 | - macperl = ""; | |
21 | - | |
22 | - Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl); | |
23 | - if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) | |
24 | - incpush(SvPVX(privdir), TRUE, FALSE); | |
25 | - Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl); | |
26 | - if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) | |
27 | - incpush(SvPVX(privdir), TRUE, FALSE); | |
28 | - | |
29 | - SvREFCNT_dec(privdir); | |
30 | - } | |
31 | - if (!PL_tainting) | |
32 | - incpush(":", FALSE, FALSE); | |
33 | -#else | |
34 | -#ifndef PRIVLIB_EXP | |
35 | -# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" | |
36 | -#endif | |
37 | -#if defined(WIN32) | |
38 | - incpush(PRIVLIB_EXP, TRUE, FALSE); | |
39 | -#else | |
40 | - incpush(PRIVLIB_EXP, FALSE, FALSE); | |
41 | -#endif | |
42 | - | |
43 | #ifdef SITEARCH_EXP | |
44 | /* sitearch is always relative to sitelib on Windows for | |
45 | * DLL-based path intuition to work correctly */ | |
46 | @@ -3729,7 +3696,7 @@ | |
47 | #endif | |
48 | ||
49 | #ifdef SITELIB_STEM /* Search for version-specific dirs below here */ | |
50 | - incpush(SITELIB_STEM, FALSE, TRUE); | |
51 | +/* incpush(SITELIB_STEM, FALSE, TRUE); */ | |
52 | #endif | |
53 | ||
54 | #ifdef PERL_VENDORARCH_EXP | |
55 | @@ -3749,7 +3716,40 @@ | |
56 | #endif | |
57 | ||
58 | #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */ | |
59 | - incpush(PERL_VENDORLIB_STEM, FALSE, TRUE); | |
60 | +/* incpush(PERL_VENDORLIB_STEM, FALSE, TRUE); */ | |
61 | +#endif | |
62 | + | |
63 | +#ifdef ARCHLIB_EXP | |
64 | + incpush(ARCHLIB_EXP, FALSE, FALSE); | |
65 | +#endif | |
66 | +#ifdef MACOS_TRADITIONAL | |
67 | + { | |
68 | + Stat_t tmpstatbuf; | |
69 | + SV * privdir = NEWSV(55, 0); | |
70 | + char * macperl = PerlEnv_getenv("MACPERL"); | |
71 | + | |
72 | + if (!macperl) | |
73 | + macperl = ""; | |
74 | + | |
75 | + Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl); | |
76 | + if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) | |
77 | + incpush(SvPVX(privdir), TRUE, FALSE); | |
78 | + Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl); | |
79 | + if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) | |
80 | + incpush(SvPVX(privdir), TRUE, FALSE); | |
81 | + | |
82 | + SvREFCNT_dec(privdir); | |
83 | + } | |
84 | + if (!PL_tainting) | |
85 | + incpush(":", FALSE, FALSE); | |
86 | +#else | |
87 | +#ifndef PRIVLIB_EXP | |
88 | +# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" | |
89 | +#endif | |
90 | +#if defined(WIN32) | |
91 | + incpush(PRIVLIB_EXP, TRUE, FALSE); | |
92 | +#else | |
93 | + incpush(PRIVLIB_EXP, FALSE, FALSE); | |
94 | #endif | |
95 | ||
96 | #ifdef PERL_OTHERLIBDIRS |