diff options
| author | Jase Thew <bazerka@irssi.org> | 2010-12-09 09:51:58 +0000 |
|---|---|---|
| committer | bazerka <bazerka@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2010-12-09 09:51:58 +0000 |
| commit | 2bee6f12ae028bba82e55cf5d38bd562d59726ef (patch) | |
| tree | e8ad0a69a48041cc039a814c23b96c83520ea85b | |
| parent | 81b8dcdeb2e58d3b924dd66f442b68c05a6f54cc (diff) | |
| download | irssi-2bee6f12ae028bba82e55cf5d38bd562d59726ef.zip | |
Add the path contained in the perl_use_lib setting to the search list
when attempting to automatically use chat_protocol perl modules. This
fixes the automatic calling of "use Irssi::Irc" when the Irssi perl modules
have been installed in a location outside of perl's site/vendor hierarchy.
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5197 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | src/perl/perl-common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c index 4018dcb1..daaa87f6 100644 --- a/src/perl/perl-common.c +++ b/src/perl/perl-common.c @@ -568,6 +568,7 @@ static void perl_register_protocol(CHAT_PROTOCOL_REC *rec) "Nick" }; static char *find_use_code = + "use lib qw(%s);\n" "my $pkg = Irssi::%s; $pkg =~ s/::/\\//;\n" "foreach my $i (@INC) {\n" " return 1 if (-f \"$i/$pkg.pm\");\n" @@ -626,7 +627,8 @@ static void perl_register_protocol(CHAT_PROTOCOL_REC *rec) perl_eval_pv(code, TRUE); } - pcode = g_strdup_printf(find_use_code, name); + pcode = g_strdup_printf(find_use_code, + settings_get_str("perl_use_lib"), name); sv = perl_eval_pv(pcode, TRUE); g_free(pcode); |